Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.IotSystemAlarmRo;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import com.yeejoin.equipmanage.common.dto.UserDto;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm;
@@ -16,8 +17,11 @@ import com.yeejoin.equipmanage.common.enums.AlarmCleanTypeEnum;
 import com.yeejoin.equipmanage.common.enums.AlarmStatusEnum;
 import com.yeejoin.equipmanage.common.enums.AlarmTypeEnum;
 import com.yeejoin.equipmanage.common.enums.TopicEnum;
+import com.yeejoin.equipmanage.common.utils.DateUtils;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
+import com.yeejoin.equipmanage.common.vo.Token;
 import com.yeejoin.equipmanage.fegin.JcsFeign;
+import com.yeejoin.equipmanage.fegin.SystemctlFeign;
 import com.yeejoin.equipmanage.mapper.ConfirmAlarmMapper;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmMapper;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
@@ -85,6 +89,12 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
     @Value("${window.vedioFormat}")
     String vedioFormat;
 
+    @Value("${isSendApp}")
+    private Boolean isSendApp;
+
+    @Autowired
+    private SystemctlFeign systemctlFeign;
+
     @Autowired
     private RuleConfirmAlarmService ruleConfirmAlamService;
 
@@ -96,6 +106,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
 
 
 
+
     @Override
     public Map<String, Object> getDetailsById(Long alarmId, Long equipId, String type, String area) {
         final String videoType = "video";
@@ -177,10 +188,15 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
                     }
                 }
                 if (isBatch == 1 && CollectionUtils.isNotEmpty(list)) {
-                    list.stream().forEach(x -> webMqttHandler.publish(TopicEnum.EQYQR.getTopic(), JSON.parseObject(JSON.toJSONString(x), HashMap.class)));
+                    list.stream().forEach(x ->{
+                        webMqttHandler.publish(TopicEnum.EQYQR.getTopic(), JSON.parseObject(JSON.toJSONString(x), HashMap.class));
+                        x.setAlarmReason(ent.getAlarmReason());
+//                        syncConfirmAlarmMsgToSystemctl(x);
+                    });
                 } else {
 //                    mqttSendGateway.sendToMqtt(TopicEnum.EQYQR.getTopic(), JSON.toJSONString(ent));
                     webMqttHandler.publish(TopicEnum.EQYQR.getTopic(), JSON.parseObject(JSON.toJSONString(ent), HashMap.class));
+//                    syncConfirmAlarmMsgToSystemctl(ent);
                 }
 //                syncDataService.syncCreatedSendAlarmReport(ent);
             }
@@ -200,6 +216,39 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
         }
     }
 
+    public void syncConfirmAlarmMsgToSystemctl(EquipmentSpecificAlarmLog equipmentSpecificAlarmLog) {
+        try {
+            MessageModel model = new MessageModel();
+            String alarmReason = ValidationUtil.isEmpty(equipmentSpecificAlarmLog.getAlarmReason()) ? "" : equipmentSpecificAlarmLog.getAlarmReason();
+            if (alarmReason.contains("：")) {
+                String[] split = alarmReason.split("：");
+                alarmReason = split[1];
+            }
+            model.setTitle(equipmentSpecificAlarmLog.getEquipmentSpecificIndexName());
+            String body = String.format("警情类型：%s；报警设备：%s；报警位置：%s；报警原因：%s；报警时间：%s",
+                    equipmentSpecificAlarmLog.getEquipmentSpecificIndexName(), equipmentSpecificAlarmLog.getEquipmentSpecificName(),
+                    equipmentSpecificAlarmLog.getLocation(), alarmReason,
+                    DateUtils.date2LongStr(equipmentSpecificAlarmLog.getCreateDate()));
+            model.setBody(body);
+            model.setMsgType("iotMonitor");
+            if (isSendApp){
+                model.setIsSendApp(true);
+                model.setTerminal("APP/WEB");
+            } else {
+                model.setIsSendApp(false);
+                model.setTerminal("WEB");
+            }
+            model.setIsSendWeb(true);
+            model.setCategory(1);
+            model.setRelationId(String.valueOf(equipmentSpecificAlarmLog.getId()));
+            Token token = remoteSecurityService.getServerToken();
+            systemctlFeign.create(token.getAppKey(), token.getProduct(), token.getToke(), model);
+            log.debug(String.format("调用平台消息服务成功：%s", JSON.toJSONString(model)));
+        } catch (Exception e) {
+            log.error("告警消息同步平台失败：syncSystemctlMsg，===>>>" + e.getMessage());
+        }
+    }
+
     @Override
     public Integer getFireAlarm() {
         return confirmAlarmMapper.getFireAlarm();

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

@@ -907,13 +907,14 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         equipmentSpecificAlarmLog.setEquipmentSpecificCode(equipmentSpecificAlarm.getCode());
         equipmentSpecificAlarmLog.setBuildId(equipmentSpecificAlarm.getBuildId());
         equipmentSpecificAlarmLog.setStatus(equipmentSpecificAlarm.getStatus());
-        equipmentSpecificAlarmLogService.save(equipmentSpecificAlarmLog);
+        boolean bool = equipmentSpecificAlarmLogService.save(equipmentSpecificAlarmLog);
         //  同步告警消息给平台
-        if (amosSwitch) {
+        if (amosSwitch && bool) {
+            EquipmentSpecificAlarmLog alarmLog = equipmentSpecificAlarmLogService.getById(equipmentSpecificAlarmLog.getId());
             new Thread(new Runnable() {
                 @Override
                 public void run() {
-                    syncSystemctlMsg(equipmentSpecificAlarmLog);
+                    syncSystemctlMsg(alarmLog);
                 }
             }).start();
         }