Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/core/common/request/DateUtil.java

@@ -1346,6 +1346,10 @@ public class DateUtil {
         int toDay = to.get(Calendar.DAY_OF_YEAR);
         int year = toYear  -  fromYear;
         int day = toDay  - fromDay;
+        if(day < 0){
+            day +=365;
+            year -=1; 
+        }
         param.put("year", year);
         param.put("day", day);
         return param;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/BubbleTipAction.java

@@ -30,7 +30,7 @@ public class BubbleTipAction implements CustomerAction
 	
 	
 	//@ExposeAction("气泡提示")
-	@RuleMethod(methodLabel = "气泡提示", project = "青海风险管控")
+	@RuleMethod(methodLabel = "气泡提示", project = "风险管控")
 	public void sendBubbleTip(Object bizobj, Boolean showInfo, Object title, String type)
 	{
 		BubbleTipResult result = new BubbleTipResult();

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/CheckInputItemRo.java

@@ -9,7 +9,7 @@ import lombok.Data;
 /**
  * @author DELL
  */
-@RuleFact(value = "检查项",project = "青海风险管控")
+@RuleFact(value = "检查项",project = "风险管控")
 @Data
 public class CheckInputItemRo implements Serializable {
 	/**

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/FireEquimentDataRo.java

@@ -7,7 +7,7 @@ import lombok.Data;
 
 import java.security.acl.LastOwnerException;
 
-@RuleFact(value = "消防设备",project = "青海风险管控")
+@RuleFact(value = "消防设备",project = "风险管控")
 @Data
 public class FireEquimentDataRo extends BasicsRo
 {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/ProtalDataRo.java

@@ -7,7 +7,7 @@ import com.yeejoin.amos.component.rule.RuleFact;
 import lombok.Data;
 
 
-@RuleFact(value = "巡检点",project = "青海风险管控")
+@RuleFact(value = "巡检点",project = "风险管控")
 @Data
 public class ProtalDataRo extends BasicsRo {
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/RiskSourceRo.java

@@ -8,7 +8,7 @@ import com.yeejoin.amos.component.rule.RuleFact;
 
 import lombok.Data;
 
-@RuleFact(value = "风险点",project = "青海风险管控")
+@RuleFact(value = "风险点",project = "风险管控")
 @Data
 public class RiskSourceRo extends BasicsRo {
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/RiskSourceRuleRo.java

@@ -7,7 +7,7 @@ import com.yeejoin.amos.component.rule.RuleFact;
 
 import lombok.Data;
 
-@RuleFact(value = "风险点-关联巡检点",project = "青海风险管控")
+@RuleFact(value = "风险点-关联巡检点",project = "风险管控")
 @Data
 public class RiskSourceRuleRo extends BasicsRo {
 

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

@@ -690,8 +690,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/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/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/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/RiskSourceServiceImpl.java

@@ -1025,10 +1025,10 @@ 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());
+//    			new EquipmentSpecificIndexVo();
+//    	equipmentSpecificIndexVo.setEquipmentSpecificId(Long.valueOf(deviceData.getPointCode()));
+//    	equipmentSpecificIndexVo.setType("FIREALARM");
 
     	TopicEntityVo topicEntity = new TopicEntityVo();
     	topicEntity.setMessage(JSON.toJSONString(equipmentSpecificIndexVo));

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

@@ -126,10 +126,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/changelog/fas-2.0.1.xml

@@ -554,16 +554,36 @@
             ALTER TABLE `f_station_info` ADD COLUMN `safety_user_phone_num` varchar(20) NULL COMMENT '安全负责人联系方式';
         </sql>
     </changeSet>
-    <changeSet author="zjw" id="16062323232111">
+    <changeSet author="keyong" id="1608279637-1">
         <preConditions onFail="MARK_RAN">
             <not>
-                <columnExists tableName="f_station_info" columnName="safety_user_phone_num" />
+                <columnExists tableName="f_station_info" columnName="fire_captain_name" />
             </not>
         </preConditions>
         <comment>修改f_station_info表结构</comment>
         <sql>
             ALTER TABLE `f_station_info` ADD COLUMN `fire_captain_name` varchar(20) NULL COMMENT '驻站消防队队长姓名';
+        </sql>
+    </changeSet>
+    <changeSet author="keyong" id="1608279637-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="f_station_info" columnName="fire_captain_phone_num" />
+            </not>
+        </preConditions>
+        <comment>修改f_station_info表结构</comment>
+        <sql>
             ALTER TABLE `f_station_info` ADD COLUMN `fire_captain_phone_num` varchar(20) NULL COMMENT '驻站消防队队长电话';
+        </sql>
+    </changeSet>
+    <changeSet author="keyong" id="1608279637-3">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="f_station_info" columnName="fire_captain_user_id" />
+            </not>
+        </preConditions>
+        <comment>修改f_station_info表结构</comment>
+        <sql>
             ALTER TABLE `f_station_info` ADD COLUMN `fire_captain_user_id` varchar(20) NULL COMMENT '驻站消防队队长';
         </sql>
     </changeSet>

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>
@@ -287,6 +287,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`,
@@ -583,4 +601,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_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_risk_source.xml

@@ -647,7 +647,7 @@
 
 
 	<select id="queryContingencyWater"  resultType="java.util.HashMap">
-		<!-- SELECT
+	<!--SELECT
 			wr.alarm_level,
 			wr.max_level,
 			wr.area,
@@ -664,7 +664,31 @@
 			wr.alarm_level,
 			wr.max_level,
 			wr.area,
-			wr.`name` -->
+			wr.`name`-->
+		SELECT
+		*
+		FROM
+		(
+		SELECT
+		building.height AS alarm_level,
+		building.warn_height AS max_level,
+		building.area_measure AS area,
+		building.CODE AS CODE,
+		building.NAME AS NAME,
+		3.6 AS
+		VALUE
+
+		FROM
+		wl_building building
+		LEFT JOIN wl_equipment_category category ON building.equipment_code = category.id
+		WHERE
+		category.CODE = 93020000
+		) wr
+		GROUP BY
+		wr.alarm_level,
+		wr.max_level,
+		wr.area,
+		wr.`name`
 	</select>