From 034015f4f756314154c515b7e227e561fa20e930 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 30 Jul 2021 15:11:20 +0800 Subject: [PATCH 01/29] =?UTF-8?q?>8000=E7=9A=84=E9=94=99=E8=AF=AF=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=BB=99=E7=94=A8=E6=88=B7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PartyMemberConfirmServiceImpl.java | 2 +- .../java/com/epmet/service/impl/UserResiInfoServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index fb8490ad0b..951d13bb86 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -583,7 +583,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService Result result = epmetUserFeignClient.saveResiInfo(userResiInfoDTO); log.info("isResiRegister epmetUserFeignClient.saveResiInfo result:{}",JSON.toJSONString(result)); if (!result.success()){ - throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(),EpmetErrorCode.SERVER_ERROR.getMsg()); + throw new RenException(result.getCode(),result.getMsg()); } }else{ log.info("isResiRegister partyMember have registered resi，userId:{}",partyMemberInfoDTO.getUserId()); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 53befc262c..2c58fe7b65 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -310,8 +310,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl Date: Fri, 30 Jul 2021 17:36:15 +0800 Subject: [PATCH 02/29] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/filter/LogMsgSendFilter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java index ffadf837b3..4a6332f74a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java @@ -21,6 +21,7 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; +import java.util.Date; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -70,7 +71,7 @@ public class LogMsgSendFilter extends LevelFilter { stringBuilder.append("\n"); } - stringBuilder.append("故障时间：").append(DateUtils.formatTimestamp(event.getTimeStamp(),DateUtils.DATE_TIME_PATTERN)); + stringBuilder.append("故障时间：").append(DateUtils.format(new Date(event.getTimeStamp()),DateUtils.DATE_TIME_PATTERN)); stringBuilder.append("\n"); stringBuilder.append("TraceId：").append(Thread.currentThread().getName()); stringBuilder.append("\n"); From 973948cd41b86a9c1ffee96ad9b57232f48f48e1 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 2 Aug 2021 10:03:43 +0800 Subject: [PATCH 03/29] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=A5=E4=BA=8B?= =?UTF-8?q?=E7=9A=84controller,service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/ResiEventController.java | 17 +++++++++++++++++ .../com/epmet/service/ResiEventService.java | 9 +++++++++ .../service/impl/ResiEventServiceImpl.java | 13 +++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java new file mode 100644 index 0000000000..c0a20d039a --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -0,0 +1,17 @@ +package com.epmet.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description 群众直报/报事controller + * @author wxz + * @date 2021.08.02 09:58:40 +*/ +@RestController +@RequestMapping("resi-event") +public class ResiEventController { + + + +} diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java new file mode 100644 index 0000000000..3a426d3326 --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java @@ -0,0 +1,9 @@ +package com.epmet.service; + +/** + * @Description 报事service + * @author wxz + * @date 2021.08.02 09:59:16 +*/ +public interface ResiEventService { +} diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java new file mode 100644 index 0000000000..2d8be957f7 --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -0,0 +1,13 @@ +package com.epmet.service.impl; + +import com.epmet.service.ResiEventService; +import org.springframework.stereotype.Service; + +/** + * @Description 报事service + * @author wxz + * @date 2021.08.02 09:59:36 +*/ +@Service +public class ResiEventServiceImpl implements ResiEventService { +} From d154c172b229aac8300687f3d5b0b6be67641917 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 3 Aug 2021 09:10:46 +0800 Subject: [PATCH 04/29] =?UTF-8?q?=E6=96=B0=E5=A2=9Eresi=5Fevent=5FXXX?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=BB=BA=E8=A1=A8=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V0.0.16__create_resievent_tables.sql | 126 ++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql new file mode 100644 index 0000000000..f753c01e22 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql @@ -0,0 +1,126 @@ +CREATE TABLE `resi_event` ( + `ID` varchar(64) NOT NULL COMMENT '主键，事件id', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `GRID_ID` varchar(64) NOT NULL COMMENT '居民端用户所在网格id', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '居民端用户所在网格的所属组织', + `PIDS` varchar(64) NOT NULL COMMENT '居民端用户所在网格的所有上级组织，包含AGENCY_ID', + `REPORT_USER_ID` varchar(64) NOT NULL COMMENT '报事的人', + `IS_PARTY` varchar(1) NOT NULL DEFAULT '0' COMMENT '1：党员；0：不是党员；默认0', + `EVENT_CONTENT` varchar(1024) NOT NULL COMMENT '事件内容', + `LATITUDE` varchar(32) DEFAULT NULL COMMENT '纬度', + `LONGITUDE` varchar(32) DEFAULT NULL COMMENT '经度', + `ADDRESS` varchar(255) NOT NULL COMMENT '地址', + `STATUS` varchar(32) NOT NULL COMMENT '处理中：processing；已办结：closed_case', + `SHIFT_PROJECT` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1：已转项目；0：未转项目；默认0', + `PROJECT_ID` varchar(64) DEFAULT NULL COMMENT '项目id;shift_project=1时，此列有值', + `RECALL_FLAG` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1:已撤回；0：未撤回正常展示；默认0', + `RECALL_TIME` datetime DEFAULT NULL COMMENT '撤回时间', + `READ_FLAG` tinyint(1) NOT NULL DEFAULT '0' COMMENT '事件是否被阅读过;1已读；针对报事人待处理列表', + `RED_DOT` tinyint(1) NOT NULL DEFAULT '0' COMMENT '报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/办结更新为1; ', + `LATEST_OPERATED_TIME` datetime NOT NULL COMMENT '最近一次操作时间（回复、立项、办结更新此列）', + `RESOLVE_STATUS` varchar(32) DEFAULT NULL COMMENT '是否解决：已解决 resolved，未解决 un_solved', + `CLOSE_REMARK` varchar(255) DEFAULT NULL COMMENT '结案说明可放这。', + `DEL_FLAG` char(1) NOT NULL COMMENT '删除标识:0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '展示红点：visible；隐藏：invisible；人大回复、工作人员回复/立项更新为visible; 插入数据默认不展示', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='居民报事表'; + +CREATE TABLE `resi_event_attachment` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `RESI_EVENT_ID` varchar(64) NOT NULL COMMENT '事件Id，关联resi_event的id', + `ATTACHMENT_NAME` varchar(64) NOT NULL COMMENT '附件名', + `ATTACHMENT_FORMAT` varchar(64) NOT NULL COMMENT '文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）', + `ATTACHMENT_TYPE` varchar(64) NOT NULL COMMENT '附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））', + `ATTACHMENT_URL` varchar(255) NOT NULL COMMENT '附件地址', + `SORT` int(1) NOT NULL COMMENT '排序字段', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='事件附件表'; + + +CREATE TABLE `resi_event_mention` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `RESI_EVENT_ID` varchar(64) NOT NULL COMMENT '事件id', + `USER_TYPE` varchar(32) NOT NULL COMMENT '人大代表:npc_user', + `USER_ID` varchar(64) NOT NULL COMMENT '居民端用户id', + `GRID_ID` varchar(64) NOT NULL COMMENT '居民注册网格ID', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '居民所属社区，就是grid_id的所属组织', + `PIDS` varchar(255) NOT NULL COMMENT '居民注册网格的所有上级', + `READ_FLAG` varchar(10) NOT NULL DEFAULT 'un_read' COMMENT '含义：已读read，未读：un_read；人大代表从未读=>已读，点击查看详情前更新为已读；', + `RED_DOT` tinyint(1) NOT NULL DEFAULT '1' COMMENT '(1)含义：1:展示红点；0：不展示；(2)注意：发布事件插入数据时为1，(3)何时更新？：报事人回复or工作人员回复、立项、办结更新为1；', + `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 1删除；0未删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='事件被@人表'; + + +CREATE TABLE `resi_event_report_org` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `RESI_EVENT_ID` varchar(64) NOT NULL COMMENT '事件id', + `ORG_TYPE` varchar(32) NOT NULL COMMENT '报给？：\r\n网格：grid；\r\n社区：community；\r\n乡（镇、街道）级:street；\r\n区县级: district；\r\n市级: city；\r\n省级:province。', + `ORG_ID` varchar(64) NOT NULL COMMENT '报给的组织或者网格id', + `ORG_PID` varchar(64) NOT NULL COMMENT 'org_id的上级组织id，org_id是跟组织，此列为0', + `ORG_PIDS` varchar(255) NOT NULL COMMENT 'org_id的所有上级组织id，org_id是跟组织，此列为0', + `ORG_READ` varchar(10) NOT NULL DEFAULT 'un_read' COMMENT '含义：已读read，未读：un_read；组织下的工作人员从待处理=>处理中，点击查看详情前更新为已读；', + `RED_DOT` tinyint(1) NOT NULL DEFAULT '1' COMMENT '(1)含义：1:展示红点；0：不展示；(2)注意：发布事件插入数据时为1，(3)何时更新？：人大代表回复or报事人回复or工作人员回复、立项、办结更新为1；', + `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 1删除；0未删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='事件相关组织表'; + + + +CREATE TABLE `resi_event_reply` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `RESI_EVENT_ID` varchar(64) NOT NULL COMMENT '事件Id，关联resi_event的id', + `FROM_USER_ID` varchar(64) NOT NULL COMMENT '回复人用户Id', + `CONTENT` varchar(255) NOT NULL COMMENT '内容', + `USER_SHOW_NAME` varchar(64) NOT NULL COMMENT '报事人：xxx路尹女士；人大：人大代表-张三；组织：组织名：阜新路社区', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='事件回复表'; + + +CREATE TABLE `resi_event_operation_log` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `RESI_EVENT_ID` varchar(64) NOT NULL COMMENT '事件id', + `USER_ID` varchar(64) NOT NULL COMMENT '用户id', + `USER_IDENTITY` varchar(32) NOT NULL COMMENT '居民端用户:resi_user；工作人员:staff；报事人:report_user', + `ACTION_CODE` varchar(32) NOT NULL COMMENT '1、发布事件：publish；\r\n2、撤回事件：recall；\r\n3、复：reply；\r\n4、立项：shift_project；\r\n5、办结：close_case;\r\n6、选择是否已解决：choose_resolve;\r\n7、查看阅读事件：read：人大代表未读=>已读；工作人员待处理=>处理中；\r\n', + `ACTION_DESC` varchar(32) NOT NULL COMMENT '1、发布事件：publish；\r\n2、撤回事件：recall；\r\n3、复：reply；\r\n4、立项：shift_project；\r\n5、办结：close_case;\r\n6、选择是否已解决：choose_resolve;\r\n7、查看阅读事件：read：人大代表未读=>已读；工作人员待处理=>处理中；', + `OPERATE_TIME` datetime NOT NULL COMMENT '操作时间', + `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 1删除；0未删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='事件操作日志表'; \ No newline at end of file From 16345ea5ae91e605e78d9d2c254d6baaa0dfe5ee Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 3 Aug 2021 09:25:10 +0800 Subject: [PATCH 05/29] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=8C=E5=8F=AA=E6=94=BE=E4=BA=86=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=92=8C=E5=9B=9E=E5=A4=8D=E4=B8=A4=E4=B8=AA=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E7=9A=84controller?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/ResiEventController.java | 40 +++++ .../com/epmet/dao/ResiEventAttachmentDao.java | 33 ++++ .../main/java/com/epmet/dao/ResiEventDao.java | 33 ++++ .../com/epmet/dao/ResiEventMentionDao.java | 33 ++++ .../epmet/dao/ResiEventOperationLogDao.java | 33 ++++ .../java/com/epmet/dao/ResiEventReplyDao.java | 33 ++++ .../com/epmet/dao/ResiEventReportOrgDao.java | 33 ++++ .../entity/ResiEventAttachmentEntity.java | 76 ++++++++++ .../com/epmet/entity/ResiEventEntity.java | 141 ++++++++++++++++++ .../epmet/entity/ResiEventMentionEntity.java | 86 +++++++++++ .../entity/ResiEventOperationLogEntity.java | 89 +++++++++++ .../epmet/entity/ResiEventReplyEntity.java | 66 ++++++++ .../entity/ResiEventReportOrgEntity.java | 87 +++++++++++ .../epmet/service/ResiEventReplyService.java | 31 ++++ .../com/epmet/service/ResiEventService.java | 30 ++++ .../impl/ResiEventReplyServiceImpl.java | 36 +++++ .../service/impl/ResiEventServiceImpl.java | 36 +++++ .../mapper/ResiEventAttachmentDao.xml | 8 + .../main/resources/mapper/ResiEventDao.xml | 8 + .../resources/mapper/ResiEventMentionDao.xml | 8 + .../mapper/ResiEventOperationLogDao.xml | 8 + .../resources/mapper/ResiEventReplyDao.xml | 8 + .../mapper/ResiEventReportOrgDao.xml | 8 + 23 files changed, 964 insertions(+) create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventAttachmentDao.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventOperationLogDao.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReplyDao.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventAttachmentEntity.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventOperationLogEntity.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReplyEntity.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReportOrgEntity.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventAttachmentDao.xml create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventOperationLogDao.xml create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReplyDao.xml create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java new file mode 100644 index 0000000000..9352700c88 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -0,0 +1,40 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.controller; + +import com.epmet.service.ResiEventService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 居民报事表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@RestController +@RequestMapping("resievent") +public class ResiEventController { + + @Autowired + private ResiEventService resiEventService; + + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventAttachmentDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventAttachmentDao.java new file mode 100644 index 0000000000..1202c3dc22 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventAttachmentDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.ResiEventAttachmentEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 事件附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@Mapper +public interface ResiEventAttachmentDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java new file mode 100644 index 0000000000..c1312cb0d9 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.ResiEventEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 居民报事表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@Mapper +public interface ResiEventDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java new file mode 100644 index 0000000000..270500ae05 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.ResiEventMentionEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 事件被@人表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@Mapper +public interface ResiEventMentionDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventOperationLogDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventOperationLogDao.java new file mode 100644 index 0000000000..6432b2dbb6 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventOperationLogDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.ResiEventOperationLogEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 事件操作日志表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@Mapper +public interface ResiEventOperationLogDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReplyDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReplyDao.java new file mode 100644 index 0000000000..38cbf1467d --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReplyDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.ResiEventReplyEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 事件回复表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@Mapper +public interface ResiEventReplyDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java new file mode 100644 index 0000000000..b8d9776cab --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.ResiEventReportOrgEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 事件相关组织表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@Mapper +public interface ResiEventReportOrgDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventAttachmentEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventAttachmentEntity.java new file mode 100644 index 0000000000..255c7c465c --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventAttachmentEntity.java @@ -0,0 +1,76 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 事件附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("resi_event_attachment") +public class ResiEventAttachmentEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 事件Id，关联resi_event的id + */ + private String resiEventId; + + /** + * 附件名 + */ + private String attachmentName; + + /** + * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS） + */ + private String attachmentFormat; + + /** + * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） + */ + private String attachmentType; + + /** + * 附件地址 + */ + private String attachmentUrl; + + /** + * 排序字段 + */ + private Integer sort; + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java new file mode 100644 index 0000000000..9453ab7447 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java @@ -0,0 +1,141 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 居民报事表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("resi_event") +public class ResiEventEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 居民端用户所在网格id + */ + private String gridId; + + /** + * 居民端用户所在网格的所属组织 + */ + private String agencyId; + + /** + * 居民端用户所在网格的所有上级组织，包含AGENCY_ID + */ + private String pids; + + /** + * 报事的人 + */ + private String reportUserId; + + /** + * 1：党员；0：不是党员；默认0 + */ + private String isParty; + + /** + * 事件内容 + */ + private String eventContent; + + /** + * 纬度 + */ + private String latitude; + + /** + * 经度 + */ + private String longitude; + + /** + * 地址 + */ + private String address; + + /** + * 处理中：processing；已办结：closed_case + */ + private String status; + + /** + * 1：已转项目；0：未转项目；默认0 + */ + private Integer shiftProject; + + /** + * 项目id;shift_project=1时，此列有值 + */ + private String projectId; + + /** + * 1:已撤回；0：未撤回正常展示；默认0 + */ + private Integer recallFlag; + + /** + * 撤回时间 + */ + private Date recallTime; + + /** + * 事件是否被阅读过;1已读；针对报事人待处理列表 + */ + private Integer readFlag; + + /** + * 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/办结更新为1; + */ + private Integer redDot; + + /** + * 最近一次操作时间（回复、立项、办结更新此列） + */ + private Date latestOperatedTime; + + /** + * 是否解决：已解决 resolved，未解决 un_solved + */ + private String resolveStatus; + + /** + * 结案说明可放这。 + */ + private String closeRemark; + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java new file mode 100644 index 0000000000..882f282a04 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java @@ -0,0 +1,86 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 事件被@人表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("resi_event_mention") +public class ResiEventMentionEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 事件id + */ + private String resiEventId; + + /** + * 人大代表:npc_user + */ + private String userType; + + /** + * 居民端用户id + */ + private String userId; + + /** + * 居民注册网格ID + */ + private String gridId; + + /** + * 居民所属社区，就是grid_id的所属组织 + */ + private String agencyId; + + /** + * 居民注册网格的所有上级 + */ + private String pids; + + /** + * 含义：已读read，未读：un_read；人大代表从未读=>已读，点击查看详情前更新为已读； + */ + private String readFlag; + + /** + * (1)含义：1:展示红点；0：不展示；(2)注意：发布事件插入数据时为1，(3)何时更新？：报事人回复or工作人员回复、立项、办结更新为1； + */ + private Integer redDot; + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventOperationLogEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventOperationLogEntity.java new file mode 100644 index 0000000000..e2c34cc30e --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventOperationLogEntity.java @@ -0,0 +1,89 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 事件操作日志表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("resi_event_operation_log") +public class ResiEventOperationLogEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 事件id + */ + private String resiEventId; + + /** + * 用户id + */ + private String userId; + + /** + * 居民端用户:resi_user；工作人员:staff；报事人:report_user + */ + private String userIdentity; + + /** + * 1、发布事件：publish； +2、撤回事件：recall； +3、复：reply； +4、立项：shift_project； +5、办结：close_case; +6、选择是否已解决：choose_resolve; +7、查看阅读事件：read：人大代表未读=>已读；工作人员待处理=>处理中； + + */ + private String actionCode; + + /** + * 1、发布事件：publish； +2、撤回事件：recall； +3、复：reply； +4、立项：shift_project； +5、办结：close_case; +6、选择是否已解决：choose_resolve; +7、查看阅读事件：read：人大代表未读=>已读；工作人员待处理=>处理中； + */ + private String actionDesc; + + /** + * 操作时间 + */ + private Date operateTime; + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReplyEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReplyEntity.java new file mode 100644 index 0000000000..2d597fd6e3 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReplyEntity.java @@ -0,0 +1,66 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 事件回复表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("resi_event_reply") +public class ResiEventReplyEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 事件Id，关联resi_event的id + */ + private String resiEventId; + + /** + * 回复人用户Id + */ + private String fromUserId; + + /** + * 内容 + */ + private String content; + + /** + * 报事人：xxx路尹女士；人大：人大代表-张三；组织：组织名：阜新路社区 + */ + private String userShowName; + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReportOrgEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReportOrgEntity.java new file mode 100644 index 0000000000..dfdeb11c5d --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReportOrgEntity.java @@ -0,0 +1,87 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 事件相关组织表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("resi_event_report_org") +public class ResiEventReportOrgEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 事件id + */ + private String resiEventId; + + /** + * 报给？： +网格：grid； +社区：community； +乡（镇、街道）级:street； +区县级: district； +市级: city； +省级:province。 + */ + private String orgType; + + /** + * 报给的组织或者网格id + */ + private String orgId; + + /** + * org_id的上级组织id，org_id是跟组织，此列为0 + */ + private String orgPid; + + /** + * org_id的所有上级组织id，org_id是跟组织，此列为0 + */ + private String orgPids; + + /** + * 含义：已读read，未读：un_read；组织下的工作人员从待处理=>处理中，点击查看详情前更新为已读； + */ + private String orgRead; + + /** + * (1)含义：1:展示红点；0：不展示；(2)注意：发布事件插入数据时为1，(3)何时更新？：人大代表回复or报事人回复or工作人员回复、立项、办结更新为1； + */ + private Integer redDot; + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java new file mode 100644 index 0000000000..49137c1053 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java @@ -0,0 +1,31 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.entity.ResiEventReplyEntity; + +/** + * 事件回复表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +public interface ResiEventReplyService extends BaseService { + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java new file mode 100644 index 0000000000..bdcfedaab3 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java @@ -0,0 +1,30 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.entity.ResiEventEntity; + +/** + * 居民报事表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +public interface ResiEventService extends BaseService { +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java new file mode 100644 index 0000000000..e042cd3acc --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java @@ -0,0 +1,36 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.dao.ResiEventReplyDao; +import com.epmet.entity.ResiEventReplyEntity; +import com.epmet.service.ResiEventReplyService; +import org.springframework.stereotype.Service; + +/** + * 事件回复表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@Service +public class ResiEventReplyServiceImpl extends BaseServiceImpl implements ResiEventReplyService { + + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java new file mode 100644 index 0000000000..0b0814189a --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -0,0 +1,36 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.impl; + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.dao.ResiEventDao; +import com.epmet.entity.ResiEventEntity; +import com.epmet.service.ResiEventService; +import org.springframework.stereotype.Service; + +/** + * 居民报事表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@Service +public class ResiEventServiceImpl extends BaseServiceImpl implements ResiEventService { + + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventAttachmentDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventAttachmentDao.xml new file mode 100644 index 0000000000..6bb3be938d --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventAttachmentDao.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml new file mode 100644 index 0000000000..21c7a902d7 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml new file mode 100644 index 0000000000..98064a416f --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventOperationLogDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventOperationLogDao.xml new file mode 100644 index 0000000000..12d1f0ce48 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventOperationLogDao.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReplyDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReplyDao.xml new file mode 100644 index 0000000000..5e01548862 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReplyDao.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml new file mode 100644 index 0000000000..7c8b96db9e --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file From ad21a4eea5deb02bb92846080fa4de36c2ff3ca4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 3 Aug 2021 09:46:13 +0800 Subject: [PATCH 06/29] tinyint(1)=>Boolean --- .../src/main/java/com/epmet/entity/ResiEventEntity.java | 8 ++++---- .../java/com/epmet/entity/ResiEventMentionEntity.java | 5 +---- .../java/com/epmet/entity/ResiEventReportOrgEntity.java | 5 +---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java index 9453ab7447..34ae10cd86 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java @@ -96,7 +96,7 @@ public class ResiEventEntity extends BaseEpmetEntity { /** * 1：已转项目；0：未转项目；默认0 */ - private Integer shiftProject; + private Boolean shiftProject; /** * 项目id;shift_project=1时，此列有值 @@ -106,7 +106,7 @@ public class ResiEventEntity extends BaseEpmetEntity { /** * 1:已撤回；0：未撤回正常展示；默认0 */ - private Integer recallFlag; + private Boolean recallFlag; /** * 撤回时间 @@ -116,12 +116,12 @@ public class ResiEventEntity extends BaseEpmetEntity { /** * 事件是否被阅读过;1已读；针对报事人待处理列表 */ - private Integer readFlag; + private Boolean readFlag; /** * 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/办结更新为1; */ - private Integer redDot; + private Boolean redDot; /** * 最近一次操作时间（回复、立项、办结更新此列） diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java index 882f282a04..2a6a2abe05 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventMentionEntity.java @@ -18,13 +18,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 事件被@人表 * @@ -81,6 +78,6 @@ public class ResiEventMentionEntity extends BaseEpmetEntity { /** * (1)含义：1:展示红点；0：不展示；(2)注意：发布事件插入数据时为1，(3)何时更新？：报事人回复or工作人员回复、立项、办结更新为1； */ - private Integer redDot; + private Boolean redDot; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReportOrgEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReportOrgEntity.java index dfdeb11c5d..20f4bfad3f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReportOrgEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventReportOrgEntity.java @@ -18,13 +18,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 事件相关组织表 * @@ -82,6 +79,6 @@ public class ResiEventReportOrgEntity extends BaseEpmetEntity { /** * (1)含义：1:展示红点；0：不展示；(2)注意：发布事件插入数据时为1，(3)何时更新？：人大代表回复or报事人回复or工作人员回复、立项、办结更新为1； */ - private Integer redDot; + private Boolean redDot; } From 63641531e8f6eba6a71d888ce0e93789db68a355 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 3 Aug 2021 10:01:39 +0800 Subject: [PATCH 07/29] resieventreply --- .../controller/ResiEventReplyController.java | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java new file mode 100644 index 0000000000..a8d2fba48f --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java @@ -0,0 +1,40 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.controller; + +import com.epmet.service.ResiEventReplyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 事件回复表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@RestController +@RequestMapping("resieventreply") +public class ResiEventReplyController { + + @Autowired + private ResiEventReplyService resiEventReplyService; + + +} \ No newline at end of file From 0f003b38adee8be61916046f62e485e71bf843e3 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 3 Aug 2021 10:59:37 +0800 Subject: [PATCH 08/29] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=88=91?= =?UTF-8?q?=E8=A6=81=E6=8A=A5=E4=BA=8B-=E6=9F=A5=E8=AF=A2=E4=BA=BA?= =?UTF-8?q?=E5=A4=A7=E4=BB=A3=E8=A1=A8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/feign/ResultDataResolver.java | 5 +- .../dto/form/ResiEventNpcListFormDTO.java | 13 +++++ .../dto/result/ResiEventNpcResultDTO.java | 28 +++++++++++ .../resi-home/resi-home-server/pom.xml | 10 ++++ .../epmet/controller/ResiEventController.java | 25 ++++++++++ .../com/epmet/service/ResiEventService.java | 11 +++++ .../service/impl/ResiEventServiceImpl.java | 47 +++++++++++++++++-- .../com/epmet/constant/BadgeConstant.java | 3 ++ .../dto/form/ListUserByBadgeFormDTO.java | 20 ++++++++ .../dto/result/ListUserByBadgeResultDTO.java | 20 ++++++++ .../epmet/feign/EpmetUserOpenFeignClient.java | 9 ++++ .../EpmetUserOpenFeignClientFallback.java | 10 ++++ .../com/epmet/controller/BadgeController.java | 23 +++++++-- .../src/main/java/com/epmet/dao/BadgeDao.java | 8 ++++ .../java/com/epmet/service/BadgeService.java | 8 ++++ .../epmet/service/impl/BadgeServiceImpl.java | 4 ++ .../src/main/resources/mapper/BadgeDao.xml | 20 ++++++++ 17 files changed, 256 insertions(+), 8 deletions(-) create mode 100644 epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java create mode 100644 epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ListUserByBadgeResultDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/ResultDataResolver.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/ResultDataResolver.java index 1e44b924c2..5b56e64b1a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/ResultDataResolver.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/ResultDataResolver.java @@ -30,8 +30,11 @@ public interface ResultDataResolver { //} /** - * @Description 获取Result种的data，如果失败(返回result为null或者result.success为false)，那么抛出异常 + * @Description * @return + * @param targetServiceName 目标service名称 + * @param errorCode 错误码，可以为空，为空则使用上游服务抛出的错误码 + * @param errorInternalMsg 错误信息，可以为空，为空则使用上游服务抛出的异常信息 * @author wxz * @date 2021.06.07 22:45 */ diff --git a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java new file mode 100644 index 0000000000..97b856a8e6 --- /dev/null +++ b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java @@ -0,0 +1,13 @@ +package com.epmet.dto.form; + +import lombok.Data; + +/** + * @Description 我要报事人大代表列表 + * @author wxz + * @date 2021.08.03 09:16:59 +*/ +@Data +public class ResiEventNpcListFormDTO { + private String gridId; +} diff --git a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java new file mode 100644 index 0000000000..6f285807ce --- /dev/null +++ b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java @@ -0,0 +1,28 @@ +package com.epmet.dto.result; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; + +/** + * @Description 我要报事-人大代表列表 + * @author wxz + * @date 2021.08.03 09:12:57 +*/ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ResiEventNpcResultDTO { + + private String userId; + + private String gridId; + + private String displayName; + + private String headImgUrl; + + private String agencyId; +} diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index 5bfd93548c..041357ea74 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -68,6 +68,16 @@ 2.0.0 compile + + com.epmet + gov-org-client + 2.0.0 + + + com.epmet + epmet-user-client + 2.0.0 + diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java index c0a20d039a..fd316f0475 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -1,8 +1,18 @@ package com.epmet.controller; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.ResiEventNpcListFormDTO; +import com.epmet.dto.result.ResiEventNpcResultDTO; +import com.epmet.service.ResiEventService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @Description 群众直报/报事controller * @author wxz @@ -12,6 +22,21 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("resi-event") public class ResiEventController { + @Autowired + private ResiEventService resiEventService; + /** + * @Description 查询人大代表列表 + * @return + * @author wxz + * @date 2021.08.03 09:17 + */ + @PostMapping("/npc-list-ingrid") + public Result> listNpc(@RequestBody ResiEventNpcListFormDTO input) { + ValidatorUtils.validateEntity(input); + String gridId = input.getGridId(); + List npcs = resiEventService.listNpcByGrid(gridId); + return new Result>().ok(npcs); + } } diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java index 3a426d3326..ec30ef44e8 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java @@ -1,9 +1,20 @@ package com.epmet.service; +import com.epmet.dto.result.ResiEventNpcResultDTO; + +import java.util.List; + /** * @Description 报事service * @author wxz * @date 2021.08.02 09:59:16 */ public interface ResiEventService { + /** + * @Description 查询网格的人大代表列表 + * @return + * @author wxz + * @date 2021.08.03 09:29 + */ + List listNpcByGrid(String gridId); } diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 2d8be957f7..b1871afb51 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -1,13 +1,54 @@ package com.epmet.service.impl; +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.feign.ResultDataResolver; +import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.BadgeConstant; +import com.epmet.dto.form.ListUserByBadgeFormDTO; +import com.epmet.dto.result.GridInfoResultDTO; +import com.epmet.dto.result.ListUserByBadgeResultDTO; +import com.epmet.dto.result.ResiEventNpcResultDTO; +import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.ResiEventService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.stream.Collectors; + /** - * @Description 报事service * @author wxz + * @Description 报事service * @date 2021.08.02 09:59:36 -*/ + */ @Service -public class ResiEventServiceImpl implements ResiEventService { +public class ResiEventServiceImpl implements ResiEventService, ResultDataResolver { + + @Autowired + GovOrgOpenFeignClient govOrgOpenFeignClient; + + @Autowired + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + + @Override + public List listNpcByGrid(String gridId) { + + // 查询网格所属的组织信息 + Result gridInfoResult = govOrgOpenFeignClient.queryGridInfo(gridId); + GridInfoResultDTO gridInfoData = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null); + String parentAgencyId = gridInfoData.getParentAgencyId(); + + //查询人大代表列表 + ListUserByBadgeFormDTO npcForm = new ListUserByBadgeFormDTO(gridId, BadgeConstant.BADGE_KEY_NPC); + Result> npcResult = epmetUserOpenFeignClient.listUsersByBadge(npcForm); + List npcData = getResultDataOrThrowsException(npcResult, ServiceConstant.EPMET_USER_SERVER, null, null); + + List npcResultList = npcData.stream() + .map(npc -> new ResiEventNpcResultDTO(npc.getUserId(), gridId, "人大代表-".concat(npc.getRealName()), npc.getHeadImgUrl(), parentAgencyId)) + .collect(Collectors.toList()); + + return npcResultList; + } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java index 3be3ce02c3..c8b52524f2 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java @@ -42,4 +42,7 @@ public interface BadgeConstant { String DEFAULT = "default"; + // 人大代表徽章KEY + String BADGE_KEY_NPC = "NPC"; + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java new file mode 100644 index 0000000000..8d616bacf3 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.form; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ListUserByBadgeFormDTO { + + @NotBlank(message = "网格ID不能为空") + private String gridId; + + @NotBlank(message = "徽章key不能为空") + private String badgeKey; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ListUserByBadgeResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ListUserByBadgeResultDTO.java new file mode 100644 index 0000000000..24139d4161 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ListUserByBadgeResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.result; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author wxz + * @Description 根据徽章查询用户结果集 + * @date 2021.08.02 10:23:37 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ListUserByBadgeResultDTO { + private String userId; + private String gridId; + private String realName; + private String headImgUrl; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index e111a8fb6c..059ced9e35 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -605,4 +605,13 @@ public interface EpmetUserOpenFeignClient { */ @PostMapping("/epmetuser/staffpatrol/endpatrolJob") Result endPatrolJob(@RequestBody StartPatrolFormDTO formDTO); + + /** + * @Description 根据徽章查询用户列表 + * @return + * @author wxz + * @date 2021.08.02 10:27 + */ + @PostMapping("/epmetuser/badge/list-users-by-badge") + Result> listUsersByBadge(ListUserByBadgeFormDTO input); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 7398ecb56c..31c82beb05 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -422,4 +422,14 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "endPatrolJob", formDTO); } + /** + * @Description 根据徽章查询用户列表 + * @return + * @author wxz + * @date 2021.08.03 09:03 + */ + @Override + public Result> listUsersByBadge(ListUserByBadgeFormDTO input) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listUsersByBadge", input); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java index a5d13c581f..192fc3c5d3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java @@ -10,11 +10,9 @@ import com.epmet.dto.result.*; import com.epmet.redis.UserBadgeRedis; import com.epmet.service.BadgeService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import javax.validation.constraints.NotBlank; import java.util.List; import java.util.Map; @@ -190,4 +188,21 @@ public class BadgeController { public Result> userBadges(@RequestBody UserBadgesFormDTO formDTO){ return new Result>().ok(badgeService.userBadges(formDTO)); } + + /** + * @Description + * @return + * @author wxz + * @date 2021.08.02 10:27 + */ + @PostMapping("list-users-by-badge") + public Result> listUsersByBadge(@RequestBody ListUserByBadgeFormDTO input) { + ValidatorUtils.validateEntity(input); + + String gridId = input.getGridId(); + String badgeKey = input.getBadgeKey(); + + List users = badgeService.listUsersByBadge(gridId, badgeKey); + return new Result>().ok(users); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java index a9dc7ee49a..5c4aab8dcb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java @@ -196,4 +196,12 @@ public interface BadgeDao extends BaseDao { * @date 2020/11/19 10:18 上午 */ int selectNextSort(@Param("customerId") String customerId); + + /** + * @Description 根据徽章查询人列表 + * @return + * @author wxz + * @date 2021.08.02 10:40 + */ + List listUsersByBadge(@Param("gridId") String gridId, @Param("badgeKey") String badgeKey); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java index f89f180458..fad619e87b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java @@ -192,4 +192,12 @@ public interface BadgeService extends BaseService { * @date 2021/4/22 下午4:17 */ List userBadges(UserBadgesFormDTO formDTO); + + /** + * @Description 根据徽章查询用户列表 + * @return + * @author wxz + * @date 2021.08.02 10:39 + */ + List listUsersByBadge(String gridId, String badgeKey); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java index dcdd39d4f1..985dd00c46 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java @@ -480,4 +480,8 @@ public class BadgeServiceImpl extends BaseServiceImpl imp return result; } + @Override + public List listUsersByBadge(String gridId, String badgeKey) { + return baseDao.listUsersByBadge(gridId, badgeKey); + } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml index c9be676412..560867c932 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml @@ -310,4 +310,24 @@ ORDER BY CREATED_TIME DESC LIMIT 1 + + + \ No newline at end of file From 33bc6098ab7a69f5fbd990e9e5e33e858050ffdd Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 3 Aug 2021 11:04:30 +0800 Subject: [PATCH 09/29] =?UTF-8?q?emm=20=E8=B5=B6=E7=B4=A7=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=20=E7=9C=81=E7=9D=80=E5=92=8C=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/EventListFormDTO.java | 29 ++++++++++ .../epmet/dto/form/UpdateViewTimeFormDTO.java | 29 ++++++++++ .../epmet/dto/result/EventListResultDTO.java | 48 +++++++++++++++++ .../com/epmet/controller/EventController.java | 53 +++++++++++++++++++ .../com/epmet/service/ResiEventService.java | 40 ++++++++------ .../service/impl/ResiEventServiceImpl.java | 25 +++++++++ 6 files changed, 207 insertions(+), 17 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java new file mode 100644 index 0000000000..eff8d5e66b --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java @@ -0,0 +1,29 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/8/3 10:43 上午 + * @DESC + */ +@Data +public class EventListFormDTO implements Serializable { + + private static final long serialVersionUID = 5882062169112022561L; + + public interface EventListForm extends CustomerClientShowGroup{} + + /** + * 报事列表类型【已处理：processed 未处理：undisposed 已办结：transferred】 + */ + @NotBlank(message = "报事列表类型不能为空",groups = EventListForm.class) + private String eventType; + + @NotBlank(message = "",groups = EventListForm.class) + private String orgId; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java new file mode 100644 index 0000000000..30e891cd78 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java @@ -0,0 +1,29 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/8/3 10:55 上午 + * @DESC + */ +@Data +public class UpdateViewTimeFormDTO implements Serializable { + + private static final long serialVersionUID = 7104400078458366322L; + + public interface UpdateViewTimeForm extends CustomerClientShowGroup{} + + /** + * 居民端用户:resi_user；工作人员:staff + */ + @NotBlank(message = "viewType不能为空",groups = UpdateViewTimeForm.class) + private String viewType; + + @NotBlank(message = "事件ID不能为空",groups = UpdateViewTimeForm.class) + private String eventId; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java new file mode 100644 index 0000000000..94853b80d1 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java @@ -0,0 +1,48 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2021/8/3 10:41 上午 + * @DESC + */ +@Data +public class EventListResultDTO implements Serializable { + + private static final long serialVersionUID = -8550265282744924930L; + + /** + * 报事标题 + */ + private String eventTitle; + + /** + * 报事时间 + */ + private String eventTime; + + /** + * 报事ID + */ + private String eventId; + + /** + * 是否立项【true：是，false：否】 + */ + private Boolean isProject; + + /** + * 红点显示【true：显示，false：不显示】 + */ + private Boolean redDot; + + /** + * 报事图片 + */ + private List eventImgs; + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java new file mode 100644 index 0000000000..062740b5d7 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java @@ -0,0 +1,53 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.EventListFormDTO; +import com.epmet.dto.form.UpdateViewTimeFormDTO; +import com.epmet.dto.result.EventListResultDTO; +import com.epmet.service.ResiEventService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +/** + * 居民报事表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@RestController +@RequestMapping("event") +public class EventController { + + @Autowired + private ResiEventService resiEventService; + + /** + * @Description 群众直报（待处理、处理中、已办结）列表 + * @Param formDTO + * @author zxc + * @date 2021/8/3 10:53 上午 + */ + @PostMapping("eventlist") + public Result> eventList(@RequestBody EventListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, EventListFormDTO.EventListForm.class); + return new Result>().ok(resiEventService.eventList(formDTO)); + } + + /** + * @Description 查看报事时,更新时间操作 + * @Param formDTO + * @author zxc + * @date 2021/8/3 11:01 上午 + */ + @PostMapping("updateviewtime") + public Result updateViewTime(@RequestBody UpdateViewTimeFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, UpdateViewTimeFormDTO.UpdateViewTimeForm.class); + resiEventService.updateViewTime(formDTO); + return new Result(); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java index bdcfedaab3..fec1527d3c 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java @@ -1,24 +1,13 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.form.EventListFormDTO; +import com.epmet.dto.form.UpdateViewTimeFormDTO; +import com.epmet.dto.result.EventListResultDTO; import com.epmet.entity.ResiEventEntity; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; /** * 居民报事表 @@ -27,4 +16,21 @@ import com.epmet.entity.ResiEventEntity; * @since v1.0.0 2021-08-03 */ public interface ResiEventService extends BaseService { + + /** + * @Description 群众直报（待处理、处理中、已办结）列表 + * @Param formDTO + * @author zxc + * @date 2021/8/3 10:53 上午 + */ + List eventList(EventListFormDTO formDTO); + + /** + * @Description 查看报事时,更新时间操作 + * @Param formDTO + * @author zxc + * @date 2021/8/3 11:01 上午 + */ + void updateViewTime(UpdateViewTimeFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 0b0814189a..a3b5e3cd81 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -19,10 +19,15 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.dao.ResiEventDao; +import com.epmet.dto.form.EventListFormDTO; +import com.epmet.dto.form.UpdateViewTimeFormDTO; +import com.epmet.dto.result.EventListResultDTO; import com.epmet.entity.ResiEventEntity; import com.epmet.service.ResiEventService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 居民报事表 * @@ -32,5 +37,25 @@ import org.springframework.stereotype.Service; @Service public class ResiEventServiceImpl extends BaseServiceImpl implements ResiEventService { + /** + * @Description 群众直报（待处理、处理中、已办结）列表 + * @Param formDTO + * @author zxc + * @date 2021/8/3 10:53 上午 + */ + @Override + public List eventList(EventListFormDTO formDTO) { + return null; + } + + /** + * @Description 查看报事时,更新时间操作 + * @Param formDTO + * @author zxc + * @date 2021/8/3 11:01 上午 + */ + @Override + public void updateViewTime(UpdateViewTimeFormDTO formDTO) { + } } \ No newline at end of file From da4c6b7429b92e4a33feb685fd1c81a467e363f5 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 3 Aug 2021 11:12:52 +0800 Subject: [PATCH 10/29] =?UTF-8?q?=E6=8A=93=E7=B4=A7=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E4=B8=8D=E5=90=88=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/EventListFormDTO.java | 2 +- .../com/epmet/dto/form/ReplyListFormDTO.java | 23 +++++++++++++++++++ .../epmet/dto/form/UpdateViewTimeFormDTO.java | 2 +- .../epmet/dto/result/ReplyListResultDTO.java | 18 +++++++++++++++ .../controller/ResiEventReplyController.java | 19 +++++++++++++++ .../epmet/service/ResiEventReplyService.java | 13 +++++++++++ .../impl/ResiEventReplyServiceImpl.java | 15 +++++++++++- 7 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java index eff8d5e66b..1815ecd434 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java @@ -16,7 +16,7 @@ public class EventListFormDTO implements Serializable { private static final long serialVersionUID = 5882062169112022561L; - public interface EventListForm extends CustomerClientShowGroup{} + public interface EventListForm{} /** * 报事列表类型【已处理：processed 未处理：undisposed 已办结：transferred】 diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java new file mode 100644 index 0000000000..20575626fd --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/8/3 11:07 上午 + * @DESC + */ +@Data +public class ReplyListFormDTO implements Serializable { + + private static final long serialVersionUID = 3875624725235229558L; + + public interface ReplyListForm{} + + @NotBlank(message = "报事ID不能为空",groups = ReplyListForm.class) + private String resiEventId; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java index 30e891cd78..c2ca21208e 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UpdateViewTimeFormDTO.java @@ -16,7 +16,7 @@ public class UpdateViewTimeFormDTO implements Serializable { private static final long serialVersionUID = 7104400078458366322L; - public interface UpdateViewTimeForm extends CustomerClientShowGroup{} + public interface UpdateViewTimeForm{} /** * 居民端用户:resi_user；工作人员:staff diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java new file mode 100644 index 0000000000..f5b744289e --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/8/3 11:07 上午 + * @DESC + */ +@Data +public class ReplyListResultDTO implements Serializable { + + private static final long serialVersionUID = 4875335642497226847L; + + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java index a8d2fba48f..6a1eac37ef 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java @@ -17,11 +17,19 @@ package com.epmet.controller; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.ReplyListFormDTO; +import com.epmet.dto.result.ReplyListResultDTO; import com.epmet.service.ResiEventReplyService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 事件回复表 @@ -36,5 +44,16 @@ public class ResiEventReplyController { @Autowired private ResiEventReplyService resiEventReplyService; + /** + * @Description 报事详情-回复列表-两端通用 + * @Param formDTO + * @author zxc + * @date 2021/8/3 11:11 上午 + */ + @PostMapping("list") + public Result> replyList(@RequestBody ReplyListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, ReplyListFormDTO.ReplyListForm.class); + return new Result>().ok(resiEventReplyService.replyList(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java index 49137c1053..5065a9eb79 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java @@ -18,7 +18,12 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.form.ReplyListFormDTO; +import com.epmet.dto.result.ReplyListResultDTO; import com.epmet.entity.ResiEventReplyEntity; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; /** * 事件回复表 @@ -28,4 +33,12 @@ import com.epmet.entity.ResiEventReplyEntity; */ public interface ResiEventReplyService extends BaseService { + /** + * @Description 报事详情-回复列表-两端通用 + * @Param formDTO + * @author zxc + * @date 2021/8/3 11:11 上午 + */ + List replyList(ReplyListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java index e042cd3acc..4b003cf048 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java @@ -19,10 +19,14 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.dao.ResiEventReplyDao; +import com.epmet.dto.form.ReplyListFormDTO; +import com.epmet.dto.result.ReplyListResultDTO; import com.epmet.entity.ResiEventReplyEntity; import com.epmet.service.ResiEventReplyService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 事件回复表 * @@ -32,5 +36,14 @@ import org.springframework.stereotype.Service; @Service public class ResiEventReplyServiceImpl extends BaseServiceImpl implements ResiEventReplyService { - + /** + * @Description 报事详情-回复列表-两端通用 + * @Param formDTO + * @author zxc + * @date 2021/8/3 11:11 上午 + */ + @Override + public List replyList(ReplyListFormDTO formDTO) { + return null; + } } \ No newline at end of file From cc7b6d4a2d15785c9a7d6be5525d8e6ae5728692 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 3 Aug 2021 13:48:31 +0800 Subject: [PATCH 11/29] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/EventProjectInfoDTO.java | 43 ++++++++++ .../epmet/dto/form/EventDetailFormDTO.java | 22 +++++ .../dto/result/EventDetailResultDTO.java | 82 +++++++++++++++++++ .../epmet/controller/ResiEventController.java | 17 ++++ .../com/epmet/service/ResiEventService.java | 11 ++- .../service/impl/ResiEventServiceImpl.java | 13 +++ 6 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventDetailFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java new file mode 100644 index 0000000000..b8de802fe0 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java @@ -0,0 +1,43 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/8/3 1:38 下午 + * @DESC + */ +@Data +public class EventProjectInfoDTO implements Serializable { + + private static final long serialVersionUID = 5622220354099001615L; + + /** + * 项目ID + */ + private String projectId; + + /** + * 操作人【xxx社区-张三】 + */ + private String operationName; + + /** + * 操作时间 + */ + private String operationTime; + + /** + * 报事说明 + */ + private String projectDeclare; + + public EventProjectInfoDTO() { + this.projectId = ""; + this.operationName = ""; + this.operationTime = ""; + this.projectDeclare = ""; + } +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventDetailFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventDetailFormDTO.java new file mode 100644 index 0000000000..1d2972d0c3 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventDetailFormDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/8/3 1:27 下午 + * @DESC + */ +@Data +public class EventDetailFormDTO implements Serializable { + + private static final long serialVersionUID = -297495947153154171L; + + public interface EventDetailForm{} + + @NotBlank(message = "报事ID不能为空",groups = EventDetailForm.class) + private String eventId; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java new file mode 100644 index 0000000000..85e0a0a9b2 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java @@ -0,0 +1,82 @@ +package com.epmet.dto.result; + +import com.epmet.dto.EventProjectInfoDTO; +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2021/8/3 1:30 下午 + * @DESC + */ +@Data +public class EventDetailResultDTO implements Serializable { + + private static final long serialVersionUID = 3905105043326445613L; + + /** + * 报事时间 + */ + private String eventTime; + + /** + * 报事内容 + */ + private String eventContent; + + /** + * 报事地址 + */ + private String eventAddress; + + /** + * 所属网格【xx社区-xx网格】 + */ + private String gridName; + + /** + * 是否办结【是：true，否：false】 + */ + private Boolean isClosed; + + /** + * 是否解决【是：true，否：false】 + */ + private Boolean isResolve; + + /** + * 是否可以撤回【true：是，false：否】 + */ + private Boolean isRollback; + + /** + * 报事图片 + */ + private List eventImgs; + + /** + * 报事提到的人 + */ + private List eventPerson; + + /** + * 项目信息 + */ + private EventProjectInfoDTO projectInfo; + + public EventDetailResultDTO() { + this.eventTime = ""; + this.eventContent = ""; + this.eventAddress = ""; + this.gridName = ""; + this.isClosed = false; + this.isResolve = false; + this.isRollback = false; + this.eventImgs = new ArrayList<>(); + this.eventPerson = new ArrayList<>(); + this.projectInfo = new EventProjectInfoDTO(); + } +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java index 9352700c88..e97ee03e78 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -17,8 +17,14 @@ package com.epmet.controller; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.EventDetailFormDTO; +import com.epmet.dto.result.EventDetailResultDTO; import com.epmet.service.ResiEventService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -36,5 +42,16 @@ public class ResiEventController { @Autowired private ResiEventService resiEventService; + /** + * @Description 报事详情-两端通用 + * @Param formDTO + * @author zxc + * @date 2021/8/3 1:47 下午 + */ + @PostMapping("eventdetail") + public Result eventDetail(@RequestBody EventDetailFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO); + return new Result().ok(resiEventService.eventDetail(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java index fec1527d3c..8606c1c59f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java @@ -1,11 +1,12 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.form.EventDetailFormDTO; import com.epmet.dto.form.EventListFormDTO; import com.epmet.dto.form.UpdateViewTimeFormDTO; +import com.epmet.dto.result.EventDetailResultDTO; import com.epmet.dto.result.EventListResultDTO; import com.epmet.entity.ResiEventEntity; -import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -33,4 +34,12 @@ public interface ResiEventService extends BaseService { */ void updateViewTime(UpdateViewTimeFormDTO formDTO); + /** + * @Description 报事详情-两端通用 + * @Param formDTO + * @author zxc + * @date 2021/8/3 1:47 下午 + */ + EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index a3b5e3cd81..1697e07a84 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -19,8 +19,10 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.dao.ResiEventDao; +import com.epmet.dto.form.EventDetailFormDTO; import com.epmet.dto.form.EventListFormDTO; import com.epmet.dto.form.UpdateViewTimeFormDTO; +import com.epmet.dto.result.EventDetailResultDTO; import com.epmet.dto.result.EventListResultDTO; import com.epmet.entity.ResiEventEntity; import com.epmet.service.ResiEventService; @@ -58,4 +60,15 @@ public class ResiEventServiceImpl extends BaseServiceImpl Date: Tue, 3 Aug 2021 14:33:13 +0800 Subject: [PATCH 12/29] =?UTF-8?q?=E6=9A=82=E5=AD=98=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/ChooseResolveFormDTO.java | 42 ++++++++++ .../com/epmet/dto/form/MyReportedFormDTO.java | 42 ++++++++++ .../epmet/dto/form/ReCallEventFormDTO.java | 34 ++++++++ .../com/epmet/dto/form/ResiEventFormDTO.java | 34 ++++++++ .../epmet/dto/result/MyReportedResultDTO.java | 55 +++++++++++++ .../com/epmet/dto/result/ResiEventIdDTO.java | 24 ++++++ .../epmet/controller/ResiEventController.java | 81 +++++++++++++++++++ .../com/epmet/service/ResiEventService.java | 47 +++++++++++ .../service/impl/ResiEventServiceImpl.java | 79 ++++++++++++++++++ 9 files changed, 438 insertions(+) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ChooseResolveFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MyReportedFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReCallEventFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventIdDTO.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ChooseResolveFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ChooseResolveFormDTO.java new file mode 100644 index 0000000000..f52f9622fe --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ChooseResolveFormDTO.java @@ -0,0 +1,42 @@ +package com.epmet.dto.form; + +import com.epmet.dto.result.ResiEventIdDTO; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 选择已解决，未解决？？ + * + * @author yinzuomei@elink-cn.com + * @date 2021/8/3 13:53 + */ +@Data +public class ChooseResolveFormDTO extends ResiEventIdDTO implements Serializable { + private static final long serialVersionUID = 7888566055415227282L; + + + public interface AddUserInternalGroup { + } + + /** + * 是否解决：已解决 resolved，未解决 un_solved + */ + @NotBlank(message = "resolveStatus不能为空",groups = AddUserInternalGroup.class) + private String resolveStatus; + + + //以下参数从token中获取 + /** + * 当前用户id + */ + @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class) + private String userId; + + /** + * 当前客户id + */ + @NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class) + private String customerId; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MyReportedFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MyReportedFormDTO.java new file mode 100644 index 0000000000..a1cdd9d389 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MyReportedFormDTO.java @@ -0,0 +1,42 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 我的报事列表查询 + * + * @author yinzuomei@elink-cn.com + * @date 2021/8/3 14:07 + */ +@Data +public class MyReportedFormDTO implements Serializable { + private static final long serialVersionUID = 8426911903236849796L; + + public interface AddUserInternalGroup { + } + + /** + * 未处理:un_read；处理中：processing；已办结：closed_case + */ + @NotBlank(message = "statusCondition不能为空",groups = AddUserInternalGroup.class) + private String statusCondition; + + private Integer pageNo; + private Integer pageSize; + + //以下参数从token中获取 + /** + * 当前用户id + */ + @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class) + private String userId; + + /** + * 当前客户id + */ + @NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class) + private String customerId; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReCallEventFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReCallEventFormDTO.java new file mode 100644 index 0000000000..a52f89d02a --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReCallEventFormDTO.java @@ -0,0 +1,34 @@ +package com.epmet.dto.form; + +import com.epmet.dto.result.ResiEventIdDTO; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 撤回事件入参 + * + * @author yinzuomei@elink-cn.com + * @date 2021/8/3 11:28 + */ +@Data +public class ReCallEventFormDTO extends ResiEventIdDTO implements Serializable { + private static final long serialVersionUID = 2127663703852717437L; + + public interface AddUserInternalGroup { + } + + //以下参数从token中获取 + /** + * 当前用户id + */ + @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class) + private String userId; + + /** + * 当前客户id + */ + @NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class) + private String customerId; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java new file mode 100644 index 0000000000..83d96502ae --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java @@ -0,0 +1,34 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 我要报事-提交（尹） + * + * @author yinzuomei@elink-cn.com + * @date 2021/8/3 10:46 + */ +@Data +public class ResiEventFormDTO implements Serializable { + private static final long serialVersionUID = -778643059131036832L; + + public interface AddUserInternalGroup { + } + + + //以下参数从token中获取 + /** + * 当前用户id + */ + @NotBlank(message = "userId不能为空",groups =AddUserInternalGroup.class) + private String userId; + + /** + * 当前客户id + */ + @NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class) + private String customerId; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java new file mode 100644 index 0000000000..32209d0249 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java @@ -0,0 +1,55 @@ +package com.epmet.dto.result; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 报事列表 + * + * @author yinzuomei@elink-cn.com + * @date 2021/8/3 14:11 + */ +@Data +public class MyReportedResultDTO implements Serializable { + private static final long serialVersionUID = -7372245830000262134L; + + /** + * 事件id + */ + private String resiEventId; + + /** + * 事件内容 + */ + private String eventContent; + + /** + * 图片列表，可为空 + */ + private List imgList; + + /** + * true展示；false不展示 + */ + private Boolean redDot; + + /** + * 处理中：processing；已办结：closed_case + */ + private String status; + + /** + * true:已转项目；false：未立项 + */ + private Boolean shiftProject; + + /** + * 列表显示时间用此列：yyyy-MM-dd HH:mm:ss；处理中：上报事件时间，处理中：最新一次处理事件；已办结：办结时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date showTime; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventIdDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventIdDTO.java new file mode 100644 index 0000000000..22282ce4ca --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResiEventIdDTO.java @@ -0,0 +1,24 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 事件id + * + * @author yinzuomei@elink-cn.com + * @date 2021/8/3 10:48 + */ +@Data +public class ResiEventIdDTO implements Serializable { + private static final long serialVersionUID = 1553798655658549134L; + public interface ResiEventIdGroup { + } + /** + * 居民端报的事件id + */ + @NotBlank(message = "事件id不能为空",groups = ResiEventIdGroup.class) + private String resiEventId; +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java index 9352700c88..611a1c2af6 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -17,11 +17,25 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.ChooseResolveFormDTO; +import com.epmet.dto.form.MyReportedFormDTO; +import com.epmet.dto.form.ReCallEventFormDTO; +import com.epmet.dto.form.ResiEventFormDTO; +import com.epmet.dto.result.MyReportedResultDTO; +import com.epmet.dto.result.ResiEventIdDTO; import com.epmet.service.ResiEventService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 居民报事表 @@ -36,5 +50,72 @@ public class ResiEventController { @Autowired private ResiEventService resiEventService; + /** + * 我要报事-提交（尹） + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @date 2021/8/3 10:46 + */ + public Result report(@LoginUser TokenDto tokenDto, @RequestBody ResiEventFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + //校验参数 + //todo + return new Result().ok(resiEventService.report(formDTO)); + } + + /** + * 我要报事-撤回（尹） + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @date 2021/8/3 10:54 + */ + @PostMapping("recall") + public Result recall(@LoginUser TokenDto tokenDto,@RequestBody ReCallEventFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO,ResiEventIdDTO.ResiEventIdGroup.class,ReCallEventFormDTO.AddUserInternalGroup.class); + resiEventService.reCall(formDTO); + return new Result(); + } + + /** + * 选择已解决，未解决 + * + * @param tokenDto + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @date 2021/8/3 13:57 + */ + @PostMapping("chooseresolve") + public Result chooseResolve(@LoginUser TokenDto tokenDto,@RequestBody ChooseResolveFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO,ResiEventIdDTO.ResiEventIdGroup.class,ChooseResolveFormDTO.AddUserInternalGroup.class); + resiEventService.chooseResolve(formDTO); + return new Result(); + } + + /** + * 我的报事列表查询 + * + * @param tokenDto + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + * @author yinzuomei + * @date 2021/8/3 14:27 + */ + @PostMapping("myreported") + public Result> queryMyReported(@LoginUser TokenDto tokenDto, @RequestBody MyReportedFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO,MyReportedFormDTO.AddUserInternalGroup.class); + return new Result>().ok(resiEventService.queryMyReported(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java index bdcfedaab3..3ab2019443 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java @@ -18,8 +18,16 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.form.ChooseResolveFormDTO; +import com.epmet.dto.form.MyReportedFormDTO; +import com.epmet.dto.form.ReCallEventFormDTO; +import com.epmet.dto.form.ResiEventFormDTO; +import com.epmet.dto.result.MyReportedResultDTO; +import com.epmet.dto.result.ResiEventIdDTO; import com.epmet.entity.ResiEventEntity; +import java.util.List; + /** * 居民报事表 * @@ -27,4 +35,43 @@ import com.epmet.entity.ResiEventEntity; * @since v1.0.0 2021-08-03 */ public interface ResiEventService extends BaseService { + /** + * 我要报事-提交（尹） + * + * @param formDTO + * @return com.epmet.dto.result.ResiEventResultDTO + * @author yinzuomei + * @date 2021/8/3 10:51 + */ + ResiEventIdDTO report(ResiEventFormDTO formDTO); + + /** + * 撤回事件 + * + * @param formDTO + * @return void + * @author yinzuomei + * @date 2021/8/3 13:45 + */ + void reCall(ReCallEventFormDTO formDTO); + + /** + * 选择已解决，未解决 + * + * @param formDTO + * @return void + * @author yinzuomei + * @date 2021/8/3 13:58 + */ + void chooseResolve(ChooseResolveFormDTO formDTO); + + /** + * 我的报事列表查询 + * + * @param formDTO + * @return java.util.List + * @author yinzuomei + * @date 2021/8/3 14:28 + */ + List queryMyReported(MyReportedFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 0b0814189a..98088e7936 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -19,10 +19,18 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.dao.ResiEventDao; +import com.epmet.dto.form.ChooseResolveFormDTO; +import com.epmet.dto.form.MyReportedFormDTO; +import com.epmet.dto.form.ReCallEventFormDTO; +import com.epmet.dto.form.ResiEventFormDTO; +import com.epmet.dto.result.MyReportedResultDTO; +import com.epmet.dto.result.ResiEventIdDTO; import com.epmet.entity.ResiEventEntity; import com.epmet.service.ResiEventService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 居民报事表 * @@ -33,4 +41,75 @@ import org.springframework.stereotype.Service; public class ResiEventServiceImpl extends BaseServiceImpl implements ResiEventService { + /** + * 我要报事-提交（尹） + * + * @param formDTO + * @return com.epmet.dto.result.ResiEventResultDTO + * @author yinzuomei + * @date 2021/8/3 10:51 + */ + @Override + public ResiEventIdDTO report(ResiEventFormDTO formDTO) { + //todo + + + + + + return null; + } + + /** + * 撤回事件 + * + * @param formDTO + * @return void + * @author yinzuomei + * @date 2021/8/3 13:45 + */ + @Override + public void reCall(ReCallEventFormDTO formDTO) { + // todo + + + + } + + /** + * 选择已解决，未解决 + * + * @param formDTO + * @return void + * @author yinzuomei + * @date 2021/8/3 13:58 + */ + @Override + public void chooseResolve(ChooseResolveFormDTO formDTO) { + // todo + + + + + + + } + + /** + * 我的报事列表查询 + * + * @param formDTO + * @return java.util.List + * @author yinzuomei + * @date 2021/8/3 14:28 + */ + @Override + public List queryMyReported(MyReportedFormDTO formDTO) { + // todo + + + + + return null; + } } \ No newline at end of file From e869adc73fe0818f1dcbbb8330e81f3166d8ee2a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 3 Aug 2021 14:37:57 +0800 Subject: [PATCH 13/29] emm --- .../main/java/com/epmet/service/ResiEventService.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java index 77c2ab0614..82dabf69fc 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java @@ -1,14 +1,15 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.form.*; +import com.epmet.dto.result.EventDetailResultDTO; +import com.epmet.dto.result.EventListResultDTO; import com.epmet.entity.ResiEventEntity; -import com.epmet.dto.form.ChooseResolveFormDTO; -import com.epmet.dto.form.MyReportedFormDTO; -import com.epmet.dto.form.ReCallEventFormDTO; -import com.epmet.dto.form.ResiEventFormDTO; import com.epmet.dto.result.MyReportedResultDTO; import com.epmet.dto.result.ResiEventIdDTO; +import java.util.List; + /** * 居民报事表 * From 52d917f4b547ec8ea23d271682812f7c604c84f5 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 3 Aug 2021 15:25:54 +0800 Subject: [PATCH 14/29] =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/EventListFormDTO.java | 2 +- .../com/epmet/constant/EventConstant.java | 17 ++++++++++ .../com/epmet/controller/EventController.java | 23 ------------- .../epmet/controller/ResiEventController.java | 32 ++++++++++++++++--- .../service/impl/ResiEventServiceImpl.java | 17 +++++++++- 5 files changed, 61 insertions(+), 30 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java index 1815ecd434..699c6ada63 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventListFormDTO.java @@ -19,7 +19,7 @@ public class EventListFormDTO implements Serializable { public interface EventListForm{} /** - * 报事列表类型【已处理：processed 未处理：undisposed 已办结：transferred】 + * 报事列表类型【处理中：processed 待处理：undisposed 已办结：transferred】 */ @NotBlank(message = "报事列表类型不能为空",groups = EventListForm.class) private String eventType; diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java new file mode 100644 index 0000000000..8a63bba97b --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java @@ -0,0 +1,17 @@ +package com.epmet.constant; + +/** + * @Author zxc + * @DateTime 2021/8/3 2:45 下午 + * @DESC + */ +public interface EventConstant { + + /** + * 【处理中：processed 待处理：undisposed 已办结：transferred】 + */ + String EVENT_PROCESSED = "processed"; + String EVENT_UN_DISPOSED = "undisposed"; + String EVENT_TRANSFERRED = "transferred"; + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java index 062740b5d7..02f58c15ca 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/EventController.java @@ -25,29 +25,6 @@ public class EventController { @Autowired private ResiEventService resiEventService; - /** - * @Description 群众直报（待处理、处理中、已办结）列表 - * @Param formDTO - * @author zxc - * @date 2021/8/3 10:53 上午 - */ - @PostMapping("eventlist") - public Result> eventList(@RequestBody EventListFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, EventListFormDTO.EventListForm.class); - return new Result>().ok(resiEventService.eventList(formDTO)); - } - /** - * @Description 查看报事时,更新时间操作 - * @Param formDTO - * @author zxc - * @date 2021/8/3 11:01 上午 - */ - @PostMapping("updateviewtime") - public Result updateViewTime(@RequestBody UpdateViewTimeFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, UpdateViewTimeFormDTO.UpdateViewTimeForm.class); - resiEventService.updateViewTime(formDTO); - return new Result(); - } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java index c04c99145c..4622d74927 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -19,16 +19,13 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dto.form.EventDetailFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.EventDetailResultDTO; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dto.form.ChooseResolveFormDTO; -import com.epmet.dto.form.MyReportedFormDTO; -import com.epmet.dto.form.ReCallEventFormDTO; -import com.epmet.dto.form.ResiEventFormDTO; +import com.epmet.dto.result.EventListResultDTO; import com.epmet.dto.result.MyReportedResultDTO; import com.epmet.dto.result.ResiEventIdDTO; import com.epmet.service.ResiEventService; @@ -133,4 +130,29 @@ public class ResiEventController { ValidatorUtils.validateEntity(formDTO,MyReportedFormDTO.AddUserInternalGroup.class); return new Result>().ok(resiEventService.queryMyReported(formDTO)); } + + /** + * @Description 群众直报（待处理、处理中、已办结）列表 + * @Param formDTO + * @author zxc + * @date 2021/8/3 10:53 上午 + */ + @PostMapping("eventlist") + public Result> eventList(@RequestBody EventListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, EventListFormDTO.EventListForm.class); + return new Result>().ok(resiEventService.eventList(formDTO)); + } + + /** + * @Description 查看报事时,更新时间操作 + * @Param formDTO + * @author zxc + * @date 2021/8/3 11:01 上午 + */ + @PostMapping("updateviewtime") + public Result updateViewTime(@RequestBody UpdateViewTimeFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, UpdateViewTimeFormDTO.UpdateViewTimeForm.class); + resiEventService.updateViewTime(formDTO); + return new Result(); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 2e55ca8228..321decec81 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -18,6 +18,7 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.constant.EventConstant; import com.epmet.dao.ResiEventDao; import com.epmet.dto.form.EventDetailFormDTO; import com.epmet.dto.form.EventListFormDTO; @@ -34,6 +35,7 @@ import com.epmet.entity.ResiEventEntity; import com.epmet.service.ResiEventService; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -47,13 +49,26 @@ public class ResiEventServiceImpl extends BaseServiceImpl eventList(EventListFormDTO formDTO) { - return null; + // 处理中 + if (formDTO.getEventType().equals(EventConstant.EVENT_PROCESSED)){ + + // 待处理 + }else if (formDTO.getEventType().equals(EventConstant.EVENT_UN_DISPOSED)){ + + // 已办结 + }else if (formDTO.getEventType().equals(EventConstant.EVENT_TRANSFERRED)){ + + } + return new ArrayList<>(); } /** From ed46482948e0f6b4adc02033f37ac8ce75986d6e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 3 Aug 2021 15:35:55 +0800 Subject: [PATCH 15/29] =?UTF-8?q?data-agg=EF=BC=9A=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA@?= =?UTF-8?q?=E6=88=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/UserEventLogoResultDTO.java | 28 +++++++++++++++ .../data-aggregator-server/pom.xml | 6 ++++ .../controller/EpmetUserController.java | 20 +++++++---- .../dao/epmetuser/ResiUserBadgeDao.java | 4 ++- .../dataaggre/dao/govproject/ProjectDao.java | 2 ++ .../service/epmetuser/EpmetUserService.java | 10 ++++++ .../epmetuser/impl/EpmetUserServiceImpl.java | 36 ++++++++++++++++--- .../service/govproject/GovProjectService.java | 10 ++++++ .../impl/GovProjectServiceImpl.java | 14 ++++++++ .../mapper/epmetuser/ResiUserBadgeDao.xml | 13 +++++++ .../mapper/govproject/ProjectDao.xml | 11 ++++++ 11 files changed, 142 insertions(+), 12 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserEventLogoResultDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserEventLogoResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserEventLogoResultDTO.java new file mode 100644 index 0000000000..290845787b --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/UserEventLogoResultDTO.java @@ -0,0 +1,28 @@ +package com.epmet.dataaggre.dto.epmetuser.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 人大代表个人中心，是否显示@me + * + * @author yinzuomei@elink-cn.com + * @date 2021/8/3 15:01 + */ +@Data +public class UserEventLogoResultDTO implements Serializable { + private static final long serialVersionUID = 3232361347890014097L; + /** + * true:人大代表；false：不是人大代表；此列用来判断是否显示@我 + */ + private Boolean isNpc; + /** + * 展示红点：true；隐藏：false + */ + private Boolean redDot; + public UserEventLogoResultDTO(){ + this.isNpc=false; + this.redDot=false; + } +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 6c2a9d38c6..184e00a313 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -75,6 +75,12 @@ 2.0.0 compile + + com.epmet + epmet-user-client + 2.0.0 + compile + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java index 39a634fb76..fb08567037 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java @@ -8,15 +8,10 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dataaggre.dto.epmetuser.form.OpenStaffDetailFormDTO; -import com.epmet.dataaggre.dto.epmetuser.form.GridMemberStatsFormDTO; import com.epmet.dataaggre.dto.epmetuser.form.PatrolDateListFormDTO; import com.epmet.dataaggre.dto.epmetuser.form.PatrolRecordListFormDTO; import com.epmet.dataaggre.dto.epmetuser.form.StaffListFormDTO; -import com.epmet.dataaggre.dto.epmetuser.result.OpenStaffDetailResultDTO; -import com.epmet.dataaggre.dto.epmetuser.result.PatrolDateListResultDTO; -import com.epmet.dataaggre.dto.epmetuser.result.PatrolRecordListResultDTO; -import com.epmet.dataaggre.dto.epmetuser.result.PersonalPatrolListResultDTO; -import com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO; +import com.epmet.dataaggre.dto.epmetuser.result.*; import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; import com.epmet.dataaggre.service.datastats.DataStatsService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; @@ -200,4 +195,17 @@ public class EpmetUserController { } + /** + * 我要报事-人大代表个人中心（尹） 是否显示@我，是否显示红点 + * + * @param tokenDto + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @date 2021/8/3 15:07 + */ + @PostMapping("mentionme") + public Result mentionMeEvent(@LoginUser TokenDto tokenDto){ + return new Result().ok(epmetUserService.mentionMeEvent(tokenDto.getUserId())); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/ResiUserBadgeDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/ResiUserBadgeDao.java index 7d8765b542..cc12c17271 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/ResiUserBadgeDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/ResiUserBadgeDao.java @@ -20,6 +20,7 @@ package com.epmet.dataaggre.dao.epmetuser; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 用户徽章关系表 @@ -29,5 +30,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ResiUserBadgeDao extends BaseDao { - + + ResiUserBadgeEntity selectUserByBadge(@Param("userId")String userId, @Param("badgeKey")String badgeKey); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java index cc3f3d9e7e..4697a0f267 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java @@ -68,4 +68,6 @@ public interface ProjectDao extends BaseDao { List selectDepartmentNameList(ProjectDTO project); List selectList(@Param("customerId") String customerId,@Param("list")List issueIds); + + int countRedDot(String userId); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index 10f164c6a9..e1941c1c08 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -86,4 +86,14 @@ public interface EpmetUserService { * @Author sun **/ List getStaffRoleList(String customerId, String userId); + + /** + * 我要报事-人大代表个人中心（尹） 是否显示@我，是否显示红点 + * + * @param userId + * @return com.epmet.dataaggre.dto.epmetuser.result.UserEventLogoResultDTO + * @author yinzuomei + * @date 2021/8/3 15:09 + */ + UserEventLogoResultDTO mentionMeEvent(String userId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 281f24cc6d..58ea59a3ee 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -3,11 +3,9 @@ package com.epmet.dataaggre.service.epmetuser.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.constant.BadgeConstant; import com.epmet.dataaggre.constant.DataSourceConstant; -import com.epmet.dataaggre.dao.epmetuser.CustomerStaffDao; -import com.epmet.dataaggre.dao.epmetuser.StaffPatrolRecordDao; -import com.epmet.dataaggre.dao.epmetuser.StaffRoleDao; -import com.epmet.dataaggre.dao.epmetuser.UserBaseInfoDao; +import com.epmet.dataaggre.dao.epmetuser.*; import com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO; import com.epmet.dataaggre.dto.epmetuser.StaffPatrolDetailDTO; import com.epmet.dataaggre.dto.epmetuser.StaffPatrolRecordDTO; @@ -19,17 +17,18 @@ import com.epmet.dataaggre.dto.epmetuser.result.*; import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO; +import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.epmetuser.StaffPatrolDetailService; import com.epmet.dataaggre.service.epmetuser.StaffPatrolRecordService; import com.epmet.dataaggre.service.govorg.GovOrgService; +import com.epmet.dataaggre.service.govproject.GovProjectService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.math.BigDecimal; import java.text.NumberFormat; import java.util.*; import java.util.stream.Collectors; @@ -57,6 +56,10 @@ public class EpmetUserServiceImpl implements EpmetUserService { private StaffRoleDao staffRoleDao; @Resource private CustomerStaffDao customerStaffDao; + @Autowired + private ResiUserBadgeDao resiUserBadgeDao; + @Autowired + private GovProjectService govProjectService; /** * @Description 根据UserIds查询 @@ -374,5 +377,28 @@ public class EpmetUserServiceImpl implements EpmetUserService { return staffRoleDao.selectStaffRoleList(customerId, userId); } + /** + * 我要报事-人大代表个人中心（尹） 是否显示@我，是否显示红点 + * + * @param userId + * @return com.epmet.dataaggre.dto.epmetuser.result.UserEventLogoResultDTO + * @author yinzuomei + * @date 2021/8/3 15:09 + */ + @Override + public UserEventLogoResultDTO mentionMeEvent(String userId) { + UserEventLogoResultDTO resultDTO = new UserEventLogoResultDTO(); + ResiUserBadgeEntity resiUserBadgeEntity = resiUserBadgeDao.selectUserByBadge(userId, BadgeConstant.BADGE_KEY_NPC); + //是否是人大代表 + if (null != resiUserBadgeEntity) { + resultDTO.setIsNpc(true); + } + //展示红点：true；隐藏：false + if(govProjectService.countRedDot(userId)>0){ + resultDTO.setRedDot(true); + }; + return resultDTO; + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index 38192cd035..35b0096790 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -41,4 +41,14 @@ public interface GovProjectService { List queryProjectDistribution(ProjectDistributionFormDTO formDTO); + + /** + * 查询resi_event_mention + * + * @param userId + * @return int + * @author yinzuomei + * @date 2021/8/3 15:27 + */ + int countRedDot(String userId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index d48c31f2d7..2063b3f83d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -233,4 +233,18 @@ public class GovProjectServiceImpl implements GovProjectService { throw new RenException("计算首次响应时间失败"); } } + + /** + * 查询resi_event_mention + * + * @param userId + * @return int + * @author yinzuomei + * @date 2021/8/3 15:27 + */ + @Override + public int countRedDot(String userId) { + return projectDao.countRedDot(userId); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/ResiUserBadgeDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/ResiUserBadgeDao.xml index ba7b99c850..40e651d1e9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/ResiUserBadgeDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/ResiUserBadgeDao.xml @@ -3,4 +3,17 @@ + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index d376938904..1e144e3420 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -144,4 +144,15 @@ order by p.CREATED_TIME desc + + \ No newline at end of file From a665b9f1e0f0a5b96e748aa797e5a67a87e469c3 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 3 Aug 2021 15:56:01 +0800 Subject: [PATCH 16/29] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=8A=A5?= =?UTF-8?q?=E4=BA=8B-=E5=8F=AF=E4=B8=8A=E6=8A=A5=E7=9A=84=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E7=BA=A7=E5=88=AB=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/enums/OrgLevelEnums.java | 66 +++++++++++++++++++ .../dto/form/ResiEventTargetLevelFormDTO.java | 18 +++++ .../dto/result/ResiEventNpcResultDTO.java | 2 + .../result/ResiEventTargetLevelResultDTO.java | 31 +++++++++ .../epmet/controller/ResiEventController.java | 38 +++++++++-- .../com/epmet/service/ResiEventService.java | 10 +++ .../service/impl/ResiEventServiceImpl.java | 60 +++++++++++++++-- 7 files changed, 213 insertions(+), 12 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/OrgLevelEnums.java create mode 100644 epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventTargetLevelFormDTO.java create mode 100644 epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventTargetLevelResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/OrgLevelEnums.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/OrgLevelEnums.java new file mode 100644 index 0000000000..00107ec8f5 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/OrgLevelEnums.java @@ -0,0 +1,66 @@ +package com.epmet.enums; + +import lombok.extern.slf4j.Slf4j; + +import java.util.Optional; + +/** + * @Description 入职级别枚举 + * @author wxz + * @date 2021.08.03 14:29:01 +*/ +@Slf4j +public enum OrgLevelEnums { + + GRID("grid", "网格"), + COMMUNITY("community", "社区"), + STREET("street", "街道"), + DISTRICT("district", "区"), + CITY("city", "市"), + PROVINCE("province", "省"), + + DEPARTMENT("department", "部门"), + ; + + private String level; + private String levelName; + + OrgLevelEnums(String level, String levelName) { + this.level = level; + this.levelName = levelName; + } + + /** + * @Description 级别枚举对象 + * @return + * @author wxz + * @date 2021.08.03 14:46 + */ + public static OrgLevelEnums getLevelObject(String level) { + for (OrgLevelEnums l :OrgLevelEnums.values()) { + if (l.getLevel().equals(level)) { + return l; + } + } + return null; + } + + /** + * @Description 级别中文名称 + * @return + * @author wxz + * @date 2021.08.03 14:47 + */ + public static String getLevelName(String level) { + OrgLevelEnums levelObject = getLevelObject(level); + return levelObject == null ? null : levelObject.getLevelName(); + } + + public String getLevel() { + return level; + } + + public String getLevelName() { + return levelName; + } +} diff --git a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventTargetLevelFormDTO.java b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventTargetLevelFormDTO.java new file mode 100644 index 0000000000..62dfcf4327 --- /dev/null +++ b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventTargetLevelFormDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Description 群众直报-上报目标级别查询 + * @author wxz + * @date 2021.08.03 13:47:23 +*/ +@Data +public class ResiEventTargetLevelFormDTO { + + @NotBlank(message = "网格ID不能为空") + private String gridId; + +} diff --git a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java index 6f285807ce..4208f28751 100644 --- a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java +++ b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java @@ -25,4 +25,6 @@ public class ResiEventNpcResultDTO { private String headImgUrl; private String agencyId; + + private String pids; } diff --git a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventTargetLevelResultDTO.java b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventTargetLevelResultDTO.java new file mode 100644 index 0000000000..7a2b3ce29b --- /dev/null +++ b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventTargetLevelResultDTO.java @@ -0,0 +1,31 @@ +package com.epmet.dto.result; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description 群众直报目标层级Result + * @author wxz + * @date 2021.08.03 13:43:58 +*/ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ResiEventTargetLevelResultDTO implements Comparable { + + private String orgLevel; + private String levelName; + private String orgId; + private String orgPid; + private String orgPids; + + //排序索引，用于排序 + private Integer index; + + @Override + public int compareTo(Object o) { + ResiEventTargetLevelResultDTO df = (ResiEventTargetLevelResultDTO) o; + return this.index.compareTo(df.getIndex()); + } +} diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java index fd316f0475..b594e42921 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -3,7 +3,9 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.ResiEventNpcListFormDTO; +import com.epmet.dto.form.ResiEventTargetLevelFormDTO; import com.epmet.dto.result.ResiEventNpcResultDTO; +import com.epmet.dto.result.ResiEventTargetLevelResultDTO; import com.epmet.service.ResiEventService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -11,13 +13,16 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.validation.constraints.NotBlank; +import java.util.HashMap; import java.util.List; +import java.util.TreeSet; /** - * @Description 群众直报/报事controller * @author wxz + * @Description 群众直报/报事controller * @date 2021.08.02 09:58:40 -*/ + */ @RestController @RequestMapping("resi-event") public class ResiEventController { @@ -26,17 +31,38 @@ public class ResiEventController { private ResiEventService resiEventService; /** - * @Description 查询人大代表列表 * @return + * @Description 查询人大代表列表 * @author wxz * @date 2021.08.03 09:17 - */ + */ @PostMapping("/npc-list-ingrid") - public Result> listNpc(@RequestBody ResiEventNpcListFormDTO input) { + public Result>> listNpc(@RequestBody ResiEventNpcListFormDTO input) { ValidatorUtils.validateEntity(input); String gridId = input.getGridId(); List npcs = resiEventService.listNpcByGrid(gridId); - return new Result>().ok(npcs); + + HashMap> wrapper = new HashMap<>(); + wrapper.put("reportTargets", npcs); + return new Result>>().ok(wrapper); + } + + /** + * @return + * @Description 查询上报目标列表 + * @author wxz + * @date 2021.08.03 13:47 + */ + @PostMapping("/report-target-level-list") + public Result listReportTargetLevels(@RequestBody ResiEventTargetLevelFormDTO input) { + ValidatorUtils.validateEntity(input); + String gridId = input.getGridId(); + TreeSet targetList = resiEventService.listReportTargetLevels(gridId); + + HashMap> warpper = new HashMap<>(); + warpper.put("reportTargets", targetList); + + return new Result().ok(warpper); } } diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java index ec30ef44e8..b23d04a476 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java @@ -1,8 +1,10 @@ package com.epmet.service; import com.epmet.dto.result.ResiEventNpcResultDTO; +import com.epmet.dto.result.ResiEventTargetLevelResultDTO; import java.util.List; +import java.util.TreeSet; /** * @Description 报事service @@ -17,4 +19,12 @@ public interface ResiEventService { * @date 2021.08.03 09:29 */ List listNpcByGrid(String gridId); + + /** + * @Description 查询上报目标列表 + * @return + * @author wxz + * @date 2021.08.03 13:50 + */ + TreeSet listReportTargetLevels(String gridId); } diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index b1871afb51..713d821588 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -1,22 +1,25 @@ package com.epmet.service.impl; import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.BadgeConstant; +import com.epmet.constant.OrgInfoConstant; import com.epmet.dto.form.ListUserByBadgeFormDTO; -import com.epmet.dto.result.GridInfoResultDTO; -import com.epmet.dto.result.ListUserByBadgeResultDTO; -import com.epmet.dto.result.ResiEventNpcResultDTO; +import com.epmet.dto.form.OrgInfoFormDTO; +import com.epmet.dto.result.*; +import com.epmet.enums.OrgLevelEnums; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.ResiEventService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * @author wxz @@ -39,6 +42,7 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve Result gridInfoResult = govOrgOpenFeignClient.queryGridInfo(gridId); GridInfoResultDTO gridInfoData = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null); String parentAgencyId = gridInfoData.getParentAgencyId(); + String pids = gridInfoData.getPids(); //查询人大代表列表 ListUserByBadgeFormDTO npcForm = new ListUserByBadgeFormDTO(gridId, BadgeConstant.BADGE_KEY_NPC); @@ -46,9 +50,53 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve List npcData = getResultDataOrThrowsException(npcResult, ServiceConstant.EPMET_USER_SERVER, null, null); List npcResultList = npcData.stream() - .map(npc -> new ResiEventNpcResultDTO(npc.getUserId(), gridId, "人大代表-".concat(npc.getRealName()), npc.getHeadImgUrl(), parentAgencyId)) + .map(npc -> new ResiEventNpcResultDTO(npc.getUserId(), gridId, "人大代表-".concat(npc.getRealName()), npc.getHeadImgUrl(), parentAgencyId, pids)) .collect(Collectors.toList()); return npcResultList; } + + /** + * @Description 此处会调用org上游接口批量获取父级组织信息，由于上游接口排序不可控，因此此处需要使用TreeSet做排序 + * @return + * @author wxz + * @date 2021.08.03 15:51 + */ + @Override + public TreeSet listReportTargetLevels(String gridId) { + TreeSet targetLevels = new TreeSet<>(); + + Result gridInfoResult = govOrgOpenFeignClient.queryGridInfo(gridId); + GridInfoResultDTO gridInfoData = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null); + String pidsPath = gridInfoData.getPids(); + List parentOrgIds = Arrays.asList(pidsPath.split(":")); + // 翻转列表 + Collections.reverse(parentOrgIds); + + // 一.网格信息(只有一条，但是为了适应接口，组装成了列表) + List currentGridId = Arrays.asList(gridId); + Result> currentGridInfoResult = govOrgOpenFeignClient.selectOrgInfo(new OrgInfoFormDTO(OrgInfoConstant.GRID, currentGridId)); + List currentGridInfos = getResultDataOrThrowsException(currentGridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null); + OrgInfoResultDTO currentGridInfo = currentGridInfos.get(0); + + // 因为上游接口的值对应问题，这里只好做一个适配，拼接起来，希望上游代码不要再改了... + String pids = currentGridInfo.getPids().concat(":").concat(currentGridInfo.getAgencyId()); + // 父ID列表的index排序字段是从0开始，网格要排在他们前面，则网格的index为-1 + targetLevels.add(new ResiEventTargetLevelResultDTO(OrgLevelEnums.GRID.getLevel(), OrgLevelEnums.GRID.getLevelName(), currentGridInfo.getOrgId(), currentGridInfo.getAgencyId(), pids, -1)); + + // 二.父级组织信息 + Result> parentOrgInfoResult = govOrgOpenFeignClient.selectOrgInfo(new OrgInfoFormDTO(OrgInfoConstant.AGENCY, parentOrgIds)); + List parentOrgInfos = getResultDataOrThrowsException(parentOrgInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null); + parentOrgInfos.forEach(porg -> { + String levelName = OrgLevelEnums.getLevelName(porg.getLevel()); + if (StringUtils.isBlank(levelName)) { + throw new RenException(String.format("根据级别%s没有找到对应的组织级别枚举", porg.getLevel())); + } + //parentOrgIds.indexOf(porg.getOrgId()为当前orgId在pids中的位置，得到之后，赋值给index字段，treeset会利用这个字段进行排序 + ResiEventTargetLevelResultDTO pLevel = new ResiEventTargetLevelResultDTO(porg.getLevel(), levelName, porg.getOrgId(), porg.getPid(), porg.getPids(), parentOrgIds.indexOf(porg.getOrgId())); + targetLevels.add(pLevel); + }); + + return targetLevels; + } } From f9ac0ce789b4cb20bd39034225bc3ff8f8032d21 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 3 Aug 2021 16:29:16 +0800 Subject: [PATCH 17/29] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=8A=A5=E4=BA=8B=E6=96=87=E4=BB=B6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/OssController.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java index 4914a71cfc..4fc64984c9 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java @@ -22,6 +22,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AliyunGroup; import com.epmet.commons.tools.validator.group.QcloudGroup; import com.epmet.commons.tools.validator.group.QiniuGroup; +import com.epmet.constants.PrivacyType; import com.epmet.dto.UploadDTO; import com.epmet.dto.form.RemoveFileFormDTO; import com.epmet.dto.result.UploadImgResultDTO; @@ -373,4 +374,31 @@ public class OssController { return ossService.uploadImgV2(file, null, customerId); } + /** + * @Description 上传报事文件(目前只有图片) + * @return + * @author wxz + * @date 2021.08.03 16:23 + */ + @PostMapping("upload-resi-event-file") + public Result uploadResiEventFile(@RequestPart(value = "file") MultipartFile file, @RequestParam("customerId") String customerId) { + + // 体积限制 + int sizeMb = 10; + int sizeThreshold = sizeMb * 1024 * 1024; // 大小限制10m + if (file.getSize() > sizeThreshold) { + throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getCode(), + EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg().concat("，限制在").concat(String.valueOf(sizeMb)).concat("M以内")); + } + + // 格式限制，只允许png和jpeg + if (!MediaType.IMAGE_PNG_VALUE.equals(file.getContentType()) + && !MediaType.IMAGE_JPEG_VALUE.equals(file.getContentType())) { + throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getCode() + , EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getMsg()); + } + + return ossService.uploadImgV2(file, PrivacyType.EXTERNAL, customerId); + } + } From 5e9e4a26b8d449dfed3f17623da0226a61f0a9a9 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 3 Aug 2021 16:42:11 +0800 Subject: [PATCH 18/29] =?UTF-8?q?=E5=88=A0=E6=8E=89=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E5=81=A5=E5=BA=B7=E6=A3=80=E6=9F=A5Controller?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HealthCheckController.java | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/HealthCheckController.java diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/HealthCheckController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/HealthCheckController.java deleted file mode 100644 index 63241a4bac..0000000000 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/HealthCheckController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.epmet.controller; - -import com.epmet.commons.tools.utils.Result; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("healthcheck") -public class HealthCheckController { - - /** - * http健康检查 - * @return - */ - @PostMapping("http") - public Result httpHealthCheck() { - return new Result(); - } - -} From 379eb16df784e1bc8104ea92b3821cbd0dcde621 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 3 Aug 2021 17:10:29 +0800 Subject: [PATCH 19/29] =?UTF-8?q?=E6=8A=A5=E4=BA=8B=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/MentionUserFormDTO.java | 35 ++++++ .../com/epmet/dto/form/ReportOrgFormDTO.java | 34 +++++ .../com/epmet/dto/form/ResiEventFormDTO.java | 51 ++++++++ .../com/epmet/constant/EventConstant.java | 3 + .../com/epmet/constant/ResiEventAction.java | 61 +++++++++ .../epmet/controller/ResiEventController.java | 10 +- .../service/impl/ResiEventServiceImpl.java | 117 +++++++++++++++--- 7 files changed, 291 insertions(+), 20 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReportOrgFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java new file mode 100644 index 0000000000..b142456c3d --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java @@ -0,0 +1,35 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 被艾特的人 + * + * @author yinzuomei@elink-cn.com + * @date 2021/8/3 15:51 + */ +@Data +public class MentionUserFormDTO implements Serializable { + + /** + * 人大代表用户id + */ + private String npcUserId; + + /** + * 人大代表注册网格id + */ + private String gridId; + + /** + * 人大代表注册网格所属社区id + */ + private String agencyId; + + /** + * 注册网格的所有上级 + */ + private String pids; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReportOrgFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReportOrgFormDTO.java new file mode 100644 index 0000000000..453ce8d382 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReportOrgFormDTO.java @@ -0,0 +1,34 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 报给谁？ + * + * @author yinzuomei@elink-cn.com + * @date 2021/8/3 15:51 + */ +@Data +public class ReportOrgFormDTO implements Serializable { + /** + * 报给？： 网格：grid； 社区：community； 乡（镇、街道）级:street； 区县级: district； 市级: city； 省级:province。 + */ + private String orgType; + + /** + * 报给的组织或者网格id + */ + private String orgId; + + /** + * org_id的上级组织id，org_id是跟组织，此列为0 + */ + private String orgPid; + + /** + * org_id的所有上级组织id，org_id是跟组织，此列为0 + */ + private String orgPids; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java index 83d96502ae..b0d1f4ff99 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventFormDTO.java @@ -1,9 +1,14 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.dto.form.FileCommonDTO; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; +import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; +import java.util.List; /** * 我要报事-提交（尹） @@ -17,6 +22,52 @@ public class ResiEventFormDTO implements Serializable { public interface AddUserInternalGroup { } + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + /** + * 用户所在网格id + */ + @NotBlank(message = "不能为空",groups = AddUserInternalGroup.class) + private String gridId; + + /** + * 事件内容，最多1000 + */ + @Length(min = 1, max = 1000, message = "请填写内容,最多输入1000字", groups = AddUserShowGroup.class) + private String eventContent; + + /** + * 纬度 + */ + private String latitude; + + /** + * 经度 + */ + private String longitude; + + /** + * 地址 + */ + @NotBlank(message = "地址不能为空",groups = AddUserShowGroup.class) + private String address; + + /** + * 附件列表 + */ + private List attachmentList; + /** + * @的人 + */ + private List npcUserList; + + /** + * 报给谁？ + */ + @NotEmpty(message = "不能为空",groups = AddUserInternalGroup.class) + private List orgList; + //以下参数从token中获取 diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java index 8a63bba97b..112ad2fa36 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java @@ -14,4 +14,7 @@ public interface EventConstant { String EVENT_UN_DISPOSED = "undisposed"; String EVENT_TRANSFERRED = "transferred"; + String EVENT_STATUS_PROCESSING="processing"; + String READ="read"; + String UN_READ="un_read"; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java new file mode 100644 index 0000000000..f525143772 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java @@ -0,0 +1,61 @@ +package com.epmet.constant; + +import com.epmet.commons.tools.constant.StrConstant; + +/** + * resi_event_operation_log事件操作日志枚举类 + * + * @author yinzuomei@elink-cn.com + * @date 2021/8/3 16:38 + */ +public enum ResiEventAction { + // 1、发布事件：publish； + // 2、撤回事件：recall； + // 3、复：reply； + // 4、立项：shift_project； + // 5、办结：close_case; + // 6、选择是否已解决：choose_resolve; + // 7、查看阅读事件：read：人大代表未读=>已读；工作人员待处理=>处理中； + PUBLISH ( "publish",""), + RECALL( "recall",""), + REPLY ("reply",""), + SHIFIT_PROJECT ( "shift_project",""), + CLOSE_CASE ( "close_case",""), + CHOOSE_RESOLVE ( "choose_resolve",""), + READ( "read",""); + + + private String code; + private String desc; + + ResiEventAction(String code, String desc) { + this.code = code; + this.desc = desc; + } + + public static String getDesc(String code) { + ResiEventAction[] businessModeEnums = values(); + for (ResiEventAction resiEventAction : businessModeEnums) { + if (resiEventAction.getCode()==code) { + return resiEventAction.getDesc(); + } + } + return StrConstant.EPMETY_STR; + } + + public String getCode(){ + return this.code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getDesc(){ + return this.desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java index 4622d74927..c1b9818a91 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -17,14 +17,12 @@ package com.epmet.controller; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dto.form.*; -import com.epmet.dto.result.EventDetailResultDTO; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.*; +import com.epmet.dto.result.EventDetailResultDTO; import com.epmet.dto.result.EventListResultDTO; import com.epmet.dto.result.MyReportedResultDTO; import com.epmet.dto.result.ResiEventIdDTO; @@ -70,11 +68,11 @@ public class ResiEventController { * @author yinzuomei * @date 2021/8/3 10:46 */ + @PostMapping("report") public Result report(@LoginUser TokenDto tokenDto, @RequestBody ResiEventFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - //校验参数 - //todo + ValidatorUtils.validateEntity(formDTO,ResiEventFormDTO.AddUserShowGroup.class,ResiEventFormDTO.AddUserInternalGroup.class); return new Result().ok(resiEventService.report(formDTO)); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 321decec81..4855a76fa8 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -18,25 +18,36 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.dto.form.FileCommonDTO; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.scan.param.ImgScanParamDTO; +import com.epmet.commons.tools.scan.param.ImgTaskDTO; +import com.epmet.commons.tools.scan.param.TextScanParamDTO; +import com.epmet.commons.tools.scan.param.TextTaskDTO; +import com.epmet.commons.tools.scan.result.SyncScanResult; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.ScanContentUtils; import com.epmet.constant.EventConstant; import com.epmet.dao.ResiEventDao; -import com.epmet.dto.form.EventDetailFormDTO; -import com.epmet.dto.form.EventListFormDTO; -import com.epmet.dto.form.UpdateViewTimeFormDTO; -import com.epmet.dto.result.EventDetailResultDTO; -import com.epmet.dto.result.EventListResultDTO; -import com.epmet.dto.form.ChooseResolveFormDTO; -import com.epmet.dto.form.MyReportedFormDTO; -import com.epmet.dto.form.ReCallEventFormDTO; -import com.epmet.dto.form.ResiEventFormDTO; -import com.epmet.dto.result.MyReportedResultDTO; -import com.epmet.dto.result.ResiEventIdDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.*; import com.epmet.entity.ResiEventEntity; +import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.ResiEventService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.util.ArrayList; +import java.util.Date; import java.util.List; +import java.util.UUID; /** * 居民报事表 @@ -44,8 +55,18 @@ import java.util.List; * @author generator generator@elink-cn.com * @since v1.0.0 2021-08-03 */ +@Slf4j @Service public class ResiEventServiceImpl extends BaseServiceImpl implements ResiEventService { + @Value("${openapi.scan.server.url}") + private String scanApiUrl; + @Value("${openapi.scan.method.textSyncScan}") + private String textSyncScanMethod; + @Value("${openapi.scan.method.imgSyncScan}") + private String imgSyncScanMethod; + @Autowired + private GovOrgOpenFeignClient govOrgOpenFeignClient; + /** * @Description 群众直报（待处理、处理中、已办结）列表 @@ -102,15 +123,83 @@ public class ResiEventServiceImpl extends BaseServiceImpl gridInfoRes=govOrgOpenFeignClient.queryGridInfo(formDTO.getGridId()); + if(!gridInfoRes.success()||null==gridInfoRes.getData()){ + throw new RenException("网格信息查询异常"); + } + ResiEventEntity resiEventEntity= ConvertUtils.sourceToTarget(formDTO,ResiEventEntity.class); + resiEventEntity.setAgencyId(gridInfoRes.getData().getParentAgencyId()); + resiEventEntity.setPids(gridInfoRes.getData().getPids()); + resiEventEntity.setReportUserId(formDTO.getUserId()); //todo - - - + resiEventEntity.setIsParty("?????"); + resiEventEntity.setStatus(EventConstant.EVENT_STATUS_PROCESSING); + resiEventEntity.setShiftProject(false); + resiEventEntity.setProjectId(StrConstant.EPMETY_STR); + resiEventEntity.setRecallFlag(false); + resiEventEntity.setReadFlag(false); + resiEventEntity.setRedDot(false); + resiEventEntity.setLatestOperatedTime(new Date()); + resiEventEntity.setCreatedTime(resiEventEntity.getLatestOperatedTime()); + resiEventEntity.setUpdatedTime(resiEventEntity.getLatestOperatedTime()); + baseDao.insert(resiEventEntity); + //4、插入主表resi_event + //5、插入附件表 + //6、插入组织表 + //7、插入艾特人表 + //8、插入log日志 return null; } + private void scanContent(String eventContent, List attachmentList) { + //事件内容 + if (StringUtils.isNotBlank(eventContent)) { + TextScanParamDTO textScanParamDTO = new TextScanParamDTO(); + TextTaskDTO taskDTO = new TextTaskDTO(); + taskDTO.setContent(eventContent); + taskDTO.setDataId(UUID.randomUUID().toString().replace("-", "")); + textScanParamDTO.getTasks().add(taskDTO); + Result textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); + if (!textSyncScanResult.success()) { + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + } else { + if (!textSyncScanResult.getData().isAllPass()) { + throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(), EpmetErrorCode.TEXT_SCAN_FAILED.getMsg()); + } + } + } + List imgList=new ArrayList<>(); + for(FileCommonDTO fileCommonDTO:attachmentList){ + if("image".equals(fileCommonDTO.getType())){ + imgList.add(fileCommonDTO.getUrl()); + } + } + //事件图片 + if (!CollectionUtils.isEmpty(imgList)) { + ImgScanParamDTO imgScanParamDTO = new ImgScanParamDTO(); + imgList.forEach(imgUrl -> { + ImgTaskDTO task = new ImgTaskDTO(); + task.setDataId(UUID.randomUUID().toString().replace("-", "")); + task.setUrl(imgUrl); + imgScanParamDTO.getTasks().add(task); + }); + Result imgScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO); + if (!imgScanResult.success()) { + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + } else { + if (!imgScanResult.getData().isAllPass()) { + throw new RenException(EpmetErrorCode.IMG_SCAN_FAILED.getCode(), EpmetErrorCode.IMG_SCAN_FAILED.getMsg()); + } + } + } + } + /** * 撤回事件 * From 5437d7a12feda8d9c3a6a9fec1d5a0cfa0f2579f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 3 Aug 2021 17:16:15 +0800 Subject: [PATCH 20/29] =?UTF-8?q?resi=5Fevent=E6=96=B0=E5=A2=9Eclose=5Fcas?= =?UTF-8?q?e=5Ftime=E5=8A=9E=E7=BB=93=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/entity/ResiEventEntity.java | 5 +++++ .../db/migration/V0.0.16__create_resievent_tables.sql | 1 + 2 files changed, 6 insertions(+) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java index 34ae10cd86..a142881c1d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java @@ -93,6 +93,11 @@ public class ResiEventEntity extends BaseEpmetEntity { */ private String status; + /** + * 办结时间 + */ + private Date closeCaseTime; + /** * 1：已转项目；0：未转项目；默认0 */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql index f753c01e22..67f600d311 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql @@ -11,6 +11,7 @@ CREATE TABLE `resi_event` ( `LONGITUDE` varchar(32) DEFAULT NULL COMMENT '经度', `ADDRESS` varchar(255) NOT NULL COMMENT '地址', `STATUS` varchar(32) NOT NULL COMMENT '处理中：processing；已办结：closed_case', + `close_case_time` datetime DEFAULT NULL COMMENT '办结时间', `SHIFT_PROJECT` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1：已转项目；0：未转项目；默认0', `PROJECT_ID` varchar(64) DEFAULT NULL COMMENT '项目id;shift_project=1时，此列有值', `RECALL_FLAG` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1:已撤回；0：未撤回正常展示；默认0', From 6c040539f9a2bb14c23b99c1a7b6e71ab81746d4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 3 Aug 2021 17:28:09 +0800 Subject: [PATCH 21/29] =?UTF-8?q?resi=5Fevent=E4=BF=AE=E6=94=B9is=5Fparty?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BAtinyint(1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/entity/ResiEventEntity.java | 2 +- .../com/epmet/service/impl/ResiEventServiceImpl.java | 9 ++++++++- .../db/migration/V0.0.16__create_resievent_tables.sql | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java index a142881c1d..f00dab5a06 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java @@ -66,7 +66,7 @@ public class ResiEventEntity extends BaseEpmetEntity { /** * 1：党员；0：不是党员；默认0 */ - private String isParty; + private Boolean isParty; /** * 事件内容 diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 4855a76fa8..ca685464b8 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -35,6 +35,7 @@ import com.epmet.dao.ResiEventDao; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.ResiEventEntity; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.ResiEventService; import lombok.extern.slf4j.Slf4j; @@ -66,6 +67,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl partyRes=epmetUserOpenFeignClient.selectIsPartyMemberByUserId(formDTO.getUserId()); + if(!partyRes.success()||null==partyRes.getData()){ + throw new RenException("查询用户是否是党员异常"); + } + resiEventEntity.setIsParty(partyRes.getData()); resiEventEntity.setStatus(EventConstant.EVENT_STATUS_PROCESSING); resiEventEntity.setShiftProject(false); resiEventEntity.setProjectId(StrConstant.EPMETY_STR); diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql index 67f600d311..90cc434e75 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql @@ -5,7 +5,7 @@ CREATE TABLE `resi_event` ( `AGENCY_ID` varchar(64) NOT NULL COMMENT '居民端用户所在网格的所属组织', `PIDS` varchar(64) NOT NULL COMMENT '居民端用户所在网格的所有上级组织，包含AGENCY_ID', `REPORT_USER_ID` varchar(64) NOT NULL COMMENT '报事的人', - `IS_PARTY` varchar(1) NOT NULL DEFAULT '0' COMMENT '1：党员；0：不是党员；默认0', + `IS_PARTY` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1：党员；0：不是党员；默认0', `EVENT_CONTENT` varchar(1024) NOT NULL COMMENT '事件内容', `LATITUDE` varchar(32) DEFAULT NULL COMMENT '纬度', `LONGITUDE` varchar(32) DEFAULT NULL COMMENT '经度', From e24c661d2acb8c94eb327aa9a72d1b453fd23d55 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 3 Aug 2021 17:38:03 +0800 Subject: [PATCH 22/29] =?UTF-8?q?=E5=92=8C=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/EventListResultDTO.java | 2 +- .../main/java/com/epmet/dao/ResiEventDao.java | 13 ++++++ .../service/impl/ResiEventServiceImpl.java | 12 ++---- .../main/resources/mapper/ResiEventDao.xml | 41 ++++++++++++++++++- 4 files changed, 56 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java index 94853b80d1..23ecd11982 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventListResultDTO.java @@ -18,7 +18,7 @@ public class EventListResultDTO implements Serializable { /** * 报事标题 */ - private String eventTitle; + private String eventContent; /** * 报事时间 diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java index c1312cb0d9..1f5bc47f00 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java @@ -18,8 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.EventListResultDTO; import com.epmet.entity.ResiEventEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 居民报事表 @@ -29,5 +33,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ResiEventDao extends BaseDao { + + /** + * @Description 查询报事列表 + * @Param orgId + * @Param eventType + * @author zxc + * @date 2021/8/3 4:21 下午 + */ + List eventUnDisposedList(@Param("orgId")String orgId,@Param("eventType")String eventType); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index ca685464b8..6df99a2e62 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -82,15 +82,9 @@ public class ResiEventServiceImpl extends BaseServiceImpl eventList(EventListFormDTO formDTO) { - // 处理中 - if (formDTO.getEventType().equals(EventConstant.EVENT_PROCESSED)){ - - // 待处理 - }else if (formDTO.getEventType().equals(EventConstant.EVENT_UN_DISPOSED)){ - - // 已办结 - }else if (formDTO.getEventType().equals(EventConstant.EVENT_TRANSFERRED)){ - + List result = baseDao.eventUnDisposedList(formDTO.getOrgId(), formDTO.getEventType()); + if (!CollectionUtils.isEmpty(result)){ + return result; } return new ArrayList<>(); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml index 21c7a902d7..f971e92473 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml @@ -3,6 +3,43 @@ - - + + + + + + + + + + + + \ No newline at end of file From e9ba326edeeea25f23d3dac5dd8a3f283ea3ecd2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 3 Aug 2021 17:39:38 +0800 Subject: [PATCH 23/29] hebing --- .../service/impl/ResiEventServiceImpl.java | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index ca685464b8..52a188fdde 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -31,9 +31,11 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.ScanContentUtils; import com.epmet.constant.EventConstant; +import com.epmet.dao.ResiEventAttachmentDao; import com.epmet.dao.ResiEventDao; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.entity.ResiEventAttachmentEntity; import com.epmet.entity.ResiEventEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; @@ -69,7 +71,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl partyRes=epmetUserOpenFeignClient.selectIsPartyMemberByUserId(formDTO.getUserId()); if(!partyRes.success()||null==partyRes.getData()){ throw new RenException("查询用户是否是党员异常"); @@ -153,9 +155,13 @@ public class ResiEventServiceImpl extends BaseServiceImpl attachmentEntityList=getAttList(formDTO.getCustomerId(),resiEventEntity.getId(),formDTO.getAttachmentList()); + attachmentEntityList.forEach(attachmentEntity->{ + resiEventAttachmentDao.insert(attachmentEntity); + }); //6、插入组织表 //7、插入艾特人表 //8、插入log日志 @@ -164,6 +170,23 @@ public class ResiEventServiceImpl extends BaseServiceImpl getAttList(String customerId,String resiEventId, List attachmentList) { + List list=new ArrayList<>(); + int sort=1; + for(FileCommonDTO img:attachmentList){ + ResiEventAttachmentEntity entity=new ResiEventAttachmentEntity(); + entity.setCustomerId(customerId); + entity.setResiEventId(resiEventId); + entity.setAttachmentName(img.getName()); + entity.setAttachmentFormat(img.getFormat()); + entity.setAttachmentType(img.getType()); + entity.setAttachmentUrl(img.getUrl()); + entity.setSort(sort); + sort++; + } + return list; + } + private void scanContent(String eventContent, List attachmentList) { //事件内容 if (StringUtils.isNotBlank(eventContent)) { From 30807755a46a207114e99cb4f95ea3d3efa372ea Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 4 Aug 2021 09:11:53 +0800 Subject: [PATCH 24/29] =?UTF-8?q?=E6=8A=A5=E4=BA=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 3 + .../com/epmet/constant/EventConstant.java | 26 ++++ .../epmet/controller/ResiEventController.java | 3 + .../main/java/com/epmet/dao/ResiEventDao.java | 13 +- .../service/impl/ResiEventServiceImpl.java | 146 +++++++++++++++--- .../main/resources/mapper/ResiEventDao.xml | 44 ++++++ 6 files changed, 213 insertions(+), 22 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 3a213b5191..015095cc83 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -95,6 +95,9 @@ public enum EpmetErrorCode { IMG_SCAN_FAILED(8504,"图片审核失败，请重新上传"), PROJECT_IS_CLOSED(8601,"项目已结案"), VOTE_ISSUE_PLEASE(8602,"请先选择支持或反对，再发表您的想法"), + RESI_EVENT_READ(8603,"当前事件正在处理中,不能撤回"), + RESI_EVENT_NOT_MY_REPORTED(8604,"当前事件不是您发布的，无权操作"), + // 爱心互助 居民端 NOT_IN_THE_SIGN_IN_RANGE(8510, "您还未进入指定的签到范围～"), // 活动报名失败，弹窗：志愿者认证 diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java index 112ad2fa36..2608de1e9f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java @@ -14,7 +14,33 @@ public interface EventConstant { String EVENT_UN_DISPOSED = "undisposed"; String EVENT_TRANSFERRED = "transferred"; + + /** + * 事件状态resi_event.status:处理中：processing；已办结：closed_case + */ String EVENT_STATUS_PROCESSING="processing"; + String EVENT_STATUS_CLOSED_CASE="closed_case"; + String READ="read"; String UN_READ="un_read"; + + /** + * 事件@人员表，用户身份 + * resi_event_mention.user_type + */ + String NPC_USER="npc_user"; + + /** + * 操作日志表用户来源：resi_event_operation_log.userIdentity + * 居民端用户:resi_user；工作人员:staff；报事人:report_user + */ + String RESI_USER="resi_user"; + String STAFF="staff"; + String REPORT_USER="report_user"; + + /** + * 事件是否解决：已解决 resolved，未解决 un_solved + */ + String RESOLVED="resolved"; + String UN_SOLVED="un_solved"; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java index c1b9818a91..d453e6ecd3 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -153,4 +153,7 @@ public class ResiEventController { resiEventService.updateViewTime(formDTO); return new Result(); } + + + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java index 1f5bc47f00..95f95f4959 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java @@ -19,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.result.EventListResultDTO; +import com.epmet.dto.result.MyReportedResultDTO; import com.epmet.entity.ResiEventEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -42,5 +43,15 @@ public interface ResiEventDao extends BaseDao { * @date 2021/8/3 4:21 下午 */ List eventUnDisposedList(@Param("orgId")String orgId,@Param("eventType")String eventType); - + + /** + * 居民端我的报事列表查询 + * + * @param userId 报事人 + * @param statusCondition 未处理:un_read；处理中：processing；已办结：closed_case + * @return java.util.List + * @author yinzuomei + * @date 2021/8/3 23:21 + */ + List queryMyReported(@Param("userId") String userId, @Param("statusCondition")String statusCondition); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 4c1a68f950..935e56abe6 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -17,7 +17,9 @@ package com.epmet.service.impl; +import com.alibaba.fastjson.JSON; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.FileCommonDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -31,15 +33,16 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.ScanContentUtils; import com.epmet.constant.EventConstant; -import com.epmet.dao.ResiEventAttachmentDao; -import com.epmet.dao.ResiEventDao; +import com.epmet.constant.ResiEventAction; +import com.epmet.dao.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; -import com.epmet.entity.ResiEventAttachmentEntity; -import com.epmet.entity.ResiEventEntity; +import com.epmet.entity.*; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.ResiEventService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -73,6 +76,12 @@ public class ResiEventServiceImpl extends BaseServiceImpl orgEntityList=getOrgList(formDTO.getCustomerId(),resiEventEntity.getId(),formDTO.getOrgList()); + orgEntityList.forEach(orgEntity->{ + resiEventReportOrgDao.insert(orgEntity); + }); //7、插入艾特人表 + List npcList=getNpcList(formDTO.getCustomerId(),resiEventEntity.getId(),formDTO.getNpcUserList()); + npcList.forEach(npc->{ + resiEventMentionDao.insert(npc); + }); //8、插入log日志 + ResiEventOperationLogEntity publishLog=new ResiEventOperationLogEntity(); + publishLog.setCustomerId(formDTO.getCustomerId()); + publishLog.setResiEventId(resiEventEntity.getId()); + publishLog.setUserId(formDTO.getUserId()); + publishLog.setUserIdentity(EventConstant.REPORT_USER); + publishLog.setActionCode(ResiEventAction.PUBLISH.getCode()); + publishLog.setActionDesc(ResiEventAction.PUBLISH.getDesc()); + publishLog.setOperateTime(resiEventEntity.getCreatedTime()); + resiEventOperationLogDao.insert(publishLog); + //9、返回事件id + ResiEventIdDTO resiEventIdDTO=new ResiEventIdDTO(); + resiEventIdDTO.setResiEventId(resiEventEntity.getId()); + return resiEventIdDTO; + } + private List getNpcList(String customerId, String resiEventId, List npcUserList) { + List list=new ArrayList<>(); + npcUserList.forEach(npc->{ + ResiEventMentionEntity mentionEntity=new ResiEventMentionEntity(); + mentionEntity.setCustomerId(customerId); + mentionEntity.setResiEventId(resiEventId); + mentionEntity.setUserType(EventConstant.NPC_USER); + mentionEntity.setUserId(npc.getNpcUserId()); + mentionEntity.setGridId(npc.getGridId()); + mentionEntity.setAgencyId(npc.getAgencyId()); + mentionEntity.setPids(npc.getPids()); + mentionEntity.setReadFlag(EventConstant.UN_READ); + mentionEntity.setRedDot(true); + list.add(mentionEntity); + }); + return list; + } - return null; + private List getOrgList(String customerId, String resiEventId, List orgList) { + List list=new ArrayList<>(); + orgList.forEach(org->{ + ResiEventReportOrgEntity entity=ConvertUtils.sourceToTarget(org,ResiEventReportOrgEntity.class); + entity.setCustomerId(customerId); + entity.setResiEventId(resiEventId); + //默认是未读 + entity.setOrgRead(EventConstant.UN_READ); + entity.setRedDot(true); + list.add(entity); + }); + return list; } private List getAttList(String customerId,String resiEventId, List attachmentList) { List list=new ArrayList<>(); - int sort=1; + int sort= NumConstant.ONE; for(FileCommonDTO img:attachmentList){ ResiEventAttachmentEntity entity=new ResiEventAttachmentEntity(); entity.setCustomerId(customerId); @@ -177,6 +237,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl queryMyReported(MyReportedFormDTO formDTO) { - // todo - - + PageInfo result = PageHelper.startPage(formDTO.getPageNo(), + formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryMyReported(formDTO.getUserId(), + formDTO.getStatusCondition())); + return result.getList(); + } - return null; - } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml index f971e92473..811dbc08a8 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml @@ -42,4 +42,48 @@ )t LEFT JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 0 OR rea.SORT = 1 OR rea.SORT = 2)) + + + + + + + + + + + + + + + + + \ No newline at end of file From f1b87860d40569357e2efe5c92d79a650e144318 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 4 Aug 2021 09:55:59 +0800 Subject: [PATCH 25/29] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=9C=AA=E8=AF=BB=E3=80=81=E5=B7=B2=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/UserMentionFormDTO.java | 44 +++++++++++++++ .../dto/result/UserMentionResultDTO.java | 55 +++++++++++++++++++ .../epmet/controller/ResiEventController.java | 22 ++++++-- .../com/epmet/dao/ResiEventMentionDao.java | 16 +++++- .../com/epmet/service/ResiEventService.java | 15 +++-- .../service/impl/ResiEventServiceImpl.java | 16 ++++++ .../main/resources/mapper/ResiEventDao.xml | 3 +- .../resources/mapper/ResiEventMentionDao.xml | 49 +++++++++++++++++ 8 files changed, 209 insertions(+), 11 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UserMentionFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UserMentionFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UserMentionFormDTO.java new file mode 100644 index 0000000000..861abebb95 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UserMentionFormDTO.java @@ -0,0 +1,44 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 我要报事-人大代表未读/已读列表入参 + * + * @author yinzuomei@elink-cn.com + * @date 2021/8/4 9:34 + */ +@Data +public class UserMentionFormDTO implements Serializable { + private static final long serialVersionUID = 7548058964554418080L; + + public interface AddUserInternalGroup { + } + + /** + * 未读：un_read;已读：read； + */ + @NotBlank(message = "readFlag不能为空", groups = AddUserInternalGroup.class) + private String readFlag; + @NotNull(message = "pageNo不能为空", groups = AddUserInternalGroup.class) + private Integer pageNo; + @NotNull(message = "pageSize不能为空", groups = AddUserInternalGroup.class) + private Integer pageSize; + + //以下参数从token中获取 + /** + * 当前用户id + */ + @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class) + private String userId; + + /** + * 当前客户id + */ + @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class) + private String customerId; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java new file mode 100644 index 0000000000..95ac2e2527 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java @@ -0,0 +1,55 @@ +package com.epmet.dto.result; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 我要报事-人大代表未读/已读列表返参 + * + * @author yinzuomei@elink-cn.com + * @date 2021/8/4 9:44 + */ +@Data +public class UserMentionResultDTO implements Serializable { + + private static final long serialVersionUID = 8171079006237395425L; + /** + * 事件id + */ + private String resiEventId; + + /** + * 事件内容 + */ + private String eventContent; + + /** + * 图片列表，可为空 + */ + private List imgList; + + /** + * true展示；false不展示 + */ + private Boolean redDot; + + /** + * 处理中：processing；已办结：closed_case + */ + private String status; + + /** + * true:已转项目；false：未立项 + */ + private Boolean shiftProject; + + /** + * 列表显示时间用此列：yyyy-MM-dd HH:mm:ss；处理中：上报事件时间，处理中：最新一次处理事件；已办结：办结时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date showTime; +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java index d453e6ecd3..98bfe74b10 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -22,10 +22,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.*; -import com.epmet.dto.result.EventDetailResultDTO; -import com.epmet.dto.result.EventListResultDTO; -import com.epmet.dto.result.MyReportedResultDTO; -import com.epmet.dto.result.ResiEventIdDTO; +import com.epmet.dto.result.*; import com.epmet.service.ResiEventService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -154,6 +151,21 @@ public class ResiEventController { return new Result(); } - + /** + * 我要报事-人大代表未读/已读列表 + * + * @param tokenDto + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + * @author yinzuomei + * @date 2021/8/4 9:40 + */ + @PostMapping("mentionlist") + public Result> mentionList(@LoginUser TokenDto tokenDto, @RequestBody UserMentionFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO,UserMentionFormDTO.AddUserInternalGroup.class); + return new Result>().ok(resiEventService.mentionList(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java index 270500ae05..981cee667a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java @@ -18,8 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.UserMentionResultDTO; import com.epmet.entity.ResiEventMentionEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 事件被@人表 @@ -29,5 +33,15 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ResiEventMentionDao extends BaseDao { - + + /** + * 人大代表未读、已读列表 + * + * @param userId + * @param readFlag + * @return java.util.List + * @author yinzuomei + * @date 2021/8/4 9:54 + */ + List selectMentionList(@Param("userId")String userId, @Param("readFlag")String readFlag); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java index 82dabf69fc..604375b0fb 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java @@ -2,11 +2,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.dto.form.*; -import com.epmet.dto.result.EventDetailResultDTO; -import com.epmet.dto.result.EventListResultDTO; +import com.epmet.dto.result.*; import com.epmet.entity.ResiEventEntity; -import com.epmet.dto.result.MyReportedResultDTO; -import com.epmet.dto.result.ResiEventIdDTO; import java.util.List; @@ -81,4 +78,14 @@ public interface ResiEventService extends BaseService { * @date 2021/8/3 14:28 */ List queryMyReported(MyReportedFormDTO formDTO); + + /** + * 我要报事-人大代表未读/已读列表 + * + * @param formDTO + * @return java.util.List + * @author yinzuomei + * @date 2021/8/4 9:41 + */ + List mentionList(UserMentionFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 935e56abe6..c002ad983a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -379,5 +379,21 @@ public class ResiEventServiceImpl extends BaseServiceImpl + * @author yinzuomei + * @date 2021/8/4 9:41 + */ + @Override + public List mentionList(UserMentionFormDTO formDTO) { + PageInfo result = PageHelper.startPage(formDTO.getPageNo(), + formDTO.getPageSize()).doSelectPageInfo(() -> resiEventMentionDao.selectMentionList(formDTO.getUserId(), + formDTO.getReadFlag())); + return result.getList(); + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml index 811dbc08a8..b1576f605e 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml @@ -74,7 +74,8 @@ from resi_event re left join resi_event_attachment rea on(re.id=rea.RESI_EVENT_ID - and rea.DEL_FLAG='0') + and rea.DEL_FLAG='0' + and rea.ATTACHMENT_TYPE='image') where re.DEL_FLAG='0' and re.RECALL_FLAG='0' and re.REPORT_USER_ID=#{userId} diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml index 98064a416f..7a4f145c75 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml @@ -3,6 +3,55 @@ + + + + + + + + + + + + + + \ No newline at end of file From db26848fbdf0c1818a5338c59b3cddb5355318d9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 4 Aug 2021 10:14:33 +0800 Subject: [PATCH 26/29] =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=82=80=E8=AF=B7?= =?UTF-8?q?=E5=85=B3=E7=B3=BBbugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/UserInvitationDao.java | 8 +++++--- .../epmet/service/impl/UserInvitationServiceImpl.java | 11 +++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserInvitationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserInvitationDao.java index 948c57edf0..4409c5f7cd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserInvitationDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserInvitationDao.java @@ -23,6 +23,8 @@ import com.epmet.entity.UserInvitationEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 人员邀请关系表 记录user之间的邀请关系 * @@ -41,7 +43,7 @@ public interface UserInvitationDao extends BaseDao { * @Description 根据被邀请人id、邀请链接id、邀请场景查询人员邀请记录 * @Date 2020/4/10 0:36 **/ - UserInvitationDTO selectUserInvitation(@Param("inviteeUserId") String inviteeUserId, - @Param("inviteSourceId") String inviteSourceId, - @Param("inviteSource") String inviteSource); + List selectUserInvitation(@Param("inviteeUserId") String inviteeUserId, + @Param("inviteSourceId") String inviteSourceId, + @Param("inviteSource") String inviteSource); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserInvitationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserInvitationServiceImpl.java index adfae02876..30e26b0a98 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserInvitationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserInvitationServiceImpl.java @@ -34,6 +34,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import java.util.Arrays; import java.util.Date; @@ -106,10 +107,10 @@ public class UserInvitationServiceImpl extends BaseServiceImpl userInvitationDTOList = baseDao.selectUserInvitation(formDTO.getInviteeUserId(), formDTO.getInviteSourceId(), formDTO.getInviteSource()); - if (null == userInvitationDTO) { + if (CollectionUtils.isEmpty(userInvitationDTOList)) { UserInvitationDTO insertUserInvitationDTO = new UserInvitationDTO(); insertUserInvitationDTO.setCustomerId(formDTO.getCustomerId()); insertUserInvitationDTO.setGridId(formDTO.getGridId()); @@ -120,8 +121,10 @@ public class UserInvitationServiceImpl extends BaseServiceImpl{ + userInvitationDTO.setInvitationTime(new Date()); + this.update(userInvitationDTO); + }); } return new Result(); } From 6e877cda21598cab8cd5260807eac65389bf6018 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 4 Aug 2021 10:34:31 +0800 Subject: [PATCH 27/29] resi_event.pids varchar(255) --- .../src/main/java/com/epmet/dto/form/MentionUserFormDTO.java | 2 +- .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java | 2 +- .../resources/db/migration/V0.0.16__create_resievent_tables.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java index b142456c3d..9df7be7b21 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MentionUserFormDTO.java @@ -16,7 +16,7 @@ public class MentionUserFormDTO implements Serializable { /** * 人大代表用户id */ - private String npcUserId; + private String userId; /** * 人大代表注册网格id diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index c002ad983a..2f31225c35 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -199,7 +199,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl Date: Wed, 4 Aug 2021 10:41:38 +0800 Subject: [PATCH 28/29] orgType=>orgLevel --- .../src/main/java/com/epmet/dto/form/ReportOrgFormDTO.java | 2 +- .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReportOrgFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReportOrgFormDTO.java index 453ce8d382..56b6184fd2 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReportOrgFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReportOrgFormDTO.java @@ -15,7 +15,7 @@ public class ReportOrgFormDTO implements Serializable { /** * 报给？： 网格：grid； 社区：community； 乡（镇、街道）级:street； 区县级: district； 市级: city； 省级:province。 */ - private String orgType; + private String orgLevel; /** * 报给的组织或者网格id diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 2f31225c35..17bfd10d46 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -216,6 +216,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl Date: Wed, 4 Aug 2021 10:55:57 +0800 Subject: [PATCH 29/29] =?UTF-8?q?sql=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/StaffPatrolRecordDao.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml index d3d5b53bb3..a514e59f47 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml @@ -7,7 +7,6 @@