From ae4475f04d548bdd56c1428e0002d1a846774068 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 4 Aug 2021 10:58:30 +0800 Subject: [PATCH 01/36] actiondesc --- .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 17bfd10d46..40c0d3d72d 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 @@ -183,7 +183,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl Date: Wed, 4 Aug 2021 10:59:49 +0800 Subject: [PATCH 02/36] actiondesc --- .../java/com/epmet/constant/ResiEventAction.java | 14 +++++++------- .../epmet/service/impl/ResiEventServiceImpl.java | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) 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 index f525143772..ff9f721e1e 100644 --- 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 @@ -16,13 +16,13 @@ public enum ResiEventAction { // 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",""); + PUBLISH ( "publish","发布事件"), + RECALL( "recall","撤回事件"), + REPLY ("reply","回复"), + SHIFIT_PROJECT ( "shift_project","立项"), + CLOSE_CASE ( "close_case","办结"), + CHOOSE_RESOLVE ( "choose_resolve","选择是否解决"), + READ( "read","查看事件"); private String code; 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 40c0d3d72d..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 @@ -183,7 +183,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl Date: Wed, 4 Aug 2021 11:01:38 +0800 Subject: [PATCH 03/36] =?UTF-8?q?time=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 17bfd10d46..1907cba24c 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 @@ -185,6 +185,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl Date: Wed, 4 Aug 2021 12:58:32 +0800 Subject: [PATCH 04/36] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=8A=A5=E4=BA=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java | 3 +++ .../src/main/resources/mapper/ResiEventDao.xml | 1 + 2 files changed, 4 insertions(+) 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 1907cba24c..9d5a9e0098 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 @@ -376,6 +376,9 @@ public class ResiEventServiceImpl extends BaseServiceImpl queryMyReported(MyReportedFormDTO formDTO) { + // 未处理： 发了没有人看过的时间 + // 处理中: 有人看，正在处理中的 + // 已办结：有人看，已经办结了的 PageInfo result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryMyReported(formDTO.getUserId(), formDTO.getStatusCondition())); 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 b1576f605e..c80501a831 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 @@ -83,6 +83,7 @@ and re.READ_FLAG='0' + and re.READ_FLAG='1' and re.`STATUS`=#{statusCondition} order by re.LATEST_OPERATED_TIME desc From b19f0179c57cb529e02f6feb1aa0396ad1a82e5d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 4 Aug 2021 13:34:42 +0800 Subject: [PATCH 05/36] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/ReplyListFormDTO.java | 3 +++ .../epmet/dto/result/ReplyListResultDTO.java | 18 ++++++++++++++++++ .../controller/ResiEventReplyController.java | 5 ++++- .../java/com/epmet/dao/ResiEventReplyDao.java | 14 +++++++++++++- .../impl/ResiEventReplyServiceImpl.java | 8 +++++++- .../resources/mapper/ResiEventReplyDao.xml | 15 ++++++++++++++- 6 files changed, 59 insertions(+), 4 deletions(-) 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 index 20575626fd..ed9bb74e21 100644 --- 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 @@ -20,4 +20,7 @@ public class ReplyListFormDTO implements Serializable { @NotBlank(message = "报事ID不能为空",groups = ReplyListForm.class) private String resiEventId; + + @NotBlank(message = "当前用户id不能为空",groups = ReplyListForm.class) + private String currentUserId; } 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 index f5b744289e..87209854a4 100644 --- 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 @@ -1,8 +1,10 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * @Author zxc @@ -14,5 +16,21 @@ public class ReplyListResultDTO implements Serializable { private static final long serialVersionUID = 4875335642497226847L; + /** + * 回复人的昵称，比如：南宁路社区,人大代表-李四,山东路-尹女士 + * */ + private String replyName; + /** + * 回复时间 + * */ + private Date replyTime; + + /** + * 回复的内容 + * */ + private String replyContent; + + @JsonIgnore + private String replyUserId; } 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 6a1eac37ef..dec9a9a80f 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,6 +17,8 @@ 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.ReplyListFormDTO; @@ -51,7 +53,8 @@ public class ResiEventReplyController { * @date 2021/8/3 11:11 上午 */ @PostMapping("list") - public Result> replyList(@RequestBody ReplyListFormDTO formDTO){ + public Result> replyList(@LoginUser TokenDto tokenDto, @RequestBody ReplyListFormDTO formDTO){ + formDTO.setCurrentUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO, ReplyListFormDTO.ReplyListForm.class); return new Result>().ok(resiEventReplyService.replyList(formDTO)); } 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 index 38cbf1467d..603c1eefc9 100644 --- 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 @@ -18,9 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.ReplyListResultDTO; import com.epmet.entity.ResiEventReplyEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 事件回复表 * @@ -29,5 +32,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ResiEventReplyDao extends BaseDao { - + + /** + * 查询事件的回复列表 + * + * @param resiEventId + * @return java.util.List + * @author yinzuomei + * @date 2021/8/4 13:22 + */ + List selectReplyList(String resiEventId); } \ 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 4b003cf048..98767e41c8 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 @@ -44,6 +44,12 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl replyList(ReplyListFormDTO formDTO) { - return null; + List list=baseDao.selectReplyList(formDTO.getResiEventId()); + list.forEach(dto->{ + if(dto.getReplyUserId().equals(formDTO.getCurrentUserId())){ + dto.setReplyName("我"); + } + }); + return list; } } \ 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 index 5e01548862..bc763a71f5 100644 --- 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 @@ -3,6 +3,19 @@ - + \ No newline at end of file From ebd66fc552329cdb2f04d62ecdf49dc38272a8da Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 4 Aug 2021 14:07:47 +0800 Subject: [PATCH 06/36] =?UTF-8?q?@=E7=9A=84=E4=BA=BA=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E5=A7=93=E5=90=8D=E3=80=82=E6=8A=A5=E4=BA=8B=E5=85=A5=E5=8F=82?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0userShowName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/MentionUserFormDTO.java | 6 ++++++ .../main/java/com/epmet/entity/ResiEventMentionEntity.java | 5 +++++ .../java/com/epmet/service/impl/ResiEventServiceImpl.java | 1 + .../db/migration/V0.0.16__create_resievent_tables.sql | 1 + 4 files changed, 13 insertions(+) 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 9df7be7b21..52c37f1563 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 @@ -32,4 +32,10 @@ public class MentionUserFormDTO implements Serializable { * 注册网格的所有上级 */ private String pids; + + /** + * 人大代表姓名 + */ + private String userShowName; + } 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 2a6a2abe05..a2c5702485 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 @@ -50,6 +50,11 @@ public class ResiEventMentionEntity extends BaseEpmetEntity { */ private String userType; + /** + * 人大代表目前显示姓名 + */ + private String userShowName; + /** * 居民端用户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 9d5a9e0098..ce21f19a58 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 @@ -200,6 +200,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl Date: Wed, 4 Aug 2021 14:31:51 +0800 Subject: [PATCH 07/36] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 1 + .../java/com/epmet/dto/form/ReplyFormDTO.java | 34 ++++++++++ .../controller/ResiEventReplyController.java | 17 +++++ .../epmet/service/ResiEventReplyService.java | 11 +++- .../impl/ResiEventReplyServiceImpl.java | 64 +++++++++++++++++++ 5 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyFormDTO.java 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 015095cc83..ead3a480f5 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 @@ -97,6 +97,7 @@ public enum EpmetErrorCode { VOTE_ISSUE_PLEASE(8602,"请先选择支持或反对，再发表您的想法"), RESI_EVENT_READ(8603,"当前事件正在处理中,不能撤回"), RESI_EVENT_NOT_MY_REPORTED(8604,"当前事件不是您发布的，无权操作"), + CAN_NOT_REPLY_RESI_EVENT(8605,"办结、立项处理后不可回复"), // 爱心互助 居民端 NOT_IN_THE_SIGN_IN_RANGE(8510, "您还未进入指定的签到范围～"), diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyFormDTO.java new file mode 100644 index 0000000000..a6729ff46f --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyFormDTO.java @@ -0,0 +1,34 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 回复通用入参 + * + * @author yinzuomei@elink-cn.com + * @date 2021/8/4 14:16 + */ +@Data +public class ReplyFormDTO implements Serializable { + private static final long serialVersionUID = 1653042839040178697L; + public interface AddUserInternalGroup { + } + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + @NotBlank(message = "事件id不能为空",groups = AddUserInternalGroup.class) + private String resiEventId; + @Length(min = 1, max = 200, message = "请填写回复内容,最多输入200字", groups = AddUserShowGroup.class) + private String content; + + //以下参数从token中获取 + /** + * 当前用户id + */ + @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class) + private String userId; +} 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 dec9a9a80f..f7c57b14c5 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 @@ -21,6 +21,7 @@ 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.ReplyFormDTO; import com.epmet.dto.form.ReplyListFormDTO; import com.epmet.dto.result.ReplyListResultDTO; import com.epmet.service.ResiEventReplyService; @@ -59,4 +60,20 @@ public class ResiEventReplyController { return new Result>().ok(resiEventReplyService.replyList(formDTO)); } + /** + * 报事-工作人员回复 + * + * @param tokenDto + * @param replyFormDTO + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @date 2021/8/4 14:19 + */ + @PostMapping("govReply") + public Result govReply(@LoginUser TokenDto tokenDto,@RequestBody ReplyFormDTO replyFormDTO){ + replyFormDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(replyFormDTO,ReplyFormDTO.AddUserShowGroup.class,ReplyFormDTO.AddUserInternalGroup.class); + resiEventReplyService.govReply(replyFormDTO); + 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/ResiEventReplyService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java index 5065a9eb79..4311de0805 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,10 +18,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.form.ReplyFormDTO; 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; @@ -41,4 +41,13 @@ public interface ResiEventReplyService extends BaseService */ List replyList(ReplyListFormDTO formDTO); + /** + * 报事-工作人员回复 + * + * @param replyFormDTO + * @return void + * @author yinzuomei + * @date 2021/8/4 14:20 + */ + void govReply(ReplyFormDTO replyFormDTO); } \ 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 98767e41c8..2a284ad914 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 @@ -18,13 +18,28 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.EventConstant; +import com.epmet.constant.ResiEventAction; +import com.epmet.dao.ResiEventDao; +import com.epmet.dao.ResiEventOperationLogDao; import com.epmet.dao.ResiEventReplyDao; +import com.epmet.dto.CustomerAgencyDTO; +import com.epmet.dto.form.ReplyFormDTO; import com.epmet.dto.form.ReplyListFormDTO; import com.epmet.dto.result.ReplyListResultDTO; +import com.epmet.entity.ResiEventEntity; +import com.epmet.entity.ResiEventOperationLogEntity; import com.epmet.entity.ResiEventReplyEntity; +import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.ResiEventReplyService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; /** @@ -35,6 +50,12 @@ import java.util.List; */ @Service public class ResiEventReplyServiceImpl extends BaseServiceImpl implements ResiEventReplyService { + @Autowired + private ResiEventDao resiEventDao; + @Autowired + private ResiEventOperationLogDao resiEventOperationLogDao; + @Autowired + private GovOrgOpenFeignClient govOrgOpenFeignClient; /** * @Description 报事详情-回复列表-两端通用 @@ -52,4 +73,47 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl staffResult = govOrgOpenFeignClient.getAgencyByStaff(replyFormDTO.getUserId()); + if (!staffResult.success() && null == staffResult.getData()) { + throw new RenException("查询当前工作人员信息异常"); + } + // 插入回复表 + ResiEventReplyEntity resiEventReplyEntity=new ResiEventReplyEntity(); + resiEventReplyEntity.setCustomerId(eventEntity.getCustomerId()); + resiEventReplyEntity.setResiEventId(replyFormDTO.getResiEventId()); + resiEventReplyEntity.setFromUserId(replyFormDTO.getUserId()); + resiEventReplyEntity.setContent(replyFormDTO.getContent()); + resiEventReplyEntity.setUserShowName(staffResult.getData().getOrganizationName()); + resiEventReplyEntity.setCreatedTime(new Date()); + baseDao.insert(resiEventReplyEntity); + // 记录操作日志 + //2、插入log日志 + ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity(); + reCallLog.setCustomerId(eventEntity.getCustomerId()); + reCallLog.setResiEventId(eventEntity.getId()); + reCallLog.setUserId(replyFormDTO.getUserId()); + reCallLog.setUserIdentity(EventConstant.STAFF); + reCallLog.setActionCode(ResiEventAction.REPLY.getCode()); + reCallLog.setActionDesc(ResiEventAction.REPLY.getDesc()); + reCallLog.setOperateTime(resiEventReplyEntity.getCreatedTime()); + resiEventOperationLogDao.insert(reCallLog); + } } \ No newline at end of file From 634d05f5b6ac8f91b0b9ada4b6ac1cd951b87889 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 4 Aug 2021 14:35:24 +0800 Subject: [PATCH 08/36] =?UTF-8?q?=E5=BF=98=E4=BA=86=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E8=A6=81=E8=B5=B0=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ResiEventReplyServiceImpl.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) 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 2a284ad914..2bfa788811 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 @@ -20,7 +20,11 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; +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.Result; +import com.epmet.commons.tools.utils.ScanContentUtils; import com.epmet.constant.EventConstant; import com.epmet.constant.ResiEventAction; import com.epmet.dao.ResiEventDao; @@ -35,12 +39,15 @@ import com.epmet.entity.ResiEventOperationLogEntity; import com.epmet.entity.ResiEventReplyEntity; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.ResiEventReplyService; +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.transaction.annotation.Transactional; import java.util.Date; import java.util.List; +import java.util.UUID; /** * 事件回复表 @@ -56,6 +63,10 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl staffResult = govOrgOpenFeignClient.getAgencyByStaff(replyFormDTO.getUserId()); if (!staffResult.success() && null == staffResult.getData()) { @@ -116,4 +129,22 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl 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()); + } + } + } + } } \ No newline at end of file From 56f9e23c7a677eefb1516e4c02c6ae56ecd6824f Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 4 Aug 2021 14:45:00 +0800 Subject: [PATCH 09/36] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BA=BA=E5=A4=A7=E4=BB=A3=E8=A1=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?-=E5=B0=86=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=AD?= =?UTF-8?q?=E7=9A=84gridId=E6=94=B9=E4=B8=BAcustomerId=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E8=BF=94=E5=9B=9E=E5=80=BC=E4=B8=AD=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?userShowName=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/ResiEventNpcListFormDTO.java | 2 +- .../dto/result/ResiEventNpcResultDTO.java | 8 +++ .../epmet/controller/ResiEventController.java | 8 +-- .../com/epmet/service/ResiEventService.java | 2 +- .../service/impl/ResiEventServiceImpl.java | 55 +++++++++++++++---- .../dto/form/ListUserByBadgeFormDTO.java | 5 +- .../com/epmet/controller/BadgeController.java | 4 +- .../src/main/java/com/epmet/dao/BadgeDao.java | 2 +- .../java/com/epmet/service/BadgeService.java | 2 +- .../epmet/service/impl/BadgeServiceImpl.java | 4 +- .../src/main/resources/mapper/BadgeDao.xml | 2 +- 11 files changed, 67 insertions(+), 27 deletions(-) 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 index 97b856a8e6..8f5921ea8d 100644 --- 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 @@ -9,5 +9,5 @@ import lombok.Data; */ @Data public class ResiEventNpcListFormDTO { - private String gridId; + private String customerId; } 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 4208f28751..f7ea5861d3 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 @@ -20,8 +20,16 @@ public class ResiEventNpcResultDTO { private String gridId; + /** + * 展示名 + */ private String displayName; + /** + * 真实姓名 + */ + private String userShowName; + private String headImgUrl; private String agencyId; 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 b594e42921..57d06b8a0b 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 @@ -32,15 +32,15 @@ public class ResiEventController { /** * @return - * @Description 查询人大代表列表 + * @Description 查询人大代表列表(客户下的) * @author wxz * @date 2021.08.03 09:17 */ - @PostMapping("/npc-list-ingrid") + @PostMapping("/npc-list") public Result>> listNpc(@RequestBody ResiEventNpcListFormDTO input) { ValidatorUtils.validateEntity(input); - String gridId = input.getGridId(); - List npcs = resiEventService.listNpcByGrid(gridId); + String customerId = input.getCustomerId(); + List npcs = resiEventService.listNpcByGrid(customerId); HashMap> wrapper = new HashMap<>(); wrapper.put("reportTargets", 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 b23d04a476..85432f2a18 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 @@ -18,7 +18,7 @@ public interface ResiEventService { * @author wxz * @date 2021.08.03 09:29 */ - List listNpcByGrid(String gridId); + List listNpcByGrid(String customerId); /** * @Description 查询上报目标列表 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 713d821588..b81eb0f47e 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 @@ -36,32 +36,65 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @Override - public List listNpcByGrid(String gridId) { + public List listNpcByGrid(String customerId) { // 查询网格所属的组织信息 - Result gridInfoResult = govOrgOpenFeignClient.queryGridInfo(gridId); - GridInfoResultDTO gridInfoData = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null); - String parentAgencyId = gridInfoData.getParentAgencyId(); - String pids = gridInfoData.getPids(); + //Result gridInfoResult = govOrgOpenFeignClient.queryGridInfo(customerId); + //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); + ListUserByBadgeFormDTO npcForm = new ListUserByBadgeFormDTO(customerId, 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, pids)) - .collect(Collectors.toList()); + //批量查询人大代表所在的网格信息 + List npcGridIds = npcData.stream().map(d -> d.getGridId()).collect(Collectors.toList()); + OrgInfoFormDTO form = new OrgInfoFormDTO(OrgInfoConstant.GRID, npcGridIds); + Result> npcGridInfoResult = govOrgOpenFeignClient.selectOrgInfo(form); + List npcGridInfos = getResultDataOrThrowsException(npcGridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null); + + Map npcGridInfoMap = convertNpcGridInfos2Map(npcGridInfos); + + List npcResultList = new ArrayList<>(); + npcData.stream().forEach(npc -> { + OrgInfoResultDTO gridInfo = npcGridInfoMap.get(npc.getGridId()); + ResiEventNpcResultDTO resiEventNpcInfo = new ResiEventNpcResultDTO( + npc.getUserId(), + npc.getGridId(), + "人大代表-".concat(npc.getRealName()), + npc.getRealName(), + npc.getHeadImgUrl(), + gridInfo != null ? gridInfo.getAgencyId() : null, + gridInfo != null ? gridInfo.getPids().concat(":").concat(gridInfo.getAgencyId()) : null); + npcResultList.add(resiEventNpcInfo); + } + ); return npcResultList; } /** - * @Description 此处会调用org上游接口批量获取父级组织信息，由于上游接口排序不可控，因此此处需要使用TreeSet做排序 * @return + * @Description 将网格信息转化为map + * @author wxz + * @date 2021.08.04 14:25 + */ + private Map convertNpcGridInfos2Map(List npcGridInfos) { + HashMap result = new HashMap<>(); + npcGridInfos.stream().forEach(i -> { + result.put(i.getOrgId(), i); + }); + return result; + } + + /** + * @return + * @Description 此处会调用org上游接口批量获取父级组织信息，由于上游接口排序不可控，因此此处需要使用TreeSet做排序 * @author wxz * @date 2021.08.03 15:51 - */ + */ @Override public TreeSet listReportTargetLevels(String gridId) { TreeSet targetLevels = new TreeSet<>(); 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 index 8d616bacf3..0587b7f163 100644 --- 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 @@ -11,10 +11,9 @@ import javax.validation.constraints.NotBlank; @NoArgsConstructor public class ListUserByBadgeFormDTO { - @NotBlank(message = "网格ID不能为空") - private String gridId; + @NotBlank(message = "客户ID不能为空") + private String customerId; @NotBlank(message = "徽章key不能为空") private String badgeKey; - } 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 192fc3c5d3..503da1bd31 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 @@ -199,10 +199,10 @@ public class BadgeController { public Result> listUsersByBadge(@RequestBody ListUserByBadgeFormDTO input) { ValidatorUtils.validateEntity(input); - String gridId = input.getGridId(); + String customerId = input.getCustomerId(); String badgeKey = input.getBadgeKey(); - List users = badgeService.listUsersByBadge(gridId, badgeKey); + List users = badgeService.listUsersByBadge(customerId, 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 5c4aab8dcb..d2a10f7026 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 @@ -203,5 +203,5 @@ public interface BadgeDao extends BaseDao { * @author wxz * @date 2021.08.02 10:40 */ - List listUsersByBadge(@Param("gridId") String gridId, @Param("badgeKey") String badgeKey); + List listUsersByBadge(@Param("customerId") String customerId, @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 fad619e87b..fc06714fd9 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 @@ -199,5 +199,5 @@ public interface BadgeService extends BaseService { * @author wxz * @date 2021.08.02 10:39 */ - List listUsersByBadge(String gridId, String badgeKey); + List listUsersByBadge(String customerId, 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 985dd00c46..4734770a3a 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 @@ -481,7 +481,7 @@ public class BadgeServiceImpl extends BaseServiceImpl imp } @Override - public List listUsersByBadge(String gridId, String badgeKey) { - return baseDao.listUsersByBadge(gridId, badgeKey); + public List listUsersByBadge(String customerId, String badgeKey) { + return baseDao.listUsersByBadge(customerId, 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 560867c932..09c84bde81 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 @@ -320,7 +320,7 @@ user_base_info.HEAD_IMG_URL from resi_user_badge inner join badge on (badge.BADGE_KEY = #{badgeKey} - and resi_user_badge.GRID_ID = #{gridId} + and resi_user_badge.CUSTOMER_ID=#{customerId} and resi_user_badge.CERTIFICATION_AUTID_STATUS = 'approved' and resi_user_badge.DEL_FLAG = 0 and resi_user_badge.BADGE_ID = badge.ID From 83b4c555550c1e1cac8e10b5fb7c15b0f2822a61 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 4 Aug 2021 15:04:58 +0800 Subject: [PATCH 10/36] =?UTF-8?q?=E6=8A=A5=E4=BA=8B=E5=BD=93=E4=BA=8B?= =?UTF-8?q?=E4=BA=BA=E5=9B=9E=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 3 +- .../controller/ResiEventReplyController.java | 17 +++++ .../epmet/service/ResiEventReplyService.java | 10 +++ .../impl/ResiEventReplyServiceImpl.java | 74 +++++++++++++++++-- 4 files changed, 98 insertions(+), 6 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 ead3a480f5..1a29d62e54 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 @@ -97,7 +97,8 @@ public enum EpmetErrorCode { VOTE_ISSUE_PLEASE(8602,"请先选择支持或反对，再发表您的想法"), RESI_EVENT_READ(8603,"当前事件正在处理中,不能撤回"), RESI_EVENT_NOT_MY_REPORTED(8604,"当前事件不是您发布的，无权操作"), - CAN_NOT_REPLY_RESI_EVENT(8605,"办结、立项处理后不可回复"), + CAN_NOT_REPLY_RESI_EVENT_GOV(8605,"办结、立项处理后不可回复"), + CAN_NOT_REPLY_RESI_EVENT_SELF(8606,"当前事件待处理,不可回复"), // 爱心互助 居民端 NOT_IN_THE_SIGN_IN_RANGE(8510, "您还未进入指定的签到范围～"), 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 f7c57b14c5..2d8063a97c 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 @@ -76,4 +76,21 @@ public class ResiEventReplyController { resiEventReplyService.govReply(replyFormDTO); return new Result(); } + + /** + * 报事当事人回复 + * + * @param tokenDto + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @date 2021/8/4 14:37 + */ + @PostMapping("selfReply") + public Result selfReply(@LoginUser TokenDto tokenDto,@RequestBody ReplyFormDTO formDTO){ + formDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO,ReplyFormDTO.AddUserShowGroup.class,ReplyFormDTO.AddUserInternalGroup.class); + resiEventReplyService.selfReply(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/ResiEventReplyService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java index 4311de0805..a63654bde1 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 @@ -50,4 +50,14 @@ public interface ResiEventReplyService extends BaseService * @date 2021/8/4 14:20 */ void govReply(ReplyFormDTO replyFormDTO); + + /** + * 报事当事人回复 + * + * @param formDTO + * @return void + * @author yinzuomei + * @date 2021/8/4 14:39 + */ + void selfReply(ReplyFormDTO 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 2bfa788811..986c8328bb 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 @@ -34,9 +34,11 @@ import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.form.ReplyFormDTO; import com.epmet.dto.form.ReplyListFormDTO; import com.epmet.dto.result.ReplyListResultDTO; +import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.entity.ResiEventEntity; import com.epmet.entity.ResiEventOperationLogEntity; import com.epmet.entity.ResiEventReplyEntity; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.ResiEventReplyService; import org.apache.commons.lang3.StringUtils; @@ -44,7 +46,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.UUID; @@ -63,6 +67,9 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl userIdList =new ArrayList<>(); + userIdList.add(formDTO.getUserId()); + Result> userResult=epmetUserOpenFeignClient.queryUserBaseInfo(userIdList); + if(!userResult.success()|| CollectionUtils.isEmpty(userResult.getData())){ + throw new RenException("查询当前用户信息异常"); + } + // 插入回复表 + ResiEventReplyEntity resiEventReplyEntity=new ResiEventReplyEntity(); + resiEventReplyEntity.setCustomerId(eventEntity.getCustomerId()); + resiEventReplyEntity.setResiEventId(formDTO.getResiEventId()); + resiEventReplyEntity.setFromUserId(formDTO.getUserId()); + resiEventReplyEntity.setContent(formDTO.getContent()); + resiEventReplyEntity.setUserShowName(userResult.getData().get(0).getShowName()); + resiEventReplyEntity.setCreatedTime(new Date()); + baseDao.insert(resiEventReplyEntity); + // 记录操作日志 + //2、插入log日志 + ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity(); + reCallLog.setCustomerId(eventEntity.getCustomerId()); + reCallLog.setResiEventId(eventEntity.getId()); + reCallLog.setUserId(formDTO.getUserId()); + reCallLog.setUserIdentity(EventConstant.RESI_USER); + reCallLog.setActionCode(ResiEventAction.REPLY.getCode()); + reCallLog.setActionDesc(ResiEventAction.REPLY.getDesc()); + reCallLog.setOperateTime(resiEventReplyEntity.getCreatedTime()); + resiEventOperationLogDao.insert(reCallLog); + } + private void scanReplyContent(String content) { if (StringUtils.isNotBlank(content)) { TextScanParamDTO textScanParamDTO = new TextScanParamDTO(); @@ -147,4 +207,8 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl Date: Wed, 4 Aug 2021 15:11:31 +0800 Subject: [PATCH 11/36] =?UTF-8?q?@=E7=9A=84=E4=BA=BA=E5=9B=9E=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResiEventReplyController.java | 17 ++++++++ .../epmet/service/ResiEventReplyService.java | 10 +++++ .../impl/ResiEventReplyServiceImpl.java | 43 ++++++++++++++++++- 3 files changed, 68 insertions(+), 2 deletions(-) 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 2d8063a97c..0d7f93a2d8 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 @@ -93,4 +93,21 @@ public class ResiEventReplyController { resiEventReplyService.selfReply(formDTO); return new Result(); } + + /** + * 艾特的人回复 + * + * @param tokenDto + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @date 2021/8/4 15:06 + */ + @PostMapping("atReply") + public Result atReply(@LoginUser TokenDto tokenDto,@RequestBody ReplyFormDTO formDTO){ + formDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO,ReplyFormDTO.AddUserShowGroup.class,ReplyFormDTO.AddUserInternalGroup.class); + resiEventReplyService.atReply(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/ResiEventReplyService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java index a63654bde1..4ad83c6e04 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 @@ -60,4 +60,14 @@ public interface ResiEventReplyService extends BaseService * @date 2021/8/4 14:39 */ void selfReply(ReplyFormDTO formDTO); + + /** + * 艾特的人回复 + * + * @param formDTO + * @return void + * @author yinzuomei + * @date 2021/8/4 15:06 + */ + void atReply(ReplyFormDTO 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 986c8328bb..547d17e230 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 @@ -121,7 +121,6 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl userIdList =new ArrayList<>(); + userIdList.add(replyFormDTO.getUserId()); + Result> userResult=epmetUserOpenFeignClient.queryUserBaseInfo(userIdList); + if(!userResult.success()|| CollectionUtils.isEmpty(userResult.getData())){ + throw new RenException("查询当前用户信息异常"); + } + // 插入回复表 + ResiEventReplyEntity resiEventReplyEntity=new ResiEventReplyEntity(); + resiEventReplyEntity.setCustomerId(eventEntity.getCustomerId()); + resiEventReplyEntity.setResiEventId(replyFormDTO.getResiEventId()); + resiEventReplyEntity.setFromUserId(replyFormDTO.getUserId()); + resiEventReplyEntity.setContent(replyFormDTO.getContent()); + resiEventReplyEntity.setUserShowName("人大代表-".concat(userResult.getData().get(0).getRealName())); + resiEventReplyEntity.setCreatedTime(new Date()); + baseDao.insert(resiEventReplyEntity); + // 记录操作日志 + ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity(); + reCallLog.setCustomerId(eventEntity.getCustomerId()); + reCallLog.setResiEventId(eventEntity.getId()); + reCallLog.setUserId(replyFormDTO.getUserId()); reCallLog.setUserIdentity(EventConstant.RESI_USER); reCallLog.setActionCode(ResiEventAction.REPLY.getCode()); reCallLog.setActionDesc(ResiEventAction.REPLY.getDesc()); From 4337d11bb75c7d9fe60859f85c13201ca4ea0a7b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 4 Aug 2021 16:36:47 +0800 Subject: [PATCH 12/36] org --- .../epmet/feign/GovOrgOpenFeignClient.java | 19 +++++++++++++ .../GovOrgOpenFeignClientFallback.java | 10 +++++++ .../controller/CustomerGridController.java | 11 ++++++++ .../com/epmet/controller/StaffController.java | 16 ++++++++--- .../java/com/epmet/dao/CustomerGridDao.java | 8 ++++++ .../com/epmet/dao/CustomerStaffAgencyDao.java | 8 ++++++ .../epmet/service/CustomerGridService.java | 8 ++++++ .../java/com/epmet/service/StaffService.java | 8 ++++++ .../service/impl/CustomerGridServiceImpl.java | 11 ++++++++ .../epmet/service/impl/StaffServiceImpl.java | 27 +++++++++++++++++++ .../main/resources/mapper/CustomerGridDao.xml | 10 +++++++ .../mapper/CustomerStaffAgencyDao.xml | 10 +++++++ 12 files changed, 142 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index bf6df86b7b..3564d39a61 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -370,4 +370,23 @@ public interface GovOrgOpenFeignClient { */ @PostMapping("/gov/org/staff/mine") Result queryStaffProfile(@RequestBody StaffInfoFromDTO fromDTO); + + /** + * @Description 查询工作人员名字 【xx组织-章三】 + * @Param userId + * @author zxc + * @date 2021/8/4 4:23 下午 + */ + @PostMapping("/gov/org/staff/staffname") + Result staffName(@RequestParam("userId")String userId); + + /** + * @Description 查询网格名字 + * @Param gridName + * @author zxc + * @date 2021/8/4 4:26 下午 + */ + @PostMapping("/gov/org/customergrid/selectgridname") + Result gridName(@RequestParam("gridId")String gridId); + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index c384f302aa..97bc8402b7 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -215,6 +215,16 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "mine", fromDTO); } + @Override + public Result staffName(String userId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "staffName", userId); + } + + @Override + public Result gridName(String gridId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridName", gridId); + } + @Override public Result selectPidsByGridId(String gridId) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index bb06477812..7fe5c72cbe 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -252,4 +252,15 @@ public class CustomerGridController { public Result selectPidsByGridId(@RequestParam("gridId") String gridId){ return new Result().ok(customerGridService.selectPidsByGridId(gridId)); } + + /** + * @Description 查询网格名字 + * @Param gridId + * @author zxc + * @date 2021/8/4 4:26 下午 + */ + @PostMapping("selectgridname") + Result gridName(@RequestParam("gridId")String gridId){ + return new Result().ok(customerGridService.gridName(gridId)); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java index 88ee0bd046..834cd56869 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java @@ -12,10 +12,7 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.service.StaffService; 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 java.util.List; @@ -157,4 +154,15 @@ public class StaffController { ValidatorUtils.validateEntity(fromDTO, StaffBasicInfoFromDTO.AddUserInternalGroup.class); return staffService.staffBasicInfo(fromDTO); } + + /** + * @Description 查询工作人员名字 + * @Param userId + * @author zxc + * @date 2021/8/4 3:38 下午 + */ + @PostMapping("staffname") + public Result staffName(@RequestParam("userId")String userId){ + return new Result().ok(staffService.staffName(userId)); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index ec16bf0dcd..314c483a0f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java @@ -276,4 +276,12 @@ public interface CustomerGridDao extends BaseDao { * @date 2021/7/16 9:52 上午 */ String selectPidsByGridId(@Param("gridId")String gridId); + + /** + * @Description 查询网格名字 + * @Param gridId + * @author zxc + * @date 2021/8/4 4:30 下午 + */ + String gridName(String gridId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffAgencyDao.java index ffc46fa725..864603ee07 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffAgencyDao.java @@ -108,4 +108,12 @@ public interface CustomerStaffAgencyDao extends BaseDao getAgencyStaffList(@Param("agencyId")String agencyId); + + /** + * @Description 查询工作人员所属组织名字 + * @Param staffId + * @author zxc + * @date 2021/8/4 3:54 下午 + */ + String selectStaffBelongAgency(@Param("staffId")String staffId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index b892fa84f8..e1cc5f79a7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -295,4 +295,12 @@ public interface CustomerGridService extends BaseService { * @date 2021/7/16 9:52 上午 */ String selectPidsByGridId(String gridId); + + /** + * @Description 查询网格名字 + * @Param gridId + * @author zxc + * @date 2021/8/4 4:26 下午 + */ + String gridName(String gridId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java index f23330fa24..5ac3ac549a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java @@ -105,4 +105,12 @@ public interface StaffService { * @author sun */ Result staffBasicInfo(StaffBasicInfoFromDTO fromDTO); + + /** + * @Description 查询工作人员名字 + * @Param userId + * @author zxc + * @date 2021/8/4 3:38 下午 + */ + String staffName(String userId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 007aabd4b9..ec5c673374 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -721,4 +721,15 @@ public class CustomerGridServiceImpl extends BaseServiceImpl getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) { @@ -274,4 +278,27 @@ public class StaffServiceImpl implements StaffService { public Result staffBasicInfo(StaffBasicInfoFromDTO fromDTO) { return epmetUserOpenFeignClient.getStaffBasicInfo(fromDTO); } + + /** + * @Description 查询工作人员名字 + * @Param userId + * @author zxc + * @date 2021/8/4 3:38 下午 + */ + @Override + public String staffName(String userId) { + // 查询所属组织名字 + String agencyName = customerStaffAgencyDao.selectStaffBelongAgency(userId); + if (StringUtils.isEmpty(agencyName)){ + throw new RenException("查询工作人员所属组织名称为空"); + } + StaffBasicInfoFromDTO formDTO = new StaffBasicInfoFromDTO(); + formDTO.setStaffId(userId); + Result staffBasicInfo = epmetUserOpenFeignClient.getStaffBasicInfo(formDTO); + if (!staffBasicInfo.success()){ + throw new RenException("查询工作人员姓名失败"); + } + String result = agencyName.concat(staffBasicInfo.getData().getRealName()); + return result; + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 6c348a0489..49025a9b9a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -584,4 +584,14 @@ + + + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml index 3df433a5b6..b7559668a8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml @@ -152,4 +152,14 @@ del_flag = '0' AND agency_id = #{agencyId} + + + \ No newline at end of file From de8f78f0d2ad8137360b8145df4b6a83c76939cc Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 4 Aug 2021 16:48:09 +0800 Subject: [PATCH 13/36] =?UTF-8?q?=E6=8A=A5=E4=BA=8B-=E9=A6=96=E6=AC=A1?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=BA=8B=E4=BB=B6-=E4=B8=A4=E7=AB=AF?= =?UTF-8?q?=E9=80=9A=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/UpdateViewTimeFormDTO.java | 28 ++++++++++++++----- .../com/epmet/constant/ResiEventAction.java | 2 +- .../epmet/controller/ResiEventController.java | 12 ++++++-- .../com/epmet/dao/ResiEventMentionDao.java | 11 ++++++++ .../epmet/dao/ResiEventOperationLogDao.java | 16 ++++++++++- .../com/epmet/dao/ResiEventReportOrgDao.java | 13 ++++++++- .../com/epmet/service/ResiEventService.java | 2 +- .../service/impl/ResiEventServiceImpl.java | 28 +++++++++++++++++-- .../V0.0.16__create_resievent_tables.sql | 4 +-- .../resources/mapper/ResiEventMentionDao.xml | 11 ++++++++ .../mapper/ResiEventOperationLogDao.xml | 8 +++++- .../mapper/ResiEventReportOrgDao.xml | 11 +++++++- 12 files changed, 126 insertions(+), 20 deletions(-) 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 c2ca21208e..c397dc8d08 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 @@ -9,21 +9,35 @@ import java.io.Serializable; /** * @Author zxc * @DateTime 2021/8/3 10:55 上午 - * @DESC + * @DESC 报事-首次查看事件-两端通用 */ @Data public class UpdateViewTimeFormDTO implements Serializable { private static final long serialVersionUID = 7104400078458366322L; + public interface AddUserInternalGroup { + } + public interface GovInternalGroup { + } - public interface UpdateViewTimeForm{} + // 居民端：resi_user；工作端：staff + @NotBlank(message = "viewType不能为空", groups = AddUserInternalGroup.class) + private String viewType; + @NotBlank(message = "eventId不能为空", groups = AddUserInternalGroup.class) + private String eventId; + @NotBlank(message = "orgId不能为空", groups = GovInternalGroup.class) + private String orgId; + //以下参数从token中获取 /** - * 居民端用户:resi_user；工作人员:staff + * 当前用户id */ - @NotBlank(message = "viewType不能为空",groups = UpdateViewTimeForm.class) - private String viewType; + @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class) + private String userId; - @NotBlank(message = "事件ID不能为空",groups = UpdateViewTimeForm.class) - private String eventId; + /** + * 当前客户id + */ + @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class) + private String customerId; } 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 index ff9f721e1e..b7e1faa0ff 100644 --- 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 @@ -22,7 +22,7 @@ public enum ResiEventAction { SHIFIT_PROJECT ( "shift_project","立项"), CLOSE_CASE ( "close_case","办结"), CHOOSE_RESOLVE ( "choose_resolve","选择是否解决"), - READ( "read","查看事件"); + READ_FIRST( "read_first","首次查看事件"); private String code; 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 98bfe74b10..e868c85459 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 @@ -21,6 +21,7 @@ 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.constant.EventConstant; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.service.ResiEventService; @@ -139,14 +140,19 @@ public class ResiEventController { } /** - * @Description 查看报事时,更新时间操作 + * @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); + public Result updateViewTime(@LoginUser TokenDto tokenDto,@RequestBody UpdateViewTimeFormDTO formDTO){ + formDTO.setUserId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO,UpdateViewTimeFormDTO.AddUserInternalGroup.class); + if(EventConstant.STAFF.equals(formDTO.getViewType())){ + ValidatorUtils.validateEntity(formDTO,UpdateViewTimeFormDTO.GovInternalGroup.class); + } resiEventService.updateViewTime(formDTO); return new Result(); } 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 981cee667a..6580567b78 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 @@ -44,4 +44,15 @@ public interface ResiEventMentionDao extends BaseDao { * @date 2021/8/4 9:54 */ List selectMentionList(@Param("userId")String userId, @Param("readFlag")String readFlag); + + /** + * 人大代表从未读-》已读，首次查看事件 + * + * @param eventId + * @param userId + * @return int + * @author yinzuomei + * @date 2021/8/4 16:37 + */ + int updateReadFlag(@Param("eventId") String eventId, @Param("userId")String userId); } \ 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 index 6432b2dbb6..d6e16450a0 100644 --- 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 @@ -20,6 +20,9 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.ResiEventOperationLogEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 事件操作日志表 @@ -29,5 +32,16 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ResiEventOperationLogDao extends BaseDao { - + + /** + * 查询事件操作日志 + * + * @param eventId + * @param userId + * @param actionCode + * @return com.epmet.entity.ResiEventOperationLogEntity + * @author yinzuomei + * @date 2021/8/4 16:44 + */ + List selectByUserAction(@Param("eventId") String eventId, @Param("userId")String userId, @Param("actionCode")String actionCode); } \ 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 index b8d9776cab..5d8a5044a5 100644 --- 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 @@ -20,6 +20,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.ResiEventReportOrgEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 事件相关组织表 @@ -29,5 +30,15 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ResiEventReportOrgDao extends BaseDao { - + + /** + * 工作人员从待处理=》处理中 + * + * @param eventId + * @param orgId + * @return int + * @author yinzuomei + * @date 2021/8/4 16:40 + */ + int updateReadFlag(@Param("eventId") String eventId, @Param("orgId") String orgId,@Param("userId") String userId); } \ 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 604375b0fb..596609d158 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 @@ -24,7 +24,7 @@ public interface ResiEventService extends BaseService { List eventList(EventListFormDTO formDTO); /** - * @Description 查看报事时,更新时间操作 + * @Description 报事-首次查看事件-两端通用 * @Param formDTO * @author zxc * @date 2021/8/3 11:01 上午 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 ce21f19a58..1c41b517fb 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 @@ -102,14 +102,38 @@ public class ResiEventServiceImpl extends BaseServiceImpl logEntityList = resiEventOperationLogDao.selectByUserAction(formDTO.getEventId(), formDTO.getUserId(), ResiEventAction.READ_FIRST.getCode()); + if (CollectionUtils.isEmpty(logEntityList)) { + ResiEventOperationLogEntity publishLog=new ResiEventOperationLogEntity(); + publishLog.setCustomerId(formDTO.getCustomerId()); + publishLog.setResiEventId(formDTO.getEventId()); + publishLog.setUserId(formDTO.getUserId()); + publishLog.setUserIdentity(formDTO.getViewType()); + publishLog.setActionCode(ResiEventAction.READ_FIRST.getCode()); + publishLog.setActionDesc(ResiEventAction.READ_FIRST.getDesc()); + publishLog.setOperateTime(new Date()); + publishLog.setCreatedTime(publishLog.getOperateTime()); + resiEventOperationLogDao.insert(publishLog); + } } /** 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 8aa3fab8d9..ae83c130fd 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 @@ -115,8 +115,8 @@ CREATE TABLE `resi_event_operation_log` ( `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：人大代表未读=>已读；工作人员待处理=>处理中；', + `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_first：人大代表未读=>已读；工作人员待处理=>处理中；\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_first：人大代表未读=>已读；工作人员待处理=>处理中；', `OPERATE_TIME` datetime NOT NULL COMMENT '操作时间', `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 1删除；0未删除', `REVISION` int(11) NOT NULL COMMENT '乐观锁', 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 7a4f145c75..3de3934948 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 @@ -54,4 +54,15 @@ + + + UPDATE resi_event_mention + SET READ_FLAG = 'read', + UPDATED_BY = #{userId}, + UPDATED_TIME = NOW() + WHERE + RESI_EVENT_ID = #{eventId} + AND USER_ID = #{userId} + AND DEL_FLAG = '0' + \ 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 index 12d1f0ce48..29052bcccb 100644 --- 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 @@ -2,7 +2,13 @@ - + \ 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 index 7c8b96db9e..9ff79fe891 100644 --- 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 @@ -4,5 +4,14 @@ - + + UPDATE resi_event_report_org + SET READ_FLAG = 'read', + UPDATED_BY = #{userId}, + UPDATED_TIME = NOW() + WHERE + RESI_EVENT_ID = #{eventId} + AND ORG_ID = #{orgId} + AND DEL_FLAG = '0' + \ No newline at end of file From e49fcf5722a3e2510d683f5a622c78b186c6e7cc Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 4 Aug 2021 16:51:15 +0800 Subject: [PATCH 14/36] =?UTF-8?q?=E5=85=88=E6=8F=90=E4=B8=80=E9=83=A8?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/EventProjectInfoDTO.java | 4 ++ .../dto/result/EventDetailResultDTO.java | 18 ++++++++ .../main/java/com/epmet/dao/ProjectDao.java | 9 ++++ .../main/java/com/epmet/dao/ResiEventDao.java | 9 ++++ .../service/impl/ResiEventServiceImpl.java | 41 ++++++++++++++++++- .../src/main/resources/mapper/ProjectDao.xml | 13 ++++++ .../main/resources/mapper/ResiEventDao.xml | 40 ++++++++++++++++++ 7 files changed, 133 insertions(+), 1 deletion(-) 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 index b8de802fe0..f3866f0a13 100644 --- 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 @@ -1,5 +1,6 @@ package com.epmet.dto; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -29,6 +30,9 @@ public class EventProjectInfoDTO implements Serializable { */ private String operationTime; + @JsonIgnore + private String userId; + /** * 报事说明 */ 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 index 85e0a0a9b2..b16e292f44 100644 --- 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 @@ -1,6 +1,7 @@ package com.epmet.dto.result; import com.epmet.dto.EventProjectInfoDTO; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -37,6 +38,9 @@ public class EventDetailResultDTO implements Serializable { */ private String gridName; + @JsonIgnore + private String gridId; + /** * 是否办结【是：true，否：false】 */ @@ -62,11 +66,25 @@ public class EventDetailResultDTO implements Serializable { */ private List eventPerson; + /** + * 报事人名字 + */ + private String eventPeopleName; + + @JsonIgnore + private String eventUserId; + /** * 项目信息 */ private EventProjectInfoDTO projectInfo; + @JsonIgnore + private String projectId; + + @JsonIgnore + private Boolean isProject; + public EventDetailResultDTO() { this.eventTime = ""; this.eventContent = ""; diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java index d5c2dbab5d..a4c1b69b36 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.EventProjectInfoDTO; import com.epmet.dto.ProjectDTO; import com.epmet.dto.ProjectStaffDTO; import com.epmet.dto.form.LatestListFormDTO; @@ -206,4 +207,12 @@ public interface ProjectDao extends BaseDao { * @return java.util.List */ List selectUnResolvedListByGrid(@Param("gridId")String gridId); + + /** + * @Description 查询报事转项目详情 + * @Param projectId + * @author zxc + * @date 2021/8/4 2:43 下午 + */ + EventProjectInfoDTO selectEventProjectInfo(@Param("projectId")String projectId); } \ 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 95f95f4959..87ffeb3d1a 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,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.EventDetailResultDTO; import com.epmet.dto.result.EventListResultDTO; import com.epmet.dto.result.MyReportedResultDTO; import com.epmet.entity.ResiEventEntity; @@ -54,4 +55,12 @@ public interface ResiEventDao extends BaseDao { * @date 2021/8/3 23:21 */ List queryMyReported(@Param("userId") String userId, @Param("statusCondition")String statusCondition); + + /** + * @Description 查询报事详情 + * @Param eventId + * @author zxc + * @date 2021/8/4 2:16 下午 + */ + EventDetailResultDTO selectEventDetail(@Param("eventId")String eventId); } \ 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 1c41b517fb..2d27b7284e 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,11 +35,13 @@ import com.epmet.commons.tools.utils.ScanContentUtils; import com.epmet.constant.EventConstant; import com.epmet.constant.ResiEventAction; import com.epmet.dao.*; +import com.epmet.dto.EventProjectInfoDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.*; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.feign.GovProjectOpenFeignClient; import com.epmet.service.ResiEventService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -82,6 +84,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl staffName = govOrgOpenFeignClient.staffName(eventProjectInfo.getUserId()); + if (!staffName.success()){ + throw new RenException("查询工作人员名字失败"); + } + eventProjectInfo.setOperationName(staffName.getData()); + dto.setProjectInfo(eventProjectInfo); + } + // 查询报事人名字 + List userIdList = new ArrayList<>(); + userIdList.add(dto.getEventUserId()); + Result> userResult=epmetUserOpenFeignClient.queryUserBaseInfo(userIdList); + if(!userResult.success()|| CollectionUtils.isEmpty(userResult.getData())){ + throw new RenException("查询当前用户信息异常"); + } + userResult.getData().forEach(u -> { + if (u.getUserId().equals(dto.getEventUserId())){ + dto.setEventPeopleName(u.getShowName()); + } + }); + // 查询所属网格 + Result gridNameResult = govOrgOpenFeignClient.gridName(dto.getGridId()); + if (!gridNameResult.success()){ + throw new RenException("查询所属网格失败"); + } + dto.setGridName(gridNameResult.getData()); + return dto; } + /** * 我要报事-提交（尹） * diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 5940f47003..7b0dac13a0 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -379,4 +379,17 @@ ORDER BY a.UPDATED_TIME DESC + + + \ 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 c80501a831..a9461bd9b4 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 @@ -88,4 +88,44 @@ order by re.LATEST_OPERATED_TIME desc + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From e32581e639989f488e04279667b59919759df443 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 4 Aug 2021 17:51:50 +0800 Subject: [PATCH 15/36] =?UTF-8?q?=E6=8A=A5=E4=BA=8B=E4=BA=BA=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=EF=BC=9A@=E7=9A=84=E4=BA=BA=E5=92=8C=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=98=BE=E7=A4=BA=E7=BA=A2=E7=82=B9;@=E4=BA=BA?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=EF=BC=9A=E8=A2=AB@=E7=9A=84=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E4=BA=BA+=E6=8A=A5=E4=BA=8B=E4=BA=BA+=E6=8A=A5?= =?UTF-8?q?=E7=BB=99=E7=9A=84=E7=BB=84=E7=BB=87=E6=98=BE=E7=A4=BA=E7=BA=A2?= =?UTF-8?q?=E7=82=B9=EF=BC=9B=E7=BB=84=E7=BB=87=E5=9B=9E=E5=A4=8D=EF=BC=9A?= =?UTF-8?q?=E6=8A=A5=E4=BA=8B=E4=BA=BA+@=E7=9A=84=E4=BA=BA+=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E7=BB=84=E7=BB=87=E6=98=BE=E7=A4=BA=E7=BA=A2=E7=82=B9?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dao/ResiEventMentionDao.java | 10 +++++++ .../com/epmet/dao/ResiEventReportOrgDao.java | 10 +++++++ .../impl/ResiEventReplyServiceImpl.java | 26 ++++++++++++++++--- .../service/impl/ResiEventServiceImpl.java | 6 +++-- .../resources/mapper/ResiEventMentionDao.xml | 13 ++++++++++ .../mapper/ResiEventReportOrgDao.xml | 9 +++++++ 6 files changed, 69 insertions(+), 5 deletions(-) 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 6580567b78..15062a1385 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 @@ -55,4 +55,14 @@ public interface ResiEventMentionDao extends BaseDao { * @date 2021/8/4 16:37 */ int updateReadFlag(@Param("eventId") String eventId, @Param("userId")String userId); + + /** + * 展示红点 + * + * @param resiEventId + * @return int + * @author yinzuomei + * @date 2021/8/4 17:41 + */ + int updateRedDotShow(@Param("resiEventId") String resiEventId,@Param("excludeUserId")String excludeUserId); } \ 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 index 5d8a5044a5..216f6dace8 100644 --- 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 @@ -41,4 +41,14 @@ public interface ResiEventReportOrgDao extends BaseDao * @date 2021/8/4 16:40 */ int updateReadFlag(@Param("eventId") String eventId, @Param("orgId") String orgId,@Param("userId") String userId); + + /** + * 展示红点 + * + * @param resiEventId + * @return int + * @author yinzuomei + * @date 2021/8/4 17:41 + */ + int updateRedDotShow(String resiEventId); } \ 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 547d17e230..5f1d1ddaee 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 @@ -27,9 +27,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.ScanContentUtils; import com.epmet.constant.EventConstant; import com.epmet.constant.ResiEventAction; -import com.epmet.dao.ResiEventDao; -import com.epmet.dao.ResiEventOperationLogDao; -import com.epmet.dao.ResiEventReplyDao; +import com.epmet.dao.*; import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.form.ReplyFormDTO; import com.epmet.dto.form.ReplyListFormDTO; @@ -66,6 +64,10 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl + + + + UPDATE resi_event_mention + SET RED_DOT = '1', + UPDATED_TIME = NOW() + WHERE + RESI_EVENT_ID = #{resiEventId} + + and user_id !=#{excludeUserId} + + AND DEL_FLAG = '0' + \ 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 index 9ff79fe891..98795d7364 100644 --- 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 @@ -14,4 +14,13 @@ AND ORG_ID = #{orgId} AND DEL_FLAG = '0' + + + UPDATE resi_event_report_org + SET RED_DOT = '1', + UPDATED_TIME = NOW() + WHERE + RESI_EVENT_ID = #{resiEventId} + AND DEL_FLAG = '0' + \ No newline at end of file From ddc632c4ebbbaea0c7ff06a362cc3f09df8428eb Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 4 Aug 2021 18:02:48 +0800 Subject: [PATCH 16/36] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/project/ResiEventDTO.java | 85 +++++++++++++++++++ .../com/epmet/constant/ProjectConstant.java | 1 + .../com/epmet/dao/project/ProjectDao.java | 12 ++- .../FactAgencyGovernDailyServiceImpl.java | 34 +++++++- .../impl/FactGridGovernDailyServiceImpl.java | 20 ++++- .../impl/ProjectExtractServiceImpl.java | 26 ++++-- .../service/impl/StatsIssueServiceImpl.java | 2 +- .../epmet/service/project/ProjectService.java | 8 ++ .../project/impl/ProjectServiceImpl.java | 15 +++- .../extract/FactOriginProjectLogDailyDao.xml | 3 +- .../resources/mapper/project/ProjectDao.xml | 19 ++++- 11 files changed, 198 insertions(+), 27 deletions(-) create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ResiEventDTO.java diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ResiEventDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ResiEventDTO.java new file mode 100644 index 0000000000..d0e2efaf01 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ResiEventDTO.java @@ -0,0 +1,85 @@ +/** + * 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.dto.project; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 居民报事表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-08-03 + */ +@Data +public class ResiEventDTO implements Serializable { + + 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 Boolean redDot; + + private String projectId; + + private String createdBy; + +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java index b714ce2210..af4ef095f6 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java @@ -81,4 +81,5 @@ public interface ProjectConstant { * 项目来源于 工作端立项 */ String PROJECT_ORIGIN_AGENCY="agency"; + String PROJECT_ORIGIN_EVENT="resi_event"; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java index 704aa3ee26..a0f70a5591 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java @@ -19,10 +19,7 @@ package com.epmet.dao.project; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.ProjectDTO; -import com.epmet.dto.project.ProjectAgencyDTO; -import com.epmet.dto.project.ProjectCategoryDTO; -import com.epmet.dto.project.ProjectGridDTO; -import com.epmet.dto.project.ProjectPointDTO; +import com.epmet.dto.project.*; import com.epmet.dto.project.result.ProjectExceedParamsResultDTO; import com.epmet.entity.project.ProjectEntity; import org.apache.ibatis.annotations.Mapper; @@ -194,4 +191,11 @@ public interface ProjectDao extends BaseDao { List selectClosedProjectIds(@Param("customerId")String customerId, @Param("origin")String origin, @Param("projectStatus")String projectStatus); + + /** + * 获取已转项目事件事件 + * @param customerId + * @return + */ + List getEventList(@Param("customerId")String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java index 9cae42b818..c2ebfd43e6 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java @@ -206,24 +206,54 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl projectResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId, dateId, ProjectConstant.RESOLVED, OrgTypeConstant.AGENCY); + Map eventProjectResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId, + dateId, ProjectConstant.RESOLVED, + ProjectConstant.PROJECT_ORIGIN_EVENT); if (!projectResolvedTotal.isEmpty()) { agencyGovernDailyList.forEach(item -> { OrgStatisticsResultDTO dto = projectResolvedTotal.get(item.getAgencyId()); + int sum = item.getApprovalProjectResolvedCount(); + if (null != dto) { + sum = sum + dto.getSum(); + } + item.setApprovalProjectResolvedCount(sum); + }); + } + if (!eventProjectResolvedTotal.isEmpty()) { + agencyGovernDailyList.forEach(item -> { + OrgStatisticsResultDTO dto = eventProjectResolvedTotal.get(item.getAgencyId()); + int sum = item.getApprovalProjectResolvedCount(); if (null != dto) { - item.setApprovalProjectResolvedCount(dto.getSum()); + sum = sum + dto.getSum(); } + item.setApprovalProjectResolvedCount(sum); }); } // 当前组织内：来源于议题的项目：结案无需解决数 Map projectUnResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId, dateId, ProjectConstant.UNRESOLVED, OrgTypeConstant.AGENCY); + Map eventProjectUnResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId, + dateId, ProjectConstant.UNRESOLVED, + ProjectConstant.PROJECT_ORIGIN_EVENT); if (!projectUnResolvedTotal.isEmpty()) { agencyGovernDailyList.forEach(item -> { OrgStatisticsResultDTO dto = projectUnResolvedTotal.get(item.getAgencyId()); + int sum = item.getApprovalProjectUnResolvedCount(); + if (null != dto) { + sum = sum + dto.getSum(); + } + item.setApprovalProjectUnResolvedCount(sum); + }); + } + if (!eventProjectUnResolvedTotal.isEmpty()) { + agencyGovernDailyList.forEach(item -> { + OrgStatisticsResultDTO dto = eventProjectUnResolvedTotal.get(item.getAgencyId()); + int sum = item.getApprovalProjectUnResolvedCount(); if (null != dto) { - item.setApprovalProjectUnResolvedCount(dto.getSum()); + sum = sum + dto.getSum(); } + item.setApprovalProjectUnResolvedCount(sum); }); } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java index 56346813b5..a5bb954bef 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java @@ -108,6 +108,8 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl issueProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_ISSUE,DimObjectStatusConstant.UNRESOLVED); Map approvalProjectResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.RESOLVED); Map approvalProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.UNRESOLVED); + Map eventProjectResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_EVENT,DimObjectStatusConstant.RESOLVED); + Map eventProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_EVENT,DimObjectStatusConstant.UNRESOLVED); Map inGroupTopicResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED,NumConstant.ZERO_STR); Map inGroupTopicUnResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED,NumConstant.ZERO_STR); Map dtoMap=getGovernGridClosedTotalCommonDTOMap(customerId,gridIds); @@ -142,14 +144,24 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl projectList = projectService.getProjectInfo(customerId, dateString); factOriginProjectMainDailyService.deleteByDate(customerId, dateString); if (!CollectionUtils.isEmpty(projectList)) { + Map projectEventMap = projectService.getEventList(customerId); //提取议题ID List issueIds = projectList.stream().filter(item -> ProjectConstant.ISSUE.equals(item.getOrigin())).map(ProjectDTO::getOriginId).collect(Collectors.toList()); @@ -154,11 +153,6 @@ public class ProjectExtractServiceImpl implements ProjectExtractService { entity.setMonthId(dimId.getMonthId()); entity.setWeekId(dimId.getWeekId()); entity.setDateId(dimId.getDateId()); - if (ProjectConstant.ISSUE.equals(project.getOrigin())) { - entity.setIssueId(project.getOriginId()); - } else { - entity.setIssueId(""); - } entity.setProjectStatus(project.getStatus()); entity.setIsResolved(project.getClosedStatus()); entity.setCreatedTime(project.getCreatedTime()); @@ -168,6 +162,20 @@ public class ProjectExtractServiceImpl implements ProjectExtractService { entity.setTopicId(""); entity.setTopicCreatorId(""); entity.setGridId(""); + if (ProjectConstant.ISSUE.equals(project.getOrigin())) { + entity.setIssueId(project.getOriginId()); + } else if (ProjectConstant.PROJECT_ORIGIN_EVENT.equals(project.getOrigin())){ + entity.setIssueId(""); + ResiEventDTO eventDTO = projectEventMap.get(project.getId()); + if (null != eventDTO) { + if (ProjectConstant.PUBLISHER_TYPE_GRID.equals(eventDTO.getOrgType())) { + entity.setGridId(eventDTO.getOrgId()); + entity.setTopicCreatorId(eventDTO.getCreatedBy()); + } + } + } else { + entity.setIssueId(""); + } String[] pIds = project.getOrgIdPath().split(StrConstant.COLON); if (pIds.length > 1) { entity.setPid(pIds[pIds.length - 2]); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java index c359035647..4c587f9694 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java @@ -270,7 +270,7 @@ public class StatsIssueServiceImpl implements StatsIssueService { //已结案项目统计 List closedProjectTotalList = projectService.getGridClosedProjectTotal(customerId, dateString); //已结案项目增量 - List closedProjectIncList = projectService.getGridClosedProjectTotal(customerId, dateString); + List closedProjectIncList = projectService.getGridClosedProjectInc(customerId, dateString); Map resolveMap= new HashMap<>(); Map unResolveMap = new HashMap<>(); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java index e826c9f9e7..f4283979b0 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java @@ -22,6 +22,7 @@ import com.epmet.dto.ProjectCategoryDTO; import com.epmet.dto.ProjectDTO; import com.epmet.dto.project.ProjectAgencyDTO; import com.epmet.dto.project.ProjectGridDTO; +import com.epmet.dto.project.ResiEventDTO; import com.epmet.dto.project.result.ProjectExceedParamsResultDTO; import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity; import com.epmet.entity.project.ProjectEntity; @@ -191,4 +192,11 @@ public interface ProjectService extends BaseService { * @return */ List selectClosedProjectIds(String customerId,String origin ,String projectStatus); + + /** + * 获取事件信息 + * @param customerId + * @return + */ + Map getEventList(String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java index f67bff807c..095a0ec901 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java @@ -23,10 +23,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.constant.DataSourceConstant; import com.epmet.dao.project.ProjectDao; import com.epmet.dto.ProjectDTO; -import com.epmet.dto.project.ProjectAgencyDTO; -import com.epmet.dto.project.ProjectCategoryDTO; -import com.epmet.dto.project.ProjectGridDTO; -import com.epmet.dto.project.ProjectPointDTO; +import com.epmet.dto.project.*; import com.epmet.dto.project.result.ProjectExceedParamsResultDTO; import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity; import com.epmet.entity.project.ProjectEntity; @@ -37,6 +34,7 @@ import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -239,5 +237,14 @@ public class ProjectServiceImpl extends BaseServiceImpl getEventList(String customerId) { + List list = baseDao.getEventList(customerId); + if (org.apache.commons.collections4.CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + return list.stream().collect(Collectors.toMap(ResiEventDTO::getProjectId, Function.identity())); + } + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml index 280de575cf..92dd3ee38a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml @@ -707,7 +707,8 @@ ) a ON fm.GRID_ID = a.orgId WHERE PROJECT_STATUS = 'closed' - AND ORIGIN = "issue" + AND (ORIGIN = 'issue' OR ORIGIN = 'resi_event') + AND GRID_ID != '' AND CUSTOMER_ID = #{customerId} AND DATE_ID <= #{dateId} GROUP BY diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml index 0b60e3efd5..7b217ec4ff 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml @@ -55,7 +55,7 @@ FROM project WHERE DEL_FLAG = '0' - AND ORIGIN = 'issue' + AND (ORIGIN = 'issue' OR ORIGIN = 'resi_event') AND STATUS = 'closed' AND CUSTOMER_ID = #{customerId} AND DATE_FORMAT(UPDATED_TIME, '%Y-%m-%d') #{date} @@ -69,7 +69,7 @@ FROM project WHERE DEL_FLAG = '0' - AND ORIGIN = 'issue' + AND (ORIGIN = 'issue' OR ORIGIN = 'resi_event') AND STATUS = 'closed' AND CUSTOMER_ID = #{customerId} AND DATE_FORMAT(UPDATED_TIME, '%Y-%m-%d') = #{date} @@ -220,4 +220,19 @@ AND p.ORIGIN =#{origin} + + From 9b9daf9b012aaf97b3c2c195c8b9f166655ad17e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 4 Aug 2021 18:12:45 +0800 Subject: [PATCH 17/36] =?UTF-8?q?updateviewtime=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ResiEventServiceImpl.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 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 3ffb927545..6af1ea3723 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 @@ -41,7 +41,6 @@ import com.epmet.dto.result.*; import com.epmet.entity.*; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; -import com.epmet.feign.GovProjectOpenFeignClient; import com.epmet.service.ResiEventService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -114,17 +113,25 @@ public class ResiEventServiceImpl extends BaseServiceImpl logEntityList = resiEventOperationLogDao.selectByUserAction(formDTO.getEventId(), formDTO.getUserId(), ResiEventAction.READ_FIRST.getCode()); if (CollectionUtils.isEmpty(logEntityList)) { ResiEventOperationLogEntity publishLog=new ResiEventOperationLogEntity(); From 762c2eff502633aae942516673f2c36554a747b5 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 4 Aug 2021 18:31:42 +0800 Subject: [PATCH 18/36] =?UTF-8?q?=E5=85=88=E6=8F=90project?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/OrgNameByTypeResultDTO.java | 22 +++++++++++++++++++ .../epmet/feign/GovOrgOpenFeignClient.java | 9 ++++++++ .../GovOrgOpenFeignClientFallback.java | 5 +++++ .../controller/CustomerGridController.java | 11 ++++++++++ .../java/com/epmet/dao/CustomerGridDao.java | 8 +++++++ .../epmet/service/CustomerGridService.java | 8 +++++++ .../service/impl/CustomerGridServiceImpl.java | 11 ++++++++++ .../main/resources/mapper/CustomerGridDao.xml | 17 ++++++++++++++ 8 files changed, 91 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java new file mode 100644 index 0000000000..dd5aa27458 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/8/4 5:48 下午 + * @DESC + */ +@Data +public class OrgNameByTypeResultDTO implements Serializable { + + private static final long serialVersionUID = -6544341694748437312L; + + private String orgId; + + private String orgType; + + private String orgName; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 3564d39a61..2ac3978628 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -389,4 +389,13 @@ public interface GovOrgOpenFeignClient { @PostMapping("/gov/org/customergrid/selectgridname") Result gridName(@RequestParam("gridId")String gridId); + /** + * @Description 根据类型查询组织名称 + * @Param formList + * @author zxc + * @date 2021/8/4 6:14 下午 + */ + @PostMapping("/gov/org/customergrid/selectorgnamebytype") + Result> selectOrgNameByType(@RequestBody List formList); + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index 97bc8402b7..84b3cb74c2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -225,6 +225,11 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridName", gridId); } + @Override + public Result> selectOrgNameByType(List formList) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectOrgNameByType", formList); + } + @Override public Result selectPidsByGridId(String gridId) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index 7fe5c72cbe..7dc0f3f385 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -263,4 +263,15 @@ public class CustomerGridController { Result gridName(@RequestParam("gridId")String gridId){ return new Result().ok(customerGridService.gridName(gridId)); } + + /** + * @Description 根据类型查询组织名称 + * @Param formList + * @author zxc + * @date 2021/8/4 6:14 下午 + */ + @PostMapping("selectorgnamebytype") + public Result> selectOrgNameByType(@RequestBody List formList){ + return new Result>().ok(customerGridService.selectOrgNameByType(formList)); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index 314c483a0f..956405698b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java @@ -284,4 +284,12 @@ public interface CustomerGridDao extends BaseDao { * @date 2021/8/4 4:30 下午 */ String gridName(String gridId); + + /** + * @Description 查询组织名字 + * @Param orgIds + * @author zxc + * @date 2021/8/4 6:25 下午 + */ + List selectOrgNameByType(@Param("orgIds") List orgIds); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index e1cc5f79a7..773ebd45e7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -303,4 +303,12 @@ public interface CustomerGridService extends BaseService { * @date 2021/8/4 4:26 下午 */ String gridName(String gridId); + + /** + * @Description 根据类型查询组织名称 + * @Param formList + * @author zxc + * @date 2021/8/4 6:14 下午 + */ + List selectOrgNameByType(List formList); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index ec5c673374..875f2c04dd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -732,4 +732,15 @@ public class CustomerGridServiceImpl extends BaseServiceImpl selectOrgNameByType(List formList) { + return baseDao.selectOrgNameByType(formList); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 49025a9b9a..5c5fae63b3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -594,4 +594,21 @@ WHERE cg.DEL_FLAG = 0 AND cg.ID = #{gridId} + + + From 56d8f9b8f114a3086ad181aac4e8733f08213b67 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 4 Aug 2021 18:45:19 +0800 Subject: [PATCH 19/36] =?UTF-8?q?=E6=8A=A5=E4=BA=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/EventDetailFormDTO.java | 2 ++ .../dto/result/EventDetailResultDTO.java | 3 +++ .../dto/result/OrgNameByTypeResultDTO.java | 22 +++++++++++++++ .../com/epmet/constant/EventConstant.java | 6 +++++ .../epmet/controller/ResiEventController.java | 4 +-- .../main/java/com/epmet/dao/ResiEventDao.java | 16 +++++++++++ .../com/epmet/dao/ResiEventReportOrgDao.java | 9 +++++++ .../com/epmet/service/ResiEventService.java | 3 ++- .../service/impl/ResiEventServiceImpl.java | 21 ++++++++++++++- .../main/resources/mapper/ResiEventDao.xml | 27 ++++++++++++++++++- .../mapper/ResiEventReportOrgDao.xml | 10 +++++++ 11 files changed, 118 insertions(+), 5 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java 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 index 1d2972d0c3..65a4143f9d 100644 --- 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 @@ -19,4 +19,6 @@ public class EventDetailFormDTO implements Serializable { @NotBlank(message = "报事ID不能为空",groups = EventDetailForm.class) private String eventId; + + private String orgId; } 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 index b16e292f44..e5997ab62f 100644 --- 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 @@ -79,6 +79,9 @@ public class EventDetailResultDTO implements Serializable { */ private EventProjectInfoDTO projectInfo; + @JsonIgnore + private List orgNameList; + @JsonIgnore private String projectId; diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java new file mode 100644 index 0000000000..dd5aa27458 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/8/4 5:48 下午 + * @DESC + */ +@Data +public class OrgNameByTypeResultDTO implements Serializable { + + private static final long serialVersionUID = -6544341694748437312L; + + private String orgId; + + private String orgType; + + private String orgName; +} 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 2608de1e9f..7daf809615 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 @@ -43,4 +43,10 @@ public interface EventConstant { */ String RESOLVED="resolved"; String UN_SOLVED="un_solved"; + + /** + * 小程序类型 + */ + String TYPE_GOV = "gov"; + String TYPE_RESI = "resi"; } 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 e868c85459..0e090ed1b9 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 @@ -54,9 +54,9 @@ public class ResiEventController { * @date 2021/8/3 1:47 下午 */ @PostMapping("eventdetail") - public Result eventDetail(@RequestBody EventDetailFormDTO formDTO){ + public Result eventDetail(@LoginUser TokenDto tokenDto ,@RequestBody EventDetailFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO); - return new Result().ok(resiEventService.eventDetail(formDTO)); + return new Result().ok(resiEventService.eventDetail(formDTO,tokenDto)); } /** * 我要报事-提交（尹） 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 87ffeb3d1a..cf74df59f1 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 @@ -63,4 +63,20 @@ public interface ResiEventDao extends BaseDao { * @date 2021/8/4 2:16 下午 */ EventDetailResultDTO selectEventDetail(@Param("eventId")String eventId); + + /** + * @Description 更新报事人红点状态 + * @Param userId + * @author zxc + * @date 2021/8/4 5:30 下午 + */ + void updateResiEvent(@Param("userId") String userId,@Param("eventId")String eventId); + + /** + * @Description 更新人大代表红点状态 + * @Param userId + * @author zxc + * @date 2021/8/4 5:32 下午 + */ + void updateEventMention(@Param("userId") String userId,@Param("eventId")String eventId); } \ 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 index 216f6dace8..6f851d34c3 100644 --- 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 @@ -42,6 +42,15 @@ public interface ResiEventReportOrgDao extends BaseDao */ int updateReadFlag(@Param("eventId") String eventId, @Param("orgId") String orgId,@Param("userId") String userId); + /** + * @Description 更新组织的红点显示状态 + * @Param eventId + * @Param orgId + * @author zxc + * @date 2021/8/4 5:42 下午 + */ + void updateEventOrg(@Param("eventId") String eventId, @Param("orgId") String orgId); + /** * 展示红点 * 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 596609d158..65d13d225f 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,6 +1,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.ResiEventEntity; @@ -37,7 +38,7 @@ public interface ResiEventService extends BaseService { * @author zxc * @date 2021/8/3 1:47 下午 */ - EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO); + EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO, TokenDto tokenDto); /** * 我要报事-提交（尹） 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 6af1ea3723..776d82467a 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 @@ -29,6 +29,7 @@ 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.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.ScanContentUtils; @@ -49,6 +50,7 @@ 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.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.util.ArrayList; @@ -154,7 +156,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl orgNameList = dto.getOrgNameList(); + Result> orgResult = govOrgOpenFeignClient.selectOrgNameByType(orgNameList); + if (!orgResult.success()){ + throw new RenException("查询组织名称失败"); + } + List data = orgResult.getData(); + data.addAll(dto.getEventPerson()); + dto.setEventPerson(data); + // 更改已读状态 报事人的红点：resi_event,艾特人的：resi_event_mention,所代表的组织的：resi_event_report_org + if (tokenDto.getApp().equals(EventConstant.TYPE_RESI)){ + baseDao.updateResiEvent(tokenDto.getUserId(),formDTO.getEventId()); + baseDao.updateEventMention(tokenDto.getUserId(),formDTO.getEventId()); + }else if (tokenDto.getApp().equals(EventConstant.TYPE_GOV)){ + resiEventReportOrgDao.updateEventOrg(formDTO.getEventId(), formDTO.getOrgId()); + } return dto; } 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 a9461bd9b4..ca3e51f51e 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 @@ -107,6 +107,9 @@ + + + + + + + UPDATE resi_event + SET RED_DOT = 0, + UPDATED_TIME = NOW() + WHERE DEL_FLAG = '0' + AND ID = #{eventId} + AND REPORT_USER_ID = #{userId} + + + + + UPDATE resi_event_mention + SET RED_DOT = 0, + UPDATED_TIME = NOW() + WHERE DEL_FLAG = '0' + AND USER_ID = #{userId} + AND RESI_EVENT_ID = #{eventId} + \ 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 index 98795d7364..7291f346c2 100644 --- 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 @@ -23,4 +23,14 @@ RESI_EVENT_ID = #{resiEventId} AND DEL_FLAG = '0' + + + + UPDATE resi_event_report_org + SET RED_DOT = 0, + UPDATED_TIME = NOW() + WHERE DEL_FLAG = '0' + AND ORG_ID = #{orgId} + AND RESI_EVENT_ID = #{eventId} + \ No newline at end of file From 23c30ae2a8244af896911226dc4e9f7ea520c3cc Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 5 Aug 2021 09:31:28 +0800 Subject: [PATCH 20/36] =?UTF-8?q?=E4=BF=AE=E5=93=8E=E6=98=AF=E5=90=A6=20?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B7=B2=E8=A7=A3=E5=86=B3=20=E6=9C=AA?= =?UTF-8?q?=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ResiEventDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ca3e51f51e..4ff17b6e35 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 @@ -117,7 +117,7 @@ IFNULL(re.EVENT_CONTENT,'') AS eventContent, IFNULL(re.ADDRESS,'') AS eventAddress, (CASE WHEN re.`STATUS` = 'processing' THEN FALSE WHEN re.`STATUS` = 'closed_case' THEN TRUE ELSE FALSE END) AS isClosed, - (IF(re.`STATUS` = 'processing', FALSE, (CASE WHEN re.RESOLVE_STATUS = 'resolved' THEN TRUE ELSE FALSE END))) AS isResolve, + (IF('' = re.RESOLVE_STATUS OR NULL = re.RESOLVE_STATUS, TRUE, FALSE)) AS isResolve, (CASE WHEN re.READ_FLAG = 1 THEN FALSE ELSE TRUE END) AS isRollback, (CASE WHEN re.SHIFT_PROJECT = 1 THEN TRUE ELSE FALSE END) AS isProject, IFNULL(re.project_id,'') AS projectId, From 731fca8630303177fab802c96bc45ce49191ccd9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 5 Aug 2021 09:52:34 +0800 Subject: [PATCH 21/36] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=EF=BC=8C?= =?UTF-8?q?=E7=BE=A4=E4=BC=97=E7=9B=B4=E6=8A=A5=E5=85=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E6=9D=83=E9=99=90key=EF=BC=8C=E8=AE=B0=E5=BE=97=E5=8F=91?= =?UTF-8?q?=E4=B8=80=E4=B8=8Bgov-access?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/enums/RequirePermissionEnum.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java index 831913de5e..87a31cc857 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java @@ -187,7 +187,13 @@ public enum RequirePermissionEnum { /** * 基层治理-巡查 */ - WORK_GRASSROOT_GOVERN_PATROL("work_grassroot_govern_patrol","基层治理:巡查","巡查"); + WORK_GRASSROOT_GOVERN_PATROL("work_grassroot_govern_patrol","基层治理:巡查","巡查"), + + + /** + * 基层治理-群众直报 功能入口 + */ + RESI_EVENT_MANAGE("resi_event_manage","群众直报","基层治理-群众直报"); private String key; private String name; From 09cf227a591910e55562a4d095a34130d5640877 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 5 Aug 2021 09:53:39 +0800 Subject: [PATCH 22/36] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=EF=BC=8C?= =?UTF-8?q?=E7=BE=A4=E4=BC=97=E7=9B=B4=E6=8A=A5=E5=85=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E6=9D=83=E9=99=90key=EF=BC=8C=E8=AE=B0=E5=BE=97=E5=8F=91?= =?UTF-8?q?=E4=B8=80=E4=B8=8Bgov-access?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/enums/RequirePermissionEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java index 87a31cc857..17b7c21b99 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java @@ -193,7 +193,7 @@ public enum RequirePermissionEnum { /** * 基层治理-群众直报 功能入口 */ - RESI_EVENT_MANAGE("resi_event_manage","群众直报","基层治理-群众直报"); + RESI_EVENT_MANAGE("resi_event_manage","基层治理:群众直报","基层治理-群众直报"); private String key; private String name; From ddcc808863239096ecd5f6394b6e6ef5551b26f4 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 5 Aug 2021 10:20:55 +0800 Subject: [PATCH 23/36] =?UTF-8?q?=E5=85=88=E6=8F=90=E4=B8=80=E5=8D=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/feign/GovOrgOpenFeignClient.java | 9 +++++++++ .../fallback/GovOrgOpenFeignClientFallback.java | 5 +++++ .../com/epmet/controller/CustomerGridController.java | 12 ++++++++++++ .../src/main/java/com/epmet/dao/CustomerGridDao.java | 8 ++++++++ .../java/com/epmet/service/CustomerGridService.java | 8 ++++++++ .../epmet/service/impl/CustomerGridServiceImpl.java | 11 +++++++++++ .../src/main/resources/mapper/CustomerGridDao.xml | 7 +++++++ 7 files changed, 60 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 2ac3978628..7237abcc5b 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -398,4 +398,13 @@ public interface GovOrgOpenFeignClient { @PostMapping("/gov/org/customergrid/selectorgnamebytype") Result> selectOrgNameByType(@RequestBody List formList); + /** + * @Description 根据人查询所在组织 + * @Param userId + * @author zxc + * @date 2021/8/5 10:08 上午 + */ + @PostMapping("/gov/org/customergrid/selectorgsbyuserid") + Result> selectOrgsByUserId(@RequestParam("userId")String userId); + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index 84b3cb74c2..91f9052c84 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -230,6 +230,11 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectOrgNameByType", formList); } + @Override + public Result> selectOrgsByUserId(String userId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectOrgsByUserId", userId); + } + @Override public Result selectPidsByGridId(String gridId) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index 7dc0f3f385..c765a58962 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -274,4 +274,16 @@ public class CustomerGridController { public Result> selectOrgNameByType(@RequestBody List formList){ return new Result>().ok(customerGridService.selectOrgNameByType(formList)); } + + /** + * @Description 根据人查询所在组织 + * @Param userId + * @author zxc + * @date 2021/8/5 10:08 上午 + */ + @PostMapping("/selectorgsbyuserid") + public Result> selectOrgsByUserId(@RequestParam("userId")String userId){ + return new Result>().ok(customerGridService.selectOrgsByUserId(userId)); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index 956405698b..fae6640a7d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java @@ -292,4 +292,12 @@ public interface CustomerGridDao extends BaseDao { * @date 2021/8/4 6:25 下午 */ List selectOrgNameByType(@Param("orgIds") List orgIds); + + /** + * @Description 根据人查询所在组织 + * @Param userId + * @author zxc + * @date 2021/8/5 10:08 上午 + */ + List selectOrgsByUserId(@Param("userId") String userId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index 773ebd45e7..78221d8fa8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -311,4 +311,12 @@ public interface CustomerGridService extends BaseService { * @date 2021/8/4 6:14 下午 */ List selectOrgNameByType(List formList); + + /** + * @Description 根据人查询所在组织 + * @Param userId + * @author zxc + * @date 2021/8/5 10:08 上午 + */ + List selectOrgsByUserId(String userId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 875f2c04dd..23de67608c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -743,4 +743,15 @@ public class CustomerGridServiceImpl extends BaseServiceImpl selectOrgNameByType(List formList) { return baseDao.selectOrgNameByType(formList); } + + /** + * @Description 根据人查询所在组织 + * @Param userId + * @author zxc + * @date 2021/8/5 10:08 上午 + */ + @Override + public List selectOrgsByUserId(String userId) { + return baseDao.selectOrgsByUserId(userId); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 5c5fae63b3..0667d009c4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -611,4 +611,11 @@ ) + + + From 886e520b49fb734a21ac9f52e9bea1290cf2cb89 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 5 Aug 2021 10:35:50 +0800 Subject: [PATCH 24/36] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E6=97=B6=E9=97=B4=E5=88=B0=E5=88=86=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/result/ReplyListResultDTO.java | 2 ++ 1 file changed, 2 insertions(+) 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 index 87209854a4..4ffa078aaf 100644 --- 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 @@ -1,5 +1,6 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; @@ -24,6 +25,7 @@ public class ReplyListResultDTO implements Serializable { /** * 回复时间 * */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone="GMT+8") private Date replyTime; /** From 28043e3b058407f2e5aedd08025dba9740eddaa8 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 5 Aug 2021 11:01:10 +0800 Subject: [PATCH 25/36] =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=9B=B4=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/NewEventsResultDTO.java | 32 +++++++++++++++++++ .../epmet/controller/ResiEventController.java | 11 +++++++ .../main/java/com/epmet/dao/ResiEventDao.java | 9 ++++++ .../com/epmet/service/ResiEventService.java | 8 +++++ .../service/impl/ResiEventServiceImpl.java | 20 ++++++++++++ .../main/resources/mapper/ResiEventDao.xml | 29 +++++++++++++++-- 6 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java new file mode 100644 index 0000000000..77f4eb4d68 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java @@ -0,0 +1,32 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2021/8/5 9:51 上午 + * @DESC + */ +@Data +public class NewEventsResultDTO implements Serializable { + + private static final long serialVersionUID = 2151884734349908080L; + + /** + * 事件内容 + */ + private String eventContent; + + /** + * 事件时间 + */ + private String eventTime; + + /** + * 事件图片 + */ + private List eventImgs; +} 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 0e090ed1b9..c76a1ea63c 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 @@ -174,4 +174,15 @@ public class ResiEventController { return new Result>().ok(resiEventService.mentionList(formDTO)); } + /** + * @Description 最新直报 + * @Param userId + * @author zxc + * @date 2021/8/5 9:55 上午 + */ + @PostMapping("newevents") + public Result> newEvents(@LoginUser TokenDto tokenDto){ + return new Result>().ok(resiEventService.newEvents(tokenDto.getUserId())); + } + } \ 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 cf74df59f1..6275a0d821 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 @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.result.EventDetailResultDTO; import com.epmet.dto.result.EventListResultDTO; import com.epmet.dto.result.MyReportedResultDTO; +import com.epmet.dto.result.NewEventsResultDTO; import com.epmet.entity.ResiEventEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -79,4 +80,12 @@ public interface ResiEventDao extends BaseDao { * @date 2021/8/4 5:32 下午 */ void updateEventMention(@Param("userId") String userId,@Param("eventId")String eventId); + + /** + * @Description 最新直报 + * @Param orgIds + * @author zxc + * @date 2021/8/5 10:42 上午 + */ + List newEvents(@Param("orgIds")List orgIds); } \ 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 65d13d225f..236ebe765e 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 @@ -89,4 +89,12 @@ public interface ResiEventService extends BaseService { * @date 2021/8/4 9:41 */ List mentionList(UserMentionFormDTO formDTO); + + /** + * @Description 最新直报 + * @Param userId + * @author zxc + * @date 2021/8/5 9:55 上午 + */ + List newEvents(String userId); } \ 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 776d82467a..89f51ed5c5 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 @@ -493,5 +493,25 @@ public class ResiEventServiceImpl extends BaseServiceImpl newEvents(String userId) { + Result> listResult = govOrgOpenFeignClient.selectOrgsByUserId(userId); + if (!listResult.success()){ + throw new RenException("查询userId："+userId+"，所在org失败"); + } + List orgIds = listResult.getData(); + if (!CollectionUtils.isEmpty(orgIds)){ + List result = baseDao.newEvents(orgIds); + return result; + } + return new ArrayList<>(); + } + } \ 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 4ff17b6e35..1af9c54926 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 @@ -18,7 +18,7 @@ SELECT IFNULL(rea.ATTACHMENT_URL,'') AS img,t.* FROM (SELECT re.EVENT_CONTENT AS eventContent, - IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i:%s'),'') AS eventTime, + IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i'),'') AS eventTime, re.ID AS eventId, (CASE WHEN re.SHIFT_PROJECT = 1 THEN TRUE ELSE FALSE END) AS isProject, (CASE WHEN ro.RED_DOT = 1 THEN TRUE ELSE FALSE END) AS redDot @@ -113,7 +113,7 @@ + SELECT + IFNULL(re.EVENT_CONTENT,'') AS eventContent, + DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i') AS eventTime, + IFNULL(ea.ATTACHMENT_URL,'') AS img + FROM resi_event_report_org ro + LEFT JOIN resi_event re ON (re.ID = ro.RESI_EVENT_ID AND re.DEL_FLAG = '0') + LEFT JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND + ea.ATTACHMENT_TYPE = 'image' AND ea.SORT IN (0,1,2)) + WHERE ro.DEL_FLAG = '0' + AND ro.ORG_READ = 'un_read' + AND ro.ORG_ID IN( + + #{orgId} + ) + ORDER BY ro.CREATED_TIME DESC + \ No newline at end of file From ba86998a67c516d79be07b886888c9b1397edd96 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 5 Aug 2021 11:03:16 +0800 Subject: [PATCH 26/36] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=9A=84=E6=B2=BB?= =?UTF-8?q?=E7=90=86=E6=8C=87=E6=95=B0=E6=8C=89=E5=A4=A9=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?--GRID=5FSELF=5FGOVERN=5FPROJECT=5FTOTAL=E6=9C=AA=E8=B5=8B?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/todata/impl/FactAgencyGovernDailyServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java index 9cae42b818..f96f3babc7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java @@ -249,6 +249,7 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl Date: Thu, 5 Aug 2021 11:09:09 +0800 Subject: [PATCH 27/36] =?UTF-8?q?=E6=8A=A5=E4=BA=8B=E5=8A=9E=E7=BB=93+3?= =?UTF-8?q?=E4=B8=AA=E5=9B=9E=E5=A4=8D=E9=9C=80=E8=A6=81=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=9A=84=E6=9C=80=E5=90=8E=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 1 + .../epmet/dto/form/CloseResiEventFormDTO.java | 29 ++++++++++++ .../epmet/controller/ResiEventController.java | 16 +++++++ .../com/epmet/service/ResiEventService.java | 10 +++++ .../impl/ResiEventReplyServiceImpl.java | 9 +++- .../service/impl/ResiEventServiceImpl.java | 45 +++++++++++++++++++ 6 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/CloseResiEventFormDTO.java 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 1a29d62e54..3966217c18 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 @@ -99,6 +99,7 @@ public enum EpmetErrorCode { RESI_EVENT_NOT_MY_REPORTED(8604,"当前事件不是您发布的，无权操作"), CAN_NOT_REPLY_RESI_EVENT_GOV(8605,"办结、立项处理后不可回复"), CAN_NOT_REPLY_RESI_EVENT_SELF(8606,"当前事件待处理,不可回复"), + RESI_EVENT_CAN_NOT_CLOSE_CASE(8607,"事件尚未处理，请处理完成后进行办结"), // 爱心互助 居民端 NOT_IN_THE_SIGN_IN_RANGE(8510, "您还未进入指定的签到范围～"), diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/CloseResiEventFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/CloseResiEventFormDTO.java new file mode 100644 index 0000000000..bf3cdcc62c --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/CloseResiEventFormDTO.java @@ -0,0 +1,29 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 报事-办结 入参DTO + * + * @author yinzuomei@elink-cn.com + * @date 2021/8/5 10:44 + */ +@Data +public class CloseResiEventFormDTO implements Serializable { + private static final long serialVersionUID = -3621650590714057648L; + + public interface AddUserInternalGroup { + } + @NotBlank(message = "eventId不能为空", groups = AddUserInternalGroup.class) + private String eventId; + + //以下参数从token中获取 + /** + * 当前用户id + */ + @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class) + private String userId; +} 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 0e090ed1b9..79002b9f56 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 @@ -174,4 +174,20 @@ public class ResiEventController { return new Result>().ok(resiEventService.mentionList(formDTO)); } + /** + * 报事办结 + * + * @param tokenDto + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @date 2021/8/5 10:47 + */ + @PostMapping("close") + public Result closeResiEvent(@LoginUser TokenDto tokenDto,@RequestBody CloseResiEventFormDTO formDTO){ + formDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO,CloseResiEventFormDTO.AddUserInternalGroup.class); + resiEventService.closeResiEvent(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 65d13d225f..9529c3e005 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 @@ -89,4 +89,14 @@ public interface ResiEventService extends BaseService { * @date 2021/8/4 9:41 */ List mentionList(UserMentionFormDTO formDTO); + + /** + * 报事办结 + * + * @param formDTO + * @return void + * @author yinzuomei + * @date 2021/8/5 10:48 + */ + void closeResiEvent(CloseResiEventFormDTO 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 5f1d1ddaee..7d1116c60c 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 @@ -136,8 +136,10 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl replyList=resiEventReplyDao.selectReplyList(formDTO.getEventId()); + //如果未转项目，也没有回复，不允许办结 + if(!resiEventEntity.getShiftProject()&&CollectionUtils.isEmpty(replyList)){ + throw new RenException(EpmetErrorCode.RESI_EVENT_CAN_NOT_CLOSE_CASE.getCode(),EpmetErrorCode.RESI_EVENT_CAN_NOT_CLOSE_CASE.getMsg()); + } + // 1、修改事件状态 + resiEventEntity.setRedDot(true); + resiEventEntity.setStatus(EventConstant.EVENT_STATUS_CLOSED_CASE); + resiEventEntity.setCloseCaseTime(new Date()); + resiEventEntity.setLatestOperatedTime(resiEventEntity.getCloseCaseTime()); + baseDao.updateById(resiEventEntity); + // 2、记录操作日志 + ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity(); + reCallLog.setCustomerId(resiEventEntity.getCustomerId()); + reCallLog.setResiEventId(resiEventEntity.getId()); + reCallLog.setUserId(formDTO.getUserId()); + reCallLog.setUserIdentity(EventConstant.STAFF); + reCallLog.setActionCode(ResiEventAction.CLOSE_CASE.getCode()); + reCallLog.setActionDesc(ResiEventAction.CLOSE_CASE.getDesc()); + reCallLog.setOperateTime(resiEventEntity.getCloseCaseTime()); + resiEventOperationLogDao.insert(reCallLog); + // 3、红点： + // 当前工作人员办结后： + // 3.1、报事人在已办结列表中展示红点：上面已经更新 + // 3.2、人大代表在未读/已读列表中展示红点 + resiEventMentionDao.updateRedDotShow(formDTO.getEventId(),null); + // 3.3、目前Db设计支持报给多个层级（组织或网格），按理说应该更新非当前组织外，其他的组织，显示红点，先不做了吧 todo + } + } \ No newline at end of file From b7c337afe9ab3757bf56b50527c7fb5bebc0366a Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 5 Aug 2021 11:11:14 +0800 Subject: [PATCH 28/36] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=EF=BC=9A=E6=94=B9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/healthcheck/HealthCheckController.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java index 7ad372c8cc..f3bba8d5e1 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java @@ -1,10 +1,14 @@ package com.epmet.healthcheck; +import com.epmet.commons.tools.utils.IpUtils; 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; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + @RestController @RequestMapping("healthcheck") public class HealthCheckController { @@ -14,8 +18,9 @@ public class HealthCheckController { * @return */ @PostMapping("http") - public Result httpHealthCheck() { - return new Result(); + public Result httpHealthCheck(HttpServletRequest request) { + String serverIp = IpUtils.getIpAddr(request); + return new Result().ok(serverIp); } } From abdaf5aa90a134ee15dcff6a380424a6761d1613 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 5 Aug 2021 11:12:51 +0800 Subject: [PATCH 29/36] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/ResiEventController.java | 69 ++++++++++--------- .../service/impl/ResiEventServiceImpl.java | 2 +- 2 files changed, 37 insertions(+), 34 deletions(-) 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 c8eb08e5cd..d984456930 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 @@ -43,34 +43,35 @@ import java.util.List; @RestController @RequestMapping("resievent") public class ResiEventController { - + @Autowired private ResiEventService resiEventService; /** - * @Description 报事详情-两端通用 + * @Description 报事详情-两端通用 * @Param formDTO * @author zxc * @date 2021/8/3 1:47 下午 */ @PostMapping("eventdetail") - public Result eventDetail(@LoginUser TokenDto tokenDto ,@RequestBody EventDetailFormDTO formDTO){ + public Result eventDetail(@LoginUser TokenDto tokenDto, @RequestBody EventDetailFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); - return new Result().ok(resiEventService.eventDetail(formDTO,tokenDto)); + return new Result().ok(resiEventService.eventDetail(formDTO, tokenDto)); } + /** * 我要报事-提交（尹） * * @param formDTO - * @return com.epmet.commons.tools.utils.Result + * @return com.epmet.commons.tools.utils.Result * @author yinzuomei * @date 2021/8/3 10:46 */ @PostMapping("report") - public Result report(@LoginUser TokenDto tokenDto, @RequestBody ResiEventFormDTO formDTO){ + public Result report(@LoginUser TokenDto tokenDto, @RequestBody ResiEventFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - ValidatorUtils.validateEntity(formDTO,ResiEventFormDTO.AddUserShowGroup.class,ResiEventFormDTO.AddUserInternalGroup.class); + ValidatorUtils.validateEntity(formDTO, ResiEventFormDTO.AddUserShowGroup.class, ResiEventFormDTO.AddUserInternalGroup.class); return new Result().ok(resiEventService.report(formDTO)); } @@ -78,15 +79,15 @@ public class ResiEventController { * 我要报事-撤回（尹） * * @param formDTO - * @return com.epmet.commons.tools.utils.Result + * @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){ + 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); + ValidatorUtils.validateEntity(formDTO, ResiEventIdDTO.ResiEventIdGroup.class, ReCallEventFormDTO.AddUserInternalGroup.class); resiEventService.reCall(formDTO); return new Result(); } @@ -96,15 +97,15 @@ public class ResiEventController { * * @param tokenDto * @param formDTO - * @return com.epmet.commons.tools.utils.Result + * @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){ + 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); + ValidatorUtils.validateEntity(formDTO, ResiEventIdDTO.ResiEventIdGroup.class, ChooseResolveFormDTO.AddUserInternalGroup.class); resiEventService.chooseResolve(formDTO); return new Result(); } @@ -115,43 +116,43 @@ public class ResiEventController { * * @param tokenDto * @param formDTO - * @return com.epmet.commons.tools.utils.Result> + * @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){ + public Result> queryMyReported(@LoginUser TokenDto tokenDto, @RequestBody MyReportedFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - ValidatorUtils.validateEntity(formDTO,MyReportedFormDTO.AddUserInternalGroup.class); + ValidatorUtils.validateEntity(formDTO, MyReportedFormDTO.AddUserInternalGroup.class); return new Result>().ok(resiEventService.queryMyReported(formDTO)); } /** - * @Description 群众直报（待处理、处理中、已办结）列表 + * @Description 群众直报（待处理、处理中、已办结）列表 * @Param formDTO * @author zxc * @date 2021/8/3 10:53 上午 */ @PostMapping("eventlist") - public Result> eventList(@RequestBody EventListFormDTO formDTO){ + public Result> eventList(@RequestBody EventListFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, EventListFormDTO.EventListForm.class); return new Result>().ok(resiEventService.eventList(formDTO)); } /** - * @Description 报事-首次查看事件-两端通用 + * @Description 报事-首次查看事件-两端通用 * @Param formDTO * @author zxc * @date 2021/8/3 11:01 上午 */ @PostMapping("updateviewtime") - public Result updateViewTime(@LoginUser TokenDto tokenDto,@RequestBody UpdateViewTimeFormDTO formDTO){ + public Result updateViewTime(@LoginUser TokenDto tokenDto, @RequestBody UpdateViewTimeFormDTO formDTO) { formDTO.setUserId(tokenDto.getUserId()); formDTO.setCustomerId(tokenDto.getCustomerId()); - ValidatorUtils.validateEntity(formDTO,UpdateViewTimeFormDTO.AddUserInternalGroup.class); - if(EventConstant.STAFF.equals(formDTO.getViewType())){ - ValidatorUtils.validateEntity(formDTO,UpdateViewTimeFormDTO.GovInternalGroup.class); + ValidatorUtils.validateEntity(formDTO, UpdateViewTimeFormDTO.AddUserInternalGroup.class); + if (EventConstant.STAFF.equals(formDTO.getViewType())) { + ValidatorUtils.validateEntity(formDTO, UpdateViewTimeFormDTO.GovInternalGroup.class); } resiEventService.updateViewTime(formDTO); return new Result(); @@ -162,25 +163,26 @@ public class ResiEventController { * * @param tokenDto * @param formDTO - * @return com.epmet.commons.tools.utils.Result> + * @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){ + public Result> mentionList(@LoginUser TokenDto tokenDto, @RequestBody UserMentionFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - ValidatorUtils.validateEntity(formDTO,UserMentionFormDTO.AddUserInternalGroup.class); + ValidatorUtils.validateEntity(formDTO, UserMentionFormDTO.AddUserInternalGroup.class); return new Result>().ok(resiEventService.mentionList(formDTO)); - }} + } + /** - * @Description 最新直报 + * @Description 最新直报 * @Param userId * @author zxc * @date 2021/8/5 9:55 上午 */ @PostMapping("newevents") - public Result> newEvents(@LoginUser TokenDto tokenDto){ + public Result> newEvents(@LoginUser TokenDto tokenDto) { return new Result>().ok(resiEventService.newEvents(tokenDto.getUserId())); } @@ -189,14 +191,15 @@ public class ResiEventController { * * @param tokenDto * @param formDTO - * @return com.epmet.commons.tools.utils.Result + * @return com.epmet.commons.tools.utils.Result * @author yinzuomei * @date 2021/8/5 10:47 */ @PostMapping("close") - public Result closeResiEvent(@LoginUser TokenDto tokenDto,@RequestBody CloseResiEventFormDTO formDTO){ + public Result closeResiEvent(@LoginUser TokenDto tokenDto, @RequestBody CloseResiEventFormDTO formDTO) { formDTO.setUserId(tokenDto.getUserId()); - ValidatorUtils.validateEntity(formDTO,CloseResiEventFormDTO.AddUserInternalGroup.class); + ValidatorUtils.validateEntity(formDTO, CloseResiEventFormDTO.AddUserInternalGroup.class); resiEventService.closeResiEvent(formDTO); return new Result(); - } \ No newline at end of file + } +} \ 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 50b73bc605..4e2452c6c2 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 @@ -89,7 +89,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl Date: Thu, 5 Aug 2021 12:32:41 +0800 Subject: [PATCH 30/36] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=EF=BC=9A=E6=94=B9=E8=89=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/healthcheck/HealthCheckController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java index f3bba8d5e1..d03caf495f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java @@ -19,8 +19,8 @@ public class HealthCheckController { */ @PostMapping("http") public Result httpHealthCheck(HttpServletRequest request) { - String serverIp = IpUtils.getIpAddr(request); - return new Result().ok(serverIp); + String serverName = request.getServerName(); + return new Result().ok(serverName); } } From 1b28edaeee17acebb0081fc4ac766bb8dcf0a23c Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 5 Aug 2021 12:45:15 +0800 Subject: [PATCH 31/36] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=EF=BC=9A=E6=94=B9=E8=89=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/healthcheck/HealthCheckController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java index d03caf495f..64d7de00bd 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java @@ -2,6 +2,7 @@ package com.epmet.healthcheck; import com.epmet.commons.tools.utils.IpUtils; import com.epmet.commons.tools.utils.Result; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -11,6 +12,7 @@ import javax.servlet.http.HttpServletResponse; @RestController @RequestMapping("healthcheck") +@Slf4j public class HealthCheckController { /** @@ -20,6 +22,7 @@ public class HealthCheckController { @PostMapping("http") public Result httpHealthCheck(HttpServletRequest request) { String serverName = request.getServerName(); + log.info("健康检查：serverName:{}", serverName); return new Result().ok(serverName); } From d30a52ca5e922bb8db0697dfe77d0cdea638f91e Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 5 Aug 2021 13:01:22 +0800 Subject: [PATCH 32/36] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=EF=BC=9A=E6=94=B9=E8=89=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../healthcheck/HealthCheckController.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java index 64d7de00bd..2f9a0d6d7a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java @@ -1,14 +1,14 @@ package com.epmet.healthcheck; -import com.epmet.commons.tools.utils.IpUtils; import com.epmet.commons.tools.utils.Result; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.UnknownHostException; @RestController @RequestMapping("healthcheck") @@ -20,10 +20,15 @@ public class HealthCheckController { * @return */ @PostMapping("http") - public Result httpHealthCheck(HttpServletRequest request) { - String serverName = request.getServerName(); - log.info("健康检查：serverName:{}", serverName); - return new Result().ok(serverName); + public Result httpHealthCheck() { + InetAddress serverIp = null; + try { + serverIp = Inet4Address.getLocalHost(); + } catch (UnknownHostException e) { + e.printStackTrace(); + } + log.info("健康检查：serverName:{}", serverIp); + return new Result().ok(serverIp); } } From a6de8b67d963383e938a6c15f5b74e47485ed52e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 5 Aug 2021 14:03:45 +0800 Subject: [PATCH 33/36] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=8A=A5=E4=BA=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=EF=BC=8C=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=9B=9E=E5=A4=8D=E6=8C=89=E9=92=AE=EF=BC=9A?= =?UTF-8?q?=E5=B7=B2=E5=8A=9E=E7=BB=93=E7=9A=84=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E8=A2=AB=E4=BA=BA=E8=AF=BB=E7=9A=84=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=B7=B2=E8=A2=AB=E8=AF=BB=E7=9A=84?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/MyReportedResultDTO.java | 10 ++++++++++ .../epmet/service/impl/ResiEventServiceImpl.java | 15 +++++++++++++++ .../src/main/resources/mapper/ResiEventDao.xml | 4 +++- 3 files changed, 28 insertions(+), 1 deletion(-) 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 index 32209d0249..d2df7d7a66 100644 --- 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 @@ -52,4 +52,14 @@ public class MyReportedResultDTO implements Serializable { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date showTime; + + /** + * true:显示回复；false：不显示回复按钮 + */ + private String replyButtonFlag; + + /** + * 事件是否被阅读过;1已读；针对报事人待处理列表 + */ + private Boolean readFlag; } 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 4e2452c6c2..83d20152fd 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 @@ -476,6 +476,21 @@ public class ResiEventServiceImpl extends BaseServiceImpl result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryMyReported(formDTO.getUserId(), formDTO.getStatusCondition())); + result.getList().forEach(resultDTO->{ + if(EventConstant.EVENT_STATUS_CLOSED_CASE.equals(resultDTO.getStatus())){ + // 已办结的不显示回复按钮 + resultDTO.setReplyButtonFlag("false"); + }else{ + // 处理中的事件 + if(resultDTO.getReadFlag()){ + // 被别人看过了就显示回复 + resultDTO.setReplyButtonFlag("true"); + }else{ + //别人没看过 + resultDTO.setReplyButtonFlag("false"); + } + } + }); return result.getList(); } 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 1af9c54926..617d3c795c 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 @@ -51,6 +51,7 @@ + @@ -70,7 +71,8 @@ re.`STATUS`, re.SHIFT_PROJECT, re.LATEST_OPERATED_TIME, - rea.ATTACHMENT_URL as img_url + rea.ATTACHMENT_URL as img_url, + re.READ_FLAG from resi_event re left join resi_event_attachment rea on(re.id=rea.RESI_EVENT_ID From 867b08871855a9a04e13b6af2743a535758bc540 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 5 Aug 2021 14:14:38 +0800 Subject: [PATCH 34/36] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E4=BA=BA=E5=91=98Id=20=E8=8E=B7=E5=8F=96=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=A0=91=20areaCode=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/enums/KongCunCustomerEnvEnum.java | 70 ----------- .../commons/tools/enums/OrgLevelEnum.java | 33 ++++++ .../commons/tools/utils/TreeAreaCodeNode.java | 38 ++++++ .../epmet/commons/tools/utils/TreeUtils.java | 28 +++++ .../epmet/dto/form/govOrg/OrgTreeFormDTO.java | 22 ++++ .../controller/screen/AgencyController.java | 15 +++ .../screen/ScreenCustomerAgencyDao.java | 37 +++--- .../evaluationindex/screen/AgencyService.java | 12 ++ .../screen/impl/AgencyServiceImpl.java | 109 ++++++++++++++---- .../mapper/screen/ScreenCustomerAgencyDao.xml | 15 +++ .../impl/IndexCalculateStreetServiceImpl.java | 1 - .../main/java/com/epmet/dto/OrgTreeNode.java | 11 +- 12 files changed, 284 insertions(+), 107 deletions(-) delete mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/KongCunCustomerEnvEnum.java create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeAreaCodeNode.java create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/govOrg/OrgTreeFormDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/KongCunCustomerEnvEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/KongCunCustomerEnvEnum.java deleted file mode 100644 index d56cd7615a..0000000000 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/KongCunCustomerEnvEnum.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.epmet.commons.tools.enums; - -import com.epmet.commons.tools.utils.SpringContextUtils; -import org.springframework.core.env.Environment; - -/** - * 系统环境变量枚举类 - * dev|test|prod - * - * @author jianjun liu - * @date 2020-07-03 11:14 - **/ -public enum KongCunCustomerEnvEnum { - /** - * 环境变量枚举 - */ - DEV("dev", "开发环境", "613cc61a6b8ce4c70d21bd413dac72cc"), - TEST("test", "体验环境", "b272625617e53620b2b3cbc65d1ecbbb"), - PROD("prod", "生产环境", "6f203e30de1a65aab7e69c058826cd80"), - UN_KNOWN("prod", "生产环境", "6f203e30de1a65aab7e69c058826cd80") - ; - - private String code; - private String name; - private String customerId; - - - - KongCunCustomerEnvEnum(String code, String name, String customerId) { - this.code = code; - this.name = name; - this.customerId = customerId; - } - - public static KongCunCustomerEnvEnum getEnum(String code) { - KongCunCustomerEnvEnum[] values = KongCunCustomerEnvEnum.values(); - for (KongCunCustomerEnvEnum value : values) { - if (value.getCode().equals(code)) { - return value; - } - } - return KongCunCustomerEnvEnum.UN_KNOWN; - } - - public static KongCunCustomerEnvEnum getCurrentEnv(){ - try { - Environment environment = SpringContextUtils.getBean(Environment.class); - String[] activeProfiles = environment.getActiveProfiles(); - if (activeProfiles.length > 0) { - return getEnum(activeProfiles[0]); - } - } catch (Exception e) { - e.printStackTrace(); - } - return KongCunCustomerEnvEnum.UN_KNOWN; - } - - - public String getCode() { - return code; - } - - public String getName() { - return name; - } - - public String getCustomerId(){ - return customerId; - } -} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/OrgLevelEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/OrgLevelEnum.java index 3462ad772b..97087745d0 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/OrgLevelEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/OrgLevelEnum.java @@ -1,7 +1,9 @@ package com.epmet.commons.tools.enums; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; +import org.apache.commons.lang3.StringUtils; /** * 组织级别枚举类 @@ -42,6 +44,37 @@ public enum OrgLevelEnum { throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode()); } + /** + * desc: 获取下一等级的组织级别 + * + * @param parentAgencyLevel + * @return java.lang.String + * @author LiuJanJun + * @date 2021/8/5 1:57 下午 + * todo 加上数字 根据数据返回 + */ + public static String getSubOrgLevel(String parentAgencyLevel) { + String level = StrConstant.EPMETY_STR; + if (StringUtils.isBlank(parentAgencyLevel)) { + return level; + } + OrgLevelEnum anEnum = OrgLevelEnum.getEnum(parentAgencyLevel); + switch (anEnum){ + case PROVINCE: + return OrgLevelEnum.CITY.getCode(); + case CITY: + return OrgLevelEnum.DISTRICT.getCode(); + case DISTRICT: + return OrgLevelEnum.STREET.getCode(); + case STREET: + return OrgLevelEnum.COMMUNITY.getCode(); + case COMMUNITY: + return OrgLevelEnum.GRID.getCode(); + default: + return level; + } + } + diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeAreaCodeNode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeAreaCodeNode.java new file mode 100644 index 0000000000..2f70659219 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeAreaCodeNode.java @@ -0,0 +1,38 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.commons.tools.utils; + +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * 树节点，所有需要实现树节点的，都需要继承该类 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Data +public class TreeAreaCodeNode extends TreeStringNode implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 主键 + */ + private String areaCode; + /** + * 上级ID + */ + private String parentAreaCode; + /** + * 子节点列表 + */ + private List children = new ArrayList<>(); +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeUtils.java index 4272d9cfc6..c321fea717 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeUtils.java @@ -131,4 +131,32 @@ public class TreeUtils { return result; } + /** + * 构建树节点 + */ + public static List buildTreeByAreaCode(List treeNodes) { + List result = new ArrayList<>(); + + //list转map + Map nodeMap = new LinkedHashMap<>(treeNodes.size()); + for(T treeNode : treeNodes){ + nodeMap.put(treeNode.getAreaCode(), treeNode); + } + + for(T node : nodeMap.values()) { + T parent = nodeMap.get(node.getParentAreaCode()); + if(parent != null && !(node.getAreaCode().equals(parent.getAreaCode()))){ + if (parent.getChildren() == null){ + parent.setChildren(new ArrayList()); + } + parent.getChildren().add(node); + continue; + } + + result.add(node); + } + + return result; + } + } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/govOrg/OrgTreeFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/govOrg/OrgTreeFormDTO.java new file mode 100644 index 0000000000..0eae55ef84 --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/govOrg/OrgTreeFormDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.form.govOrg; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 各机关注册用户数入参DTO + * + * @author yinzuomei@elink-cn.com + * @date 2020/6/22 12:47 + */ +@Data +public class OrgTreeFormDTO implements Serializable { + + + private static final long serialVersionUID = 6649155066499141632L; + + private String mobile; + + private String customerId; +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java index 6c71a15009..5adfa369d4 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java @@ -5,9 +5,11 @@ 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.datareport.service.evaluationindex.screen.AgencyService; +import com.epmet.dto.OrgTreeNode; import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AgencyDetailMulticFormDTO; import com.epmet.dto.form.AreaCodeDictFormDTO; +import com.epmet.dto.form.govOrg.OrgTreeFormDTO; import com.epmet.dto.result.AgencyDetailMulticResultDTO; import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.commonservice.AddAreaCodeDictResultDTO; @@ -129,4 +131,17 @@ public class AgencyController { ValidatorUtils.validateEntity(formDTO, AgencyDetailMulticFormDTO.AddUserInternalGroup.class); return new Result().ok(agencyService.queryAgencyDetailMultiC(formDTO)); } + + /** + * desc: 获取组织树 含所有直线上级 但不含部门和网格 目前 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author LiuJanJun + * @date 2021/8/3 5:17 下午 + */ + @PostMapping("getStaffAgencyTree") + public Result getStaffAgencyTree(@RequestBody OrgTreeFormDTO formDTO) { + return new Result().ok(agencyService.getStaffAgencyTree(formDTO)); + } } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java index 04c509de8b..051a6ec3e6 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java @@ -114,7 +114,7 @@ public interface ScreenCustomerAgencyDao { CompartmentResultDTO getAgencyInfoByAegncyId(@Param("agencyId") String agencyId); /** - * @Description 查询组织的下级组织ID + * @Description 查询组织的下级组织ID * @Param agencyId * @author zxc * @date 2020/10/28 10:33 上午 @@ -134,7 +134,7 @@ public interface ScreenCustomerAgencyDao { * @description 根据areaCode查询组织机构 * @Date 2021/2/4 21:51 **/ - List queryStaffAgencyTree(@Param("areaCode")String areaCode); + List queryStaffAgencyTree(@Param("areaCode") String areaCode); /** * @param areaCode @@ -143,7 +143,7 @@ public interface ScreenCustomerAgencyDao { * @description 查找组织下的部门 * @Date 2021/2/4 21:51 **/ - List selectDeptList(@Param("areaCode") String areaCode,@Param("agencyId") String agencyId); + List selectDeptList(@Param("areaCode") String areaCode, @Param("agencyId") String agencyId); /** * @param areaCode @@ -152,27 +152,27 @@ public interface ScreenCustomerAgencyDao { * @description 查找组织下的网格 * @Date 2021/2/4 21:52 **/ - List selectGridList(@Param("areaCode") String areaCode,@Param("agencyId") String agencyId); + List selectGridList(@Param("areaCode") String areaCode, @Param("agencyId") String agencyId); /** - * @return java.util.List * @param areaCode * @param agencyId + * @return java.util.List * @author yinzuomei * @description 下一级组织+直属网格 * @Date 2021/5/10 14:02 **/ - List getNextAgencyIds(@Param("areaCode")String areaCode,@Param("agencyId")String agencyId); + List getNextAgencyIds(@Param("areaCode") String areaCode, @Param("agencyId") String agencyId); - List selectSubAgencyIds(@Param("areaCode")String areaCode, @Param("agencyId")String agencyId); + List selectSubAgencyIds(@Param("areaCode") String areaCode, @Param("agencyId") String agencyId); /** - * @Description 根据agencyId查询网格 + * @Description 根据agencyId查询网格 * @Param agencyId * @author zxc * @date 2021/6/8 1:27 下午 */ - List selectGrid(@Param("agencyId")String agencyId,@Param("areaCode")String areaCode); + List selectGrid(@Param("agencyId") String agencyId, @Param("areaCode") String areaCode); /** * 查询当前组织的下一级组织，可根据areaCode查询，也可根据pid查询 @@ -190,13 +190,13 @@ public interface ScreenCustomerAgencyDao { * @param parentAgencyId * @return java.util.List */ - List selectGridDTOList(@Param("areaCode") String areaCode, @Param("parentAgencyId") String parentAgencyId,@Param("allCustomerIds") List allCustomerIds); + List selectGridDTOList(@Param("areaCode") String areaCode, @Param("parentAgencyId") String parentAgencyId, @Param("allCustomerIds") List allCustomerIds); - List selectPAgencyById(@Param("listStr")List pidList); + List selectPAgencyById(@Param("listStr") List pidList); /** - * @return com.epmet.dto.result.ScreenCustomerAgencyDTO * @param customerId + * @return com.epmet.dto.result.ScreenCustomerAgencyDTO * @author yinzuomei * @description 根据客户id，返回当前客户下的跟组织信息 * @Date 2021/6/24 17:43 @@ -204,4 +204,15 @@ public interface ScreenCustomerAgencyDao { ScreenCustomerAgencyDTO selectCustomerRootAgency(String customerId); ScreenCustomerAgencyDTO selectByAreaCode(String areaCode); -} \ No newline at end of file + + /** + * desc: 根据pids 或者 areaCode 获取所有下级组织 + * + * @param pids + * @param areaCode + * @return java.util.List + * @author LiuJanJun + * @date 2021/8/5 11:01 上午 + */ + List selectAllSubAgencyList(@Param("pids") String pids, @Param("areaCode") String areaCode); +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java index aa142bed95..c95977c5bd 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java @@ -1,10 +1,12 @@ package com.epmet.datareport.service.evaluationindex.screen; import com.epmet.dto.AgencyInfoDTO; +import com.epmet.dto.OrgTreeNode; import com.epmet.dto.ScreenCustomerGridDTO; import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AgencyDetailMulticFormDTO; import com.epmet.dto.form.AreaCodeDictFormDTO; +import com.epmet.dto.form.govOrg.OrgTreeFormDTO; import com.epmet.dto.result.AgencyDetailMulticResultDTO; import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.ScreenCustomerAgencyDTO; @@ -104,4 +106,14 @@ public interface AgencyService { * @return com.epmet.dto.result.AgencyDetailMulticResultDTO */ AgencyDetailMulticResultDTO queryAgencyDetailMultiC(AgencyDetailMulticFormDTO formDTO); + + /** + * desc: 获取工作人员组织树 含所有直线上级组织 不含网格及部门 + * + * @param mobile + * @return com.epmet.dto.result.plugins.AgencyNodeDTO + * @author LiuJanJun + * @date 2021/8/3 5:03 下午 + */ + OrgTreeNode getStaffAgencyTree(OrgTreeFormDTO mobile); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java index c6dc8deba2..42e97e5b29 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java @@ -2,23 +2,26 @@ package com.epmet.datareport.service.evaluationindex.screen.impl; import com.alibaba.fastjson.JSON; import com.epmet.commons.dynamic.datasource.annotation.DataSource; -import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.enums.OrgLevelEnum; +import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.AgencyTreeUtils; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.TreeUtils; import com.epmet.constant.DataSourceConstant; import com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerAgencyDao; import com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerGridDao; import com.epmet.datareport.redis.DataReportRedis; import com.epmet.datareport.service.evaluationindex.screen.AgencyService; -import com.epmet.dto.AgencyInfoDTO; -import com.epmet.dto.ScreenCustomerGridDTO; +import com.epmet.dto.*; import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AgencyDetailMulticFormDTO; import com.epmet.dto.form.AreaCodeDictFormDTO; +import com.epmet.dto.form.CustomerStaffFormDTO; +import com.epmet.dto.form.govOrg.OrgTreeFormDTO; import com.epmet.dto.result.AgencyDetailMulticResultDTO; import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.ParentListResultDTO; @@ -33,6 +36,7 @@ import com.epmet.evaluationindex.screen.dto.result.AgencyDistributionResultDTO; import com.epmet.evaluationindex.screen.dto.result.CompartmentResultDTO; import com.epmet.evaluationindex.screen.dto.result.TreeResultDTO; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.feign.OperCrmOpenFeignClient; import lombok.extern.slf4j.Slf4j; @@ -70,6 +74,8 @@ public class AgencyServiceImpl implements AgencyService { private OperCrmOpenFeignClient operCrmOpenFeignClient; @Autowired private DataReportRedis dataReportRedis; + @Autowired + private EpmetUserOpenFeignClient userOpenFeignClient; /** * @Description 1、组织机构树 @@ -438,7 +444,7 @@ public class AgencyServiceImpl implements AgencyService { log.info("多客户版本parentList、level要重新赋值;agencysResultDTO.getParentAreaCode()="+agencysResultDTO.getParentAreaCode()); ScreenCustomerAgencyDTO parentAgency=screenCustomerAgencyDao.selectByAreaCode(agencysResultDTO.getParentAreaCode()); if (null != parentAgency) { - agencysResultDTO.setLevel(getAgencyLevelMultiC(parentAgency)); + agencysResultDTO.setLevel(OrgLevelEnum.getSubOrgLevel(parentAgency.getLevel())); List temp = getParentListMultic(parentList, parentAgency, formDTO.getCustomerId(), agencysResultDTO.getRootAgencyId()); agencysResultDTO.setParentList(temp); } @@ -468,6 +474,85 @@ public class AgencyServiceImpl implements AgencyService { return agencysResultDTO; } + @Override + public OrgTreeNode getStaffAgencyTree(OrgTreeFormDTO formDTO) { + //todo 获取客户的所有组织 然后遍历剔除 再构建出一颗树 咋样 + //获取工作人员信息 + CustomerStaffFormDTO staffParam = new CustomerStaffFormDTO(); + staffParam.setMobile(formDTO.getMobile()); + staffParam.setCustomerId(formDTO.getCustomerId()); + Result staffInfoResult = userOpenFeignClient.getCustomerStaffInfo(staffParam); + if (!staffInfoResult.success()){ + throw new RenException(staffInfoResult.getCode(),staffInfoResult.getInternalMsg()); + } + //获取工作人员组织信息 + Result agencyByStaff = govOrgOpenFeignClient.getAgencyByStaff(staffInfoResult.getData().getUserId()); + if (!agencyByStaff.success() || agencyByStaff.getData()== null || StringUtils.isBlank(agencyByStaff.getData().getId()) ){ + throw new RenException(staffInfoResult.getCode(),staffInfoResult.getMsg()); + } + CustomerAgencyDTO staffAgencyDTO = agencyByStaff.getData(); + + + //4、如果当前客户不存在子客户则areaCode置为空 + Result> crmRes=operCrmOpenFeignClient.getAllSubCustomerIds(formDTO.getCustomerId()); + if (!crmRes.success()){ + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + } + List nodes = new ArrayList<>(); + //单客户 + if (CollectionUtils.isEmpty(crmRes.getData())){ + //todo 暂不处理 有时间再说 + }else { + ScreenCustomerAgencyDTO parentAgencyDTO = null; + String subAgencyAreaCode = staffAgencyDTO.getParentAreaCode(); + List nodeList = new ArrayList<>(); + + /*ScreenCustomerAgencyDTO currentAgency = new ScreenCustomerAgencyDTO(); + currentAgency.setCustomerId(staffAgencyDTO.getCustomerId()); + currentAgency.setAgencyId(staffAgencyDTO.getId()); + currentAgency.setAgencyName(staffAgencyDTO.getOrganizationName()); + currentAgency.setLevel(staffAgencyDTO.getLevel()); + currentAgency.setAreaCode(staffAgencyDTO.getAreaCode()); + currentAgency.setParentAreaCode(staffAgencyDTO.getParentAreaCode()); + currentAgency.setPid(staffAgencyDTO.getPid()); + currentAgency.setPids(staffAgencyDTO.getPids()); + + convertOrgTreeNode(nodeList, currentAgency);*/ + //多客户 获取所有直线上级 + do { + parentAgencyDTO = screenCustomerAgencyDao.selectByAreaCode(subAgencyAreaCode); + if (parentAgencyDTO == null){ + break; + } + convertOrgTreeNode(nodeList, parentAgencyDTO); + if (parentAgencyDTO.getPid() == null || NumConstant.ZERO_STR.equals(parentAgencyDTO.getPid())){ + break; + } + subAgencyAreaCode = parentAgencyDTO.getAreaCode(); + } while (true); + //多客户 获取所有下级 + List agencyNodeDTOS = screenCustomerAgencyDao.selectAllSubAgencyList(null,staffAgencyDTO.getAreaCode()); + //孔村降级处理 + String KONG_CUN_AGENCY_ID = "1234085031077498881"; + agencyNodeDTOS.forEach(e->{ + if (e.getPids().contains(KONG_CUN_AGENCY_ID)){ + e.setLevel(OrgLevelEnum.getSubOrgLevel(e.getLevel())); + } + convertOrgTreeNode(nodeList, e); + }); + nodes = TreeUtils.buildTreeByAreaCode(nodeList); + } + //只有一个根节点的树 所以返回一个 + return nodes.get(0); + } + + private void convertOrgTreeNode(List nodeList, ScreenCustomerAgencyDTO currentAgency) { + OrgTreeNode orgTreeNode = ConvertUtils.sourceToTarget(currentAgency, OrgTreeNode.class); + orgTreeNode.setOrgId(currentAgency.getAgencyId()); + orgTreeNode.setOrgName(currentAgency.getAgencyName()); + nodeList.add(orgTreeNode); + } + private List getParentListMultic(List resList, ScreenCustomerAgencyDTO firstParent, String currentUserCustomerId, String rootAgencyId) { ParentListResultDTO resultDTO = new ParentListResultDTO(); resultDTO.setId(firstParent.getAgencyId()); @@ -491,20 +576,4 @@ public class AgencyServiceImpl implements AgencyService { } } } - - private String getAgencyLevelMultiC(ScreenCustomerAgencyDTO parentAgency) { - String level=StrConstant.EPMETY_STR; - if(null!=parentAgency){ - if(Constant.PROVINCE.equals(parentAgency.getLevel())){ - return Constant.CITY; - }else if(Constant.CITY.equals(parentAgency.getLevel())){ - return Constant.DISTRICT; - }else if(Constant.DISTRICT.equals(parentAgency.getLevel())){ - return Constant.STREET; - }else if(Constant.STREET.equals(parentAgency.getLevel())){ - return Constant.COMMUNITY; - } - } - return level; - } } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml index 0d940865f0..221f2d2d91 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml @@ -433,4 +433,19 @@ AND sca.AREA_CODE = #{areaCode} limit 1 + diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java index b5d77983b0..7401c62038 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java @@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSON; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; -import com.epmet.commons.tools.enums.KongCunCustomerEnvEnum; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/OrgTreeNode.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/OrgTreeNode.java index 064d2173ea..7cea43566d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/OrgTreeNode.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/OrgTreeNode.java @@ -1,13 +1,18 @@ package com.epmet.dto; +import com.epmet.commons.tools.utils.TreeAreaCodeNode; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data -public class OrgTreeNode { +public class OrgTreeNode extends TreeAreaCodeNode { + private String id; + private String pid; private String orgId; private String orgName; - private String orgType; - private List subOrgs; + private String level; + + private List children=new ArrayList<>(); } From b759be01560cd63fb0406ba0c8ffd6ce265b1776 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 5 Aug 2021 14:19:38 +0800 Subject: [PATCH 35/36] =?UTF-8?q?=E5=BA=94=E5=89=8D=E7=AB=AF=E8=A6=81?= =?UTF-8?q?=E6=B1=82=EF=BC=8C=E5=B0=86=E8=A2=AB=E6=8F=90=E5=88=B0=E7=9A=84?= =?UTF-8?q?=E4=BA=BA=E5=88=86=E6=88=90=E4=B8=A4=E4=B8=AA=E9=9B=86=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/EventDetailResultDTO.java | 5 +++++ .../java/com/epmet/service/impl/ResiEventServiceImpl.java | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) 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 index e5997ab62f..18295391c5 100644 --- 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 @@ -66,6 +66,11 @@ public class EventDetailResultDTO implements Serializable { */ private List eventPerson; + /** + * 被提到的组织 + */ + private List eventOrg; + /** * 报事人名字 */ 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 83d20152fd..b102b84c85 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 @@ -201,8 +201,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl data = orgResult.getData(); - data.addAll(dto.getEventPerson()); - dto.setEventPerson(data); + dto.setEventOrg(data); // 更改已读状态 报事人的红点：resi_event,艾特人的：resi_event_mention,所代表的组织的：resi_event_report_org if (tokenDto.getApp().equals(EventConstant.TYPE_RESI)){ baseDao.updateResiEvent(tokenDto.getUserId(),formDTO.getEventId()); From e5658bf9b12f847871d67c6611f9cf01d21e9a89 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 5 Aug 2021 14:19:59 +0800 Subject: [PATCH 36/36] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E5=8C=85=E4=BD=8D=E7=BD=AE=E7=A7=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/govOrg}/OrgTreeNode.java | 2 +- .../datareport/controller/screen/AgencyController.java | 2 +- .../service/evaluationindex/screen/AgencyService.java | 2 +- .../evaluationindex/screen/impl/AgencyServiceImpl.java | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) rename epmet-module/{gov-org/gov-org-client/src/main/java/com/epmet/dto => data-report/data-report-client/src/main/java/com/epmet/dto/result/govOrg}/OrgTreeNode.java (91%) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/OrgTreeNode.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/govOrg/OrgTreeNode.java similarity index 91% rename from epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/OrgTreeNode.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/govOrg/OrgTreeNode.java index 7cea43566d..4989cc8bd1 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/OrgTreeNode.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/govOrg/OrgTreeNode.java @@ -1,4 +1,4 @@ -package com.epmet.dto; +package com.epmet.dto.result.govOrg; import com.epmet.commons.tools.utils.TreeAreaCodeNode; import lombok.Data; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java index 5adfa369d4..f393b43c59 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java @@ -5,7 +5,6 @@ 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.datareport.service.evaluationindex.screen.AgencyService; -import com.epmet.dto.OrgTreeNode; import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AgencyDetailMulticFormDTO; import com.epmet.dto.form.AreaCodeDictFormDTO; @@ -13,6 +12,7 @@ import com.epmet.dto.form.govOrg.OrgTreeFormDTO; import com.epmet.dto.result.AgencyDetailMulticResultDTO; import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.commonservice.AddAreaCodeDictResultDTO; +import com.epmet.dto.result.govOrg.OrgTreeNode; import com.epmet.dto.result.plugins.AgencyNodeDTO; import com.epmet.evaluationindex.screen.dto.form.CompartmentByBizTypeFormDTO; import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java index c95977c5bd..284241e296 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java @@ -1,7 +1,6 @@ package com.epmet.datareport.service.evaluationindex.screen; import com.epmet.dto.AgencyInfoDTO; -import com.epmet.dto.OrgTreeNode; import com.epmet.dto.ScreenCustomerGridDTO; import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AgencyDetailMulticFormDTO; @@ -11,6 +10,7 @@ import com.epmet.dto.result.AgencyDetailMulticResultDTO; import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.ScreenCustomerAgencyDTO; import com.epmet.dto.result.commonservice.AddAreaCodeDictResultDTO; +import com.epmet.dto.result.govOrg.OrgTreeNode; import com.epmet.dto.result.plugins.AgencyNodeDTO; import com.epmet.evaluationindex.screen.dto.form.CompartmentByBizTypeFormDTO; import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java index 42e97e5b29..6f191c2fc5 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java @@ -16,7 +16,10 @@ import com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerAgencyDao; import com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerGridDao; import com.epmet.datareport.redis.DataReportRedis; import com.epmet.datareport.service.evaluationindex.screen.AgencyService; -import com.epmet.dto.*; +import com.epmet.dto.AgencyInfoDTO; +import com.epmet.dto.CustomerAgencyDTO; +import com.epmet.dto.CustomerStaffDTO; +import com.epmet.dto.ScreenCustomerGridDTO; import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AgencyDetailMulticFormDTO; import com.epmet.dto.form.AreaCodeDictFormDTO; @@ -27,6 +30,7 @@ import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.ParentListResultDTO; import com.epmet.dto.result.ScreenCustomerAgencyDTO; import com.epmet.dto.result.commonservice.AddAreaCodeDictResultDTO; +import com.epmet.dto.result.govOrg.OrgTreeNode; import com.epmet.dto.result.plugins.AgencyNodeDTO; import com.epmet.evaluationindex.screen.constant.ScreenConstant; import com.epmet.evaluationindex.screen.dto.form.CompartmentByBizTypeFormDTO;