Merge branch 'dev_upgrade-1225' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into eqintegration

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/AlarmController.java

@@ -27,8 +27,10 @@ import io.swagger.annotations.ApiParam;
 @RequestMapping("/api/alarm")
 @Api("报警信息api")
 public class AlarmController extends BaseController {
+	
 	@Autowired 
 	IAlarmService iAlarmService;
+	
 	/**
 	 * 风险等级分页查询
 	 * 

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

@@ -157,8 +157,8 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
         deviceData.setId(String.valueOf(equipmentSpecific.getId()));
         deviceData.setCode(equipmentSpecific.getCode());
         //设备告警处理逻辑
-        if (EquipmentRiskTypeEnum.HZGJ.getCode().equals(equipmentSpecificIndex.getType())) {
-            log.info("(报警)Message type is: " + equipmentSpecificIndex.getType());
+        if (EquipmentRiskTypeEnum.HZGJ.getCode().equals(specificIndexType)) {
+            log.info("(报警)Message type is: " + specificIndexType);
             /**
              * 推送告警数据
              * 影响区域：消防安全=>火灾告警
@@ -168,9 +168,9 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
             // 报警触发调用规则服务
             //注释自动触发预案
             //executeDynamicPlan(deviceData, equipment, equipmentSpecific, toke,topicEntity.getRecordId());
-        } else if (EquipmentRiskTypeEnum.GZ.getCode().equals(equipmentSpecificIndex.getType())) {
+        } else if (EquipmentRiskTypeEnum.GZ.getCode().equals(specificIndexType)) {
             // 设备故障处理逻辑
-            log.info("(故障)Message type is: " + equipmentSpecificIndex.getType());
+            log.info("(故障)Message type is: " +specificIndexType);
             final String stateTrue = "true";
             final String stateFalse = "false";
             String state = equipmentSpecificIndex.getValue();
@@ -200,7 +200,7 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
            
         } else {
             // 监测数据逻辑
-            log.info("(监测)Message type is: " + equipmentSpecificIndex.getType());
+            log.info("(监测)Message type is: " + specificIndexType);
             Map<String, Object> content = new HashMap<>();
             content.put("id", equipmentSpecific.getId());
             content.put("label", equipmentSpecific.getName()+" "+equipmentSpecificIndex.getEquipmentIndexName());

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

@@ -1540,16 +1540,16 @@
 		)
 		END positionDTO,
 		vi.name as label,
-		sou.name as protectObjName,
+		ws.name as protectObjName,
 		'' as routeName,
 		'' as person,
 		vi.name as title,
 		concat('video-',vi.id) as `key`,
 		vis.source_id as riskSourceId,
-		sou.name as room
+		CONCAT(ws.full_name,vi.address) AS room
 		from wl_video as vi
 		left join wl_video_source as vis on vi.id = vis.video_id
-		left join f_risk_source as sou on sou.id = vis.source_id
+		LEFT JOIN wl_warehouse_structure AS ws ON ws.id = vis.source_id
 		where vis.source_id is not null
 		group by vi.id
 		UNION all
@@ -1581,7 +1581,7 @@
 		'' as person,
 		det.name as title,
 		concat('hydrant-',spe.id) as `key`,
-		risk.id as riskSourceId,
+		str.source_id as riskSourceId,
 		str.full_name as room
 		from
 		wl_equipment_specific as spe
@@ -1590,8 +1590,7 @@
 		left join wl_equipment_category as cat on equ.category_id = cat.id
 		left join wl_stock_detail as sto on  sto.qr_code = spe.qr_code
 		left join wl_warehouse_structure as str on sto.warehouse_structure_id = str.source_id
-		left join f_risk_source as risk on str.source_id = risk.source_id
-		where   substr(cat.code ,1,4)= '3105' and risk.source_id is not null
+		where   substr(cat.code ,1,4)= '3105' and str.source_id is not null
 		UNION all
 		select
 		concat('pool-',s.instanceId) as id,
@@ -1636,9 +1635,8 @@
 		FROM
 		`wl_form_instance` a where a.group_code in('pool','r_pool')
 		GROUP BY
-		a.instance_id) s,
-		f_risk_source r
-		where s.instanceId = r.source_id
+		a.instance_id) s
+		LEFT JOIN f_risk_source r ON s.instanceId = r.source_id
 		UNION all
 		select concat('fireCar-',car.id) as id,concat(car.id) as originId,car.name,car.car_num as code,null as ue4Location,null as ue4Rotation, 'fireCar' as type,car.org_code as orgCode,
 		0 as level , 'level_0' as levelStr,null as isIndoor,'消防车' as typeName,'fireEquipment' as typeCode,