设置名称修改

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -23,6 +23,7 @@ import com.huaxu.process.entity.ProcessDefinition;
 import com.huaxu.process.service.WorkFlowService;
 import com.huaxu.process.utils.Action;
 import com.huaxu.task.entity.PlanManage;
+import com.huaxu.task.entity.UserEntity;
 import com.huaxu.task.service.PlanManageService;
 import com.huaxu.util.DatesUtil;
 import com.huaxu.util.MessageSendUtil;
@@ -40,6 +41,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/order/workOrderManage")
@@ -124,12 +126,7 @@ public class WorkOrderManageController {
     @ApiOperation(value = "APP运维管理待处理查询")
     public AjaxMessage<List<WorkOrderManageDto>> selectAppTodo() {
         List<WorkOrderManageDto> result=workOrderManageService.selectAppTodo();
-        Map<String,String> dictMap=userCenterClient.selectListByPCodes("SC_WORK_ORDER_TYPE,SC_TASK_TYPE");
-        if(result.size()>0&&dictMap.size()>0){
-            for(WorkOrderManageDto workOrderManageDto:result) {
-                workOrderManageDto.setTypeName(dictMap.get(workOrderManageDto.getOrderTypeId().toString()));
-            }
-        }
+        setName(result);
         return new AjaxMessage<>(ResultStatus.OK,  result);
     }
     /**
@@ -140,12 +137,7 @@ public class WorkOrderManageController {
     @ApiOperation(value = "APP运维管理全部查询")
     public AjaxMessage<List<WorkOrderManageDto>> selectAppAll() {
         List<WorkOrderManageDto> result=workOrderManageService.selectAppAll();
-        Map<String,String> dictMap=userCenterClient.selectListByPCodes("SC_WORK_ORDER_TYPE,SC_TASK_TYPE");
-        if(result.size()>0&&dictMap.size()>0){
-            for(WorkOrderManageDto workOrderManageDto:result) {
-                workOrderManageDto.setTypeName(dictMap.get(workOrderManageDto.getOrderTypeId().toString()));
-            }
-        }
+        setName(result);
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
     /**
@@ -261,12 +253,7 @@ public class WorkOrderManageController {
     public AjaxMessage<List<WorkOrderManageDto>> selectOrderDetail(
             @ApiParam(value = "工单id", required = true) @RequestParam Integer flowId) {
         List<WorkOrderManageDto> result=workOrderManageService.selectOrderDetail(flowId);
-        Map<String,String> dictMap=userCenterClient.selectListByPCodes("SC_WORK_ORDER_TYPE,SC_TASK_TYPE");
-        if(result.size()>0&&dictMap.size()>0){
-            for(WorkOrderManageDto workOrderManageDto:result) {
-                workOrderManageDto.setTypeName(dictMap.get(workOrderManageDto.getOrderTypeId().toString()));
-            }
-        }
+        setName(result);
         return new AjaxMessage<>(ResultStatus.OK,  result);
     }
     @RequestMapping(value = "saveDetail", method = RequestMethod.GET)
@@ -515,4 +502,52 @@ public class WorkOrderManageController {
         }
         return new AjaxMessage<>(ResultStatus.OK,result);
     }
+    /**
+     * 获取并设置用户、任务工单类型名称
+     * @param result
+     */
+    private void setName(List<WorkOrderManageDto> result){
+        if(result.size()>0){
+            try{
+                List<Long> idList = new ArrayList<Long>();
+                for(WorkOrderManageDto workOrder:result) {
+                    if(workOrder.getSendBy()!=null) {
+                        idList.add(Long.valueOf(workOrder.getSendBy()));
+                    }
+                    if(workOrder.getOrderUserId()!=null) {
+                        idList.add(Long.valueOf(workOrder.getOrderUserId()));
+                    }
+                    if(workOrder.getCreateBy()!=null) {
+                        idList.add(Long.valueOf(workOrder.getCreateBy()));
+                    }
+                    if(workOrder.getUpdateBy()!=null) {
+                        idList.add(Long.valueOf(workOrder.getUpdateBy()));
+                    }
+                }
+                Long[] ids = idList.toArray(new Long[0]);
+                Map<Long,String> userMap = userCenterClient.findUserIdsByUserIds(ids).stream().collect(Collectors.toMap(UserEntity::getId, UserEntity::getUsername));
+                Map<String,String> dictMap=userCenterClient.selectListByPCodes("SC_WORK_ORDER_TYPE,SC_TASK_TYPE");
+                for(WorkOrderManageDto workOrder:result) {
+                    if(workOrder.getOrderTypeId()!=null) {
+                        workOrder.setTypeName(dictMap.get(workOrder.getOrderTypeId().toString()));
+                    }
+                    if(workOrder.getSendBy()!=null) {
+                        workOrder.setSendByName(userMap.get(Long.valueOf(workOrder.getSendBy())));
+                    }
+                    if(workOrder.getOrderUserId()!=null) {
+                        workOrder.setOrderUserName(userMap.get(Long.valueOf(workOrder.getOrderUserId())));
+                    }
+                    if(workOrder.getCreateBy()!=null) {
+                        workOrder.setCreateByName(userMap.get(Long.valueOf(workOrder.getCreateBy())));
+                    }
+                    if(workOrder.getUpdateBy()!=null) {
+                        workOrder.setUpdateByName(userMap.get(Long.valueOf(workOrder.getUpdateBy())));
+                    }
+                }
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+        }
+    }
 }
+

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -190,20 +190,6 @@ public class PlanManageController {
         setName(new ArrayList<PlanManageDto>(){{
             this.add(result);
         }});
-        /*try{
-            Long[] ids = new Long[4];
-            ids[0]=Long.parseLong(result.getUserId());
-            ids[1]=Long.parseLong(result.getPlanUserId());
-            ids[2]=Long.parseLong(result.getCreateBy());
-            ids[3]=Long.parseLong(result.getUpdateBy());
-            Map<Long,String> userMap = userCenterClient.findUserIdsByUserIds(ids).stream().collect(Collectors.toMap(UserEntity::getId, UserEntity::getUsername));
-            result.setUserName(userMap.get(ids[0]));
-            result.setPlanUserName(userMap.get(ids[1]));
-            result.setCreateByName(userMap.get(ids[2]));
-            result.setUpdateByName(userMap.get(ids[3]));
-        }catch (Exception e){
-            e.printStackTrace();
-        }*/
         return new AjaxMessage<>(ResultStatus.OK, result );
     }