From b5aaf6afcf32b8db90cb5a08d39fef30ac9ae757 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Mon, 13 Jan 2020 17:43:13 +0800 Subject: [PATCH] =?UTF-8?q?api=E6=A8=A1=E5=9D=97=E6=96=B0=E5=A2=9E/api/wor?= =?UTF-8?q?k/event/item/handleCategory=E6=8E=A5=E5=8F=A3=EF=BC=88=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=BD=93=E5=89=8D=E9=83=A8=E9=97=A8=E5=8F=AF=E5=81=9A?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiWorkItemController.java | 18 ++++-- .../esua/epdc/feign/WorkItemFeignClient.java | 15 ++++- .../fallback/WorkItemFeignClientFallback.java | 9 ++- .../esua/epdc/service/WorkItemService.java | 14 +++-- .../service/impl/WorkItemServiceImpl.java | 7 +++ .../item/controller/WorkItemController.java | 14 ++++- .../modules/item/service/ItemService.java | 8 +++ .../item/service/impl/ItemServiceImpl.java | 61 +++++++++++++++++++ 8 files changed, 133 insertions(+), 13 deletions(-) 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 c79f35f14..52d4c712a 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,9 +1,6 @@ package com.elink.esua.epdc.controller; -import com.elink.esua.epdc.common.token.dto.TokenDto; -import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; @@ -111,8 +108,9 @@ public class ApiWorkItemController { /** * 项目消息列表 + * * @Params: [ formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lipengfei * @Date: 2019/11/19 16:34 */ @@ -120,4 +118,16 @@ public class ApiWorkItemController { public Result> notice(ItemInformationFormDTO formDto) { return workItemService.notice(formDto); } + + /** + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author yinzuomei + * @Description 获取当前部门可做操作 + * @Date 2020/1/13 16:48 + **/ + @GetMapping("handleCategory") + public Result> queryHandleCategories() { + return workItemService.queryHandleCategories(); + } } 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 bf7a57bf6..aaf4381e2 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 @@ -20,7 +20,7 @@ import java.util.List; * @Author LPF * @Date 2019/11/18 16:39 */ -@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkItemFeignClientFallback.class, configuration = FeignRequestInterceptor.class) +@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkItemFeignClientFallback.class, configuration = FeignRequestInterceptor.class, url = "http://localhost:9066") public interface WorkItemFeignClient { @@ -99,14 +99,25 @@ public interface WorkItemFeignClient { */ @GetMapping(value = "events/work/item/processList", consumes = MediaType.APPLICATION_JSON_VALUE) Result> processList(ItemProcessFormDTO dto) ; + /** * 项目消息列表 + * * @Params: [ItemProcessFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei * @Date: 2019/11/19 16:34 */ @GetMapping(value = "events/work/item/notice", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> notice(ItemInformationFormDTO formDto) ; + Result> notice(ItemInformationFormDTO formDto); + /** + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author yinzuomei + * @Description 获取当前部门可做操作 + * @Date 2020/1/13 16:53 + **/ + @GetMapping(value = "events/work/item/handleCategory") + Result> queryHandleCategories(); } 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 ad2867457..69a5d5291 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,11 +3,9 @@ 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.SysDeptDTO; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; -import com.elink.esua.epdc.feign.ItemFeignClient; import com.elink.esua.epdc.feign.WorkItemFeignClient; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.PathVariable; @@ -52,13 +50,20 @@ public class WorkItemFeignClientFallback implements WorkItemFeignClient { public Result> evaluationDept(EvaluationFormDTO evaluationFormDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "evaluationDept", evaluationFormDTO); } + @Override public Result> processList(ItemProcessFormDTO dto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "processList", dto); } + @Override public Result> notice(ItemInformationFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "notice", formDto); } + @Override + public Result> queryHandleCategories() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryHandleCategories"); + } + } 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 ec4f52023..b30e56fa6 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,12 +1,9 @@ package com.elink.esua.epdc.service; -import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; -import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -80,8 +77,10 @@ public interface WorkItemService { * @Date: 2019/11/19 16:34 */ Result> processList(ItemProcessFormDTO dto); + /** * 项目消息列表 + * * @Params: [formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -89,5 +88,12 @@ public interface WorkItemService { */ Result> notice(ItemInformationFormDTO formDto); - + /** + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author yinzuomei + * @Description 获取当前部门可做操作 + * @Date 2020/1/13 16:49 + **/ + Result> queryHandleCategories(); } 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 f78a49a45..971be648d 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 @@ -64,13 +64,20 @@ public class WorkItemServiceImpl implements WorkItemService { public Result> evaluationDept(EvaluationFormDTO evaluationFormDTO) { return workItemFeignClient.evaluationDept(evaluationFormDTO); } + @Override public Result> processList(ItemProcessFormDTO dto) { return workItemFeignClient.processList(dto); } + @Override public Result> notice(ItemInformationFormDTO formDto) { return workItemFeignClient.notice(formDto); } + @Override + public Result> queryHandleCategories() { + return workItemFeignClient.queryHandleCategories(); + } + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java index 72598df84..9bca8e461 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java @@ -148,4 +148,16 @@ public class WorkItemController { List data = itemService.listOfItemHandleProgressByWork(formDTO.getItemId()); return new Result>().ok(data); } -} \ No newline at end of file + + /** + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author yinzuomei + * @Description 获取当前部门可做操作 + * @Date 2020/1/13 16:55 + **/ + @GetMapping(value = "handleCategory") + public Result> queryHandleCategories() { + return itemService.queryHandleCategories(); + } +} 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 8574dd2e9..7827cfa9f 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 @@ -313,4 +313,12 @@ public interface ItemService extends BaseService { */ Result reportCallback(ItemPlatformProcessFormDTO formDto); + /** + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author yinzuomei + * @Description 获取当前部门可做操作 + * @Date 2020/1/13 16:55 + **/ + Result> queryHandleCategories(); } 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 33310165e..133cd11ab 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 @@ -1174,4 +1174,65 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result(); } + /** + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author yinzuomei + * @Description 获取当前部门可做操作 + * @Date 2020/1/13 16:55 + **/ + @Override + public Result> queryHandleCategories() { + List itemHandleResultDTOList = new ArrayList<>(); + UserDetail userDetail = SecurityUser.getUser(); + // 获取可操作处理和可流转部门 + switch (userDetail.getTypeKey()) { + case OrganizationTypeConstant.ORG_TYPE_GRID_PARTY: + itemHandleResultDTOList = ItemHandleCategoryEnum.getHandleCategoriesForGird(false); + break; + case OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY: + case OrganizationTypeConstant.ORG_TYPE_STREET_DEPT: + case OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT: + ItemHandleResultDTO itemHanle = new ItemHandleResultDTO(); + itemHanle.setProcessResult(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue()); + itemHanle.setProcessName(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getName()); + itemHanle.setSelect(false); + itemHandleResultDTOList.add(itemHanle); + break; + case OrganizationTypeConstant.ORG_TYPE_STREET_PARTY: + itemHandleResultDTOList = getStreetPartyHandleCategory(); + } + return new Result>().ok(itemHandleResultDTOList); + } + + /** + * @param + * @return java.util.List + * @Author yinzuomei + * @Description 街道党工委目前具有的操作权限：吹哨、回应、上报网格化平台 + * @Date 2020/1/13 17:21 + **/ + private List getStreetPartyHandleCategory() { + List itemHandleResultDTOS = new ArrayList<>(); + + ItemHandleResultDTO itemHandleResultDTO = new ItemHandleResultDTO(); + itemHandleResultDTO.setProcessResult(ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue()); + itemHandleResultDTO.setProcessName(ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getName()); + itemHandleResultDTO.setSelect(false); + itemHandleResultDTOS.add(itemHandleResultDTO); + + ItemHandleResultDTO itemHandleResultDTO1 = new ItemHandleResultDTO(); + itemHandleResultDTO1.setProcessResult(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue()); + itemHandleResultDTO1.setProcessName(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getName()); + itemHandleResultDTO1.setSelect(false); + itemHandleResultDTOS.add(itemHandleResultDTO1); + + ItemHandleResultDTO itemHandleResultDTO2 = new ItemHandleResultDTO(); + itemHandleResultDTO2.setProcessResult(ItemHandleCategoryEnum.HANDLE_REPORT.getValue()); + itemHandleResultDTO2.setProcessName(ItemHandleCategoryEnum.HANDLE_REPORT.getName()); + itemHandleResultDTO2.setSelect(false); + itemHandleResultDTOS.add(itemHandleResultDTO2); + return itemHandleResultDTOS; + } + }