测试

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/FireStatisticsControllerWeb.java

@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.xml.crypto.Data;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -53,8 +55,8 @@ public class FireStatisticsControllerWeb {
     @GetMapping("page")
     public ApiResult<CommonPage<FireStatisticsPO>> page(@RequestParam Integer current,
                                                         @RequestParam Integer size,
-                                                        @RequestParam(required = false)String startTime,
-                                                        @RequestParam(required = false)String endTime,
+                                                        @RequestParam(required = false) Date startTime,
+                                                        @RequestParam(required = false) Date endTime,
                                                         @RequestParam(required = false)String address){
         return ApiResult.success(fireStatisticsService.page(current, size, startTime, endTime, address));
     }
@@ -90,8 +92,8 @@ public class FireStatisticsControllerWeb {
      * @return
      */
     @GetMapping("fireCauseRatio")
-    public ApiResult<List<FireLevelRatioVO>> getGroupByLevel(@RequestParam(required = false) String startTime,
-                                                             @RequestParam(required = false)String endTime,
+    public ApiResult<List<FireLevelRatioVO>> getGroupByLevel(@RequestParam(required = false) Date startTime,
+                                                             @RequestParam(required = false)Date endTime,
                                                              @RequestParam(required = false)String address){
         return ApiResult.success(fireStatisticsService.getGroupByLevel(startTime,endTime,address));
     }

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/SiAeAllControllerWeb.java

@@ -6,6 +6,7 @@ import com.bizmatics.mhfire.service.vo.SiAeAllVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -29,8 +30,8 @@ public class SiAeAllControllerWeb {
      * @return
      */
     @GetMapping("/siAeAllCollect")
-    public ApiResult<List<SiAeAllVO>> aeAllCollect(@RequestParam(required = false) String startTime,
-                                                   @RequestParam(required = false) String endTime){
+    public ApiResult<List<SiAeAllVO>> aeAllCollect(@RequestParam(required = false) Date startTime,
+                                                   @RequestParam(required = false) Date endTime){
         return ApiResult.success(aeAllService.getAeAllCollect(startTime,endTime));
     }
 }

mhfire-controller/src/main/resources/application-dev.properties

@@ -50,7 +50,7 @@ spring.datasource.druid.filter.slf4j.statement-close-after-log-enabled=false
 spring.datasource.druid.filter.slf4j.result-set-open-after-log-enabled=false
 spring.datasource.druid.filter.slf4j.result-set-close-after-log-enabled=false
 # jackson
-spring.jackson.date-format=yyyy-MM-dd'T'HH:mm:ssZ
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+0
 spring.jackson.default-property-inclusion=always
 #spring.jackson.serialization.indent_output=true

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -23,8 +24,8 @@ public interface FireStatisticsMapper {
      * @param endTime
      * @return
      */
-    Integer selectCount(@Param("startTime") String startTime,
-                        @Param("endTime") String endTime,
+    Integer selectCount(@Param("startTime") Date startTime,
+                        @Param("endTime") Date endTime,
                         @Param("fireAddress") String fireAddress,
                         @Param("level") String level);
 
@@ -35,12 +36,13 @@ public interface FireStatisticsMapper {
      * @param page
      * @param startTime
      * @param endTime
+     * @param address
      * @return
      */
     Page<Map<String,Object>> page(IPage<Map<String,Object>> page,
-                                  @Param("startTime") String startTime,
-                                  @Param("endTime")String endTime,
-                                  @Param("endTime")String address);
+                                  @Param("startTime") Date startTime,
+                                  @Param("endTime")Date endTime,
+                                  @Param("address")String address);
 
 
     Map<String,Object> getOne(@Param("id") String id);

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

@@ -1,8 +1,10 @@
 package com.bizmatics.mhfire.persistence.mapper;
 
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -19,5 +21,5 @@ public interface SiAeAllMapper {
      * @param
      * @return
      */
-    Map<String,Integer> selectAeAllCollect(String startTime,String endTime);
+    Map<String,Double> selectAeAllCollect(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import com.bizmatics.mhfire.persistence.mapper.po.UnitPO;
+import feign.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.Map;

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

@@ -4,41 +4,41 @@
 
     <select id="selectCount" resultType="java.lang.Integer">
         select count(1)
-        from hzdc-hztjb as fire
+        from `hzdc-hztjb`
         <where>
-            <if test="startTime != null and startTime !=''">
-                and fire.起火时间_日期型 >= #{startTime}
+            <if test="startTime != null">
+                and `起火时间_日期型` >= #{startTime}
             </if>
-            <if test="endTime !=null and endTime !=''">
-                and fire.起火时间_日期型 &lt;= #{endTime}
+            <if test="endTime != null">
+                and `起火时间_日期型` &lt;= #{endTime}
             </if>
-            <if test="fireAddress !=null and fireAddress !=''">
-                and fire.起火地点 LIKE CONCAT(CONCAT('%', #{fireAddress}), '%')
+            <if test="fireAddress != null and fireAddress != ''">
+                and `起火地点` LIKE CONCAT(CONCAT('%', #{fireAddress}), '%')
             </if>
-            <if test="level !=null and level !=''">
-                and fire.火灾原因分类（一级）= #{level}
+            <if test="level != null and level != ''">
+                and `火灾原因分类（一级）` = #{level}
             </if>
         </where>
     </select>
     <select id="page" resultType="java.util.Map">
         select *
-        from hzdc-hztjb as fire
+        from `hzdc-hztjb`
         <where>
-            <if test="startTime != null and startTime !=''">
-                and fire.起火时间_日期型 >= #{startTime}
+            <if test="startTime != null">
+                and `起火时间_日期型` >= #{startTime}
             </if>
-            <if test="endTime !=null and endTime !=''">
-                and fire.起火时间_日期型 &lt;= #{endTime}
+            <if test="endTime !=null">
+                and `起火时间_日期型` &lt;= #{endTime}
             </if>
-            <if test="fireAddress !=null and fireAddress !=''">
-                and fire.起火地点 LIKE CONCAT(CONCAT('%', #{fireAddress}), '%')
+            <if test="address !=null and address !=''">
+                and `起火地点` LIKE CONCAT(CONCAT('%', #{address}), '%')
             </if>
         </where>
     </select>
     <select id="getOne" resultType="java.util.Map">
-        select * from hzdc-hztjb where 火灾序号 = #{id};
+        select * from `hzdc-hztjb` where `火灾序号` = #{id};
     </select>
     <select id="groupByCause" resultType="java.lang.String">
-        select * from hzdc-hztjb group by 火灾原因分类（一级）
+        select `火灾原因分类（一级）` from `hzdc-hztjb` group by `火灾原因分类（一级）`
     </select>
 </mapper>

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

@@ -3,37 +3,37 @@
 <mapper namespace="com.bizmatics.mhfire.persistence.mapper.FireWaterMapper">
 
     <select id="selectOne" resultType="java.util.Map">
-        select * from jbzb-syxx where ID = #{id}
+        select * from `jbzb-syxx` where `ID` = #{id}
     </select>
     <select id="page" resultType="java.util.Map">
-        select * from jbzb-syxx
+        select * from `jbzb-syxx`
         <where>
             <if test="startTime != null">
-                and sy.BDP_AUDIT >= #{startTime}
+                and `BDP_AUDIT` >= #{startTime}
             </if>
             <if test="endTime !=null">
-                and sy.BDP_AUDIT &lt;= #{endTime}
+                and `BDP_AUDIT` &lt;= #{endTime}
             </if>
         </where>
     </select>
     <select id="selectCountByWaterNature" resultType="java.lang.Integer">
         select count(1)
-        from jbzb-syxx as sy
+        from `jbzb-syxx`
         <where>
             <if test="waterType != null and waterType !=''">
-                and sy.水源类型 = #{waterType}
+                and `水源类型` = #{waterType}
             </if>
             <if test="waterNature !=null and waterNature !=''">
-                and sy.水源性质 = #{waterNature}
+                and `水源性质` = #{waterNature}
             </if>
             <if test="getWaterType !=null and getWaterType != ''">
-                and sy.取水形式 = #{getWaterType}
+                and `取水形式` = #{getWaterType}
             </if>
             <if test="startTime !=null">
-                and sy.BDP_AUDIT >= #{startTime}
+                and `BDP_AUDIT` >= #{startTime}
             </if>
             <if test="endTime !=null">
-                and sy.BDP_AUDIT &lt;= #{endTime}
+                and `BDP_AUDIT` &lt;= #{endTime}
             </if>
         </where>
     </select>

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

@@ -12,6 +12,13 @@
         sum(`责令“三停”`) threeStop,
         sum(`发临时查封决定书（份）`) as seal
         FROM `jdjc-xzzftj-all`
-        where ChgTime >= '2012-03-25 05:17:11' and ChgTime  <= '2012-03-25 05:18:11'
+        <where>
+            <if test="startTime !=null">
+                and `ChgTime` >= #{startTime}
+            </if>
+            <if test="endTime !=null">
+                and `ChgTime`  &lt;= #{endTime}
+            </if>
+        </where>
     </select>
 </mapper>

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

@@ -2,22 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bizmatics.mhfire.persistence.mapper.UnitMapper">
 
-    <select id="selectOne" resultType="java.util.Map">
+    <select id="selectOne" resultType="java.util.Map" parameterType="com.bizmatics.mhfire.persistence.mapper.po.UnitPO">
         select *
-        from jbzb-dwxx-all
+        from `jbzb-dwxx-all`
         <where>
-            <if test="unitPo.id != null and unitPo.id !=''">
-                and ID = #{unitPo.id}
+            <if test="id != null and id !=''">
+                and `ID` = #{id}
             </if>
-            <if test="unitPo.name !=null and unitPo.name !=''">
-                and 单位名称 = #{unitPo.name}
+            <if test="name !=null and name !=''">
+                and `单位名称` = #{unitPo.name}
             </if>
-            <if test="unitPo.address !=null and unitPo.address !=''">
-                and 单位地址 = #{unitPo.address}
+            <if test="address !=null and address !=''">
+                and `单位地址` = #{address}
             </if>
         </where>
     </select>
     <select id="page" resultType="java.util.Map">
-        select * from jbzb-dwxx-all
+        select * from `jbzb-dwxx-all`
     </select>
 </mapper>

mhfire-service/src/main/java/com/bizmatics/mhfire/service/FireStatisticsService.java

@@ -5,6 +5,7 @@ import com.bizmatics.mhfire.persistence.mapper.po.FireStatisticsPO;
 import com.bizmatics.mhfire.service.vo.FireLevelRatioVO;
 import com.bizmatics.mhfire.service.vo.FireUnitPoliceVO;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -32,7 +33,7 @@ public interface FireStatisticsService {
      * @param endTime
      * @return
      */
-    CommonPage<FireStatisticsPO> page(Integer current, Integer size, String startTime, String endTime, String address);
+    CommonPage<FireStatisticsPO> page(Integer current, Integer size, Date startTime, Date endTime, String address);
 
 
     /**
@@ -58,7 +59,7 @@ public interface FireStatisticsService {
      * @param address
      * @return
      */
-    List<FireLevelRatioVO> getGroupByLevel(String startTime,String endTime,String address);
+    List<FireLevelRatioVO> getGroupByLevel(Date startTime, Date endTime, String address);
 
 
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/SiAeAllService.java

@@ -2,6 +2,7 @@ package com.bizmatics.mhfire.service;
 
 import com.bizmatics.mhfire.service.vo.SiAeAllVO;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -17,5 +18,5 @@ public interface SiAeAllService {
      * @param
      * @return
      */
-    List<SiAeAllVO> getAeAllCollect(String startTime,String endTime);
+    List<SiAeAllVO> getAeAllCollect(Date startTime, Date endTime);
 }

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

@@ -33,17 +33,19 @@ public class FireStatisticsServiceImpl implements FireStatisticsService {
         List<Integer> list = new ArrayList<>();
         Date date = new Date();
         for (int i = 0; i < 12; i++) {
-            DateUtils.setMonths(date,i);
-            Date firstDayOfMonth = DateUtils.getFirstDayOfMonth(date);
-            Date lastDayOfMonth = DateUtils.getLastDayOfMonth(date);
-            list.add(fireStatisticsMapper.selectCount(DateUtils.format(firstDayOfMonth), DateUtils.format(lastDayOfMonth), address,null));
+            date.setDate(1);
+            Date setMonths = DateUtils.setMonths(date, i);
+            System.out.println(DateUtils.format(setMonths,"yyyy-MM-dd HH:mm:ss"));
+            Date firstDayOfMonth = DateUtils.getFirstDayOfMonth(setMonths);
+            Date lastDayOfMonth = DateUtils.getLastDayOfMonth(setMonths);
+            list.add(fireStatisticsMapper.selectCount(firstDayOfMonth, lastDayOfMonth, address,null));
         }
         return list;
     }
 
 
     @Override
-    public CommonPage<FireStatisticsPO> page(Integer current, Integer size, String startTime, String endTime, String address) {
+    public CommonPage<FireStatisticsPO> page(Integer current, Integer size, Date startTime, Date endTime, String address) {
         Page<Map<String, Object>> page = new Page<>(current, size);
         page = fireStatisticsMapper.page(page, startTime, endTime, address);
         List<FireStatisticsPO> list = new ArrayList<>();
@@ -73,7 +75,7 @@ public class FireStatisticsServiceImpl implements FireStatisticsService {
     }
 
     @Override
-    public List<FireLevelRatioVO> getGroupByLevel(String startTime, String endTime, String address) {
+    public List<FireLevelRatioVO> getGroupByLevel(Date startTime, Date endTime, String address) {
         List<FireLevelRatioVO> list = new ArrayList<>();
         int fireCount = 0;
         List<String> fireCauses = fireStatisticsMapper.groupByCause();
@@ -87,7 +89,7 @@ public class FireStatisticsServiceImpl implements FireStatisticsService {
         }
         int finalFireCount = fireCount;
         list.forEach(fireLevelRatioVO -> fireLevelRatioVO.setRadio(fireLevelRatioVO.getRadio()/ finalFireCount));
-        return null;
+        return list;
     }
 
     public FireStatisticsPO enhanceFireStatisticsPo(Map<String,Object> map){
@@ -99,7 +101,7 @@ public class FireStatisticsServiceImpl implements FireStatisticsService {
         fireStatisticsPo.setDeathToll(map.get("死亡人数").toString());
         fireStatisticsPo.setNonFatal(map.get("受灾人数").toString());
         fireStatisticsPo.setDisasterHome(map.get("受灾户数").toString());
-        fireStatisticsPo.setFireCause(map.get("火灾原因分类（一级）").toString());
+        fireStatisticsPo.setFireCause(Optional.ofNullable(map.get("火灾原因分类（一级）")).orElse("").toString());
         return fireStatisticsPo;
     }
 }

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

@@ -10,10 +10,7 @@ import com.bizmatics.mhfire.service.vo.FireWaterStatisticsVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author yq
@@ -71,14 +68,14 @@ public class FireWaterServiceImpl implements FireWaterService {
         FireWaterPO fireWaterPo = new FireWaterPO();
         fireWaterPo.setAddress(fireWaterMap.get("水源地址").toString());
         //TODO 责任人字段没有
-        fireWaterPo.setDutyPerson(fireWaterMap.get("责任人").toString());
+        fireWaterPo.setDutyPerson(Optional.ofNullable(fireWaterMap.get("手机号")).orElse("").toString());
         //TODO 手机号字段没有
-        fireWaterPo.setPhone(fireWaterMap.get("手机号").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(fireWaterMap.get("手机号").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/impl/SiAeAllServiceImpl.java

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -20,14 +21,14 @@ public class SiAeAllServiceImpl implements SiAeAllService {
     @Autowired
     private SiAeAllMapper siAeAllMapper;
     @Override
-    public List<SiAeAllVO> getAeAllCollect(String startTime,String endTime) {
+    public List<SiAeAllVO> getAeAllCollect(Date startTime, Date endTime) {
         List<SiAeAllVO> allVoS = new ArrayList<>();
-        Map<String, Integer> aeAllCollect = siAeAllMapper.selectAeAllCollect(startTime,endTime);
+        Map<String, Double> aeAllCollect = siAeAllMapper.selectAeAllCollect(startTime,endTime);
         //TODO 获取同比和环比时间
         for (String type:aeAllCollect.keySet()) {
             SiAeAllVO siAeAllVO = new SiAeAllVO();
             siAeAllVO.setCheckType(type);
-            siAeAllVO.setNumber(aeAllCollect.get(type));
+            siAeAllVO.setNumber(aeAllCollect.get(type).intValue());
             allVoS.add(siAeAllVO);
         }
         return allVoS;

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

@@ -25,7 +25,8 @@ public class UnitBeOnDutyServiceImpl implements UnitBeOnDutyService {
     @Override
     public UnitBeOnDutyPO gerOneByToday() {
         //TODO 获取今日的值班情况
-        return null;
+        UnitBeOnDutyPO unitBeOnDutyPO = new UnitBeOnDutyPO();
+        return unitBeOnDutyPO;
     }
 
 

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

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * @author yq
@@ -57,11 +58,16 @@ public class UnitServiceImpl implements UnitService {
      */
     public UnitPO enhanceUnitPo(Map<String,Object> unitPoMap){
         UnitPO unitPo = new UnitPO();
-        unitPo.setName(unitPoMap.get("单位名称").toString());
-        unitPo.setAddress(unitPoMap.get("单位地址").toString());
-        //TODO 没有找见对应字段
-        unitPo.setPrincipal(unitPoMap.get("单位名称").toString());
-        unitPo.setPhone(unitPoMap.get("单位电话").toString());
+        Optional.ofNullable(unitPoMap).ifPresent(
+                unit -> {
+                    unitPo.setId(unit.get("ID").toString());
+                    unitPo.setName(Optional.ofNullable(unit.get("单位名称")).orElse("").toString());
+                    unitPo.setAddress(unit.get("单位地址").toString());
+                    //TODO 没有找见对应字段
+                    unitPo.setPrincipal(unit.get("单位名称").toString());
+                    unitPo.setPhone(unit.get("单位电话").toString());
+                }
+                );
         return unitPo;
     }