更新指标推送代码

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/SpeIndexVo.java

@@ -31,4 +31,6 @@ public class SpeIndexVo {
     private String indexValue;
 
     private String indexName;
+
+    private String qrCode;
 }

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

@@ -1245,7 +1245,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
   
   /**
    * 组装数字换流站平台告警数据
-   * @param equipmentSpecificIndex
+   * @param
    * @return
    */
   private List<FireEquipmentFireAlarm> createFireEquipmentFireAlarmVo(List<EquipmentSpecificAlarmLog> equipmentAlarmLogs){
@@ -1280,13 +1280,13 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
    * @param equipmentSpecificIndexList
    */
   private void syncSpecificIndexsToGS(List<EquipmentSpecificIndex> equipmentSpecificIndexList){
-	  if (ObjectUtils.isEmpty(equipmentSpecificIndexList) && syncSwitch) {
+	  if (!ObjectUtils.isEmpty(equipmentSpecificIndexList) && syncSwitch) {
           //  数据同步
 		  List<EquipmentIndexVO> fireEquipMeasurementCollect = new ArrayList<>();
 		  equipmentSpecificIndexList.forEach(action->{
 			  EquipmentIndexVO equipmentIndexVO = new EquipmentIndexVO();
 			  BeanUtils.copyProperties(action, equipmentIndexVO);
-			  
+              fireEquipMeasurementCollect.add(equipmentIndexVO);
 		  });
           if (0 < fireEquipMeasurementCollect.size()) {
               syncDataService.syncCreatedFireEquipMeasurement(fireEquipMeasurementCollect);

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

@@ -363,10 +363,12 @@
 				spein.emergency_level AS emergencyLevel,
 				spein.emergency_level_describe AS emergencyLevelDescribe,
 				spein.`value` AS indexValue,
-				spein.equipment_index_name AS indexName
+				spein.equipment_index_name AS indexName,
+				wes.qr_code AS qrCode
 				FROM
 					wl_equipment_specific_index AS spein
 				LEFT JOIN wl_equipment_index AS eqin ON spein.equipment_index_id = eqin.id
+				LEFT JOIN wl_equipment_specific AS wes ON wes.id = spein.equipment_specific_id
 				WHERE
 					spein.equipment_specific_id = #{id}
 				ORDER BY