水源信息的完善

mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/FireWaterMapper.java

@@ -48,5 +48,6 @@ public interface FireWaterMapper {
                                      @Param("waterNature") String waterNature,
                                      @Param("getWaterType") String getWaterType,
                                      @Param("startTime") Date startTime,
-                                     @Param("endTime") Date endTime);
+                                     @Param("endTime") Date endTime,
+                                     @Param("waterFlag") String waterFlag);
 }

mhfire-mapping/src/main/resources/mapper/mysql/FireWaterMapper.xml

@@ -35,6 +35,9 @@
             <if test="endTime !=null">
                 and `BDP_AUDIT` &lt;= #{endTime}
             </if>
+            <if test="waterFlag !=null and waterFlag != ''">
+                and `可用状态` = #{waterFlag}
+            </if>
         </where>
     </select>
 </mapper>

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/FireWaterServiceImpl.java

@@ -39,23 +39,28 @@ public class FireWaterServiceImpl implements FireWaterService {
     public FireWaterStatisticsVO getFireWaterStatistics(Date startTime, Date endTime) {
         FireWaterStatisticsVO fireWaterStatisticsVO = new FireWaterStatisticsVO();
         fireWaterStatisticsVO.setMunicipalFireCode(
-                fireWaterMapper.selectCountByWaterNature("消火栓","市政",null,startTime,endTime));
+                fireWaterMapper.selectCountByWaterNature("消火栓","市政",null,startTime,endTime,null));
         fireWaterStatisticsVO.setCommunityFireCode(
-                fireWaterMapper.selectCountByWaterNature("消火栓","社区",null,startTime,endTime));
+                fireWaterMapper.selectCountByWaterNature("消火栓","社区",null,startTime,endTime,null));
         fireWaterStatisticsVO.setUnitFireCode(
-                fireWaterMapper.selectCountByWaterNature("消火栓","单位",null,startTime,endTime));
+                fireWaterMapper.selectCountByWaterNature("消火栓","单位",null,startTime,endTime,null));
         fireWaterStatisticsVO.setNaturalWater(
-                fireWaterMapper.selectCountByWaterNature("天然水源",null,null,startTime,endTime));
+                fireWaterMapper.selectCountByWaterNature("天然水源",null,null,startTime,endTime,null));
         fireWaterStatisticsVO.setMunicipalWater(
-                fireWaterMapper.selectCountByWaterNature(null,"市政",null,startTime,endTime));
+                fireWaterMapper.selectCountByWaterNature(null,"市政",null,startTime,endTime,null));
         fireWaterStatisticsVO.setResidentWater(
-                fireWaterMapper.selectCountByWaterNature(null,"居民",null,startTime,endTime));
+                fireWaterMapper.selectCountByWaterNature(null,"居民",null,startTime,endTime,null));
         fireWaterStatisticsVO.setUnitWater(
-                fireWaterMapper.selectCountByWaterNature(null,"单位",null,startTime,endTime));
+                fireWaterMapper.selectCountByWaterNature(null,"单位",null,startTime,endTime,null));
         fireWaterStatisticsVO.setMunicipalGetWater(
-                fireWaterMapper.selectCountByWaterNature(null,null,"市政",startTime,endTime));
+                fireWaterMapper.selectCountByWaterNature(null,null,"市政",startTime,endTime,null));
         fireWaterStatisticsVO.setLandGetWater(
-                fireWaterMapper.selectCountByWaterNature(null,null,"地上",startTime,endTime));
+                fireWaterMapper.selectCountByWaterNature(null,null,"地上",startTime,endTime,null));
+        Integer total =fireWaterStatisticsVO.getMunicipalGetWater()+fireWaterStatisticsVO.getLandGetWater();
+        fireWaterStatisticsVO.setMunicipalGetWaterRadio(fireWaterStatisticsVO.getMunicipalGetWater()/total.doubleValue());
+        fireWaterStatisticsVO.setLandGetWaterRadio(fireWaterStatisticsVO.getLandGetWater()/total.doubleValue());
+        Integer waterIntact = fireWaterMapper.selectCountByWaterNature(null, null, null, startTime, endTime, "1");
+        fireWaterStatisticsVO.setWaterIntact(waterIntact/total.doubleValue());
         return fireWaterStatisticsVO;
     }
 
@@ -67,15 +72,11 @@ public class FireWaterServiceImpl implements FireWaterService {
     public FireWaterPO enhanceFireWaterPo(Map<String,Object> fireWaterMap){
         FireWaterPO fireWaterPo = new FireWaterPO();
         fireWaterPo.setAddress(fireWaterMap.get("水源地址").toString());
-        //TODO 责任人字段没有
-        fireWaterPo.setDutyPerson(Optional.ofNullable(fireWaterMap.get("手机号")).orElse("").toString());
-        //TODO 手机号字段没有
-        fireWaterPo.setPhone(Optional.ofNullable(fireWaterMap.get("手机号")).orElse("").toString());
+        fireWaterPo.setPhone(Optional.ofNullable(fireWaterMap.get("联系方式")).orElse("").toString());
         fireWaterPo.setType(fireWaterMap.get("水源类型").toString());
         fireWaterPo.setJurisdictionalAgency(fireWaterMap.get("管辖机构名称").toString());
         fireWaterPo.setGetWaterType(fireWaterMap.get("取水形式").toString());
-        //TODO 水源行政字段没有
-        fireWaterPo.setWaterAdministrative(Optional.ofNullable(fireWaterMap.get("手机号")).orElse("").toString());
+        fireWaterPo.setWaterAdministrative(Optional.ofNullable(fireWaterMap.get("水源性质")).orElse("").toString());
         fireWaterPo.setStatus(fireWaterMap.get("可用状态").toString());
         fireWaterPo.setWaterUnit(fireWaterMap.get("供水单位").toString());
         fireWaterPo.setWaterGage(fireWaterMap.get("管网压力").toString());

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/FireWaterStatisticsVO.java

@@ -58,4 +58,19 @@ public class FireWaterStatisticsVO {
      */
     private Integer landGetWater;
 
+    /**
+     * 市政取水占比
+     */
+    private Double municipalGetWaterRadio;
+
+    /**
+     * 地下取水占比
+     */
+    private Double landGetWaterRadio;
+
+    /**
+     * 水源完好率
+     */
+    private Double waterIntact;
+
 }