Merge branch 'developer' into develop_ccs

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

@@ -148,13 +148,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
                     EquipmentSpecificAlarm alarm = equipmentSpecificAlarmMapper.selectById(alarmLog.getEquipmentSpecificAlarmId());
                     alarm.setStatus(AlarmStatusEnum.HF.getCode());
                     equipmentSpecificAlarmMapper.updateById(alarm);
-                    LambdaQueryWrapper<EquipmentSpecificAlarmLog> queryWrapper = new LambdaQueryWrapper();
-                    queryWrapper.eq(EquipmentSpecificAlarmLog::getIotCode, alarmLog.getIotCode());
-                    queryWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey, alarmLog.getEquipmentSpecificIndexKey());
-                    queryWrapper.ne(EquipmentSpecificAlarmLog::getStatus, AlarmStatusEnum.HF.getCode());
-                    List<EquipmentSpecificAlarmLog> logs = equipmentSpecificAlarmLogService.getBaseMapper().selectList(queryWrapper);
-                    logs.stream().map(x -> x.setCleanTime(new Date())).map(y -> y.setStatus(AlarmStatusEnum.HF.getCode())).collect(Collectors.toList());
-                    equipmentSpecificAlarmLogService.updateBatchById(logs);
+                    MqttReceiveServiceImpl.upAlarmLogStatus(alarmLog.getIotCode(), alarmLog.getEquipmentSpecificIndexKey(), equipmentSpecificAlarmLogService);
                 }
                 //  如果是批量确警，先查询，再确警，用于批量消息推送
                 isBatch = ent.getIsBatch();

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

@@ -104,6 +104,8 @@ public class EquipmentIndexImpl extends ServiceImpl<EquipmentIndexMapper, Equipm
                     CarProperty carProperty = new CarProperty();
                     carProperty.setCarId(car.getId());
                     carProperty.setEquipmentIndexId(equipmentIndex.getId());
+                    carProperty.setEquipmentIndexKey(equipmentIndex.getPerfQuotaName());
+                    carProperty.setEquipmentIndexName(equipmentIndex.getPerfQuotaDefinitionId());
                     carProperties.add(carProperty);
                 });
                 iCarPropertyService.saveBatch(carProperties);
@@ -122,6 +124,9 @@ public class EquipmentIndexImpl extends ServiceImpl<EquipmentIndexMapper, Equipm
                     EquipmentSpecificIndex equipmentSpecificIndex = new EquipmentSpecificIndex();
                     equipmentSpecificIndex.setEquipmentSpecificId(y.getId());
                     equipmentSpecificIndex.setEquipmentIndexId(equipmentIndex.getId());
+                    equipmentSpecificIndex.setEquipmentIndexKey(equipmentIndex.getPerfQuotaDefinitionId());
+                    equipmentSpecificIndex.setEquipmentSpecificIndexName(equipmentIndex.getPerfQuotaName());
+                    equipmentSpecificIndex.setEquipmentSpecialName(y.getName());
                     equipmentSpecificIndexList.add(equipmentSpecificIndex);
                 });
                 iEquipmentSpecificIndexSerivce.saveBatch(equipmentSpecificIndexList);

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

@@ -449,13 +449,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                             }
                             mqttSendGateway.sendToMqtt(TopicEnum.EQDQR.getTopic(), JSONArray.toJSON(action).toString());
                         } else {
-                            LambdaQueryWrapper<EquipmentSpecificAlarmLog> queryWrapper = new LambdaQueryWrapper();
-                            queryWrapper.eq(EquipmentSpecificAlarmLog::getIotCode, action.getIotCode());
-                            queryWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey, action.getEquipmentSpecificIndexKey());
-                            queryWrapper.ne(EquipmentSpecificAlarmLog::getStatus, AlarmStatusEnum.HF.getCode());
-                            List<EquipmentSpecificAlarmLog> logs = equipmentSpecificAlarmLogService.getBaseMapper().selectList(queryWrapper);
-                            logs.stream().map(x -> x.setCleanTime(new Date())).map(y -> y.setStatus(AlarmStatusEnum.HF.getCode())).collect(Collectors.toList());
-                            equipmentSpecificAlarmLogService.updateBatchById(logs);
+                            upAlarmLogStatus(action.getIotCode(), action.getEquipmentSpecificIndexKey(), equipmentSpecificAlarmLogService);
                         }
                         specificAlarmIds.add(action.getId());
                         equipIndexIds.add(action.getEquipmentIndexId());
@@ -750,6 +744,21 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         }
     }
 
+    static void upAlarmLogStatus(String iotCode, String equipmentSpecificIndexKey, IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService) {
+        LambdaQueryWrapper<EquipmentSpecificAlarmLog> queryWrapper = new LambdaQueryWrapper();
+        queryWrapper.eq(EquipmentSpecificAlarmLog::getIotCode, iotCode);
+        queryWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey, equipmentSpecificIndexKey);
+        queryWrapper.ne(EquipmentSpecificAlarmLog::getStatus, AlarmStatusEnum.HF.getCode());
+        List<EquipmentSpecificAlarmLog> logs = equipmentSpecificAlarmLogService.getBaseMapper().selectList(queryWrapper);
+        logs.forEach(x -> {
+            x.setCleanTime(new Date());
+            x.setStatus(AlarmStatusEnum.HF.getCode());
+        });
+        if(!logs.isEmpty()){
+            equipmentSpecificAlarmLogService.updateBatchById(logs);
+        }
+    }
+
     void syncSystemctlMsg(EquipmentSpecificAlarmLog equipmentSpecificAlarmLog) {
         try {
             MessageModel model = new MessageModel();

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

@@ -494,18 +494,19 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
 
     @Override
     public List<Video> listByCode(String code) {
-
         return videoMapper.listByCode(code);
     }
 
 
     @Override
     public String getVideoUrl(String videoId, String presetIndex, String defaultUrl, String code) {
+    	String url = "";
         if ("hls".equals(vedioFormat)) {
-            String url = getVideoUrl(code);
-            return ObjectUtils.isEmpty(url) ? defaultUrl : url;
+            url = getVideoUrl(code);
+        } else {
+        	url = getFlvUrlByVideoIdOrPresetIndex(videoId, presetIndex);
         }
-        return getFlvUrlByVideoIdOrPresetIndex(videoId, presetIndex);
+        return ObjectUtils.isEmpty(url) ? defaultUrl : url;
     }
 
     @Override
@@ -554,7 +555,7 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
         } catch (Exception e) {
             log.error("flv视频流接口获取失败:{}", e.getMessage());
         }
-        return "flvUrl";
+        return "";
     }
 
 
@@ -576,7 +577,7 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
         if (respond.containsKey("rtsp")) {
             return respond.get("rtsp");
         }
-        return "rtsp";
+        return "";
     }
 
 }

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -350,8 +350,7 @@
         wl_equipment_specific_alarm_log wlesal
         LEFT JOIN wl_equipment we ON wlesal.equipment_code = we.code
         LEFT JOIN wl_equipment_specific_alarm wlesa ON wlesa.id = wlesal.equipment_specific_alarm_id) d
-        WHERE 1=1
-        AND d.fireEquipmentName IS NOT NULL
+        WHERE d.fireEquipmentName IS NOT NULL
         <if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">and
             d.warehouseStructureName like
             concat(concat("%",#{param.warehouseStructureName}),"%")