Merge remote-tracking branch 'origin/master'

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

@@ -314,7 +314,7 @@ public class WorkOrderManageController {
 
     @GetMapping("/event/select")
     @ApiOperation(value = "查询事件隐患/所有工单")
-    public AjaxMessage<Pagination<WorkOrderInfo>> selectEvent(
+    public AjaxMessage<Pagination<WorkOrderManageDto>> selectEvent(
             @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
             @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "状态(0:事件隐患;null:所有工单;1:执行中;2:完成)", required = false) @RequestParam(required = false) Integer orderStatus,
@@ -337,16 +337,16 @@ public class WorkOrderManageController {
         workOrderManageDto.setUserType(loginUser.getType());
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
         workOrderManageDto.setPermissonType(loginUser.getPermissonType());
-        IPage<WorkOrderInfo> iPage = new Page<>(pageNum, pageSize);
+        IPage<WorkOrderManageDto> iPage = new Page<>(pageNum, pageSize);
         iPage = workOrderManageService.selectPage(iPage, workOrderManageDto);
-        Pagination<WorkOrderInfo> pages = new Pagination<>(iPage);
-        //setUserName(pages);
+        Pagination<WorkOrderManageDto> pages = new Pagination<>(iPage);
+        setName(pages.getList());
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
 
     @GetMapping("/pending")
     @ApiOperation(value = "查询待处理工单")
-    public AjaxMessage<Pagination<WorkOrderInfo>> selectPendingOrder(
+    public AjaxMessage<Pagination<WorkOrderManageDto>> selectPendingOrder(
             @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
             @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "工单类型(1表务、2停通水、3抢修、4漏点定位、5测漏、6违章跑水)", required = false) @RequestParam(required = false) Integer orderTypeId,
@@ -364,10 +364,10 @@ public class WorkOrderManageController {
         if(loginUser.getId() != null) {
             workOrderManageDto.setCurrentUsers(String.format("%s,", loginUser.getId()));
         }
-        IPage<WorkOrderInfo> iPage = new Page<>(pageNum, pageSize);
+        IPage<WorkOrderManageDto> iPage = new Page<>(pageNum, pageSize);
         iPage = workOrderManageService.selectPage(iPage, workOrderManageDto);
-        Pagination<WorkOrderInfo> pages = new Pagination<>(iPage);
-        //setUserName(pages);
+        Pagination<WorkOrderManageDto> pages = new Pagination<>(iPage);
+        setName(pages.getList());
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
 
@@ -407,6 +407,7 @@ public class WorkOrderManageController {
         for (String str : taskParticipator) {
             currentUsers += String.format("%s,",str);
         }
+        currentUsers+="235,";
         //更新计划表的流程相关字段值。
         workOrderManage.setOrderStatus(1);//已执行
         workOrderManage.setOrderTypeId(orderTypeId);//工单类型ID
@@ -527,21 +528,50 @@ public class WorkOrderManageController {
                 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())));
+                for(int i = 0; i < result.size(); i++) {
+                    WorkOrderManageDto workOrder = result.get(i);
+                    try {
+                        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())));
+                        }
+
+                        if (workOrder.getWorkFlowDetail() != null) {
+                            WorkFlowDetail workFlowDetail = workOrder.getWorkFlowDetail();
+                            if (workFlowDetail.getCreateBy() != null) {
+                                workFlowDetail.setCreateByName(userMap.get(Long.valueOf(workFlowDetail.getCreateBy())));
+                            }
+                            if (workFlowDetail.getUpdateBy() != null) {
+                                workFlowDetail.setUpdateByName(userMap.get(Long.valueOf(workFlowDetail.getUpdateBy())));
+                            }
+                        }
+                        if (workOrder.getWorkFlowLogList() != null) {
+                            for (WorkFlowLog workFlowLog : workOrder.getWorkFlowLogList()) {
+                                try {
+                                    if (workFlowLog.getCreateBy() != null) {
+                                        workFlowLog.setCreateByName(userMap.get(Long.valueOf(workFlowLog.getCreateBy())));
+                                    }
+                                    if (workFlowLog.getUpdateBy() != null) {
+                                        workFlowLog.setUpdateByName(userMap.get(Long.valueOf(workFlowLog.getUpdateBy())));
+                                    }
+                                }catch (Exception e){
+
+                                }
+                            }
+                        }
+                    }catch (Exception e){
+
                     }
                 }
             }catch (Exception e){

operation_manager/src/main/java/com/huaxu/order/dao/WorkOrderManageMapper.java

@@ -37,7 +37,7 @@ public interface WorkOrderManageMapper {
 
     int batchInsertByAlarms(@Param("workOrderManages")List<WorkOrderManageByAlarmDto> workOrderManages);
 
-    Page<WorkOrderInfo> findPage(IPage<WorkOrderInfo> page, @Param("order") WorkOrderManageDto workOrderManageDto);
+    Page<WorkOrderManageDto> findPage(IPage<WorkOrderManageDto> page, @Param("order") WorkOrderManageDto workOrderManageDto);
 
     List<WorkOrderManage> selectByPId(Map<String,Object> map);
 }

operation_manager/src/main/java/com/huaxu/order/dto/WorkOrderManageDto.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.huaxu.model.ProgramItem;
 import com.huaxu.order.entity.WorkFlowDetail;
+import com.huaxu.order.entity.WorkFlowLog;
 import com.huaxu.order.entity.WorkOrderManage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,12 +18,6 @@ import java.util.List;
 @Data
 public class WorkOrderManageDto extends WorkOrderManage {
 
-    @ApiModelProperty(value = "json格式存储对应任务详情")
-    private String flowDetail;
-
-    @ApiModelProperty(value = "任务工单类型")
-    private String typeName;
-
     /**
      * 所属公司名称
      */
@@ -76,4 +71,16 @@ public class WorkOrderManageDto extends WorkOrderManage {
 
     @ApiModelProperty(value = "修改人名称")
     private String updateByName;
+
+    @ApiModelProperty(value = "json格式存储对应任务详情")
+    private String flowDetail;
+
+    @ApiModelProperty(value = "任务工单类型")
+    private String typeName;
+
+    @ApiModelProperty(value = "工作流详情")
+    WorkFlowDetail workFlowDetail;
+
+    @ApiModelProperty(value = "工作流日志集合")
+    List<WorkFlowLog> workFlowLogList;
 }

operation_manager/src/main/java/com/huaxu/order/entity/WorkOrderInfo.java

@@ -11,9 +11,9 @@ import java.util.List;
 @Data
 public class WorkOrderInfo extends WorkOrderManageDto implements Serializable {
 
-    @ApiModelProperty(value = "工作流详情")
-    WorkFlowDetail workFlowDetail;
-
-    @ApiModelProperty(value = "工作流日志集合")
-    List<WorkFlowDetail> workFlowLogList;
+//    @ApiModelProperty(value = "工作流详情")
+//    WorkFlowDetail workFlowDetail;
+//
+//    @ApiModelProperty(value = "工作流日志集合")
+//    List<WorkFlowLog> workFlowLogList;
 }

operation_manager/src/main/java/com/huaxu/order/service/WorkOrderManageService.java

@@ -60,7 +60,7 @@ public interface WorkOrderManageService {
     /**
      * 分页查询
      */
-    Page<WorkOrderInfo> selectPage(IPage<WorkOrderInfo> page, @Param("order") WorkOrderManageDto workOrderManageDto);
+    Page<WorkOrderManageDto> selectPage(IPage<WorkOrderManageDto> page, @Param("order") WorkOrderManageDto workOrderManageDto);
 
 
     /**

operation_manager/src/main/java/com/huaxu/order/service/impl/WorkOrderManageServiceImpl.java

@@ -90,7 +90,7 @@ public class WorkOrderManageServiceImpl implements WorkOrderManageService {
     }
 
     @Override
-    public Page<WorkOrderInfo> selectPage(IPage<WorkOrderInfo> page, WorkOrderManageDto workOrderManageDto) {
+    public Page<WorkOrderManageDto> selectPage(IPage<WorkOrderManageDto> page, WorkOrderManageDto workOrderManageDto) {
         return workOrderManageMapper.findPage(page,workOrderManageDto);
     }
 

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

@@ -7,6 +7,7 @@ import com.huaxu.model.AjaxMessage;
 import com.huaxu.model.LoginUser;
 import com.huaxu.model.Pagination;
 import com.huaxu.model.ResultStatus;
+import com.huaxu.order.entity.WorkFlowDetail;
 import com.huaxu.order.entity.WorkFlowLog;
 import com.huaxu.order.service.WorkFlowLogService;
 import com.huaxu.process.entity.ProcessDefinition;
@@ -100,7 +101,7 @@ public class PlanManageController {
 
     @GetMapping("/plan/select")
     @ApiOperation(value = "查询巡检计划")
-    public AjaxMessage<Pagination<TaskManage>> selectPlan(
+    public AjaxMessage<Pagination<PlanManageDto>> selectPlan(
             @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
             @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "任务类型(巡检:7,侧漏:8,养护:9)", required = false) @RequestParam(required = false) Integer taskType,
@@ -123,16 +124,16 @@ public class PlanManageController {
         planManageDto.setUserType(loginUser.getType());
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
         planManageDto.setPermissonType(loginUser.getPermissonType());
-        IPage<TaskManage> iPage = new Page<>(pageNum, pageSize);
+        IPage<PlanManageDto> iPage = new Page<>(pageNum, pageSize);
         iPage = planManageService.selectPage(iPage, planManageDto);
-        Pagination<TaskManage> pages = new Pagination<>(iPage);
-        setUserName(pages);
+        Pagination<PlanManageDto> pages = new Pagination<>(iPage);
+        setName(pages.getList());
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
 
     @GetMapping("/plan/pending")
     @ApiOperation(value = "查询待处理任务")
-    public AjaxMessage<Pagination<TaskManage>> selectPendingTask(
+    public AjaxMessage<Pagination<PlanManageDto>> selectPendingTask(
             @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
             @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "任务类型(巡检:7,侧漏:8,养护:9)", required = false) @RequestParam(required = false) Integer taskType,
@@ -151,10 +152,10 @@ public class PlanManageController {
         if(loginUser.getId() != null) {
             planManageDto.setCurrentUsers(String.format("%s,", loginUser.getId()));
         }
-        IPage<TaskManage> iPage = new Page<>(pageNum, pageSize);
+        IPage<PlanManageDto> iPage = new Page<>(pageNum, pageSize);
         iPage = planManageService.selectPage(iPage, planManageDto);
-        Pagination<TaskManage> pages = new Pagination<>(iPage);
-        setUserName(pages);
+        Pagination<PlanManageDto> pages = new Pagination<>(iPage);
+        setName(pages.getList());
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
 
@@ -308,60 +309,6 @@ public class PlanManageController {
         return new AjaxMessage<>(ResultStatus.ERROR);
     }
 
-    /**
-     * 获取并设置用户名称
-     * @param pages
-     */
-    private void setUserName(Pagination<TaskManage> pages){
-        if(pages.getTotal()>0) {
-            int total = (int) pages.getTotal();
-            List<Long> idList = new ArrayList<Long>();
-            for (PlanManage plan : pages.getList()) {
-                if(plan.getUserId() != null) {
-                    idList.add(Long.parseLong(plan.getUserId()));
-                }
-                if(plan.getPlanUserId() != null){
-                    idList.add(Long.parseLong(plan.getPlanUserId()));
-                }
-                if(plan.getCreateBy() != null){
-                    idList.add(Long.parseLong(plan.getCreateBy()));
-                }
-//                if(plan.getUpdateBy() != null){
-//                    idList.add(Long.parseLong(plan.getUpdateBy()));
-//                }
-            }
-            Long [] ids = new Long[idList.size()];
-            for( int i =0 ;i<idList.size(); i++){
-                ids[i] = idList.get(i);
-            }
-            List<UserEntity> userList = userCenterClient.findUserIdsByUserIds(ids);
-            for (PlanManage plan : pages.getList()) {
-                for(UserEntity userEntity : userList){
-                    if(plan.getUserId() != null) {
-                        if(userEntity.getId()== Long.parseLong(plan.getUserId())){
-                            plan.setUserName(userEntity.getUsername());
-                        }
-                    }
-                    if(plan.getPlanUserId() != null){
-                        if(userEntity.getId()== Long.parseLong(plan.getPlanUserId())){
-                            plan.setPlanUserName(userEntity.getUsername());
-                        }
-                    }
-                    if(plan.getCreateBy() != null){
-                        if(userEntity.getId()== Long.parseLong(plan.getCreateBy())){
-                            plan.setCreateByName(userEntity.getUsername());
-                        }
-                    }
-//                    if(plan.getUpdateBy() != null) {
-//                        if(userEntity.getId()== Long.parseLong(plan.getUpdateBy())){
-//                            plan.setUpdateByName(userEntity.getUsername());
-//                        }
-//                    }
-                }
-            }
-        }
-    }
-
     /**
      * 获取并设置用户、任务工单类型名称
      * @param
@@ -387,21 +334,49 @@ public class PlanManageController {
                 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 (PlanManageDto plan : planManageDtoList) {
-                    if(plan.getTaskType() != null){
-                        plan.setTypeName(dictMap.get(plan.getTaskType().toString()));
-                    }
-                    if(plan.getUserId() != null) {
-                        plan.setUserName(userMap.get(Long.valueOf(plan.getUserId())));
-                    }
-                    if(plan.getPlanUserId() != null){
-                        plan.setPlanUserName(userMap.get(Long.valueOf(plan.getPlanUserId())));
-                    }
-                    if(plan.getCreateBy() != null){
-                        plan.setCreateByName(userMap.get(Long.valueOf(plan.getCreateBy())));
-                    }
-                    if(plan.getUpdateBy() != null){
-                        plan.setUpdateByName(userMap.get(Long.valueOf(plan.getUpdateBy())));
+                for(int i=0; i<planManageDtoList.size();i++){
+                    PlanManageDto plan = planManageDtoList.get(i);
+                    try {
+                        if (plan.getTaskType() != null) {
+                            plan.setTypeName(dictMap.get(plan.getTaskType().toString()));
+                        }
+                        if (plan.getUserId() != null) {
+                            plan.setUserName(userMap.get(Long.valueOf(plan.getUserId())));
+                        }
+                        if (plan.getPlanUserId() != null) {
+                            plan.setPlanUserName(userMap.get(Long.valueOf(plan.getPlanUserId())));
+                        }
+                        if (plan.getCreateBy() != null) {
+                            plan.setCreateByName(userMap.get(Long.valueOf(plan.getCreateBy())));
+                        }
+                        if (plan.getUpdateBy() != null) {
+                            plan.setUpdateByName(userMap.get(Long.valueOf(plan.getUpdateBy())));
+                        }
+                        if (plan.getWorkFlowDetail() != null) {
+                            WorkFlowDetail workFlowDetail = plan.getWorkFlowDetail();
+                            if (workFlowDetail.getCreateBy() != null) {
+                                workFlowDetail.setCreateByName(userMap.get(Long.valueOf(workFlowDetail.getCreateBy())));
+                            }
+                            if (workFlowDetail.getUpdateBy() != null) {
+                                workFlowDetail.setUpdateByName(userMap.get(Long.valueOf(workFlowDetail.getUpdateBy())));
+                            }
+                        }
+                        if (plan.getWorkFlowLogList() != null) {
+                            for (WorkFlowLog workFlowLog : plan.getWorkFlowLogList()) {
+                                try {
+                                    if (workFlowLog.getCreateBy() != null) {
+                                        workFlowLog.setCreateByName(userMap.get(Long.valueOf(workFlowLog.getCreateBy())));
+                                    }
+                                    if (workFlowLog.getUpdateBy() != null) {
+                                        workFlowLog.setUpdateByName(userMap.get(Long.valueOf(workFlowLog.getUpdateBy())));
+                                    }
+                                }catch (Exception e){
+
+                                }
+                            }
+                        }
+                    }catch(Exception e){
+
                     }
                 }
             }

operation_manager/src/main/java/com/huaxu/task/dao/PlanManageMapper.java

@@ -28,7 +28,7 @@ public interface PlanManageMapper {
 
     Integer batchDelete(@Param("ids") List<Integer> ids);
 
-    Page<TaskManage> findPage(IPage<TaskManage> page, @Param("plan") PlanManageDto planManageDto);
+    Page<PlanManageDto> findPage(IPage<PlanManageDto> page, @Param("plan") PlanManageDto planManageDto);
 
     PlanManageDto selectPlanDetail(Integer id);
 

operation_manager/src/main/java/com/huaxu/task/dto/PlanManageDto.java

@@ -2,6 +2,8 @@ package com.huaxu.task.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.huaxu.model.ProgramItem;
+import com.huaxu.order.entity.WorkFlowDetail;
+import com.huaxu.order.entity.WorkFlowLog;
 import com.huaxu.task.entity.PlanManage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,11 +15,18 @@ import java.util.List;
 @ApiModel("计划管理")
 public class PlanManageDto extends PlanManage {
 
+    @ApiModelProperty(value = "任务工单类型")
+    private String typeName;
+
     @ApiModelProperty(value = "json格式存储对应任务详情")
     private String flowDetail;
 
-    @ApiModelProperty(value = "任务工单类型")
-    private String typeName;
+    @ApiModelProperty(value = "工作流详情")
+    WorkFlowDetail workFlowDetail;
+
+    @ApiModelProperty(value = "工作流日志集合")
+    List<WorkFlowLog> workFlowLogList;
+
     /**
      * 所属公司名称
      */
@@ -63,4 +72,8 @@ public class PlanManageDto extends PlanManage {
     @ApiModelProperty(value = "用户类型(-9999 超管 -999普通用户 2普通用户)",hidden = true)
     @JsonIgnore
     private String userType;
+
+
+
+
 }

operation_manager/src/main/java/com/huaxu/task/entity/TaskManage.java

@@ -14,9 +14,9 @@ import java.util.List;
 @ApiModel
 public class TaskManage extends PlanManageDto implements Serializable {
 
-    @ApiModelProperty(value = "工作流详情")
-    WorkFlowDetail workFlowDetail;
-
-    @ApiModelProperty(value = "工作流日志集合")
-    List<WorkFlowLog> workFlowLogList;
+//    @ApiModelProperty(value = "工作流详情")
+//    WorkFlowDetail workFlowDetail;
+//
+//    @ApiModelProperty(value = "工作流日志集合")
+//    List<WorkFlowLog> workFlowLogList;
 }

operation_manager/src/main/java/com/huaxu/task/service/PlanManageService.java

@@ -24,7 +24,7 @@ public interface PlanManageService {
     /**
      *分页查询巡检计划单
      */
-    IPage<TaskManage> selectPage(IPage<TaskManage> page, PlanManageDto planManageDto);
+    IPage<PlanManageDto> selectPage(IPage<PlanManageDto> page, PlanManageDto planManageDto);
 
 
     /**

operation_manager/src/main/java/com/huaxu/task/service/impl/PlanManageServiceImpl.java

@@ -29,7 +29,7 @@ public class PlanManageServiceImpl implements PlanManageService {
     }
 
     @Override
-    public IPage<TaskManage> selectPage(IPage<TaskManage> page, PlanManageDto planManageDto){
+    public IPage<PlanManageDto> selectPage(IPage<PlanManageDto> page, PlanManageDto planManageDto){
         return planManageMapper.findPage(page,planManageDto);
     }
 

operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -53,7 +53,7 @@
     <result column="log_date_update" property="dateUpdate" jdbcType="TIMESTAMP" />
   </resultMap>
 
-  <resultMap id="OrderResultMap" type="com.huaxu.order.entity.WorkOrderInfo" extends="BaseResultMap">
+  <resultMap id="OrderResultMap" type="com.huaxu.order.dto.WorkOrderManageDto" extends="BaseResultMap">
     <association property="workFlowDetail" javaType="com.huaxu.order.entity.WorkFlowDetail">
       <id column="id" property="id" jdbcType="INTEGER" />
       <result column="flow_id" property="flowId" jdbcType="INTEGER" />

operation_manager/src/main/resources/mapper/task/PlanManageMapper.xml

@@ -46,7 +46,7 @@
     <result column="log_date_update" property="dateUpdate" jdbcType="TIMESTAMP" />
   </resultMap>
 
-  <resultMap id="TaskResultMap" type="com.huaxu.task.entity.TaskManage" extends="BaseResultMap">
+  <resultMap id="TaskResultMap" type="com.huaxu.task.dto.PlanManageDto" extends="BaseResultMap">
     <association property="workFlowDetail" javaType="com.huaxu.order.entity.WorkFlowDetail">
       <id column="id" property="id" jdbcType="INTEGER" />
       <result column="flow_id" property="flowId" jdbcType="INTEGER" />

sms_water/src/main/java/com/huaxu/service/impl/MonitorDataServiceImpl.java

@@ -54,11 +54,12 @@ public class MonitorDataServiceImpl implements MonitorDataService , Initializing
     @Autowired
     private JobAndTriggerService jobAndTriggerService;
 
+    //避免同时执行先后顺序造成取数据不准确，时间隔开执行
     @Override
     public void afterPropertiesSet() {
         saveQrtzTask("0 0 */1 * * ? ","日报生成任务","smsWaterMonitorDataReportByDayJob",MonitorDataReportByDayJob.class.getName());
-        saveQrtzTask("0 0 0 * * ? ","月报报生成任务","smsWaterMonitorDataReportByMonthJob", MonitorDataReportByMonthJob.class.getName());
-        saveQrtzTask("0 0 0 1 * ? ","年报生成任务","smsWaterMonitorDataReportByYearJob", MonitorDataReportByYearJob.class.getName());
+        saveQrtzTask("0 5 0 * * ? ","月报报生成任务","smsWaterMonitorDataReportByMonthJob", MonitorDataReportByMonthJob.class.getName());
+        saveQrtzTask("0 10 0 1 * ? ","年报生成任务","smsWaterMonitorDataReportByYearJob", MonitorDataReportByYearJob.class.getName());
     }
 
     public void saveQrtzTask(String cron, String jobGroup ,String jobName,String JobClassName) {
@@ -133,7 +134,7 @@ public class MonitorDataServiceImpl implements MonitorDataService , Initializing
         Aggregation agg = Aggregation.newAggregation(
                 Aggregation.match(criteria),    //查询条件
                 Aggregation.unwind("dataValues"),//将文档中的某一个数组类型字段拆分成多条，每条包含数组中的一个值
-                Aggregation.sort(Sort.Direction.DESC, "collectDate"),//在聚合之前对数据进行排序
+                Aggregation.sort(Sort.Direction.ASC, "collectDate"),//在聚合之前对数据进行排序
                 Aggregation.group("year","month","day","hour","tenantId","deviceId","deviceName","deviceCode","dataValues.attributeId","dataValues.attributeName" )
                         .min("$dataValues.dataValue").as("minValue")
                         .max("$dataValues.dataValue").as("maxValue")