修改三维屏接口

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

@@ -6,6 +6,8 @@ import com.yeejoin.amos.fas.business.param.FireEquipmentParam;
 import com.yeejoin.amos.fas.business.vo.EquipCommunicationData;
 import com.yeejoin.amos.fas.core.common.response.EquipDetailsResponse;
 import com.yeejoin.amos.fas.dao.entity.FireEquipment;
+import com.yeejoin.amos.fas.dao.entity.FireStation;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.HashMap;
@@ -56,6 +58,8 @@ public interface FireEquipMapper extends BaseMapper {
 
     List<Map> queryForGroupCount(@Param("fireStationId") Long fireStationId);
     
+    List<Map> queryStorageEquips(@Param("riskSourceId") Long riskSourceId);
+
     EquipDetailsResponse findEquipDetailsById(@Param("id") Long id);
 
     EquipCommunicationData findOneByPointCode(@Param("code") String code);
@@ -85,4 +89,6 @@ public interface FireEquipMapper extends BaseMapper {
     FireEquipment findFireEquipById (@Param("id") Long id);
 
     FireEquipment findVideoById (@Param("id") Long id);
+    
+    FireStation findFireStationById(@Param("id") Long id);
 }

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

@@ -147,25 +147,25 @@ public class FireEquipServiceImpl implements IFireEquipService {
         switch (fireEquipmentType)
         {
             case pool:
-            case hydrant:
-                Optional<WaterResource> waterResource = this.iWaterResourceDao.findById(id);
-                if(waterResource.isPresent()){
-                	returnEntity = waterResource.get();
-            	}
-
-
+            	 FireStation fireStation = fireEquipMapper.findFireStationById(id);
+            	 fireStation.setType("2");
+                 fireStation.setFireEquipmentInfo(this.fireEquipMapper.queryStorageEquips(id));
+                 returnEntity = fireStation;
                  break;
             case fireFoamRoom:
+            	 FireStation fireStation1 = fireEquipMapper.findFireStationById(id);
+            	 fireStation1.setType("2");
+                 fireStation1.setFireEquipmentInfo(this.fireEquipMapper.queryStorageEquips(id));
+                 returnEntity = fireStation1;
+                 break;
             case fireChamber:
-                Optional<FireStation> fireStation1 = iFireStationDao.findById(id);
-                FireStation fireStation=null;
-                if(fireStation1.isPresent()){
-                	 fireStation=fireStation1.get();
-            	}
-                fireStation.setFireEquipmentInfo(this.fireEquipMapper.queryForGroupCount(id));
-                returnEntity = fireStation;
+            	 FireStation fireStation11 = fireEquipMapper.findFireStationById(id);
+            	 fireStation11.setType("1");
+                fireStation11.setFireEquipmentInfo(this.fireEquipMapper.queryStorageEquips(id));
+                returnEntity = fireStation11;
                 break;
             case extinguisher:
+            case hydrant:
             case monitorEquipment:
                 FireEquipment fireEquipment=fireEquipMapper.findFireEquipById(id);
                 fireEquipment.setEquipClassify(Integer.parseInt(EquipClassifyEnum.EQUIPMENT.getCode()));

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

@@ -134,10 +134,6 @@ public class View3dServiceImpl implements IView3dService {
     @Autowired
     private RemoteSecurityService remoteSecurityService;
 
-    @Value("${station.equipment.code}")
-    private String equipmentCode;
-
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public CommonResponse setPoint3dPosition(List<BindPointBo> pointBoList) {

YeeAmosFireAutoSysStart/src/main/resources/application.properties

@@ -75,13 +75,23 @@ amos.feign.gennerator.use-gateway=true
 autoSys.push.type=mqtt
 
 #查询装备分类
+
+#消防视频：xfsp
 #消防车：2101
-#灭火器：3104
-#消火栓：3105
-#探测器：8501
+data.type.fireChamber=2101
 #消防小室：9301
+data.type.fireChamber=9301
 #消防水池：9302
+data.type.pool=9302
 #消防泡沫间：9305
-#消防视频：xfsp
-station.equipment.code=2101,3104,3105,8501,9301,9302,9305,xfsp
+data.type.fireFoamRoom=9305
+#探测器：8501
+data.type.monitorEquipment=8501
+#灭火器：3104
+data.type.extinguisher=3104
+#消火栓：3105
+data.type.hydrant=3105
+
+
+
 

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

@@ -286,6 +286,24 @@
 			)
 	</select>
 	
+	<select id="queryStorageEquips" resultType="map">
+		SELECT
+			wed.`name`,
+			u.`name` AS unit,
+			sum(wsd.amount) fireEquipmentCount
+		FROM
+			wl_stock_detail wsd
+		LEFT JOIN wl_equipment_detail wed ON wed.id = wsd.equipment_detail_id
+		LEFT JOIN wl_equipment we ON we.id = wed.equipment_id
+		LEFT JOIN wl_unit u ON u.id = we.unit_id
+		LEFT JOIN wl_warehouse_structure ws ON ws.id = wsd.warehouse_structure_id
+		WHERE
+			ws.source_id = #{riskSourceId}
+		GROUP BY
+			wsd.equipment_detail_id,
+			wed.`name`
+	</select>
+
     <select id="findEquipDetailsById" resultType="com.yeejoin.amos.fas.core.common.response.EquipDetailsResponse">
         SELECT
         eq.`name`,
@@ -582,4 +600,16 @@
             video.id = #{id}
         </if>
     </select>
+    
+    <select id="findFireStationById" resultType="com.yeejoin.amos.fas.dao.entity.FireStation">
+       SELECT
+			wb.`name`,
+			wb.`code`,
+			wb.address,
+			wb.region_id AS riskSourceId
+		FROM
+			wl_building wb
+		WHERE
+			wb.id = #{id}
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -1466,7 +1466,7 @@
 		left join wl_warehouse_structure as str on sto.warehouse_structure_id = str.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
+		where   substr(cat.code ,1,4) = '8501'
 		group By m.code
 		<if test="protectObjName != null and protectObjName != ''">
 			AND f.name = #{protectObjName}
@@ -1544,7 +1544,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.id
-		where   substr(cat.code ,1,4)= 3105
+		where   substr(cat.code ,1,4)= '3105'
 		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,
 		0 as level , 'level_0' as levelStr,null as isIndoor,'消防水池' as typeName,'fireEquipment' as typeCode,
@@ -1647,7 +1647,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.id
-		where   substr(cat.code ,1,4) = 3104
+		where   substr(cat.code ,1,4) = '3104'
 		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,
 		0 as level , 'level_0' as levelStr,null as isIndoor,'泡沫间' as typeName,'fireEquipment' as typeCode,
@@ -1713,7 +1713,7 @@
 		bu.region_id as riskSourceId
 		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
+		where   substr(cat.code ,1,4) = '9301'
 		) as tmp
 		<where>
 			<if test="inputText!=null and inputText != ''" >