From 501379ad082a34302734eb3cb708c6e157c0abfd Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 10 Jun 2022 09:43:49 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=AD=E9=9F=B3=E9=99=84=E4=BB=B6=E8=BF=94?= =?UTF-8?q?=E5=8F=82=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/IcEventListResultDTO.java | 2 +- .../com/epmet/service/impl/IcEventServiceImpl.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java index 3daaf0de18..408d0c1ea6 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java @@ -44,7 +44,7 @@ public class IcEventListResultDTO implements Serializable { /** * 音频[url集合] */ - private List voiceList; + private List voiceList; /** * 上报渠道 */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 7a43bf8e82..438cbc54ae 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -135,12 +135,12 @@ public class IcEventServiceImpl extends BaseServiceImpl imageList = new ArrayList<>(); - List voiceList = new ArrayList<>(); + List voiceList = new ArrayList<>(); for(IcEventListResultDTO.Attachment file: dto.getAttachmentList()){ if ("image".equals(file.getType())) { imageList.add(file.getUrl()); } else if ("voice".equals(file.getType())) { - voiceList.add(file.getUrl()); + voiceList.add(file); } } dto.setImageList(imageList); @@ -993,7 +993,7 @@ public class IcEventServiceImpl extends BaseServiceImpl imageList = new ArrayList<>(); - List voiceList = new ArrayList<>(); + List voiceList = new ArrayList<>(); resultDTO.getAttachmentList().forEach(file -> { if ("image".equals(file.getType())) { imageList.add(file.getUrl()); } else if ("voice".equals(file.getType())) { - voiceList.add(file.getUrl()); + voiceList.add(file); } }); resultDTO.setImageList(imageList); From b99e6bdb7c7c9ae94ee42e54eee648ba9310752c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 10 Jun 2022 14:36:49 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BA=8B=E4=BB=B6@NoRepeatSubmit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcEventController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index ac46560dc7..62c940ec5b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -70,6 +70,7 @@ public class IcEventController { return new Result().ok(data); } + @NoRepeatSubmit @PostMapping("add") public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcEventAddEditFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, AddGroup.class, DefaultGroup.class); @@ -189,6 +190,7 @@ public class IcEventController { * @Author sun * @Description 事件管理-回复 **/ + @NoRepeatSubmit @PostMapping("reply") public Result reply(@LoginUser TokenDto tokenDto, @RequestBody IcEventReplyFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); @@ -202,6 +204,7 @@ public class IcEventController { * @Author sun * @Description 事件管理-立项 **/ + @NoRepeatSubmit @PostMapping("icEventToProject") public Result icEventToProject(@LoginUser TokenDto tokenDto, @RequestBody IcEventToProjectFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); @@ -320,6 +323,7 @@ public class IcEventController { * @author zxc * @date 2022/5/19 13:38 */ + @NoRepeatSubmit @PostMapping("add-event-resi") public Result addEventFromResi(@LoginUser TokenDto tokenDto,@RequestBody AddEventFromResiFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, AddEventFromResiFormDTO.AddEventFromResiForm.class); @@ -394,6 +398,7 @@ public class IcEventController { * @param formDTO * @return */ + @NoRepeatSubmit @PostMapping("resi-reply") public Result resiReply(@LoginUser TokenDto tokenDto, @RequestBody ResiReplyIcEventFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); @@ -407,6 +412,7 @@ public class IcEventController { * @Author sun * @Description 数字平台-事件导出 **/ + @NoRepeatSubmit @PostMapping("export") public void export(@LoginUser TokenDto tokenDto, @RequestBody IcEventListFormDTO formDTO, HttpServletResponse response) throws IOException { formDTO.setCustomerId(tokenDto.getCustomerId()); From 10640cad29c2c48a7f7ea013696a484988b8567e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 13 Jun 2022 10:54:04 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=92=8C=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E6=9D=83?= =?UTF-8?q?=E9=99=90=E8=AE=BE=E7=BD=AE=20=E5=AF=B9=E5=BA=94=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E6=98=AF=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/enums/RequirePermissionEnum.java | 8 +++++- .../epmet/controller/IcEventController.java | 25 +++++++++++++++++++ 2 files changed, 32 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 13b7d37057..17cb28a3f3 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 @@ -194,7 +194,13 @@ public enum RequirePermissionEnum { /** * 基层治理-群众直报 功能入口 */ - RESI_EVENT_MANAGE("resi_event_manage","基层治理:群众直报","基层治理-群众直报"); + RESI_EVENT_MANAGE("resi_event_manage","基层治理:群众直报","基层治理-群众直报"), + + /** + * 事件管理-工作端小程序列表、详情接口权限 + */ + IC_EVENT_LIST("ic_event_list","基层治理:事件管理","基层治理-事件管理列表"), + IC_EVENT_DETAIL("ic_event_detail","基层治理:事件管理","基层治理-事件管理详情"); private String key; private String name; diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index 62c940ec5b..12416e4276 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -5,9 +5,11 @@ import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.RequirePermission; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.form.PageFormDTO; +import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; @@ -63,6 +65,17 @@ public class IcEventController { formDTO.setStaffId(tokenDto.getUserId()); return new Result>().ok(icEventService.list(formDTO)); } + /** + * @Author sun + * @Description 工作端小程序-事件管理-列表 + **/ + @RequestMapping("gov-list") + @RequirePermission(requirePermission = RequirePermissionEnum.IC_EVENT_LIST) + public Result> govList(@LoginUser TokenDto tokenDto, @RequestBody IcEventListFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result>().ok(icEventService.list(formDTO)); + } @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) public Result get(@PathVariable("id") String id){ @@ -268,6 +281,18 @@ public class IcEventController { ValidatorUtils.validateEntity(formDTO, IcEventListFormDTO.Detail.class); return new Result().ok(icEventService.detail(formDTO)); } + /** + * @Author sun + * @Description 工作端小程序-事件管理-详情 + **/ + @PostMapping("gov-detail") + @RequirePermission(requirePermission = RequirePermissionEnum.IC_EVENT_DETAIL) + public Result govDetail(@LoginUser TokenDto tokenDto, @RequestBody IcEventListFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO, IcEventListFormDTO.Detail.class); + return new Result().ok(icEventService.detail(formDTO)); + } /** * 事件分类分析- 饼图2,直属下级 事件数量 From 16e8fca1f9c5d75852d03ed5802d2c383ba54c46 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 13 Jun 2022 11:08:28 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=92=8C=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E6=9D=83?= =?UTF-8?q?=E9=99=90=E8=AE=BE=E7=BD=AE=20=E5=AF=B9=E5=BA=94=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E6=98=AF=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/enums/RequirePermissionEnum.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 17cb28a3f3..d03143dd81 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 @@ -199,8 +199,8 @@ public enum RequirePermissionEnum { /** * 事件管理-工作端小程序列表、详情接口权限 */ - IC_EVENT_LIST("ic_event_list","基层治理:事件管理","基层治理-事件管理列表"), - IC_EVENT_DETAIL("ic_event_detail","基层治理:事件管理","基层治理-事件管理详情"); + IC_EVENT_LIST("ic_event_list","基层治理:事件管理:列表","基层治理-事件管理-列表"), + IC_EVENT_DETAIL("ic_event_detail","基层治理:事件管理:详情","基层治理-事件管理-详情"); private String key; private String name; From 3783546f3a825f403cdda7879b198c54277fa7ff Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 13 Jun 2022 14:35:43 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=9C=80=E6=B1=82=E3=80=81=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=93=E6=A1=88=E6=97=B6=E6=9D=A5=E6=BA=90=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E7=AB=AF=E7=9A=84=E4=BA=8B=E4=BB=B6=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E4=B8=BA=E5=B1=85=E6=B0=91=E7=AB=AF=E6=8E=A8=E9=80=81=E7=AB=99?= =?UTF-8?q?=E5=86=85=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcEventServiceImpl.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 438cbc54ae..f1f10b52c5 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1212,6 +1212,27 @@ public class IcEventServiceImpl extends BaseServiceImpl msgList = new ArrayList<>(); + UserMessageFormDTO messageFormDTO = new UserMessageFormDTO(); + messageFormDTO.setCustomerId(formDTO.getCustomerId()); + messageFormDTO.setApp(ProjectConstant.RESI); + messageFormDTO.setGridId(entity.getGridId()); + messageFormDTO.setUserId(entity.getCreatedBy()); + messageFormDTO.setTitle(UserMessageConstant.EVENT_TITILE); + messageFormDTO.setMessageContent(String.format("您上报的事件已完成,请查看。")); + messageFormDTO.setReadFlag(Constant.UNREAD); + messageFormDTO.setMessageType(UserMessageTypeConstant.IC_EVENT); + messageFormDTO.setTargetId(entity.getId()); + msgList.add(messageFormDTO); + Result sendMessageRes = messageOpenFeignClient.saveUserMessageList(msgList); + if (!sendMessageRes.success()) { + log.warn(String.format("事件回复,给居民端用户发送站内信异常,事件Id->%s", entity.getId())); + } + } + } /** From 5d1e05579c22c05da877af7910ffe5154cf712b4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 13 Jun 2022 14:37:59 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=BB=99=E5=B7=A5=E4=BD=9C=E7=AB=AF=E7=A4=BE?= =?UTF-8?q?=E5=8C=BA=E7=9A=84=E4=BA=BA=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcEventServiceImpl.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 438cbc54ae..86a3a7a1b7 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1458,6 +1458,35 @@ public class IcEventServiceImpl extends BaseServiceImpl> agencyStaffsResult = govOrgOpenFeignClient.getAgencyStaffs(formDTO); + if (!agencyStaffsResult.success()){ + throw new EpmetException("查询组织下工作人员失败..."); + } + if (!CollectionUtils.isEmpty(agencyStaffsResult.getData())){ + List msgList = new ArrayList<>(); + agencyStaffsResult.getData().forEach(u -> { + UserMessageFormDTO msg = new UserMessageFormDTO(); + msg.setUserId(u); + msg.setCustomerId(customerId); + msg.setTargetId(icEventId); + msg.setGridId("*"); + msg.setApp(AppClientConstant.APP_GOV); + msg.setMessageType(UserMessageTypeConstant.IC_EVENT); + msg.setReadFlag(ReadFlagConstant.UN_READ); + msg.setTitle("您有一条事件消息"); + msg.setMessageContent(showName+"对事件进行了新的回复,请查看。"); + msgList.add(msg); + }); + messageOpenFeignClient.saveUserMessageList(msgList); + } } /**