diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiWorkEventItemV2Controller.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiWorkEventItemV2Controller.java new file mode 100644 index 00000000..e4cb9959 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiWorkEventItemV2Controller.java @@ -0,0 +1,58 @@ +package com.elink.esua.epdc.controller.v2; + +import com.elink.esua.epdc.commons.api.version.ApiVersion; +import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.item.result.ItemCirculationDeptResultDTO; +import com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO; +import com.elink.esua.epdc.service.WorkItemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 工作端事件 迭代接口 v2 + * + * @author zy + * @date 2020/05/06 + */ +@ApiVersion(2) +@RestController("ApiWorkEventItemV2Controller") +@RequestMapping("work/event/item" + Constant.VERSION_CONTROL) +public class ApiWorkEventItemV2Controller { + + @Autowired + private WorkItemService workItemService; + + /** + * 获取可吹哨部门V2 + * + * @param: + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-05-06 + */ + @GetMapping("whistlingDept") + public Result> whistlingDept() { + Result> list = workItemService.listWhistlingV2Dept(); + return list; + } + + /** + * 获取当前部门可做操作V2 + * + * @param: + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-05-06 + */ + @GetMapping("handleCategory") + public Result> handleCategory() { + Result> list = workItemService.listHandleV2Category(); + return list; + } + +} 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 3260a626..d8a8dd0a 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 @@ -120,4 +120,26 @@ public interface WorkItemFeignClient { **/ @GetMapping(value = "events/work/item/handleCategory") Result> queryHandleCategories(); + + /** + * 获取可吹哨部门V2 + * + * @param: + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-05-06 + */ + @GetMapping(value = "events/epdc-app/work/event/item/v2/whistlingDept", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> whistlingV2Dept(); + + /** + * 获取当前部门可做操作V2 + * + * @param: + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-05-06 + */ + @GetMapping(value = "events/epdc-app/work/event/item/v2/handleCategory", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> handleV2Category(); } 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 69a5d529..29adfcfc 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 @@ -66,4 +66,13 @@ public class WorkItemFeignClientFallback implements WorkItemFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryHandleCategories"); } + @Override + public Result> whistlingV2Dept() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "whistlingV2Dept",""); + } + + @Override + public Result> handleV2Category() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "handleV2Category",""); + } } 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 b30e56fa..9b0077a2 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 @@ -96,4 +96,24 @@ public interface WorkItemService { * @Date 2020/1/13 16:49 **/ Result> queryHandleCategories(); + + /** + * 获取可吹哨部门V2 + * + * @param: + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-05-06 + */ + Result> listWhistlingV2Dept(); + + /** + * 获取当前部门可做操作V2 + * + * @param: + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-05-06 + */ + Result> listHandleV2Category(); } 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 971be648..de27dab7 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 @@ -80,4 +80,14 @@ public class WorkItemServiceImpl implements WorkItemService { return workItemFeignClient.queryHandleCategories(); } + @Override + public Result> listWhistlingV2Dept() { + return workItemFeignClient.whistlingV2Dept(); + } + + @Override + public Result> listHandleV2Category() { + return workItemFeignClient.handleV2Category(); + } + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/v2/EpdcAppWorkEventItemV2Controller.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/v2/EpdcAppWorkEventItemV2Controller.java new file mode 100644 index 00000000..0d9482c3 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/v2/EpdcAppWorkEventItemV2Controller.java @@ -0,0 +1,58 @@ +package com.elink.esua.epdc.modules.item.controller.v2; + +import com.elink.esua.epdc.commons.api.version.ApiVersion; +import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.item.result.ItemCirculationDeptResultDTO; +import com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO; +import com.elink.esua.epdc.modules.item.service.ItemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 工作端事件 迭代接口 v2 + * + * @author zy + * @date 2020/05/06 + */ + +@ApiVersion(2) +@RestController("EpdcAppWorkEventItemV2Controller") +@RequestMapping(Constant.EPDC_APP + "work/event/item" + Constant.VERSION_CONTROL) +public class EpdcAppWorkEventItemV2Controller { + + @Autowired + private ItemService itemService; + + /** + * 获取可吹哨部门V2 + * + * @param: + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-05-06 + */ + @GetMapping("whistlingDept") + public Result> whistlingDept() { + List list = this.itemService.listWhistlingDept(); + return new Result>().ok(list); + } + + /** + * 获取当前部门可做操作V2 + * + * @param: + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-05-06 + */ + @GetMapping("handleCategory") + public Result> handleCategory() { + List list = this.itemService.listHandleCategory(); + return new Result>().ok(list); + } +} 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 efe1dec5..53e713da 100644 --- 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 @@ -357,4 +357,24 @@ public interface ItemService extends BaseService { * @since 2020/3/7 12:50 */ void modifyPartyGroupName(List groups); + + /** + * 获取可吹哨部门V2 + * + * @param: + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-05-06 + */ + List listWhistlingDept(); + + /** + * 获取当前部门可做操作V2 + * + * @param: + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-05-06 + */ + List listHandleCategory(); } 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 382ba0df..3f459cec 100644 --- 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 @@ -1450,4 +1450,28 @@ public class ItemServiceImpl extends BaseServiceImpl implem baseDao.updateBatchPartyGroupName(groups); } + @Override + public List listWhistlingDept() { + UserDetail user = SecurityUser.getUser(); + Result> roleIdList = adminFeignClient.getRoleIdList(user.getId()); + if (!roleIdList.success() || roleIdList.getData().isEmpty()) { + throw new RenException("获取角色Id列表失败"); + } + + //可流转部门 + List deptResultDTOS = handleRoleCategoryService.listItemCirculationDeptResultDTO(roleIdList.getData()); + return deptResultDTOS; + } + + @Override + public List listHandleCategory() { + UserDetail user = SecurityUser.getUser(); + Result> roleIdList = adminFeignClient.getRoleIdList(user.getId()); + if (!roleIdList.success() || roleIdList.getData().isEmpty()) { + throw new RenException("获取角色Id列表失败"); + } + //可处理操作 + List handleResultDTOS = handleRoleCategoryService.listItemHandleResultDTO(roleIdList.getData()); + return handleResultDTOS; + } }