Merge branch '20210223' of http://114.135.61.188:53000/UIMS/Code into 20210223

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

@@ -15,6 +15,9 @@ public class TaskChangeTendDto implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private String dateCreate;
 
+    @ApiModelProperty(value = "时间标签")
+    private String dateLabel;
+
     @ApiModelProperty(value = "任务数")
     private Integer taskCount;
 

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

@@ -643,6 +643,7 @@
   <select id="selectTaskChangeTrend" resultType="com.huaxu.task.dto.TaskChangeTendDto" >
     select
       tab1.dateCreate,
+      right(tab1.dateCreate,2) dateLabel,
       ifnull(TaskCount, 0) TaskCount
       <if test="maintainerCount != 0">
         ,ifnull(TaskCount, 0) / #{maintainerCount} taskCountAvg

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

@@ -265,6 +265,19 @@ public class AlarmDetailsServiceImpl implements AlarmDetailsService {
 
         //处理完成后，剩下的标记为历史数据
         if(alarmDetailsDtoMap.values().size() > 0) {
+            //循环更新历史报警数据
+            Long currentTime =System.currentTimeMillis(); //系统时间
+            for(AlarmDetailsDto value : alarmDetailsDtoMap.values()){
+                value.setDateUpdate(new Date());
+                //从对象中拿到时间
+                Long startTime = value.getAlarmStartTime().getTime();
+                Long diff=(currentTime-startTime)/1000/60;
+                value.setAlarmValue(diff.doubleValue());
+                value.setAlarmEndTime(new Date());
+                value.setState(0);
+                alarmDetailMapper.update(value);//直接更新
+            }
+
             //恢复正常的设备id
             Set<Long> deviceIds = alarmDetailsDtoMap.values().stream()
                     .map(a -> a.getDeviceId().longValue())
@@ -274,8 +287,6 @@ public class AlarmDetailsServiceImpl implements AlarmDetailsService {
             //对报警信息分组
             Map<Integer,List<AlarmDetailsDto>> deviceIdAlarmDetailsMap = alarmDetailsDtoMap.values().stream().collect(Collectors.groupingBy(AlarmDetailsDto::getDeviceId));
             if (workOrders.size() > 0) {
-                //系统时间
-                Long currentTime =System.currentTimeMillis();
                 List<WorkOrderManageByAlarmDto> orderUpdate = new ArrayList<>();
                 List<Long> orderDelete = new ArrayList<>();
 
@@ -285,14 +296,14 @@ public class AlarmDetailsServiceImpl implements AlarmDetailsService {
                     List<AlarmDetailsDto> alarmDetailsDtoList = deviceIdAlarmDetailsMap.get(orderManageByAlarmDto.getDeviceId().intValue());
                     //标记为历史数据 并 修改工单描述
                     for (AlarmDetailsDto alarmDetailsDto : alarmDetailsDtoList) {
-                        alarmDetailsDto.setDateUpdate(new Date());
+                        /*alarmDetailsDto.setDateUpdate(new Date());
                         //从对象中拿到时间
                         Long startTime = alarmDetailsDto.getAlarmStartTime().getTime();
                         Long diff=(currentTime-startTime)/1000/60;
                         alarmDetailsDto.setAlarmValue(diff.doubleValue());
                         alarmDetailsDto.setAlarmEndTime(new Date());
                         alarmDetailsDto.setState(0);
-                        alarmDetailMapper.update(alarmDetailsDto);//直接更新
+                        alarmDetailMapper.update(alarmDetailsDto);//直接更新*/
                         taskDesc = taskDesc.replace(";" + alarmDetailsDto.getAlarmContent(), "")
                                 .replace(alarmDetailsDto.getAlarmContent(), "");
                     }