Merge branch 'CSFAS_V2.1.3.3' of…

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/HandlerMqttMessageImpl.java

@@ -163,7 +163,7 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
         deviceData.setMonitor(equipment != null ? equipment.getName() : "");
         deviceData.setId(String.valueOf(equipmentSpecific.getId()));
         deviceData.setCode(equipmentSpecific.getCode());
-        if (nameKey.equals("fireAlarm")) { //设备告警处理逻辑
+        if ("fireAlarm".equals(nameKey)) { //设备告警处理逻辑
             log.info("(报警)Message type is: " + specificIndexType);
 
             //通知刷新3d页面告警数据
@@ -183,7 +183,7 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
             if(EquipmentRiskTypeEnum.HZGJ.getCode().equals(specificIndexType)&&!ObjectUtils.isEmpty(equipment) && !ObjectUtils.isEmpty(equipment.getReservePlan())){
             	executeDynamicPlan(deviceData, equipment, equipmentSpecific, toke);
             }
-        } else if (nameKey.equals("fault")) { // 设备故障处理逻辑
+        } else if ("fault".equals(nameKey)) { // 设备故障处理逻辑
             log.info("(故障)Message type is: " + specificIndexType);
             long equipId = 0;
             if(StringUtil.isNotEmpty(equipment)) {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java

@@ -1077,6 +1077,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 EquipmentSpecificIndexVo equipmentSpecificIndexVo = new EquipmentSpecificIndexVo();
                 equipmentSpecificIndexVo.setEquipmentSpecificId(Long.parseLong(list.get(NumberEnum.ZERO.getValue()).toString()));
                 equipmentSpecificIndexVo.setType(typeCode);
+                equipmentSpecificIndexVo.setNameKey("fireAlarm");
 
                 TopicEntityVo topicEntity = new TopicEntityVo();
                 Equipment equipment = equipmentService.queryOne(id);

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_view3d.xml

@@ -488,13 +488,35 @@
 			ala.id,
 			ala.equipment_specific_id AS pointId,
 			'monitorEquipment' AS type,
-					spe.CODE,
+			spe. CODE,
 			ala.equipment_specific_index_name,
-					CONCAT( ala.equipment_specific_index_name, '(', ala.equipment_specific_name, ')' ) AS label,
+			CONCAT(
+				ala.equipment_specific_index_name,
+				'(',
+				ala.equipment_specific_name,
+				')',
+		
+			IF (
+				(
+					ISNULL(ws.full_name)
+					AND ISNULL(sd.description)
+				),
+				'',
+				CONCAT(
+					'【',
+					IFNULL(ws.full_name, ''),
+					' ',
+					IFNULL(sd.description, ''),
+					'】'
+				)
+			)
+			) AS label,
 			ala.create_date AS changeDate
 		FROM
 			wl_equipment_specific_alarm AS ala
 		LEFT JOIN wl_equipment_specific AS spe ON ala.equipment_specific_id = spe.id
+		LEFT JOIN wl_stock_detail sd ON sd.equipment_specific_id = spe.id
+		LEFT JOIN wl_warehouse_structure ws ON ws.id = sd.warehouse_structure_id
 		WHERE  ala.status = true
 		AND	   (ala.org_code = #{orgCode} OR ala.org_code like CONCAT(#{orgCode},'-%'))
 		AND    ala.type = 'FIREALARM'