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

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificIndex.java

@@ -101,4 +101,12 @@ public class EquipmentSpecificIndex extends BaseEntity {
 
     @TableField(exist = false)
     private String valueEnum;
+
+    @ApiModelProperty(value = "设备CODE")
+    @TableField(exist = false)
+    private String equipmentSpecificCode;
+
+    @ApiModelProperty(value = "设备所属系统ids")
+    @TableField(exist = false)
+    private String systemId;
 }

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

@@ -70,9 +70,6 @@ public class EquipmentDetailController extends AbstractBaseController {
     IEquipmentSpecificSerivce equipmentSpecificSerivce;
 
     @Autowired
-    private IEquipmentDetailService equipmentDetailService;
-
-    @Autowired
     private IExcelService excelService;
 
     @Autowired

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

 package com.yeejoin.equipmanage.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-//import net.sf.json.JSONObject;
-import com.sun.org.apache.xpath.internal.operations.Bool;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.TransactionSynchronization;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipment;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentDefectAlarm;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentFaultAlarm;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentFireAlarm;
 import com.yeejoin.equipmanage.common.dto.TemperatureAlarmDto;
-import com.yeejoin.equipmanage.common.entity.CarProperty;
-import com.yeejoin.equipmanage.common.entity.EquipmentAlarmReportDay;
-import com.yeejoin.equipmanage.common.entity.EquipmentDetail;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
-import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
+import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
-import com.yeejoin.equipmanage.common.entity.vo.CarIndexVo;
-import com.yeejoin.equipmanage.common.entity.vo.CarPropertyVo;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentIndexVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentStateVo;
-import com.yeejoin.equipmanage.common.entity.vo.IndexStateVo;
-import com.yeejoin.equipmanage.common.enums.AlarmStatusEnum;
-import com.yeejoin.equipmanage.common.enums.AlarmTypeEnum;
-import com.yeejoin.equipmanage.common.enums.CarForGisEnum;
-import com.yeejoin.equipmanage.common.enums.EquipAndCarEnum;
-import com.yeejoin.equipmanage.common.enums.EquipmentIndexLabelsEnum;
-import com.yeejoin.equipmanage.common.enums.EquipmentRiskTypeEnum;
-import com.yeejoin.equipmanage.common.enums.NBalarmEnum;
-import com.yeejoin.equipmanage.common.enums.RiskLeverForAutoSys;
-import com.yeejoin.equipmanage.common.enums.TemperatureAlarm;
-import com.yeejoin.equipmanage.common.enums.TopicEnum;
-import com.yeejoin.equipmanage.common.enums.TrueOrFalseEnum;
+import com.yeejoin.equipmanage.common.entity.vo.*;
+import com.yeejoin.equipmanage.common.enums.*;
 import com.yeejoin.equipmanage.common.utils.DateUtils;
 import com.yeejoin.equipmanage.common.utils.EquipmentStateUtil;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
-import com.yeejoin.equipmanage.common.vo.CarIndexGisVo;
-import com.yeejoin.equipmanage.common.vo.EquipmentIndexLabelsVo;
-import com.yeejoin.equipmanage.common.vo.EquipmentVo;
-import com.yeejoin.equipmanage.common.vo.IotDataVO;
-import com.yeejoin.equipmanage.common.vo.Token;
-import com.yeejoin.equipmanage.common.vo.TopicEntityVo;
+import com.yeejoin.equipmanage.common.vo.*;
 import com.yeejoin.equipmanage.fegin.SystemctlFeign;
-import com.yeejoin.equipmanage.mapper.CarMapper;
-import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmMapper;
-import com.yeejoin.equipmanage.mapper.EquipmentSpecificIndexMapper;
-import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
-import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
+import com.yeejoin.equipmanage.mapper.*;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
-import com.yeejoin.equipmanage.service.ICarPropertyService;
-import com.yeejoin.equipmanage.service.IEquipmentAlarmReportDayService;
-import com.yeejoin.equipmanage.service.IEquipmentDetailService;
-import com.yeejoin.equipmanage.service.IEquipmentIndexService;
-import com.yeejoin.equipmanage.service.IEquipmentService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmLogService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificIndexSerivce;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificIndexService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
-import com.yeejoin.equipmanage.service.IFireFightingSystemService;
-import com.yeejoin.equipmanage.service.IMainIotMonitorSerivce;
-import com.yeejoin.equipmanage.service.ISyncDataService;
-import com.yeejoin.equipmanage.service.MqttReceiveService;
-import com.yeejoin.equipmanage.service.MqttSendGateway;
+import com.yeejoin.equipmanage.service.*;
 import com.yeejoin.equipmanage.utils.BeanUtil;
-
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionSynchronization;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+//import net.sf.json.JSONObject;
 
 /**
  * @author keyong
@@ -209,8 +154,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Value("${isSendApp}")
     private Boolean isSendApp;
 
-    private static final String A = "A";
-
     private final static Map staticMap = new HashMap();
 
     private static Boolean bool = Boolean.FALSE;
@@ -311,21 +254,21 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                         equipmentSpecificIndex.setValue(value);
                         String enumStr = equipmentSpecificIndex.getValueEnum();
                         if (!ObjectUtils.isEmpty(enumStr)) {
-                          try {
-                            JSONArray jsonArray = JSONArray.parseArray(enumStr);
-                            for (int i = 0; i < jsonArray.size(); i++) {
-                              JSONObject jsonObject = jsonArray.getJSONObject(i);
-                              if (jsonObject.get("key").equals(value)) {
-                                equipmentSpeIndex.setValueLabel(jsonObject.getString("label"));
-                                equipmentSpecificIndex.setValueLabel(jsonObject.getString("label"));
-                              }
-                            }
-                          } catch (Exception e) {
+                            try {
+                                JSONArray jsonArray = JSONArray.parseArray(enumStr);
+                                for (int i = 0; i < jsonArray.size(); i++) {
+                                    JSONObject jsonObject = jsonArray.getJSONObject(i);
+                                    if (jsonObject.get("key").equals(value)) {
+                                        equipmentSpeIndex.setValueLabel(jsonObject.getString("label"));
+                                        equipmentSpecificIndex.setValueLabel(jsonObject.getString("label"));
+                                    }
+                                }
+                            } catch (Exception e) {
 
-                          }
+                            }
                         }
-                        
-                        
+
+
                         equipmentSpecificIndexList.add(equipmentSpeIndex);
                         equipmentSpecificAlarms.addAll(addIndexAlarmRecord(equipmentSpeIndex, iotDatalist));
                         equipmentAlarmReports.add(addEquipAlarmReportRecord(equipmentSpeIndex));
@@ -447,7 +390,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                         equipmentSpecificAlarmService.saveOrUpdate(action);
                         if (AlarmStatusEnum.BJ.getCode() == action.getStatus()) {
                             equipmentAlarmLogs.add(addEquipAlarmLogRecord(action));
-                            if (ValidationUtil.isEmpty(action.getAlamContent())){
+                            if (ValidationUtil.isEmpty(action.getAlamContent())) {
                                 action.setAlamContent(action.getEquipmentSpecificName() + action.getEquipmentSpecificIndexName());
                             }
                             mqttSendGateway.sendToMqtt(TopicEnum.EQDQR.getTopic(), JSONArray.toJSON(action).toString());
@@ -759,7 +702,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             x.setCleanTime(new Date());
             x.setStatus(AlarmStatusEnum.HF.getCode());
         });
-        if(!logs.isEmpty()){
+        if (!logs.isEmpty()) {
             equipmentSpecificAlarmLogService.updateBatchById(logs);
         }
     }
@@ -779,7 +722,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                     DateUtils.date2LongStr(equipmentSpecificAlarmLog.getCreateDate()));
             model.setBody(body);
             model.setMsgType("iotMonitor");
-            if (isSendApp){
+            if (isSendApp) {
                 model.setIsSendApp(true);
                 model.setTerminal("APP/WEB");
             } else {
@@ -803,7 +746,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         EquipmentSpecificIndex equipmentSpecificIndex = handleTemperatureAlarm(equipmentSpcIndex, iotDatalist);
         List<EquipmentSpecificAlarm> equipmentSpecificAlarms = new ArrayList<>();
         EquipmentSpecificAlarm equipmentSpecificAlarm = new EquipmentSpecificAlarm();
-
+        equipmentSpecificAlarm.setSystemIds(equipmentSpcIndex.getSystemId());
+        equipmentSpecificAlarm.setSystemCodes(this.getSystemCodeBySpeId(equipmentSpcIndex.getSystemId()));
         if (EquipmentRiskTypeEnum.GZ.getCode().equals(equipmentSpecificIndex.getTypeCode()) || EquipmentRiskTypeEnum.HZGJ.getCode().equals(equipmentSpecificIndex.getTypeCode())
                 || EquipmentRiskTypeEnum.PB.getCode().equals(equipmentSpecificIndex.getTypeCode())) {
             List<EquipmentSpecificAlarm> indexAlarms = equipmentSpecificAlarmMapper.findEquipmentSpecificAlarmByEquipmentSpecificIdAndEquipmentIndexIdAndStatusIstrue(equipmentSpecificIndex.getEquipmentSpecificId(), equipmentSpecificIndex.getEquipmentIndexId());
@@ -811,7 +755,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             if (verifyNB(equipmentSpecificIndex.getNameKey())) {
                 return getNbEquipAlarmList(indexAlarms, equipmentSpecificIndex, equipmentSpecificAlarm);
             }
-
             // 报警表新增信息
             if (ObjectUtils.isEmpty(indexAlarms) && (TrueOrFalseEnum.real.value.equals(equipmentSpecificIndex.getValue()))) {
                 addEquipmentSpecificAlarm(equipmentSpecificAlarms, equipmentSpecificIndex, equipmentSpecificAlarm);
@@ -828,6 +771,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                         action.setStatus(AlarmStatusEnum.HF.getCode());
                     }
                     action.setUpdateDate(new Date());
+                    // 更新所在系统,设备可能编辑过
+                    action.setSystemIds(equipmentSpcIndex.getSystemId());
+                    action.setSystemCodes(this.getSystemCodeBySpeId(equipmentSpcIndex.getSystemId()));
                     equipmentSpecificAlarms.add(action);
                 });
             }
@@ -836,27 +782,13 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         return equipmentSpecificAlarms;
     }
 
-    public String getSystemCodeBySpeId(EquipmentSpecific equipmentSpecific) {
-        List<FireFightingSystemEntity> sys = new ArrayList<>();
-        String[] ids;
-        String sysIds = equipmentSpecific.getSystemId();
+    private String getSystemCodeBySpeId(String sysIds) {
         if (StringUtil.isNotEmpty(sysIds)) {
-            if (-1 != sysIds.indexOf(",")) {
-                ids = sysIds.split(",");
-                sys = fireFightingSystemMapper.getFightingSysByIds(ids);
-            } else {
-                FireFightingSystemEntity entity = fireFightingSystemMapper.selectById(Long.valueOf(sysIds));
-                sys.add(entity);
-            }
+            List<FireFightingSystemEntity> sys = fireFightingSystemMapper.getFightingSysByIds(sysIds.split(","));
+            return sys.stream().map(FireFightingSystemEntity::getCode).collect(Collectors.joining(","));
+        } else {
+            return null;
         }
-        StringBuilder sb = new StringBuilder();
-        sys.forEach(x -> {
-            if (0 < sb.length()) {
-                sb.append(",");
-            }
-            sb.append(x.getCode());
-        });
-        return sb.toString();
     }
 
     private EquipmentAlarmReportDay addEquipAlarmReportRecord(EquipmentSpecificIndex equipmentSpecificIndex) {
@@ -943,23 +875,13 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         } else if (EquipmentRiskTypeEnum.PB.getCode().equals(equipmentSpecificIndex.getTypeCode())) {
             equipmentSpecificAlarm.setType(EquipmentRiskTypeEnum.PB.getCode());
         }
-
         equipmentSpecificAlarm.setCreateDate(new Date());
         equipmentSpecificAlarm.setUpdateDate(new Date());
-        QueryWrapper<EquipmentSpecific> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("id", equipmentSpecificIndex.getEquipmentSpecificId());
-        EquipmentSpecific specific = equipmentSpecificMapper.selectOne(queryWrapper);
-        equipmentSpecificAlarm.setSystemIds(specific.getSystemId());
-        if (!ValidationUtil.isEmpty(specific.getSystemId())) {
-            String codes = this.getSystemCodeBySpeId(specific);
-            equipmentSpecificAlarm.setSystemCodes(codes);
-        }
         equipmentSpecificAlarm.setEquipmentCode(equipmentSpecificIndex.getEquipmentCode());
         equipmentSpecificAlarm.setEquipmentId(equipmentSpecificIndex.getEquipmentId());
         equipmentSpecificAlarm.setEquipmentDetailId(equipmentSpecificIndex.getEquipmentDetailId());
-        equipmentSpecificAlarm.setCode(specific.getCode());
+        equipmentSpecificAlarm.setCode(equipmentSpecificIndex.getEquipmentSpecificCode());
         equipmentSpecificAlarms.add(equipmentSpecificAlarm);
-        
         return equipmentSpecificAlarms;
     }
 
@@ -968,7 +890,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         List<EquipmentSpecificAlarm> equipmentSpecificAlarmList = new ArrayList<>();
         if (ValidationUtil.isEmpty(indexAlarms)) { // 告警表为空，新增告警数据
             addEquipmentSpecificAlarm(equipmentSpecificAlarmList, equipmentSpecificIndex, equipmentSpecificAlarm);
-            if (!checkStateIsNormal(equipmentSpecificAlarm, equipmentSpecificIndex)){
+            if (!checkStateIsNormal(equipmentSpecificAlarm, equipmentSpecificIndex)) {
                 return equipmentSpecificAlarmList;
             } else {
                 equipmentSpecificAlarmList.clear();
@@ -988,6 +910,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                 } else {
                     action.setFrequency((action.getFrequency() + 1));
                 }
+                // 更新所在系统,设备可能编辑过
+                action.setSystemIds(equipmentSpecificIndex.getSystemId());
+                action.setSystemCodes(this.getSystemCodeBySpeId(equipmentSpecificIndex.getSystemId()));
                 action.setUpdateDate(new Date());
                 equipmentSpecificAlarmList.add(action);
             });

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

@@ -55,7 +55,9 @@
 			wesi.update_date AS updateDate,
 			ed.code AS equipmentCode,
 			ed.equipment_id AS equipmentId,
-			ed.id AS equipmentDetailId
+			ed.id AS equipmentDetailId,
+			wes.code as equipmentSpecificCode,
+			wes.system_id as systemId
         FROM
         wl_equipment_specific_index AS wesi
         LEFT JOIN wl_equipment_specific AS wes ON wes.id = wesi.equipment_specific_id