Merge branch 'develop_station' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_station

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

@@ -422,7 +422,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             List<EquipmentSpecificAlarm> alarms = equipmentSpecificAlarmService.getBaseMapper().selectList(queryWrapper);
             if (0 < alarms.size()) {
                 alarms.stream().map(x -> x.setLocation(equipmentSpecific.getPosition() + " "
-                        + equipmentSpecific.getStockDetail().getDescription())).collect(Collectors.toList());
+                        +  null == equipmentSpecific.getStockDetail().getDescription() ? "" : equipmentSpecific.getStockDetail().getDescription())).collect(Collectors.toList());
                 equipmentSpecificAlarmService.updateBatchById(alarms);
             }
         }

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

@@ -968,7 +968,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
               }
           }
       } catch (Exception e) {
-
+            e.printStackTrace();
       }
   	return "";
   }

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

@@ -320,15 +320,13 @@
 			es.qr_code AS 'qrCode',
 			es.iot_code AS 'iotCode',
 			es.realtime_iot_index_value AS 'value',
-			sc.is_alarm AS isAlarm,
-            sc.emergency_level_color AS 'emergencyLevelColor'
+			ei.is_alarm AS isAlarm,
+            ei.emergency_level_color AS 'emergencyLevelColor'
 		FROM
 			wl_equipment_specific es,
-			wl_equipment_index ei,
-			wl_signal_classify sc
+			wl_equipment_index ei
 		WHERE
 			es.realtime_iot_index_id = ei.id
-            AND upper(ei.type_code) = upper(sc.type_code)
 		AND find_in_set(
 			es.id,
 			(