From f7655a77390968cb8dc2a87a25b1898cb847cae2 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 14 May 2020 19:35:35 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E3=80=90=E5=A4=9A=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E3=80=91-=E3=80=90=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E3=80=81=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=8F=AF=E5=81=9A=E6=93=8D=E4=BD=9C=E3=80=81?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8F=AF=E5=90=B9=E5=93=A8=E9=83=A8=E9=97=A8?= =?UTF-8?q?-=E9=83=A8=E9=97=A8ID=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/05/14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiWorkItemController.java | 9 +++--- .../esua/epdc/feign/AdminFeignClient.java | 2 +- .../esua/epdc/feign/WorkIssueFeignClient.java | 1 - .../esua/epdc/feign/WorkItemFeignClient.java | 7 ++-- .../fallback/WorkItemFeignClientFallback.java | 9 +++--- .../esua/epdc/service/WorkItemService.java | 5 +-- .../service/impl/WorkItemServiceImpl.java | 9 +++--- .../elink/esua/epdc/dto/EventDeptFormDTO.java | 18 +++++++++++ .../events/form/EpdcEventsReviewFormDTO.java | 12 +++++++ .../service/impl/EpdcEventsServiceImpl.java | 10 +++--- .../item/controller/WorkItemController.java | 9 +++--- .../esua/epdc/modules/item/dao/ItemDao.java | 9 ++++++ .../modules/item/service/ItemService.java | 7 ++-- .../item/service/impl/ItemServiceImpl.java | 32 +++++++++++-------- .../main/resources/mapper/item/ItemDao.xml | 3 ++ 15 files changed, 96 insertions(+), 46 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/EventDeptFormDTO.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java index 52d4c712a..f83239d5b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.EventDeptFormDTO; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; @@ -75,8 +76,8 @@ public class ApiWorkItemController { * @Date: 2019/11/19 16:34 */ @GetMapping("whistlingDept") - public Result> whistlingDept() { - return workItemService.whistlingDept(); + public Result> whistlingDept(EventDeptFormDTO formDto) { + return workItemService.whistlingDept(formDto); } @PostMapping("handleSubmit") @@ -127,7 +128,7 @@ public class ApiWorkItemController { * @Date 2020/1/13 16:48 **/ @GetMapping("handleCategory") - public Result> queryHandleCategories() { - return workItemService.queryHandleCategories(); + public Result> queryHandleCategories(EventDeptFormDTO formDto) { + return workItemService.queryHandleCategories(formDto); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index 2e52a542b..4a7f0a0b6 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -23,7 +23,7 @@ import java.util.List; * @email yujintao@elink-cn.com * @date 2019/9/7 9:27 */ -@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class,url = "http://127.0.0.1:9092") public interface AdminFeignClient { /** diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java index a543fdc49..b7c8d1cf4 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java @@ -8,7 +8,6 @@ import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO; import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO; import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; -import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.form.*; import com.elink.esua.epdc.dto.issue.result.*; import com.elink.esua.epdc.feign.fallback.WorkIssueFeignClientFallback; diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java index 3260a626f..283252fbb 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.config.FeignRequestInterceptor; +import com.elink.esua.epdc.dto.EventDeptFormDTO; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; @@ -69,7 +70,7 @@ public interface WorkItemFeignClient { * @Date: 2019/11/19 16:34 */ @GetMapping(value = "events/work/item/whistlingDept", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> whistlingDept(); + Result> whistlingDept(EventDeptFormDTO formDto); /** * 项目处理 @@ -118,6 +119,6 @@ public interface WorkItemFeignClient { * @Description 获取当前部门可做操作 * @Date 2020/1/13 16:53 **/ - @GetMapping(value = "events/work/item/handleCategory") - Result> queryHandleCategories(); + @GetMapping(value = "events/work/item/handleCategory", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> queryHandleCategories(EventDeptFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java index 69a5d5291..a4f5289d9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.EventDeptFormDTO; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; @@ -39,8 +40,8 @@ public class WorkItemFeignClientFallback implements WorkItemFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "evaluation", evaluationFormDTO); } @Override - public Result> whistlingDept() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "whistlingDept"); + public Result> whistlingDept(EventDeptFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "whistlingDept",formDto); } @Override public Result handleSubmit(ItemHandleSubmitFormDTO dto) { @@ -62,8 +63,8 @@ public class WorkItemFeignClientFallback implements WorkItemFeignClient { } @Override - public Result> queryHandleCategories() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryHandleCategories"); + public Result> queryHandleCategories(EventDeptFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryHandleCategories",formDto); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java index b30e56fa6..48b9a1f41 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.EventDeptFormDTO; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; @@ -52,7 +53,7 @@ public interface WorkItemService { * @Author: lipengfei * @Date: 2019/11/19 16:34 */ - Result> whistlingDept(); + Result> whistlingDept(EventDeptFormDTO formDto); /** * 项目处理 * @Return: com.elink.esua.epdc.commons.tools.utils.Result @@ -95,5 +96,5 @@ public interface WorkItemService { * @Description 获取当前部门可做操作 * @Date 2020/1/13 16:49 **/ - Result> queryHandleCategories(); + Result> queryHandleCategories(EventDeptFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java index 971be648d..463c600f9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.EventDeptFormDTO; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; @@ -50,8 +51,8 @@ public class WorkItemServiceImpl implements WorkItemService { return workItemFeignClient.evaluation(evaluationFormDTO); } @Override - public Result> whistlingDept() { - return workItemFeignClient.whistlingDept(); + public Result> whistlingDept(EventDeptFormDTO formDto) { + return workItemFeignClient.whistlingDept(formDto); } @Override @@ -76,8 +77,8 @@ public class WorkItemServiceImpl implements WorkItemService { } @Override - public Result> queryHandleCategories() { - return workItemFeignClient.queryHandleCategories(); + public Result> queryHandleCategories(EventDeptFormDTO formDto) { + return workItemFeignClient.queryHandleCategories(formDto); } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/EventDeptFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/EventDeptFormDTO.java new file mode 100644 index 000000000..0a3a74d9d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/EventDeptFormDTO.java @@ -0,0 +1,18 @@ +package com.elink.esua.epdc.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: esua-epdc + * @description: 部门信息 + * @author: wangtong + * @create: 2020-05-14 16:11 + **/ +@Data +public class EventDeptFormDTO implements Serializable { + + private Long deptId; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java index 104e371bd..0368eca5f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java @@ -38,4 +38,16 @@ public class EpdcEventsReviewFormDTO implements Serializable { private String advice; private List images; + + /** + *操作部门ID + */ + @NotNull(message = "操作部门ID不能为空") + private Long handleDeptId; + + /** + *操作部门名称 + */ + @NotNull(message = "操作部门名称不能为空") + private String handleDeptName; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 6b3317d36..1493954b7 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -27,7 +27,6 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.redis.RedisKeys; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; -import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.constant.EventIssueItemState; @@ -44,13 +43,13 @@ import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; import com.elink.esua.epdc.dto.events.form.GroupFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; -import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO; import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; +import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO; import com.elink.esua.epdc.dto.issue.IssueDTO; import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO; import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO; -import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO; +import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO; import com.elink.esua.epdc.modules.async.IssueOverseeResultsTask; import com.elink.esua.epdc.modules.async.NewsTask; import com.elink.esua.epdc.modules.category.entity.CategoryEntity; @@ -240,9 +239,8 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl> whistlingDept() { - return this.itemService.whistlingDept(); + public Result> whistlingDept(@RequestBody EventDeptFormDTO formDto) { + return this.itemService.whistlingDept(formDto); } /** * 项目处理提交--工作端 @@ -157,7 +158,7 @@ public class WorkItemController { * @Date 2020/1/13 16:55 **/ @GetMapping(value = "handleCategory") - public Result> queryHandleCategories() { - return itemService.queryHandleCategories(); + public Result> queryHandleCategories(@RequestBody EventDeptFormDTO formDto) { + return itemService.queryHandleCategories(formDto); } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index e98b97c67..255b1786b 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -345,4 +345,13 @@ public interface ItemDao extends BaseDao { * @since 2020/3/7 16:39 */ List selectListOfCategoryInfo(String oldCategoryName); + + /** + * @describe: 根据部门id查询部门键类型 + * @author wangtong + * @date 2020/5/14 13:49 + * @param [deptId] + * @return java.lang.String + */ + String selectDeptTypeKeyById(@Param("deptId") Long deptId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index f9e200d7c..64c89d7a2 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -20,9 +20,10 @@ package com.elink.esua.epdc.modules.item.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.EventDeptFormDTO; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; -import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.events.form.GroupFormDTO; +import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; import com.elink.esua.epdc.dto.item.form.*; @@ -192,7 +193,7 @@ public interface ItemService extends BaseService { * @Author: lipengfei * @Date: 2019/11/19 16:34 */ - Result> whistlingDept(); + Result> whistlingDept(EventDeptFormDTO formDto); /** * 项目分类统计 @@ -341,7 +342,7 @@ public interface ItemService extends BaseService { * @Description 获取当前部门可做操作 * @Date 2020/1/13 16:55 **/ - Result> queryHandleCategories(); + Result> queryHandleCategories(EventDeptFormDTO formDto); /*** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index eff99ef59..00b427aa4 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -35,14 +35,11 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.*; import com.elink.esua.epdc.constant.*; import com.elink.esua.epdc.constants.MenuCodeConstant; -import com.elink.esua.epdc.dto.CompleteDeptDTO; -import com.elink.esua.epdc.dto.DeptGridPlatformDTO; -import com.elink.esua.epdc.dto.MenuNoticeDTO; -import com.elink.esua.epdc.dto.SysDeptDTO; +import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; -import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.events.form.GroupFormDTO; +import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO; import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO; import com.elink.esua.epdc.dto.item.*; @@ -158,6 +155,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Autowired private OssFeignClient ossFeignClient; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -450,13 +448,16 @@ public class ItemServiceImpl extends BaseServiceImpl implem * @Date: 2019/11/19 16:34 */ @Override - public Result> whistlingDept() { - UserDetail user = SecurityUser.getUser(); + public Result> whistlingDept(EventDeptFormDTO formDto) { + String typeKey = baseDao.selectDeptTypeKeyById(formDto.getDeptId()); + if(StringUtils.isBlank(typeKey)){ + throw new RenException("未查到该部门的相关信息。"); + } List deptResultDTOS = new ArrayList<>(); // 网格-可做操作和可流转部门 - if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey())) { + if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(typeKey)) { // 可流转部门 - Result completeDept = adminFeignClient.getCompleteDept(SecurityUser.getDeptId()); + Result completeDept = adminFeignClient.getCompleteDept(formDto.getDeptId()); if (!completeDept.success()) { throw new RenException("获取流转协助部门失败"); } @@ -475,9 +476,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem circulationDeptStreetResultDTO.setTypeKey(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY); deptResultDTOS.add(circulationDeptStreetResultDTO); - } else if (OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(user.getTypeKey())) { + } else if (OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(typeKey)) { // 可流转部门 - Result> listResult = adminFeignClient.listOfItemCirculationDept(SecurityUser.getDeptId()); + Result> listResult = adminFeignClient.listOfItemCirculationDept(formDto.getDeptId()); if (!listResult.success()) { throw new RenException("获取流转协助部门失败"); } @@ -1360,11 +1361,14 @@ public class ItemServiceImpl extends BaseServiceImpl implem * @Date 2020/1/13 16:55 **/ @Override - public Result> queryHandleCategories() { + public Result> queryHandleCategories(EventDeptFormDTO formDto) { List itemHandleResultDTOList = new ArrayList<>(); - UserDetail userDetail = SecurityUser.getUser(); + String typeKey = baseDao.selectDeptTypeKeyById(formDto.getDeptId()); + if(StringUtils.isBlank(typeKey)){ + throw new RenException("未查到该部门的相关信息。"); + } // 获取可操作处理和可流转部门 - switch (userDetail.getTypeKey()) { + switch (typeKey) { case OrganizationTypeConstant.ORG_TYPE_GRID_PARTY: itemHandleResultDTOList = ItemHandleCategoryEnum.getHandleCategoriesForGird(false); break; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 6dcad3cfc..4a8e09b19 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -1054,4 +1054,7 @@ WHERE FIND_IN_SET( #{oldCategoryName}, REPLACE(REPLACE(CATEGORY_FULL_NAME,',','uniquecode'),'-',',') ) + From d5cd71ab49c5edbe6b3a96a08c19d449e83eba0c Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 14 May 2020 19:38:49 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E3=80=90=E8=B0=83=E6=95=B4=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E4=BB=A3=E7=A0=81=E3=80=91-=E3=80=90=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E4=BB=A3=E7=A0=81=E5=9B=9E=E6=BB=9A=E3=80=91-?= =?UTF-8?q?=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/05/14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/elink/esua/epdc/feign/AdminFeignClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index 4a7f0a0b6..2e52a542b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -23,7 +23,7 @@ import java.util.List; * @email yujintao@elink-cn.com * @date 2019/9/7 9:27 */ -@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class,url = "http://127.0.0.1:9092") +@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class) public interface AdminFeignClient { /** From dfd8e9c196bcb1dac532c082c655e769bd9a734c Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 15 May 2020 14:33:49 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E3=80=90=E5=A4=9A=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91-=E3=80=90=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86=E3=80=81=E9=A1=B9=E7=9B=AE=E5=A4=84=E7=90=86?= =?UTF-8?q?-=E9=83=A8=E9=97=A8id=E8=B0=83=E6=95=B4=E3=80=91-=EF=BC=88?= =?UTF-8?q?=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/05/15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/EventDeptFormDTO.java | 2 + .../form/IssueWaitHandleSubmitFormDTO.java | 13 ++++ .../item/form/ItemHandleSubmitFormDTO.java | 17 ++++++ .../issue/service/impl/IssueServiceImpl.java | 14 ++--- .../item/service/impl/ItemServiceImpl.java | 60 ++++++++++--------- 5 files changed, 70 insertions(+), 36 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/EventDeptFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/EventDeptFormDTO.java index 0a3a74d9d..a646eb4ae 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/EventDeptFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/EventDeptFormDTO.java @@ -13,6 +13,8 @@ import java.io.Serializable; @Data public class EventDeptFormDTO implements Serializable { + private static final long serialVersionUID = 1312338619441938926L; + private Long deptId; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java index 696c75b03..04a4cd80a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java @@ -36,4 +36,17 @@ public class IssueWaitHandleSubmitFormDTO implements Serializable { */ private List images; + + /** + *操作部门ID + */ + @NotNull(message = "操作部门ID不能为空") + private Long handleDeptId; + + /** + *操作部门名称 + */ + @NotNull(message = "操作部门名称不能为空") + private String handleDeptName; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java index e5fd3cc55..ff89aa99b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java @@ -62,4 +62,21 @@ public class ItemHandleSubmitFormDTO implements Serializable { * 满意度评价部门 */ private List evaluateDeptDTOS; + + /** + *操作部门ID + */ + @NotNull(message = "操作部门ID不能为空") + private Long handleDeptId; + + /** + *操作部门名称 + */ + @NotNull(message = "操作部门名称不能为空") + private String handleDeptName; + + /** + *部门键类型 + */ + private String typeKey; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index cd1a8fa6b..7b9316f81 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -25,7 +25,6 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; -import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.DateUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -187,9 +186,8 @@ public class IssueServiceImpl extends BaseServiceImpl imp handleEntity.setAdvice(dto.getAdvice()); handleEntity.setState(dto.getState()); handleEntity.setIssueId(dto.getId()); - UserDetail user = SecurityUser.getUser(); - handleEntity.setHandlerDeptId(user.getDeptId()); - handleEntity.setHandlerDept(user.getDeptName()); + handleEntity.setHandlerDeptId(dto.getHandleDeptId()); + handleEntity.setHandlerDept(dto.getHandleDeptName()); IssueEntity issueEntity = new IssueEntity(); issueEntity.setId(dto.getId()); @@ -235,8 +233,8 @@ public class IssueServiceImpl extends BaseServiceImpl imp itemHandleProcessEntity.setState(EventIssueItemState.ITEM_HANDLING); itemHandleProcessEntity.setHandleAdvice(dto.getAdvice()); itemHandleProcessEntity.setOutHandleAdvice(dto.getAdvice()); - itemHandleProcessEntity.setHandlerDeptId(user.getDeptId()); - itemHandleProcessEntity.setHandlerDept(user.getDeptName()); + itemHandleProcessEntity.setHandlerDeptId(dto.getHandleDeptId()); + itemHandleProcessEntity.setHandlerDept(dto.getHandleDeptName()); itemHandleProcessService.insert(itemHandleProcessEntity); /** @@ -250,8 +248,8 @@ public class IssueServiceImpl extends BaseServiceImpl imp // 插入项目部门关联表 ItemDeptEntity itemDeptEntity = new ItemDeptEntity(); - itemDeptEntity.setDeptId(SecurityUser.getDeptId()); - itemDeptEntity.setCreatedDeptId(SecurityUser.getDeptId()); + itemDeptEntity.setDeptId(dto.getHandleDeptId()); + itemDeptEntity.setCreatedDeptId(dto.getHandleDeptId()); itemDeptEntity.setItemId(itemEntity.getId()); itemDeptService.insert(itemDeptEntity); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 00b427aa4..5d17a5052 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -580,7 +580,15 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Transactional(rollbackFor = Exception.class) public Result modifyHandleResult(ItemHandleSubmitFormDTO dto) { try { - UserDetail user = SecurityUser.getUser(); + Result deptMessage = adminFeignClient.getSysDeptInfo(dto.getHandleDeptId()); + if( null == deptMessage.getData()){ + throw new RenException("未查到该部门相关信息"); + } + String typeKey = deptMessage.getData().getTypeKey(); + if(StringUtils.isBlank(typeKey)){ + throw new RenException("未查到该部门的键类型信息"); + } + dto.setTypeKey(typeKey); ItemEntity entity = baseDao.selectById(dto.getId()); // 组装发送消息内容 EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO(); @@ -593,12 +601,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem informationFormDTO.setRelBusinessContent("项目：" + entity.getItemContent()); ItemHandleProcessEntity handleProcessEntity = new ItemHandleProcessEntity(); - handleProcessEntity.setHandlerDeptId(user.getDeptId()); - handleProcessEntity.setHandlerDept(user.getDeptName()); + handleProcessEntity.setHandlerDeptId(dto.getHandleDeptId()); + handleProcessEntity.setHandlerDept(dto.getHandleDeptName()); handleProcessEntity.setItemId(dto.getId()); handleProcessEntity.setHandleAdvice(dto.getHandleAdvice()); handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice()); - handleProcessEntity.setHandlerDeptId(user.getDeptId()); if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) { // 项目流转校验 @@ -609,13 +616,13 @@ public class ItemServiceImpl extends BaseServiceImpl implem handleProcessEntity.setState(EventIssueItemState.ITEM_HANDLING); // 获取已流转部门信息 - List oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), SecurityUser.getDeptId()); + List oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), dto.getHandleDeptId()); // 删除已流转协助部门 - itemDeptService.modifyItemDepts(SecurityUser.getDeptId(), dto.getId()); + itemDeptService.modifyItemDepts(dto.getHandleDeptId(), dto.getId()); // 记录处理记录 itemHandleProcessService.insert(handleProcessEntity); // 新增流转协助部门 - itemDeptService.saveItemDepts(SecurityUser.getDeptId(), dto, handleProcessEntity.getId()); + itemDeptService.saveItemDepts(dto.getHandleDeptId(), dto, handleProcessEntity.getId()); List circulationDeptResultDTOS = dto.getDeptResultDTOS(); List newDeptIds = new ArrayList<>(); for (ItemCirculationDeptResultDTO circulationDto : @@ -664,7 +671,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_ITEM_PROCESSED); if (null != dto.getEvaluateDeptDTOS()) { - itemEvaluateDeptService.saveEvaluateDepts(dto.getEvaluateDeptDTOS(), dto.getId(), SecurityUser.getDeptId()); + itemEvaluateDeptService.saveEvaluateDepts(dto.getEvaluateDeptDTOS(), dto.getId(), dto.getHandleDeptId()); } } } @@ -683,20 +690,20 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemInfoDto.setBusinessType(dto.getHandleCategory()); itemInfoDto.setAssociatedBusinessId(dto.getId()); itemInfoDto.setAssociatedBusinessContent(entity.getItemContent()); - itemInfoDto.setHandleDeptId(user.getDeptId()); - itemInfoDto.setHandleDept(user.getDeptName()); + itemInfoDto.setHandleDeptId(dto.getHandleDeptId()); + itemInfoDto.setHandleDept(dto.getHandleDeptName()); itemInfoDto.setHandleAdvice(dto.getHandleAdvice()); itemInfoDto.setReadFlag(ItemInformationConstant.READ_FLAG_NO); // 回应处理 if (ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue() == dto.getHandleCategory()) { // 社区党工委和街道党工委处理 - if (OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(user.getTypeKey()) || OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(user.getTypeKey())) { + if (OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(typeKey) || OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(typeKey)) { //插入项目消息表（仅网格） // 通知部门Id（网格） itemInfoDto.setDeptId(entity.getGridId().toString()); itemInformationService.insert(itemInfoDto); // 街道部门和区直部门 - } else if (OrganizationTypeConstant.ORG_TYPE_STREET_DEPT.equals(user.getTypeKey()) || OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { + } else if (OrganizationTypeConstant.ORG_TYPE_STREET_DEPT.equals(typeKey) || OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(typeKey)) { //插入项目消息表（网格和街道） // 通知部门Id（网格） itemInfoDto.setDeptId(entity.getGridId().toString()); @@ -736,7 +743,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 关闭和结案处理 } else { // 查询已吹哨部门 - List oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), SecurityUser.getDeptId()); + List oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), dto.getHandleDeptId()); // 遍历被吹哨部门插入项目消息表 for (Long itemDeptId : oldDeptIds) { // 通知部门Id（被吹哨部门） @@ -752,12 +759,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem newsTask.insertUserInformation(informationFormDTO); // 发送菜单消息-待处理项目 - if (entity.getGridId().equals(user.getDeptId())) { + if (entity.getGridId().equals(dto.getHandleDeptId())) { // 网格长操作-发送菜单消息 this.sendItemHandleMenuNotice(entity.getGridId(), null); } else { // 吹哨部门操作-发送菜单消息 - this.sendWhistlingDeptItemHandleMenuNotice(Collections.singletonList(user.getDeptId()), null); + this.sendWhistlingDeptItemHandleMenuNotice(Collections.singletonList(dto.getHandleDeptId()), null); } //项目外部处理意见图片保存 if (dto.getOutHandleImages() != null && dto.getOutHandleImages().size() > 0) { @@ -823,9 +830,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem } // 如果当前流转协助是网格发起，判断其街道党工委是否已将该项目流转协助 - UserDetail user = SecurityUser.getUser(); - if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey())) { - Result completeDept = adminFeignClient.getCompleteDept(SecurityUser.getDeptId()); + if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(dto.getTypeKey())) { + Result completeDept = adminFeignClient.getCompleteDept(dto.getHandleDeptId()); if (!completeDept.success()) { return new Result().error("获取机构信息失败，请稍后重试"); } @@ -1139,7 +1145,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemGridPlatformEntity itemGridPlatformEntity = new ItemGridPlatformEntity(); itemGridPlatformEntity.setReferenceId(handleProcessEntity.getItemId()); itemGridPlatformEntity.setTaskid(gridDto.getTaskId()); - itemGridPlatformEntity.setReportPersonDeptId(user.getDeptId()); + itemGridPlatformEntity.setReportPersonDeptId(handleProcessEntity.getHandlerDeptId()); itemGridPlatformEntity.setStatus(ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue()); itemGridPlatformService.insert(itemGridPlatformEntity); @@ -1280,7 +1286,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem * @Date: 2020-01-09 */ private void workProjectHandle(ItemHandleSubmitFormDTO dto){ - UserDetail user = SecurityUser.getUser(); //获取当前登录人信息 List deptId = new ArrayList<>(); if(ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()){ List deptList = dto.getDeptResultDTOS(); @@ -1288,18 +1293,18 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemCirculationDeptResultDTO indexDto = (ItemCirculationDeptResultDTO)deptList.get(i); deptId.add(indexDto.getDeptId()); } - issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId,user.getTypeKey());//吹哨处理 a吹b 向b部门下的，所有人员发送短信 - if (user.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY)){ //如果是街道做吹哨处理, 做回应处理 + issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId,dto.getTypeKey());//吹哨处理 a吹b 向b部门下的，所有人员发送短信 + if (dto.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY)){ //如果是街道做吹哨处理, 做回应处理 this.superiorDeptSmsHandle(dto); } } else if(ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()){ - deptId = baseDao.queryDeptIdList(dto.getId(),user.getDeptId()); + deptId = baseDao.queryDeptIdList(dto.getId(),dto.getHandleDeptId()); if (deptId != null && deptId.size() > 0){ - issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId,user.getTypeKey());//关闭/结案 当前项目的所有部门ID，下的人员发送短信，且不等于当前部门ID + issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId,dto.getTypeKey());//关闭/结案 当前项目的所有部门ID，下的人员发送短信，且不等于当前部门ID } } else if(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue() == dto.getHandleCategory()){ - if (!user.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)){//回应 + if (!dto.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)){//回应 this.superiorDeptSmsHandle(dto); } }else if(ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()){ //上报网格化平台 @@ -1316,9 +1321,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem * @Date: 2020-01-14 */ private void superiorDeptSmsHandle(ItemHandleSubmitFormDTO dto){ - UserDetail user = SecurityUser.getUser(); //获取当前登录人信息 List deptId = new ArrayList<>(); - Long queryDePtId = user.getDeptId(); + Long queryDePtId = dto.getHandleDeptId(); while (true){ List createdDeptId = baseDao.queryParentDeptId(dto.getId(),queryDePtId); if (createdDeptId != null && createdDeptId.size() > 0){ @@ -1331,7 +1335,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem } } if (deptId != null && deptId.size() > 0) { - issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId,user.getTypeKey());//做回应处理，向部门下的所有人员发送短信 + issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId,dto.getTypeKey());//做回应处理，向部门下的所有人员发送短信 } } /** From 41dac3af04baf968a0695568a0a88a4158d2a77b Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 15 May 2020 15:28:07 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E3=80=90=E5=A4=9A=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91-=E3=80=90=E8=8E=B7=E5=BE=97?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=B1=BB=E5=9E=8B=E5=BC=80=E5=8F=91=E3=80=91?= =?UTF-8?q?-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/05/15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/SysDeptController.java | 12 ++++++++++++ .../esua/epdc/service/SysDeptService.java | 9 +++++++++ .../epdc/service/impl/SysDeptServiceImpl.java | 19 +++++++++++++------ .../controller/ApiWorkUserController.java | 13 +++++++++++++ .../esua/epdc/feign/AdminFeignClient.java | 10 ++++++++++ .../fallback/AdminFeignClientFallback.java | 5 +++++ .../esua/epdc/service/WorkUserService.java | 9 +++++++++ .../service/impl/WorkUserServiceImpl.java | 5 +++++ 8 files changed, 76 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java index 4c0113e05..1067833b2 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java @@ -294,4 +294,16 @@ public class SysDeptController { List list = sysDeptService.listAllDeptInfo(formDTO); return new Result>().ok(list); } + + /** + * @describe: 获得部门类型 + * @author wangtong + * @date 2020/5/15 14:44 + * @param [deptId] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getDeptTypeKey") + public Result getDeptTypeKey(String deptId) { + return sysDeptService.getDeptTypeKey(deptId); + } } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java index 12ed3179a..5c47dd9b2 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java @@ -271,4 +271,13 @@ public interface SysDeptService extends BaseService { * @Date: 2020-04-14 */ List listAllDeptInfo(UserSysDeptInfoFormDTO formDTO); + + /** + * @describe: 获得部门类型 + * @author wangtong + * @date 2020/5/15 14:46 + * @param [deptId] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getDeptTypeKey(String deptId); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 7543ca196..0c55fe1e6 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -9,17 +9,11 @@ package com.elink.esua.epdc.service.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.db.handler.HandleHelper; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.Constant; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.constant.NumConstant; -import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; -import com.elink.esua.epdc.commons.tools.constant.*; import com.elink.esua.epdc.commons.tools.constant.*; import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; @@ -1059,6 +1053,19 @@ public class SysDeptServiceImpl extends BaseServiceImpl().ok(dept.getTypeKey()); + } + + /** * * 组织机构名称修改发送MQ消息 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java index dc4cac939..4e3f93244 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java @@ -221,4 +221,17 @@ public class ApiWorkUserController { return workUserService.updateAvatar(avatar); } + + /** + * @describe: 获得部门类型 + * @author wangtong + * @date 2020/5/15 14:37 + * @param [avatar] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getDeptTypeKey") + public Result getDeptTypeKey(String deptId) { + return workUserService.getDeptTypeKey(deptId); + } + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index 2e52a542b..30b7f0bb2 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -119,4 +119,14 @@ public interface AdminFeignClient { */ @PostMapping(value="sys/user/modifyPwd", consumes = MediaType.APPLICATION_JSON_VALUE) Result modifyPwd(ModifyPwdDTO dto); + + /** + * @describe: 获得部门类型 + * @author wangtong + * @date 2020/5/15 14:41 + * @param [deptId] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping(value="sys/dept/getDeptTypeKey", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getDeptTypeKey(@RequestParam("deptId") String deptId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index 7ee987565..4f6bdabe5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -63,4 +63,9 @@ public class AdminFeignClientFallback implements AdminFeignClient { public Result modifyPwd(ModifyPwdDTO dto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "modifyPwd",dto); } + + @Override + public Result getDeptTypeKey(String deptId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTypeKey",deptId); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java index e30ff25e0..978a95514 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java @@ -157,4 +157,13 @@ public interface WorkUserService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result updateAvatar(String avatar); + + /** + * @describe: 获得部门类型 + * @author wangtong + * @date 2020/5/15 14:38 + * @param [deptId] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getDeptTypeKey(String deptId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java index 6ea6a68b6..209e1fa39 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java @@ -352,4 +352,9 @@ public class WorkUserServiceImpl implements WorkUserService { public Result updateAvatar(String avatar) { return adminFeignClient.updateAvatar(avatar); } + + @Override + public Result getDeptTypeKey(String deptId) { + return adminFeignClient.getDeptTypeKey(deptId); + } } From 5a0fbdda60d397fa9c1aa2c2ec7d2415d649a5e5 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 15 May 2020 16:09:23 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E3=80=90=E5=BE=85=E5=A4=84=E7=90=86?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E3=80=91?= =?UTF-8?q?=E3=80=90=E6=93=8D=E4=BD=9C=E4=BA=BA=E9=83=A8=E9=97=A8=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E3=80=91-=E7=8E=8B=E5=85=AC=E5=B3=B0-02020-05-15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../events/form/EpdcEventsReviewFormDTO.java | 2 +- .../form/IssueWaitHandleSubmitFormDTO.java | 14 ++--- .../item/form/HandleResultDTOSFormDTO.java | 28 +++++++++ .../item/form/ItemHandleSubmitFormDTO.java | 16 ++--- .../service/impl/EpdcEventsServiceImpl.java | 4 ++ .../issue/service/impl/IssueServiceImpl.java | 18 ++++-- .../item/controller/ItemController.java | 17 +++++- .../modules/item/service/ItemService.java | 10 ++++ .../item/service/impl/ItemServiceImpl.java | 59 +++++++++++++------ 9 files changed, 128 insertions(+), 40 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/HandleResultDTOSFormDTO.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java index 0368eca5f..b08800c87 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java @@ -48,6 +48,6 @@ public class EpdcEventsReviewFormDTO implements Serializable { /** *操作部门名称 */ - @NotNull(message = "操作部门名称不能为空") + @NotBlank(message = "操作部门名称不能为空") private String handleDeptName; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java index 04a4cd80a..4e826b84a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.dto.issue.form; import lombok.Data; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.io.Serializable; @@ -36,17 +37,16 @@ public class IssueWaitHandleSubmitFormDTO implements Serializable { */ private List images; - /** - *操作部门ID + * 操作人部门ID */ - @NotNull(message = "操作部门ID不能为空") - private Long handleDeptId; + @NotNull(message = "操作人部门ID不能为空") + private Long handlerDeptId; /** - *操作部门名称 + * 操作人部门 */ - @NotNull(message = "操作部门名称不能为空") - private String handleDeptName; + @NotBlank(message = "操作人部门不能为空") + private String handlerDept; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/HandleResultDTOSFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/HandleResultDTOSFormDTO.java new file mode 100644 index 000000000..96f08ba09 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/HandleResultDTOSFormDTO.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 获取处理方式FormDTO + * @Author wanggongfeng + * @Date 2020/05/15 15:04 + */ +@Data +public class HandleResultDTOSFormDTO implements Serializable { + private static final long serialVersionUID = -7871958578795227805L; + + /** + * 项目ID + */ + @NotBlank(message = "项目ID不能为空") + private String itemId; + /** + * 用户ID + */ + @NotNull(message = "操作人部门ID不能为空") + private Long deptId; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java index ff89aa99b..c257f2745 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java @@ -64,19 +64,19 @@ public class ItemHandleSubmitFormDTO implements Serializable { private List evaluateDeptDTOS; /** - *操作部门ID + *部门键类型 */ - @NotNull(message = "操作部门ID不能为空") - private Long handleDeptId; + private String typeKey; /** - *操作部门名称 + *操作部门ID */ - @NotNull(message = "操作部门名称不能为空") - private String handleDeptName; + @NotNull(message = "操作人部门ID不能为空") + private Long handlerDeptId; /** - *部门键类型 + * 操作人部门 */ - private String typeKey; + @NotBlank(message = "操作人部门不能为空") + private String handlerDept; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 1493954b7..7aaaa6b1e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.redis.RedisKeys; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.constant.EventIssueItemState; @@ -241,6 +242,9 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl imp handleEntity.setAdvice(dto.getAdvice()); handleEntity.setState(dto.getState()); handleEntity.setIssueId(dto.getId()); - handleEntity.setHandlerDeptId(dto.getHandleDeptId()); - handleEntity.setHandlerDept(dto.getHandleDeptName()); + UserDetail user = SecurityUser.getUser(); + /*handleEntity.setHandlerDeptId(user.getDeptId()); + handleEntity.setHandlerDept(user.getDeptName());*/ + handleEntity.setHandlerDeptId(dto.getHandlerDeptId()); + handleEntity.setHandlerDept(dto.getHandlerDept()); IssueEntity issueEntity = new IssueEntity(); issueEntity.setId(dto.getId()); @@ -233,8 +237,10 @@ public class IssueServiceImpl extends BaseServiceImpl imp itemHandleProcessEntity.setState(EventIssueItemState.ITEM_HANDLING); itemHandleProcessEntity.setHandleAdvice(dto.getAdvice()); itemHandleProcessEntity.setOutHandleAdvice(dto.getAdvice()); - itemHandleProcessEntity.setHandlerDeptId(dto.getHandleDeptId()); - itemHandleProcessEntity.setHandlerDept(dto.getHandleDeptName()); + /*itemHandleProcessEntity.setHandlerDeptId(user.getDeptId()); + itemHandleProcessEntity.setHandlerDept(user.getDeptName());*/ + itemHandleProcessEntity.setHandlerDeptId(dto.getHandlerDeptId()); + itemHandleProcessEntity.setHandlerDept(dto.getHandlerDept()); itemHandleProcessService.insert(itemHandleProcessEntity); /** @@ -248,8 +254,8 @@ public class IssueServiceImpl extends BaseServiceImpl imp // 插入项目部门关联表 ItemDeptEntity itemDeptEntity = new ItemDeptEntity(); - itemDeptEntity.setDeptId(dto.getHandleDeptId()); - itemDeptEntity.setCreatedDeptId(dto.getHandleDeptId()); + itemDeptEntity.setDeptId(dto.getHandlerDeptId()); + itemDeptEntity.setCreatedDeptId(dto.getHandlerDeptId()); itemDeptEntity.setItemId(itemEntity.getId()); itemDeptService.insert(itemDeptEntity); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 914006d57..e08f95f47 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -23,13 +23,14 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; import com.elink.esua.epdc.dto.events.form.EventDeleteCommentsFormDTO; import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; +import com.elink.esua.epdc.dto.item.form.HandleResultDTOSFormDTO; import com.elink.esua.epdc.dto.item.form.ItemHandleSubmitFormDTO; import com.elink.esua.epdc.dto.item.result.ItemContentForPCEndResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO; @@ -86,6 +87,20 @@ public class ItemController { return new Result().ok(data); } + /** + * 获取可操作处理 + * + * @Params: [id] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: wanggongfeng + * @Date: 2020/05/15 15:04 + */ + @PostMapping("getHandleResultDTOS") + public Result getHandleResultDTOS(@RequestBody HandleResultDTOSFormDTO dto) { + ItemDetailForPCEndResultDTO data = itemService.getHandleResultDTOS(dto); + return new Result().ok(data); + } + @PostMapping public Result save(@RequestBody ItemDTO dto) { //效验数据 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 64c89d7a2..5cccb4397 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -95,6 +95,16 @@ public interface ItemService extends BaseService { */ ItemDetailForPCEndResultDTO getItemDetailById(String id); + /** + * 获取可操作处理 + * + * @Params: [id] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: wanggongfeng + * @Date: 2020/05/15 15:04 + */ + ItemDetailForPCEndResultDTO getHandleResultDTOS(HandleResultDTOSFormDTO dto); + /** * 默认保存 * diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 5d17a5052..1ded52b7d 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -322,7 +322,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem public ItemDetailForPCEndResultDTO getItemDetailById(String id) { // 详情 ItemDetailForPCEndResultDTO resultDTO = baseDao.selectOneOfItemDetailForPCEnd(id); - UserDetail user = SecurityUser.getUser(); + /*UserDetail user = SecurityUser.getUser(); // 获取已流转部门 List itemDeptDTOS = itemDeptService.listOfItemDept(id, user.getDeptId()); // 获取可操作处理和可流转部门 @@ -337,7 +337,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem break; case OrganizationTypeConstant.ORG_TYPE_STREET_PARTY: resultDTO = this.getHandleCategoryAndCirculationDeptOfStreet(resultDTO, itemDeptDTOS); - } + }*/ //获取项目基本信息 ItemEntity entity = this.selectById(id); // 获取项目处理进度 @@ -351,6 +351,29 @@ public class ItemServiceImpl extends BaseServiceImpl implem return resultDTO; } + @Override + public ItemDetailForPCEndResultDTO getHandleResultDTOS(HandleResultDTOSFormDTO dto) { + // 详情 + ItemDetailForPCEndResultDTO resultDTO = new ItemDetailForPCEndResultDTO(); + UserDetail user = SecurityUser.getUser(); + // 获取已流转部门 + List itemDeptDTOS = itemDeptService.listOfItemDept(dto.getItemId(), dto.getDeptId()); + // 获取可操作处理和可流转部门 + switch (user.getTypeKey()) { + case OrganizationTypeConstant.ORG_TYPE_GRID_PARTY: + resultDTO = this.getHandleCategoryAndCirculationDeptOfGrid(resultDTO, itemDeptDTOS); + break; + case OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY: + case OrganizationTypeConstant.ORG_TYPE_STREET_DEPT: + case OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT: + resultDTO = this.getHandleCategory(resultDTO); + break; + case OrganizationTypeConstant.ORG_TYPE_STREET_PARTY: + resultDTO = this.getHandleCategoryAndCirculationDeptOfStreet(resultDTO, itemDeptDTOS); + } + return resultDTO; + } + /** * 项目详情-网格-可做操作和可流转部门 * @@ -580,7 +603,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Transactional(rollbackFor = Exception.class) public Result modifyHandleResult(ItemHandleSubmitFormDTO dto) { try { - Result deptMessage = adminFeignClient.getSysDeptInfo(dto.getHandleDeptId()); + Result deptMessage = adminFeignClient.getSysDeptInfo(dto.getHandlerDeptId()); if( null == deptMessage.getData()){ throw new RenException("未查到该部门相关信息"); } @@ -601,8 +624,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem informationFormDTO.setRelBusinessContent("项目：" + entity.getItemContent()); ItemHandleProcessEntity handleProcessEntity = new ItemHandleProcessEntity(); - handleProcessEntity.setHandlerDeptId(dto.getHandleDeptId()); - handleProcessEntity.setHandlerDept(dto.getHandleDeptName()); + /*handleProcessEntity.setHandlerDeptId(user.getDeptId()); + handleProcessEntity.setHandlerDept(user.getDeptName());*/ + handleProcessEntity.setHandlerDeptId(dto.getHandlerDeptId()); + handleProcessEntity.setHandlerDept(dto.getHandlerDept()); handleProcessEntity.setItemId(dto.getId()); handleProcessEntity.setHandleAdvice(dto.getHandleAdvice()); handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice()); @@ -616,13 +641,13 @@ public class ItemServiceImpl extends BaseServiceImpl implem handleProcessEntity.setState(EventIssueItemState.ITEM_HANDLING); // 获取已流转部门信息 - List oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), dto.getHandleDeptId()); + List oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), dto.getHandlerDeptId()); // 删除已流转协助部门 - itemDeptService.modifyItemDepts(dto.getHandleDeptId(), dto.getId()); + itemDeptService.modifyItemDepts(dto.getHandlerDeptId(), dto.getId()); // 记录处理记录 itemHandleProcessService.insert(handleProcessEntity); // 新增流转协助部门 - itemDeptService.saveItemDepts(dto.getHandleDeptId(), dto, handleProcessEntity.getId()); + itemDeptService.saveItemDepts(dto.getHandlerDeptId(), dto, handleProcessEntity.getId()); List circulationDeptResultDTOS = dto.getDeptResultDTOS(); List newDeptIds = new ArrayList<>(); for (ItemCirculationDeptResultDTO circulationDto : @@ -671,7 +696,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_ITEM_PROCESSED); if (null != dto.getEvaluateDeptDTOS()) { - itemEvaluateDeptService.saveEvaluateDepts(dto.getEvaluateDeptDTOS(), dto.getId(), dto.getHandleDeptId()); + itemEvaluateDeptService.saveEvaluateDepts(dto.getEvaluateDeptDTOS(), dto.getId(), dto.getHandlerDeptId()); } } } @@ -690,8 +715,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemInfoDto.setBusinessType(dto.getHandleCategory()); itemInfoDto.setAssociatedBusinessId(dto.getId()); itemInfoDto.setAssociatedBusinessContent(entity.getItemContent()); - itemInfoDto.setHandleDeptId(dto.getHandleDeptId()); - itemInfoDto.setHandleDept(dto.getHandleDeptName()); + itemInfoDto.setHandleDeptId(dto.getHandlerDeptId()); + itemInfoDto.setHandleDept(dto.getHandlerDept()); itemInfoDto.setHandleAdvice(dto.getHandleAdvice()); itemInfoDto.setReadFlag(ItemInformationConstant.READ_FLAG_NO); // 回应处理 @@ -743,7 +768,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 关闭和结案处理 } else { // 查询已吹哨部门 - List oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), dto.getHandleDeptId()); + List oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), dto.getHandlerDeptId()); // 遍历被吹哨部门插入项目消息表 for (Long itemDeptId : oldDeptIds) { // 通知部门Id（被吹哨部门） @@ -759,12 +784,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem newsTask.insertUserInformation(informationFormDTO); // 发送菜单消息-待处理项目 - if (entity.getGridId().equals(dto.getHandleDeptId())) { + if (entity.getGridId().equals(dto.getHandlerDeptId())) { // 网格长操作-发送菜单消息 this.sendItemHandleMenuNotice(entity.getGridId(), null); } else { // 吹哨部门操作-发送菜单消息 - this.sendWhistlingDeptItemHandleMenuNotice(Collections.singletonList(dto.getHandleDeptId()), null); + this.sendWhistlingDeptItemHandleMenuNotice(Collections.singletonList(dto.getHandlerDeptId()), null); } //项目外部处理意见图片保存 if (dto.getOutHandleImages() != null && dto.getOutHandleImages().size() > 0) { @@ -831,7 +856,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 如果当前流转协助是网格发起，判断其街道党工委是否已将该项目流转协助 if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(dto.getTypeKey())) { - Result completeDept = adminFeignClient.getCompleteDept(dto.getHandleDeptId()); + Result completeDept = adminFeignClient.getCompleteDept(dto.getHandlerDeptId()); if (!completeDept.success()) { return new Result().error("获取机构信息失败，请稍后重试"); } @@ -1299,7 +1324,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem } } else if(ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()){ - deptId = baseDao.queryDeptIdList(dto.getId(),dto.getHandleDeptId()); + deptId = baseDao.queryDeptIdList(dto.getId(),dto.getHandlerDeptId()); if (deptId != null && deptId.size() > 0){ issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId,dto.getTypeKey());//关闭/结案 当前项目的所有部门ID，下的人员发送短信，且不等于当前部门ID } @@ -1322,7 +1347,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem */ private void superiorDeptSmsHandle(ItemHandleSubmitFormDTO dto){ List deptId = new ArrayList<>(); - Long queryDePtId = dto.getHandleDeptId(); + Long queryDePtId = dto.getHandlerDeptId(); while (true){ List createdDeptId = baseDao.queryParentDeptId(dto.getId(),queryDePtId); if (createdDeptId != null && createdDeptId.size() > 0){ From 2f17ff3d0fbd685987048d9ddb7438a0cc747704 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 15 May 2020 16:12:50 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E3=80=90=E5=A4=9A=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91-=E3=80=90=E8=8E=B7=E5=BE=97?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/05/15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/controller/SysDeptController.java | 2 +- .../java/com/elink/esua/epdc/service/SysDeptService.java | 2 +- .../elink/esua/epdc/service/impl/SysDeptServiceImpl.java | 8 ++++---- .../elink/esua/epdc/controller/ApiWorkUserController.java | 2 +- .../java/com/elink/esua/epdc/feign/AdminFeignClient.java | 2 +- .../epdc/feign/fallback/AdminFeignClientFallback.java | 2 +- .../java/com/elink/esua/epdc/service/WorkUserService.java | 2 +- .../elink/esua/epdc/service/impl/WorkUserServiceImpl.java | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java index 1067833b2..8fbbefc72 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java @@ -303,7 +303,7 @@ public class SysDeptController { * @return com.elink.esua.epdc.commons.tools.utils.Result */ @GetMapping("getDeptTypeKey") - public Result getDeptTypeKey(String deptId) { + public Result getDeptTypeKey(Long deptId) { return sysDeptService.getDeptTypeKey(deptId); } } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java index 5c47dd9b2..4a30f0e3e 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java @@ -279,5 +279,5 @@ public interface SysDeptService extends BaseService { * @param [deptId] * @return com.elink.esua.epdc.commons.tools.utils.Result */ - Result getDeptTypeKey(String deptId); + Result getDeptTypeKey(Long deptId); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 0c55fe1e6..1574ea7c3 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -1054,10 +1054,10 @@ public class SysDeptServiceImpl extends BaseServiceImpl Date: Fri, 15 May 2020 16:36:52 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E3=80=90=E5=A4=9A=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91-=E3=80=90=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BF=AE=E6=94=B9=E3=80=91-=EF=BC=88?= =?UTF-8?q?=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/05/15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/feign/AdminFeignClient.java | 12 ++++++++++++ .../feign/fallback/AdminFeignClientFallback.java | 5 +++++ .../modules/item/service/impl/ItemServiceImpl.java | 13 ++++++------- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java index baf418c97..ce29951be 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java @@ -10,6 +10,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -90,4 +91,15 @@ public interface AdminFeignClient { */ @GetMapping("sys/user/getSysGridLeaderPhone/{deptId}") Result> getSysGridLeaderPhone(@PathVariable("deptId") Long deptId); + + + /** + * @describe: 获得部门类型 + * @author wangtong + * @date 2020/5/15 14:41 + * @param [deptId] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping(value="sys/dept/getDeptTypeKey", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getDeptTypeKey(@RequestParam("deptId") Long deptId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java index 3d260100f..5d923aba6 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java @@ -54,4 +54,9 @@ public class AdminFeignClientFallback implements AdminFeignClient { public Result> getSysGridLeaderPhone(@PathVariable("deptId") Long deptId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getSysGridLeaderPhone", deptId); } + + @Override + public Result getDeptTypeKey(Long deptId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTypeKey",deptId); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 1ded52b7d..ca85bd302 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -603,13 +603,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Transactional(rollbackFor = Exception.class) public Result modifyHandleResult(ItemHandleSubmitFormDTO dto) { try { - Result deptMessage = adminFeignClient.getSysDeptInfo(dto.getHandlerDeptId()); - if( null == deptMessage.getData()){ - throw new RenException("未查到该部门相关信息"); - } - String typeKey = deptMessage.getData().getTypeKey(); - if(StringUtils.isBlank(typeKey)){ - throw new RenException("未查到该部门的键类型信息"); + Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getHandlerDeptId()); + String typeKey = ""; + if( 0 == deptMessage.getCode()){ + typeKey = deptMessage.getData().toString(); + }else{ + throw new RenException(deptMessage.getMsg()); } dto.setTypeKey(typeKey); ItemEntity entity = baseDao.selectById(dto.getId()); From d0754f1f5e1a756a08b99c9de1ddd48c7c286a3e Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 15 May 2020 17:01:26 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E3=80=90=E5=A4=9A=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91-=E3=80=90=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E3=80=81=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=8F=AF=E5=81=9A=E6=93=8D=E4=BD=9C=E3=80=81?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8F=AF=E5=90=B9=E5=93=A8=E9=83=A8=E9=97=A8?= =?UTF-8?q?-=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4=E3=80=91-=EF=BC=88?= =?UTF-8?q?=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/05/15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EpdcEventsServiceImpl.java | 3 +-- .../esua/epdc/modules/item/dao/ItemDao.java | 8 -------- .../item/service/impl/ItemServiceImpl.java | 18 ++++++++++++------ .../src/main/resources/mapper/item/ItemDao.xml | 3 --- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 7aaaa6b1e..be6f33603 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -27,7 +27,6 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.redis.RedisKeys; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; -import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.constant.EventIssueItemState; @@ -242,7 +241,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl { */ List selectListOfCategoryInfo(String oldCategoryName); - /** - * @describe: 根据部门id查询部门键类型 - * @author wangtong - * @date 2020/5/14 13:49 - * @param [deptId] - * @return java.lang.String - */ - String selectDeptTypeKeyById(@Param("deptId") Long deptId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index ca85bd302..3c9ab1bf0 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -472,9 +472,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem */ @Override public Result> whistlingDept(EventDeptFormDTO formDto) { - String typeKey = baseDao.selectDeptTypeKeyById(formDto.getDeptId()); - if(StringUtils.isBlank(typeKey)){ - throw new RenException("未查到该部门的相关信息。"); + Result deptMessage = adminFeignClient.getDeptTypeKey(formDto.getDeptId()); + String typeKey = ""; + if( 0 == deptMessage.getCode()){ + typeKey = deptMessage.getData().toString(); + }else{ + throw new RenException(deptMessage.getMsg()); } List deptResultDTOS = new ArrayList<>(); // 网格-可做操作和可流转部门 @@ -1391,9 +1394,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public Result> queryHandleCategories(EventDeptFormDTO formDto) { List itemHandleResultDTOList = new ArrayList<>(); - String typeKey = baseDao.selectDeptTypeKeyById(formDto.getDeptId()); - if(StringUtils.isBlank(typeKey)){ - throw new RenException("未查到该部门的相关信息。"); + Result deptMessage = adminFeignClient.getDeptTypeKey(formDto.getDeptId()); + String typeKey = ""; + if( 0 == deptMessage.getCode()){ + typeKey = deptMessage.getData().toString(); + }else{ + throw new RenException(deptMessage.getMsg()); } // 获取可操作处理和可流转部门 switch (typeKey) { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 4a8e09b19..6dcad3cfc 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -1054,7 +1054,4 @@ WHERE FIND_IN_SET( #{oldCategoryName}, REPLACE(REPLACE(CATEGORY_FULL_NAME,',','uniquecode'),'-',',') ) - From cf1bf5c220b2de4082014ff43ee3180292d8cf91 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 15 May 2020 17:18:50 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91=E3=80=90=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=84=8F=E8=A7=81=E8=81=94=E5=8A=A8=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E4=BA=BA=E3=80=91-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-05?= =?UTF-8?q?-15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/item/service/impl/ItemServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index ca85bd302..6f81306eb 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -355,11 +355,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem public ItemDetailForPCEndResultDTO getHandleResultDTOS(HandleResultDTOSFormDTO dto) { // 详情 ItemDetailForPCEndResultDTO resultDTO = new ItemDetailForPCEndResultDTO(); - UserDetail user = SecurityUser.getUser(); // 获取已流转部门 List itemDeptDTOS = itemDeptService.listOfItemDept(dto.getItemId(), dto.getDeptId()); + Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getDeptId()); + String typeKey = ""; + if( 0 == deptMessage.getCode()){ + typeKey = deptMessage.getData().toString(); + }else{ + throw new RenException(deptMessage.getMsg()); + } // 获取可操作处理和可流转部门 - switch (user.getTypeKey()) { + switch (typeKey) { case OrganizationTypeConstant.ORG_TYPE_GRID_PARTY: resultDTO = this.getHandleCategoryAndCirculationDeptOfGrid(resultDTO, itemDeptDTOS); break; From addff6542fc35400137b58ba9bf7d76a6ef8a392 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 15 May 2020 17:24:51 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E3=80=90=E8=AE=AE=E9=A2=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E3=80=91=E3=80=90?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E6=B4=81=E3=80=91-=E7=8E=8B?= =?UTF-8?q?=E5=85=AC=E5=B3=B0-2020-05-15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issue/service/impl/IssueServiceImpl.java | 5 ----- .../item/service/impl/ItemServiceImpl.java | 18 ------------------ 2 files changed, 23 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index 363c0d85f..ab1e37300 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -187,9 +187,6 @@ public class IssueServiceImpl extends BaseServiceImpl imp handleEntity.setAdvice(dto.getAdvice()); handleEntity.setState(dto.getState()); handleEntity.setIssueId(dto.getId()); - UserDetail user = SecurityUser.getUser(); - /*handleEntity.setHandlerDeptId(user.getDeptId()); - handleEntity.setHandlerDept(user.getDeptName());*/ handleEntity.setHandlerDeptId(dto.getHandlerDeptId()); handleEntity.setHandlerDept(dto.getHandlerDept()); @@ -237,8 +234,6 @@ public class IssueServiceImpl extends BaseServiceImpl imp itemHandleProcessEntity.setState(EventIssueItemState.ITEM_HANDLING); itemHandleProcessEntity.setHandleAdvice(dto.getAdvice()); itemHandleProcessEntity.setOutHandleAdvice(dto.getAdvice()); - /*itemHandleProcessEntity.setHandlerDeptId(user.getDeptId()); - itemHandleProcessEntity.setHandlerDept(user.getDeptName());*/ itemHandleProcessEntity.setHandlerDeptId(dto.getHandlerDeptId()); itemHandleProcessEntity.setHandlerDept(dto.getHandlerDept()); itemHandleProcessService.insert(itemHandleProcessEntity); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 63b9049f4..63668b30e 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -322,22 +322,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem public ItemDetailForPCEndResultDTO getItemDetailById(String id) { // 详情 ItemDetailForPCEndResultDTO resultDTO = baseDao.selectOneOfItemDetailForPCEnd(id); - /*UserDetail user = SecurityUser.getUser(); - // 获取已流转部门 - List itemDeptDTOS = itemDeptService.listOfItemDept(id, user.getDeptId()); - // 获取可操作处理和可流转部门 - switch (user.getTypeKey()) { - case OrganizationTypeConstant.ORG_TYPE_GRID_PARTY: - resultDTO = this.getHandleCategoryAndCirculationDeptOfGrid(resultDTO, itemDeptDTOS); - break; - case OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY: - case OrganizationTypeConstant.ORG_TYPE_STREET_DEPT: - case OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT: - resultDTO = this.getHandleCategory(resultDTO); - break; - case OrganizationTypeConstant.ORG_TYPE_STREET_PARTY: - resultDTO = this.getHandleCategoryAndCirculationDeptOfStreet(resultDTO, itemDeptDTOS); - }*/ //获取项目基本信息 ItemEntity entity = this.selectById(id); // 获取项目处理进度 @@ -632,8 +616,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem informationFormDTO.setRelBusinessContent("项目：" + entity.getItemContent()); ItemHandleProcessEntity handleProcessEntity = new ItemHandleProcessEntity(); - /*handleProcessEntity.setHandlerDeptId(user.getDeptId()); - handleProcessEntity.setHandlerDept(user.getDeptName());*/ handleProcessEntity.setHandlerDeptId(dto.getHandlerDeptId()); handleProcessEntity.setHandlerDept(dto.getHandlerDept()); handleProcessEntity.setItemId(dto.getId()); From 1c95dc659302dd5e1bfa5c854f5696a1a95696e7 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 18 May 2020 10:01:32 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E3=80=90=E8=AE=AE=E9=A2=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E3=80=91=E3=80=90?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E6=93=8D=E4=BD=9C=E4=BA=BA?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=B8=8E=E5=A4=84=E7=90=86=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E8=81=94=E5=8A=A8=E4=BC=98=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/events/form/EpdcEventsReviewFormDTO.java | 4 ++-- .../events/service/impl/EpdcEventsServiceImpl.java | 4 ++-- .../modules/item/service/impl/ItemServiceImpl.java | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java index b08800c87..1fa7366f6 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java @@ -43,11 +43,11 @@ public class EpdcEventsReviewFormDTO implements Serializable { *操作部门ID */ @NotNull(message = "操作部门ID不能为空") - private Long handleDeptId; + private Long handlerDeptId; /** *操作部门名称 */ @NotBlank(message = "操作部门名称不能为空") - private String handleDeptName; + private String handlerDept; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index be6f33603..1ba83e680 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -239,8 +239,8 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl implem // 获取可操作处理和可流转部门 switch (typeKey) { case OrganizationTypeConstant.ORG_TYPE_GRID_PARTY: - resultDTO = this.getHandleCategoryAndCirculationDeptOfGrid(resultDTO, itemDeptDTOS); + resultDTO = this.getHandleCategoryAndCirculationDeptOfGrid(resultDTO, itemDeptDTOS, dto.getDeptId()); break; case OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY: case OrganizationTypeConstant.ORG_TYPE_STREET_DEPT: @@ -359,7 +359,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem resultDTO = this.getHandleCategory(resultDTO); break; case OrganizationTypeConstant.ORG_TYPE_STREET_PARTY: - resultDTO = this.getHandleCategoryAndCirculationDeptOfStreet(resultDTO, itemDeptDTOS); + resultDTO = this.getHandleCategoryAndCirculationDeptOfStreet(resultDTO, itemDeptDTOS, dto.getDeptId()); } return resultDTO; } @@ -373,9 +373,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem * @Date: 2019/9/16 13:40 */ private ItemDetailForPCEndResultDTO getHandleCategoryAndCirculationDeptOfGrid(ItemDetailForPCEndResultDTO resultDTO, - List itemDeptDTOS) { + List itemDeptDTOS,Long deptId) { // 可流转部门 - Result completeDept = adminFeignClient.getCompleteDept(SecurityUser.getDeptId()); + Result completeDept = adminFeignClient.getCompleteDept(deptId); if (!completeDept.success()) { throw new RenException("获取流转协助部门失败"); } @@ -426,7 +426,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem resultDTO.setDeptResultDTOS(deptResultDTOS); // 满意度评价部门 - List evaluateDeptDTOS = itemDeptService.listOfEvaluateDepts(resultDTO.getId(), SecurityUser.getDeptId()); + List evaluateDeptDTOS = itemDeptService.listOfEvaluateDepts(resultDTO.getId(), deptId); resultDTO.setEvaluateDeptDTOS(evaluateDeptDTOS); return resultDTO; @@ -522,9 +522,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem * @Date: 2019/9/16 16:17 */ private ItemDetailForPCEndResultDTO getHandleCategoryAndCirculationDeptOfStreet(ItemDetailForPCEndResultDTO resultDTO, - List itemDeptDTOS) { + List itemDeptDTOS,Long deptId) { // 可流转部门 - Result> listResult = adminFeignClient.listOfItemCirculationDept(SecurityUser.getDeptId()); + Result> listResult = adminFeignClient.listOfItemCirculationDept(deptId); if (!listResult.success()) { throw new RenException("获取流转协助部门失败"); } From 8de301fd7b124e7261ba1e34d185ee3aaf749c67 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 18 May 2020 11:19:19 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91=E3=80=90=E5=90=B9=E5=93=A8=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=97=E9=81=93=E6=A0=A1=E9=AA=8C=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E3=80=91-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-05-18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/impl/ItemServiceImpl.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index ecbd0b8a6..b16552d00 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -623,6 +623,19 @@ public class ItemServiceImpl extends BaseServiceImpl implem handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice()); if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) { + // 吹哨 + Result result = adminFeignClient.getCompleteDept(entity.getGridId()); + String streetId = ""; + if( result.getCode() == 0){ + CompleteDeptDTO completeDeptDTO = (CompleteDeptDTO)result.getData(); + streetId = completeDeptDTO.getStreetId() == null ? "" : completeDeptDTO.getStreetId().toString(); + }else{ + throw new RenException(result.getMsg()); + } + if (!dto.getHandlerDeptId().equals(entity.getGridId()) || !dto.getHandlerDeptId().equals(streetId)) { + return new Result().error("请选择正确的处理部门"); + } + // 项目流转校验 Result checkResult = this.checkItemCirculation(dto); if (!checkResult.success()) { @@ -674,8 +687,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem } else { handleProcessEntity.setState(dto.getHandleCategory()); // 更新项目状态 - if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || - ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { + if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { + if (!dto.getHandlerDeptId().equals(entity.getGridId())) { + return new Result().error("请选择正确的处理部门"); + } + informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_ITEM_CLOSED); ItemEntity itemEntity = new ItemEntity(); From 4669d8d2127b40145256b5a19c793497a7f875e2 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 18 May 2020 16:28:05 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E3=80=90=E8=AE=AE=E9=A2=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91=E3=80=90=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E3=80=91-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-05?= =?UTF-8?q?-18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/events/service/impl/EpdcEventsServiceImpl.java | 4 ++++ .../epdc/modules/issue/service/impl/IssueServiceImpl.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 1ba83e680..0684051c3 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -229,6 +229,10 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl imp informationFormDTO.setBusinessId(entity.getId()); informationFormDTO.setRelBusinessContent("议题：" + entity.getIssueContent()); + if (!dto.getHandlerDeptId().equals(entity.getGridId())) { + return new Result().error("请选择正确的处理部门"); + } + // 反馈、关闭 if (EventIssueItemState.ISSUE_HANDLED_FEEDBACK == dto.getState() || EventIssueItemState.ISSUE_CLOSED == dto.getState()) { issueHandleService.insert(handleEntity); From 7600c3b4d6dd66653fa8dab58122e2d9390042f0 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 18 May 2020 17:48:10 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91=E3=80=90=E5=A4=84=E7=90=86=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E3=80=91-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-05?= =?UTF-8?q?-18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../events/service/impl/EpdcEventsServiceImpl.java | 2 +- .../epdc/modules/issue/service/impl/IssueServiceImpl.java | 2 +- .../epdc/modules/item/service/impl/ItemServiceImpl.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 0684051c3..9d858b3ba 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -229,7 +229,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl imp informationFormDTO.setBusinessId(entity.getId()); informationFormDTO.setRelBusinessContent("议题：" + entity.getIssueContent()); - if (!dto.getHandlerDeptId().equals(entity.getGridId())) { + if (dto.getHandlerDeptId().longValue() != entity.getGridId().longValue()) { return new Result().error("请选择正确的处理部门"); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index b16552d00..865b9b4d6 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -625,14 +625,14 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) { // 吹哨 Result result = adminFeignClient.getCompleteDept(entity.getGridId()); - String streetId = ""; + Long streetId = 0L; if( result.getCode() == 0){ CompleteDeptDTO completeDeptDTO = (CompleteDeptDTO)result.getData(); - streetId = completeDeptDTO.getStreetId() == null ? "" : completeDeptDTO.getStreetId().toString(); + streetId = completeDeptDTO.getStreetId(); }else{ throw new RenException(result.getMsg()); } - if (!dto.getHandlerDeptId().equals(entity.getGridId()) || !dto.getHandlerDeptId().equals(streetId)) { + if (dto.getHandlerDeptId().longValue() != entity.getGridId().longValue() || dto.getHandlerDeptId().longValue() != streetId.longValue()) { return new Result().error("请选择正确的处理部门"); } @@ -688,7 +688,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem handleProcessEntity.setState(dto.getHandleCategory()); // 更新项目状态 if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { - if (!dto.getHandlerDeptId().equals(entity.getGridId())) { + if (dto.getHandlerDeptId().longValue() != entity.getGridId().longValue()) { return new Result().error("请选择正确的处理部门"); } From ca3cf758961a7f4a5a337f5e9df4cf405ec9a56b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Mon, 18 May 2020 17:50:04 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/constant/WorkAppMenuConstant.java | 5 +++++ esua-epdc/epdc-admin/epdc-admin-server/pom.xml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/WorkAppMenuConstant.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/WorkAppMenuConstant.java index 4fc62cafa..808ad82ac 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/WorkAppMenuConstant.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/WorkAppMenuConstant.java @@ -29,6 +29,11 @@ public interface WorkAppMenuConstant { */ String WORK_APP_MENU_CODE_USER_RESIDENTS_TO_BE_CERTIFIED = "10004"; + /** + * 用户管理-待认证居民 + */ + String WORK_APP_MENU_CODE_MASTER_GROUP = "10011"; + /** * 消息 */ diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index 705d36a62..8d61028cc 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -181,8 +181,8 @@ true 47.104.224.45:8848 - 47.104.85.99 - 6a3577b4-7b79-43f6-aebb-9c3f31263f6a + 118.190.232.100 + a746dde3-7a13-4521-b986-7369b0b7c269 http://localhost:9411 From fa4bc2ffc7f6444ed112e82eb699cd27ea495dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Mon, 18 May 2020 18:01:19 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E7=AB=AF?= =?UTF-8?q?=E3=80=91-=E3=80=90=E5=A4=9A=E9=83=A8=E9=97=A8bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=91-=E6=9D=8E=E9=B9=8F=E9=A3=9E-20200518?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/events/service/impl/EpdcEventsServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 9d858b3ba..e79fda084 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -229,7 +229,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl Date: Mon, 18 May 2020 18:28:45 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E3=80=90=E5=90=B9=E5=93=A8=E5=A4=84?= =?UTF-8?q?=E7=90=86=E4=BA=BA=E9=80=BB=E8=BE=91=E3=80=91-=E7=8E=8B?= =?UTF-8?q?=E5=85=AC=E5=B3=B0-2020-05-18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 865b9b4d6..d7795f34b 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -632,7 +632,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem }else{ throw new RenException(result.getMsg()); } - if (dto.getHandlerDeptId().longValue() != entity.getGridId().longValue() || dto.getHandlerDeptId().longValue() != streetId.longValue()) { + if (dto.getHandlerDeptId().longValue() != entity.getGridId().longValue() && dto.getHandlerDeptId().longValue() != streetId.longValue()) { return new Result().error("请选择正确的处理部门"); } From d91fdcecaa4c5797ea2402d156dcabfa45580395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Tue, 19 May 2020 16:52:06 +0800 Subject: [PATCH 18/20] =?UTF-8?q?=E3=80=90banner=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=91-=E3=80=90=E5=A2=9E=E5=8A=A0=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E6=9D=83=E9=99=90=E3=80=91-=E6=9D=8E=E9=B9=8F?= =?UTF-8?q?=E9=A3=9E-2020/05/19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/service/impl/BannerServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java index 6364ff407..af5509ee5 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java @@ -86,7 +86,9 @@ public class BannerServiceImpl extends BaseServiceImpl String title = ((String) params.get("title")).trim(); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - wrapper.eq(FieldConstant.CREATED_BY, user.getId()); + if(user.getSuperAdmin() != 1 ) { + wrapper.eq(FieldConstant.CREATED_BY, user.getId()); + } wrapper.like(StringUtils.isNotBlank(title), "TITLE", title); return wrapper; } From 757c080a38e982c0bc47da5ea1c440dbc33155a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Wed, 20 May 2020 09:33:37 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E7=AB=AF?= =?UTF-8?q?=E3=80=91-=E3=80=90=E5=BB=89=E6=94=BF=E5=B8=82=E5=8C=97?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91-=E6=9D=8E=E9=B9=8F=E9=A3=9E-2020052?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/commons/tools/enums/YesOrNoEnum.java | 8 +++++++- .../elink/esua/epdc/controller/ApiAdminController.java | 5 +++++ .../java/com/elink/esua/epdc/service/AdminService.java | 10 ++++++++++ .../elink/esua/epdc/service/impl/AdminServiceImpl.java | 7 +++++++ .../elink/esua/epdc/service/impl/UserServiceImpl.java | 1 + 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/YesOrNoEnum.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/YesOrNoEnum.java index ca35dc490..ab734a6a2 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/YesOrNoEnum.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/YesOrNoEnum.java @@ -22,7 +22,13 @@ public enum YesOrNoEnum { /** * 否 */ - NO("0"); + NO("0"), + /** + * 待审核 + */ + WAIT("2"); + + private String value; diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java index 8f181538c..7d45d2b36 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.CompleteDeptDTO; import com.elink.esua.epdc.service.AdminService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -33,4 +34,8 @@ public class ApiAdminController { public Result getCompleteDeptName(Long gridId) { return adminService.getCompleteDeptName(gridId); } + @GetMapping("/dept/getComplete") + public Result getComplete(Long gridId) { + return adminService.getComplete(gridId); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java index 55e06883a..706e825f4 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.CompleteDeptDTO; /** * 管理端相关接口 @@ -20,4 +21,13 @@ public interface AdminService { * @date 2019/9/11 09:46 */ Result getCompleteDeptName(Long gridId); + /** + * 获取完整机构名称（市区/街道/社区/网格） + * + * @param gridId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author yujintao + * @date 2019/9/11 09:46 + */ + Result getComplete(Long gridId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java index c5f799828..b5bd83659 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java @@ -33,4 +33,11 @@ public class AdminServiceImpl implements AdminService { .concat(completeDept.getGrid()); return new Result().ok(deptName); } + @Override + public Result getComplete(Long gridId) { + Result adminResult = adminFeignClient.getCompleteDept(gridId); + + CompleteDeptDTO completeDept = adminResult.getData(); + return adminResult; + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index abbc20ef6..46ebe71a5 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -832,6 +832,7 @@ public class UserServiceImpl extends BaseServiceImpl implem if (!updateById(userEntity)) { throw new RenException("用户认证修改居民信息时失败！"); } + generateUserAuthenticateHistory(completeAppUser, UserAuthTypeEnum.RESIDENT_AUTH, YesOrNoEnum.WAIT, null); UserDTO userDto = ConvertUtils.sourceToTarget(userEntity, UserDTO.class); userDto.setLeaderFlag(relationInfo.getLeaderFlag()); userDto.setFaceImg(StringUtils.isBlank(userDto.getFaceImg()) ? findUser.getFaceImg() : userDto.getFaceImg()); From c5558c2e5ed1eba7455b8c495a0664fe974ee2b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Thu, 21 May 2020 18:39:15 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc-admin/epdc-admin-server/pom.xml | 6 +-- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-test.yml | 2 +- esua-epdc/epdc-auth/pom.xml | 8 ++-- .../epdc-analysis-server/pom.xml | 6 +-- .../src/main/resources/application-dev.yml | 24 ++++++------ .../src/main/resources/application-test.yml | 24 ++++++------ .../resources/mapper/user/UserAnalysisDao.xml | 38 +++++++++++-------- .../epdc-api/epdc-api-server/pom.xml | 10 ++--- .../epdc-custom/epdc-custom-server/pom.xml | 6 +-- .../src/main/resources/application.yml | 2 +- .../epdc-events/epdc-events-server/pom.xml | 12 +++--- .../epdc-group/epdc-group-server/pom.xml | 6 +-- .../epdc-heart/epdc-heart-server/pom.xml | 6 +-- .../epdc-job/epdc-job-server/pom.xml | 6 +-- .../epdc-kpi/epdc-kpi-server/pom.xml | 8 ++-- .../epdc-message/epdc-message-server/pom.xml | 6 +-- .../epdc-news/epdc-news-server/pom.xml | 10 ++--- .../epdc-oss/epdc-oss-server/pom.xml | 12 +++--- .../epdc-points/epdc-points-server/pom.xml | 6 +-- .../epdc-user/epdc-user-server/pom.xml | 14 +++---- esua-epdc/epdc-module/epdc-webservice/pom.xml | 6 +-- .../epdc-websocket-server/pom.xml | 6 +-- 23 files changed, 117 insertions(+), 109 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index 8d61028cc..2b777552d 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -140,7 +140,7 @@ dev 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 @@ -174,14 +174,14 @@ test 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 true 47.104.224.45:8848 - 118.190.232.100 + 219.146.91.110 a746dde3-7a13-4521-b986-7369b0b7c269 http://localhost:9411 diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-dev.yml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-dev.yml index 225439fcb..c79260f6e 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-dev.yml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-dev.yml @@ -8,7 +8,7 @@ spring: datasource: druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 #Oracle diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-test.yml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-test.yml index 847562aed..86592b908 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-test.yml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-test.yml @@ -8,7 +8,7 @@ spring: datasource: druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 initial-size: 10 diff --git a/esua-epdc/epdc-auth/pom.xml b/esua-epdc/epdc-auth/pom.xml index 79f7d4211..46763561f 100644 --- a/esua-epdc/epdc-auth/pom.xml +++ b/esua-epdc/epdc-auth/pom.xml @@ -110,7 +110,7 @@ 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 @@ -132,15 +132,15 @@ 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 true 47.104.224.45:8848 - 47.104.85.99 - 6a3577b4-7b79-43f6-aebb-9c3f31263f6a + 118.190.232.100 + a746dde3-7a13-4521-b986-7369b0b7c269 http://localhost:9411 diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml index 115f0640d..e66c858d7 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml @@ -149,15 +149,15 @@ 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 true 47.104.224.45:8848 - 47.104.85.99 - 6a3577b4-7b79-43f6-aebb-9c3f31263f6a + 219.146.91.110 + a746dde3-7a13-4521-b986-7369b0b7c269 diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-dev.yml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-dev.yml index 8c0fcdf01..0c2503cac 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-dev.yml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-dev.yml @@ -4,51 +4,51 @@ spring: driverClassName: com.mysql.jdbc.Driver druid: first: #数据源1 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 second: #数据源2 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 third: #数据源3 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 fourth: #数据源4 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 fifth: #数据源5 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 sixth: #数据源6 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 seventh: #数据源7 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_kpi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_kpi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 eighth: #数据源8 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_mutuality?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_mutuality?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 ninth: #数据源9 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 tenth: #数据源10 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_points?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_points?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 eleventh: #数据源11 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 twelve: #数据源12 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_analysis?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_analysis?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 initial-size: 10 diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-test.yml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-test.yml index 8c0fcdf01..0c2503cac 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-test.yml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-test.yml @@ -4,51 +4,51 @@ spring: driverClassName: com.mysql.jdbc.Driver druid: first: #数据源1 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 second: #数据源2 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 third: #数据源3 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 fourth: #数据源4 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 fifth: #数据源5 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 sixth: #数据源6 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 seventh: #数据源7 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_kpi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_kpi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 eighth: #数据源8 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_mutuality?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_mutuality?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 ninth: #数据源9 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 tenth: #数据源10 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_points?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_points?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 eleventh: #数据源11 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 twelve: #数据源12 - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_analysis?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_analysis?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: elink833066 initial-size: 10 diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml index 3485a5d16..a5d3c096e 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml @@ -113,22 +113,30 @@ @@ -513,7 +521,7 @@ AND ad.del_flag = 0 ) t0 LEFT JOIN esua_epdc_news.epdc_news un ON find_in_set(t0.id, un.ALL_DEPT_IDS) - AND un.DEL_FLAG = '0' + and un.DEL_FLAG = '0' AND un.CREATED_TIME BETWEEN #{operationStartTime} AND #{operationEndTime} @@ -543,7 +551,7 @@ AND ad.del_flag = 0 ) t0 LEFT JOIN esua_epdc_events.epdc_events epen ON find_in_set(t0.id, epen.ALL_DEPT_IDS) - AND epen.DEL_FLAG = '0' + and epen.DEL_FLAG = '0' AND epen.EVENT_STATE = '4' AND epen.CREATED_TIME BETWEEN #{operationStartTime} AND #{operationEndTime} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index 3d48b2842..a957558a8 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml @@ -168,12 +168,12 @@ 9040 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 - + epdc elink833066 @@ -209,19 +209,19 @@ 10004 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 - + epdc elink833066 true 47.104.224.45:8848 - 219.146.91.110 + 118.190.232.100 a746dde3-7a13-4521-b986-7369b0b7c269 diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml index b4c1858ff..fef6f10bc 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml @@ -174,7 +174,7 @@ 394f47d4e08fc0fd629231d3f68a34dc - + epdc elink833066 @@ -198,12 +198,12 @@ 10005 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 - + epdc elink833066 diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/application.yml index 72bd5fcc8..18a0589c8 100644 --- a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/application.yml @@ -19,7 +19,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_demo?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC + url: jdbc:mysql://118.190.232.100:3308/esua_epdc_demo?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC username: root password: shibei@888 cloud: diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml index 4001c7ac8..e3978da94 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml @@ -163,7 +163,7 @@ elink@888 - + epdc elink833066 @@ -196,23 +196,23 @@ test test - 10006 + 9066 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 - + epdc elink833066 true 47.104.224.45:8848 - 47.104.85.99 - 6a3577b4-7b79-43f6-aebb-9c3f31263f6a + 118.190.232.100 + a746dde3-7a13-4521-b986-7369b0b7c269 diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml index fef7c8382..eafe6a916 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml @@ -134,7 +134,7 @@ elink@888 - + epdc elink833066 @@ -173,12 +173,12 @@ 10007 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 - + epdc elink833066 diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml index 4fa3d9077..bf5150f8d 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml @@ -156,7 +156,7 @@ elink@888 - + epdc elink833066 @@ -186,12 +186,12 @@ 10008 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 - + epdc elink833066 diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml index 9eb0e1954..59a222882 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml @@ -153,7 +153,7 @@ elink@888 - + epdc elink833066 @@ -174,12 +174,12 @@ 10013 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 - + epdc elink833066 diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml index 77db6b1af..c218fa9b0 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml @@ -128,12 +128,12 @@ 9069 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 - + epdc elink833066 @@ -159,12 +159,12 @@ 10009 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 - + epdc elink833066 diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml index ffe406860..e397a7147 100644 --- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml @@ -153,7 +153,7 @@ elink@888 - + epdc elink833066 @@ -174,12 +174,12 @@ 10010 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 - + epdc elink833066 diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml index 71ae58d1b..2feceb0c2 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml @@ -128,7 +128,7 @@ elink@888 - + epdc elink833066 @@ -159,20 +159,20 @@ 10011 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 - + epdc elink833066 true 47.104.224.45:8848 - 47.104.85.99 - 6a3577b4-7b79-43f6-aebb-9c3f31263f6a + 219.146.91.110 + a746dde3-7a13-4521-b986-7369b0b7c269 47.104.85.99:9876;114.215.125.123:9876 diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml index 5023c26f4..b97ba6381 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml @@ -170,7 +170,7 @@ elink@888 - + epdc elink833066 @@ -196,23 +196,23 @@ test test - 10012 + 10032 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 - + epdc elink833066 true 47.104.224.45:8848 - 47.104.85.99 - 6a3577b4-7b79-43f6-aebb-9c3f31263f6a + 219.146.91.110 + a746dde3-7a13-4521-b986-7369b0b7c269 diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml index 00366f76b..d44239fb1 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml @@ -134,7 +134,7 @@ elink@888 - + epdc elink833066 @@ -155,12 +155,12 @@ 10017 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 - + epdc elink833066 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml index caa4d5c6b..bab9721fb 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml @@ -144,13 +144,13 @@ elink@888 - + epdc elink833066 - + epdc elink833066 @@ -174,26 +174,26 @@ 10014 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 - + epdc elink833066 - + epdc elink833066 true 47.104.224.45:8848 - 47.104.85.99 - 6a3577b4-7b79-43f6-aebb-9c3f31263f6a + 118.190.232.100 + a746dde3-7a13-4521-b986-7369b0b7c269 47.104.85.99:9876;114.215.125.123:9876 diff --git a/esua-epdc/epdc-module/epdc-webservice/pom.xml b/esua-epdc/epdc-module/epdc-webservice/pom.xml index 8c8098348..0ed1eb95e 100644 --- a/esua-epdc/epdc-module/epdc-webservice/pom.xml +++ b/esua-epdc/epdc-module/epdc-webservice/pom.xml @@ -132,7 +132,7 @@ elink@888 - + epdc elink833066 @@ -151,12 +151,12 @@ test 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 - + epdc elink833066 diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml index 2fc5877bf..73a3e2301 100644 --- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml @@ -147,7 +147,7 @@ elink@888 - + epdc elink833066 @@ -177,12 +177,12 @@ 10016 2 - 114.215.125.123 + 118.190.232.100 9603 epdc!redis@master1405 - + epdc elink833066