修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java

@@ -803,7 +803,8 @@ public class TopographyController extends AbstractBaseController {
                     }
                 }
             }
-            return CommonResponseUtil.success(list);
+            List<TopographyIotVo> result = list.stream().sorted(Comparator.comparing(TopographyIotVo::getTime).reversed()).collect(Collectors.toList());
+            return CommonResponseUtil.success(result);
         } else {
             logger.error("查询物联日志数据为空或iotCode为 (" + iotCode + ") 的装备不存在于物联系统中！");
             return CommonResponseUtil.success();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java

@@ -63,6 +63,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
     @Autowired
     IEquipmentSpecificIndexService equipmentSpecificIndexService;
 
+
     @Autowired
     private ISyncDataService syncDataService;
 
@@ -165,6 +166,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
                 ent.setEquipmentSpecificId(alarmLog.getEquipmentSpecificId());
                 ent.setEquipmentSpecificIndexKey(alarmLog.getEquipmentSpecificIndexKey());
                 String cleanType = equipmentSpecificMapper.getEquipmentBySpecificId(alarmLog.getEquipmentSpecificId());
+                int i = 0 ; // 是否成功标识
                 if (StringUtil.isNotEmpty(cleanType) && AlarmCleanTypeEnum.QRXC.getCode().equals(cleanType)) {
                     EquipmentSpecificAlarm alarm = equipmentSpecificAlarmMapper.selectById(alarmLog.getEquipmentSpecificAlarmId());
                     alarm.setStatus(AlarmStatusEnum.HF.getCode());
@@ -176,6 +178,12 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
                             eq(EquipmentSpecificIndex::getEquipmentSpecificId,alarm.getEquipmentSpecificId()).
                             eq(EquipmentSpecificIndex::getEquipmentIndexKey,alarm.getEquipmentSpecificIndexKey());
                     iEquipmentSpecificIndexSerivce.update(updateWrapper);
+                        //指标图标显示根据 EquipmentSpecific 表中的 RealtimeIotIndexValue 判断 同步修改
+                    LambdaUpdateWrapper<EquipmentSpecific> wrapper =new LambdaUpdateWrapper<EquipmentSpecific>().
+                            set(EquipmentSpecific::getRealtimeIotIndexValue,"false").
+                            set(EquipmentSpecific::getRealtimeIotIndexUpdateDate,new Date()).
+                            eq(EquipmentSpecific::getId,alarm.getEquipmentSpecificId());
+                            equipmentSpecificSerivce.update(wrapper);
                     MqttReceiveServiceImpl.upAlarmLogStatus(alarmLog.getIotCode(), alarmLog.getEquipmentSpecificIndexKey(), equipmentSpecificAlarmLogService);
                 }
                 //  如果是批量确警，先查询，再确警，用于批量消息推送