获取可吹哨部门V2、获取前部门可做操作V2 接口

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<java.util.List<com.elink.esua.epdc.dto.item.result.ItemCirculationDeptResultDTO>>
+     * @Author: zy
+     * @Date: 2020-05-06
+     */
+    @GetMapping("whistlingDept")
+    public Result<List<ItemCirculationDeptResultDTO>> whistlingDept() {
+        Result<List<ItemCirculationDeptResultDTO>> list = workItemService.listWhistlingV2Dept();
+        return list;
+    }
+
+    /**
+     * 获取当前部门可做操作V2
+     *
+     * @param:
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>>
+     * @Author: zy
+     * @Date: 2020-05-06
+     */
+    @GetMapping("handleCategory")
+    public Result<List<ItemHandleResultDTO>> handleCategory() {
+        Result<List<ItemHandleResultDTO>> list = workItemService.listHandleV2Category();
+        return list;
+    }
+
+}

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<List<ItemHandleResultDTO>> queryHandleCategories();
+
+    /**
+     * 获取可吹哨部门V2
+     *
+     * @param:
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemCirculationDeptResultDTO>>
+     * @Author: zy
+     * @Date: 2020-05-06
+     */
+    @GetMapping(value = "events/epdc-app/work/event/item/v2/whistlingDept", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<ItemCirculationDeptResultDTO>> whistlingV2Dept();
+
+    /**
+     * 获取当前部门可做操作V2
+     *
+     * @param:
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>>
+     * @Author: zy
+     * @Date: 2020-05-06
+     */
+    @GetMapping(value = "events/epdc-app/work/event/item/v2/handleCategory", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<ItemHandleResultDTO>> handleV2Category();
 }

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<List<ItemCirculationDeptResultDTO>> whistlingV2Dept() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "whistlingV2Dept","");
+    }
+
+    @Override
+    public Result<List<ItemHandleResultDTO>> handleV2Category() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "handleV2Category","");
+    }
 }

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<List<ItemHandleResultDTO>> queryHandleCategories();
+
+    /**
+     * 获取可吹哨部门V2
+     *
+     * @param:
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemCirculationDeptResultDTO>>
+     * @Author: zy
+     * @Date: 2020-05-06
+     */
+    Result<List<ItemCirculationDeptResultDTO>> listWhistlingV2Dept();
+
+    /**
+     * 获取当前部门可做操作V2
+     *
+     * @param:
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>>
+     * @Author: zy
+     * @Date: 2020-05-06
+     */
+    Result<List<ItemHandleResultDTO>> listHandleV2Category();
 }

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<List<ItemCirculationDeptResultDTO>> listWhistlingV2Dept() {
+        return workItemFeignClient.whistlingV2Dept();
+    }
+
+    @Override
+    public Result<List<ItemHandleResultDTO>> listHandleV2Category() {
+        return workItemFeignClient.handleV2Category();
+    }
+
 }

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<java.util.List<com.elink.esua.epdc.dto.item.result.ItemCirculationDeptResultDTO>>
+     * @Author: zy
+     * @Date: 2020-05-06
+     */
+    @GetMapping("whistlingDept")
+    public Result<List<ItemCirculationDeptResultDTO>> whistlingDept() {
+        List<ItemCirculationDeptResultDTO> list = this.itemService.listWhistlingDept();
+        return new Result<List<ItemCirculationDeptResultDTO>>().ok(list);
+    }
+
+    /**
+     * 获取当前部门可做操作V2
+     *
+     * @param:
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>>
+     * @Author: zy
+     * @Date: 2020-05-06
+     */
+    @GetMapping("handleCategory")
+    public Result<List<ItemHandleResultDTO>> handleCategory() {
+        List<ItemHandleResultDTO> list = this.itemService.listHandleCategory();
+        return new Result<List<ItemHandleResultDTO>>().ok(list);
+    }
+}

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<ItemEntity> {
      * @since 2020/3/7 12:50
      */
     void modifyPartyGroupName(List<GroupFormDTO> groups);
+
+    /**
+     * 获取可吹哨部门V2
+     *
+     * @param:
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemCirculationDeptResultDTO>>
+     * @Author: zy
+     * @Date: 2020-05-06
+     */
+    List<ItemCirculationDeptResultDTO> listWhistlingDept();
+
+    /**
+     * 获取当前部门可做操作V2
+     *
+     * @param:
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>>
+     * @Author: zy
+     * @Date: 2020-05-06
+     */
+    List<ItemHandleResultDTO> listHandleCategory();
 }

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<ItemDao, ItemEntity> implem
         baseDao.updateBatchPartyGroupName(groups);
     }
 
+    @Override
+    public List<ItemCirculationDeptResultDTO> listWhistlingDept() {
+        UserDetail user = SecurityUser.getUser();
+        Result<List<Long>> roleIdList = adminFeignClient.getRoleIdList(user.getId());
+        if (!roleIdList.success() || roleIdList.getData().isEmpty()) {
+            throw new RenException("获取角色Id列表失败");
+        }
+
+        //可流转部门
+        List<ItemCirculationDeptResultDTO> deptResultDTOS = handleRoleCategoryService.listItemCirculationDeptResultDTO(roleIdList.getData());
+        return deptResultDTOS;
+    }
+
+    @Override
+    public List<ItemHandleResultDTO> listHandleCategory() {
+        UserDetail user = SecurityUser.getUser();
+        Result<List<Long>> roleIdList = adminFeignClient.getRoleIdList(user.getId());
+        if (!roleIdList.success() || roleIdList.getData().isEmpty()) {
+            throw new RenException("获取角色Id列表失败");
+        }
+        //可处理操作
+        List<ItemHandleResultDTO> handleResultDTOS = handleRoleCategoryService.listItemHandleResultDTO(roleIdList.getData());
+        return handleResultDTOS;
+    }
 }