Merge branch 'dev_upgrade' into dev_upgrade-1225

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

@@ -20,6 +20,8 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
@@ -40,6 +42,7 @@ public class FireSourceController extends BaseController {
     private IWaterResourceService iWaterResourceService;
     @Autowired
     private IEquipmentService iEquipService;
+    private final Logger log = LoggerFactory.getLogger(FireSourceController.class);
 
     @Permission
     @ApiOperation(httpMethod = "POST", value = "添加消防装备", notes = "添加消防装备")
@@ -207,9 +210,15 @@ public class FireSourceController extends BaseController {
     @Permission
     @ApiOperation(httpMethod = "GET", value = "消防状态明细信息", notes = "消防状态明细信息")
     @RequestMapping(value = "/info/detail", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-    public CommonResponse queryForEquipmentList(@ApiParam(value = "设备名称", required = true) @RequestParam Long id,
+    public CommonResponse queryForEquipmentList(@ApiParam(value = "设备名称", required = true) @RequestParam String id,
                                                 @ApiParam(value = "设备编号", required = true) @RequestParam String type) throws Exception {
 
-        return CommonResponseUtil.success(iFireEquipService.queryForDetail(type, id));
+    	try{
+    		 return CommonResponseUtil.success(iFireEquipService.queryForDetail(type, Long.valueOf(id)));
+    	}catch (Exception e) {
+			log.error(e.getMessage(),e);
+			return CommonResponseUtil.failure("消防装备明细查询失败" + e.getMessage());
+		}
+       
     }
 }

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

@@ -663,8 +663,8 @@ public class RiskSourceController extends BaseController {
     @Permission
     @ApiOperation(value = "风险预警详情", notes = "风险预警详情")
     @GetMapping(value = "/warning/detail", produces = "application/json;charset=UTF-8")
-    public CommonResponse earlyWarning(@RequestParam Long riskSourceId) {
-        Map map = riskSourceService.earlyWarning(riskSourceId);
+    public CommonResponse earlyWarning(@RequestParam String riskSourceId) {
+        Map map = riskSourceService.earlyWarning(Long.valueOf(riskSourceId));
         return CommonResponseUtil.success(map);
     }
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/ImpAndFireEquipMapper.java

 package com.yeejoin.amos.fas.business.dao.mapper;
 
+import com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
 import com.yeejoin.amos.fas.dao.entity.EquipmentFireEquipment;
 import com.yeejoin.amos.fas.dao.entity.FireEquipment;
@@ -36,4 +37,6 @@ public interface ImpAndFireEquipMapper extends BaseMapper {
     public Boolean existsAlarmPointByEqpPointIdAndEquipId(@Param("pointId") long pointId, @Param("equipmentId") long equipmentId);
 //	Boolean containGroupedPoint(long id);
     
+    EquipmentSpecificIndexVo findFireEqupmentByCode(String code);
+
 }

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

@@ -998,21 +998,12 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @Override
     @javax.transaction.Transactional
     public String processFireEqumtData(AlarmParam deviceData) throws Exception {
-
-        EquipmentSpecificIndexVo equipmentSpecificIndexVo = new EquipmentSpecificIndexVo();
-        equipmentSpecificIndexVo.setEquipmentSpecificId(Long.valueOf(deviceData.getPointCode()));
-        equipmentSpecificIndexVo.setType("FIREALARM");
-
+    	EquipmentSpecificIndexVo equipmentSpecificIndexVo = impAndFireEquipMapper.findFireEqupmentByCode(deviceData.getPointCode());
     	TopicEntityVo topicEntity = new TopicEntityVo();
     	topicEntity.setMessage(JSON.toJSONString(equipmentSpecificIndexVo));
-
     	String data = JSON.toJSONString(topicEntity);
     	System.out.println(data);
-        iEquipmentHandlerService.handlerMqttMessage("", data);
-        // 格式化发送数据
-//        sendRiskSourceData(deviceData);
-//
-//        blockingQueue.add(deviceData);
+    	iEquipmentHandlerService.handlerMqttMessage("",data );
         return "SUCCESS";
     }
 

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

@@ -196,7 +196,7 @@
         <if test="startTime!=null">
             AND d.create_date BETWEEN '${startTime}' AND '${endTime}'
         </if>
-        AND e_value IS NOT NULL
+        AND e_value IS NOT NULL AND e_value != ''
         ORDER BY d.create_date desc
         LIMIT ${start},${length}
     </select>

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

@@ -158,4 +158,15 @@
 			and ep.id = #{pointId}
 	</select>
 	
+	<select id="findFireEqupmentByCode" resultType="com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo">
+			SELECT
+				id as equipmentSpecificId,
+				'FIREALARM' as type
+			FROM
+				wl_equipment_specific
+			WHERE
+				`code` = #{code}
+			LIMIT 1
+	</select>
+
 </mapper>
\ No newline at end of file

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

@@ -506,12 +506,13 @@
 		SELECT
 			wlesi.id,
 			wlesi.`value` status,
-			wlesi.create_date changeDate,
-			CONCAT(wlei.group_name,wlei.name) label
+			wlesi.update_date changeDate,
+			CONCAT(ed.name,' ',wlei.name) label
 		FROM
 			wl_equipment_specific_index wlesi
 			LEFT JOIN wl_equipment_index wlei ON wlesi.equipment_index_id = wlei.id
 			left join wl_equipment_specific wles on wlesi.equipment_specific_id = wles.id
+			left join wl_equipment_detail ed on ed.id = wles.equipment_detail_id
 		WHERE
 			wles.org_code=#{orgCode}
 			and wlei.type_code!='BREAKDOWN'
@@ -1326,7 +1327,7 @@
 
 	<select id="retrieveAll" resultType="java.util.HashMap">
 		select *,'{ "x": 0, "y": 0, "z": 0 }' rotationDTO,'{ "x": 1, "y": 1, "z": 1 }' scaleDTO
-		from (select concat('riskSource-',r.id) as id,r.id as originId,r.name,r.code,r.ue4_location as ue4Location,r.ue4_rotation as ue4Rotation ,'riskSource' as type,r.org_code as orgCode,
+		from (select concat('riskSource-',r.id) as id,concat(r.id) as originId,r.name,r.code,r.ue4_location as ue4Location,r.ue4_rotation as ue4Rotation ,'riskSource' as type,r.org_code as orgCode,
 		rl.level as level,rl.name as levelStr,r.is_indoor as isIndoor,'风险点' as typeName,'riskSource' as typeCode,
 		CASE
 		WHEN (
@@ -1354,7 +1355,8 @@
 		'' as person,
 		r.rpn as title,
 		CONCAT('riskSource-',r.id) as `key`,
-		r.id as riskSourceId
+		r.id as riskSourceId,
+		'' as room
 		from f_risk_source r
 		left join f_risk_level rl ON rl.id = r.risk_level_id
 		where r.is_region = 'FALSE'
@@ -1362,7 +1364,7 @@
 			AND rl.level = #{dataLevel}
 		</if>
 		UNION all
-		select concat('patrol-',p.id) as id,p.id as originId,p.name,p.point_no as code,p.ue4_location as ue4Location,p.ue4_rotation as ue4Rotation ,'patrol' as type,p.org_code as orgCode,
+		select concat('patrol-',p.id) as id,concat(p.id) as originId,p.name,p.point_no as code,p.ue4_location as ue4Location,p.ue4_rotation as ue4Rotation ,'patrol' as type,p.org_code as orgCode,
 		p.status as level,CONCAT('level_',p.status) as levelStr,p.is_indoor as isIndoor,'巡检点' as typeName,'patrol' as typeCode,
 		CASE
 		WHEN (
@@ -1395,11 +1397,13 @@
 		when p.status = '3' then '漏检'
 		end as title,
 		concat('patrol-',p.id) as `key`,
-		p.risk_source_id as riskSourceId
+		p.risk_source_id as riskSourceId,
+		r.name as room
 		from p_point p
+		left join f_risk_source r on r.id = p.risk_source_id
 		WHERE is_delete = FALSE
 		UNION all
-		select concat('impEquipment-',id) as id,id as originId,name,code,ue4_location as ue4Location,ue4_rotation as ue4Rotation ,'impEquipment' as type,org_code as orgCode,
+		select concat('impEquipment-',e.id) as id,concat(e.id) as originId,e.name,e.code,e.ue4_location as ue4Location,e.ue4_rotation as ue4Rotation ,'impEquipment' as type,e.org_code as orgCode,
 		0 as level,'level_0' as levelStr,e.is_indoor as isIndoor,'重点设备' as typeName,'impEquipment' as typeCode,
 		CASE
 		WHEN (
@@ -1425,12 +1429,14 @@
 		e.name as protectObjName,
 		'' as routeName,
 		'' as person,
-		name as title,
+		e.name as title,
 		concat('impEquipment-',e.id) as `key`,
-		e.risk_source_id as riskSourceId
+		e.risk_source_id as riskSourceId,
+		r.name as room
 		from f_equipment e
+		left join f_risk_source r on r.id = e.risk_source_id
 		UNION all
-		select concat('monitorEquipment-',m.id) as id,m.id as originId,det.name,m.code as code,'' as ue4Location,'' as ue4Rotation ,'monitorEquipment' as type,m.org_code as orgCode,
+		select concat('monitorEquipment-',m.id) as id,concat(m.id) as originId,det.name,m.code as code,'' as ue4Location,'' as ue4Rotation ,'monitorEquipment' as type,m.org_code as orgCode,
 		null as level , concat('level_',null) as levelStr,null as isIndoor,'探测器' as typeName,'monitorEquipment' as typeCode,
 		CASE
 		WHEN (
@@ -1458,7 +1464,8 @@
 		'' as person,
 		det.name as title,
 		concat('monitorEquipment-',m.id) as `key`,
-		risk.id as riskSourceId
+		risk.id as riskSourceId,
+		str.full_name as room
 		from wl_equipment_specific  m
 		left join wl_equipment_detail as det on m.equipment_detail_id = det.id
 		left join wl_equipment as equ on det.equipment_id = equ.id
@@ -1468,13 +1475,13 @@
 		left join f_risk_source as risk on str.source_id = risk.source_id
 		left join f_equipment_fire_equipment fe on fe.fire_equipment_id = m.id
 		left join f_equipment f on f.id = fe.equipment_id
-		where   substr(cat.code ,1,4) = '8501' and risk.source_id is not null
-		group By m.code
+		where   substr(cat.code ,1,4) = '8501'
 		<if test="protectObjName != null and protectObjName != ''">
 			AND f.name = #{protectObjName}
 		</if>
+		group By m.code
 		UNION all
-		select concat('video-',vi.id) as id,vi.id as originId,vi.name,vi.code,null as ue4Location,null as ue4Rotation ,'video' as type,vi.org_code as orgCode,
+		select concat('video-',vi.id) as id,concat(vi.id) as originId,vi.name,vi.code,null as ue4Location,null as ue4Rotation ,'video' as type,vi.org_code as orgCode,
 		null as level , concat('level_',null) as levelStr,null as isIndoor,'摄像头' as typeName,'video' as typeCode,
 		CASE
 		WHEN (
@@ -1502,7 +1509,8 @@
 		'' as person,
 		vi.name as title,
 		concat('video-',vi.id) as `key`,
-		vis.source_id as riskSourceId
+		vis.source_id as riskSourceId,
+		sou.name 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
@@ -1510,7 +1518,7 @@
 		group by vi.id
 
 		UNION all
-		select concat('hydrant-',spe.id) as id,spe.id as originId,det.name,spe.code as code,null as ue4Location,null as ue4Rotation ,'hydrant' as type,spe.org_code as orgCode,
+		select concat('hydrant-',spe.id) as id,concat(spe.id) as originId,det.name,spe.code as code,null as ue4Location,null as ue4Rotation ,'hydrant' as type,spe.org_code as orgCode,
 		0 as level , 'level_0' as levelStr,null as isIndoor,'消防栓' as typeName,'fireEquipment' as typeCode,
 		CASE
 		WHEN (
@@ -1538,7 +1546,8 @@
 		'' as person,
 		det.name as title,
 		concat('hydrant-',spe.id) as `key`,
-		risk.id as riskSourceId
+		risk.id as riskSourceId,
+		str.full_name as room
 		from
 		wl_equipment_specific as spe
 		left join wl_equipment_detail as det on spe.equipment_detail_id = det.id
@@ -1549,7 +1558,7 @@
 		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
 		UNION all
-		select concat('pool-',bu.id) as id,bu.id as originId,bu.name,bu.code,null as ue4Location,null as ue4Rotation,'pool' as type,bu.org_code as orgCode,
+		select concat('pool-',bu.id) as id,concat(bu.id) as originId,bu.name,bu.code,null as ue4Location,null as ue4Rotation,'pool' as type,bu.org_code as orgCode,
 		0 as level , 'level_0' as levelStr,null as isIndoor,'消防水池' as typeName,'fireEquipment' as typeCode,
 		CASE
 		WHEN (
@@ -1577,12 +1586,13 @@
 		'' as person,
 		bu.name as title,
 		concat('pool-',bu.id) as `key`,
-		bu.region_id as riskSourceId
+		bu.region_id as riskSourceId,
+		bu.address as room
 		from wl_building as bu
 		left join wl_equipment_category as cat on bu.equipment_code = cat.id
 		where   substr(cat.code ,1,4) = 9302
 		UNION all
-		select concat('fireCar-',car.id) as id,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,
+		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,
 		CASE
 		WHEN (
@@ -1610,12 +1620,13 @@
 		'' as person,
 		car.name as title,
 		concat('fireCar-',car.id) as `key`,
-		#{riskSourceId} as riskSourceId
+		#{riskSourceId} as riskSourceId,
+		'' as room
 		from wl_car as car
 		left join wl_equipment as equ on car.equipment_id = equ.id
 		left join wl_equipment_category as cat on equ.category_id = cat.id
 		UNION all
-		select concat('fireEquipment-',spe.id) as id,spe.id as originId,det.name,spe.code  as code,null as ue4Location,null as ue4Rotation,'fireEquipment' as type,spe.org_code as orgCode,
+		select concat('extinguisher-',spe.id) as id,concat(spe.id) as originId,det.name,spe.code  as code,null as ue4Location,null as ue4Rotation,'extinguisher' as type,spe.org_code as orgCode,
 		null as level , concat('level_',null) as levelStr,null as isIndoor,'灭火器' as typeName,'fireEquipment' as typeCode,
 		CASE
 		WHEN (
@@ -1642,8 +1653,9 @@
 		'' as routeName,
 		'' as person,
 		det.name as title,
-		concat('fireEquipment-',spe.id) as `key`,
-		risk.id as riskSourceId
+		concat('extinguisher-',spe.id) as `key`,
+		risk.id as riskSourceId,
+		str.full_name as room
 		from wl_equipment_specific as spe
 		left join wl_equipment_detail as det on spe.equipment_detail_id = det.id
 		left join wl_equipment as equ on det.equipment_id = equ.id
@@ -1653,7 +1665,7 @@
 		left join f_risk_source as risk on str.source_id = risk.source_id
 		where   substr(cat.code ,1,4) = '3104' and risk.source_id is not null
 		UNION all
-		select concat('fireChamber-',bu.id) as id,bu.id as originId,bu.name,bu.code,null as ue4Location,null as ue4Rotation , 'fireChamber' as type,bu.org_code as orgCode,
+		select concat('fireChamber-',bu.id) as id,concat(bu.id) as originId,bu.name,bu.code,null as ue4Location,null as ue4Rotation , 'fireChamber' as type,bu.org_code as orgCode,
 		0 as level , 'level_0' as levelStr,null as isIndoor,'泡沫间' as typeName,'fireEquipment' as typeCode,
 		CASE
 		WHEN (
@@ -1681,12 +1693,13 @@
 		'' as person,
 		bu.name as title,
 		concat('fireChamber-',bu.id) as `key`,
-		bu.region_id as riskSourceId
+		bu.region_id as riskSourceId,
+		bu.address as room
 		from wl_building as bu
 		left join wl_equipment_category as cat on bu.equipment_code = cat.id
 		where   substr(cat.code ,1,4) = 9305
 		UNION all
-		select concat('fireFoamRoom-',bu.id) as id,bu.id as originId,bu.name,bu.code,null as ue4Location,null as ue4Rotation , 'fireFoamRoom' as type,bu.org_code as orgCode,
+		select concat('fireFoamRoom-',bu.id) as id,concat(bu.id) as originId,bu.name,bu.code,null as ue4Location,null as ue4Rotation , 'fireFoamRoom' as type,bu.org_code as orgCode,
 		0 as level , 'level_0' as levelStr,null as isIndoor,'消防室' as typeName,'fireEquipment' as typeCode,
 		CASE
 		WHEN (
@@ -1714,7 +1727,8 @@
 		'' as person,
 		bu.name as title,
 		concat('fireFoamRoom-',bu.id) as `key`,
-		bu.region_id as riskSourceId
+		bu.region_id as riskSourceId,
+		bu.address as room
 		from wl_building as bu
 		left join wl_equipment_category as cat on bu.equipment_code = cat.id
 		where   substr(cat.code ,1,4) = '9301'