闵行报错接口修复；代码优化

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/ReservePlan.java

@@ -68,6 +68,7 @@ public class ReservePlan implements Serializable {
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
 
     /**

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemFireStatisticsServiceImpl.java

@@ -91,10 +91,10 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
         IPage<DemFireStatistics> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<DemFireStatistics> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(DemFireStatistics::getBurnedArea, DemFireStatistics::getDirectPropertyLoss, DemFireStatistics::getVictimNumber,
-                DemFireStatistics::getInjuredNumber, DemFireStatistics::getDeathToll, DemFireStatistics::getFileCase, DemFireStatistics::getFireGrade,
-                DemFireStatistics::getSubordinateDetachment, DemFireStatistics::getAdministrativeDivision, DemFireStatistics::getFireNumber,
-                DemFireStatistics::getFireAddress, DemFireStatistics::getFireTime, DemFireStatistics::getId, DemFireStatistics::getTypeId1,
-                DemFireStatistics::getTypeId2, DemFireStatistics::getTypeId3, DemFireStatistics::getTypeId4, DemFireStatistics::getTypeId5)
+                        DemFireStatistics::getInjuredNumber, DemFireStatistics::getDeathToll, DemFireStatistics::getFileCase, DemFireStatistics::getFireGrade,
+                        DemFireStatistics::getSubordinateDetachment, DemFireStatistics::getAdministrativeDivision, DemFireStatistics::getFireNumber,
+                        DemFireStatistics::getFireAddress, DemFireStatistics::getFireTime, DemFireStatistics::getId, DemFireStatistics::getTypeId1,
+                        DemFireStatistics::getTypeId2, DemFireStatistics::getTypeId3, DemFireStatistics::getTypeId4, DemFireStatistics::getTypeId5)
                 .like(StringUtils.isNotBlank(fireNumber), DemFireStatistics::getFireNumber, fireNumber)
                 .eq(type1 != null && type1 != 0, DemFireStatistics::getTypeId1, type1)
                 .eq(type2 != null && type2 != 0, DemFireStatistics::getTypeId2, type2)
@@ -177,7 +177,7 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
     }
 
     @Override
-    public List<DemFireStatisticsExportVO> fireAccidentStatisticExport(String fireNumber, Integer labelId, Integer classifyId){
+    public List<DemFireStatisticsExportVO> fireAccidentStatisticExport(String fireNumber, Integer labelId, Integer classifyId) {
         List<DemFireStatisticsExportVO> list = new ArrayList<>();
 
         Integer type1 = 0;
@@ -211,10 +211,10 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
         }
         LambdaQueryWrapper<DemFireStatistics> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(DemFireStatistics::getBurnedArea, DemFireStatistics::getDirectPropertyLoss, DemFireStatistics::getVictimNumber,
-                DemFireStatistics::getInjuredNumber, DemFireStatistics::getDeathToll, DemFireStatistics::getFileCase, DemFireStatistics::getFireGrade,
-                DemFireStatistics::getSubordinateDetachment, DemFireStatistics::getAdministrativeDivision, DemFireStatistics::getFireNumber,
-                DemFireStatistics::getFireAddress, DemFireStatistics::getFireTime, DemFireStatistics::getId, DemFireStatistics::getTypeId1,
-                DemFireStatistics::getTypeId2, DemFireStatistics::getTypeId3, DemFireStatistics::getTypeId4, DemFireStatistics::getTypeId5)
+                        DemFireStatistics::getInjuredNumber, DemFireStatistics::getDeathToll, DemFireStatistics::getFileCase, DemFireStatistics::getFireGrade,
+                        DemFireStatistics::getSubordinateDetachment, DemFireStatistics::getAdministrativeDivision, DemFireStatistics::getFireNumber,
+                        DemFireStatistics::getFireAddress, DemFireStatistics::getFireTime, DemFireStatistics::getId, DemFireStatistics::getTypeId1,
+                        DemFireStatistics::getTypeId2, DemFireStatistics::getTypeId3, DemFireStatistics::getTypeId4, DemFireStatistics::getTypeId5)
                 .like(StringUtils.isNotBlank(fireNumber), DemFireStatistics::getFireNumber, fireNumber)
                 .eq(type1 != null && type1 != 0, DemFireStatistics::getTypeId1, type1)
                 .eq(type2 != null && type2 != 0, DemFireStatistics::getTypeId2, type2)
@@ -223,7 +223,7 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
                 .eq(type5 != null && type5 != 0, DemFireStatistics::getTypeId5, type5)
                 .orderByDesc(DemFireStatistics::getId);
         List<DemFireStatistics> fireStatisticsList = this.list(queryWrapper);
-        if(CollectionUtils.isNotEmpty(fireStatisticsList)){
+        if (CollectionUtils.isNotEmpty(fireStatisticsList)) {
             List<String> fireNumberList = new ArrayList<>();
             for (int i = 0; i < fireStatisticsList.size(); i++) {
                 fireNumberList.add(fireStatisticsList.get(i).getFireNumber());
@@ -356,7 +356,7 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
         IPage<DemFireStatisticsAttach> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<DemFireStatisticsAttach> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(DemFireStatisticsAttach::getFireCauseType1, DemFireStatisticsAttach::getFireNumber,
-                DemFireStatisticsAttach::getId)
+                        DemFireStatisticsAttach::getId)
                 .like(StringUtils.isNotBlank(fireNumber), DemFireStatisticsAttach::getFireNumber, fireNumber)
                 .eq(StringUtils.isNotBlank(fireCauseType1), DemFireStatisticsAttach::getFireCauseType1, fireCauseType1)
                 .orderByDesc(DemFireStatisticsAttach::getId);
@@ -365,7 +365,7 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
         if (page.getTotal() > 0) {
             LambdaQueryWrapper<DemFireStatistics> queryWrapper1 = Wrappers.lambdaQuery();
             queryWrapper1.select(DemFireStatistics::getFireGrade, DemFireStatistics::getAdministrativeDivision,
-                    DemFireStatistics::getFireNumber, DemFireStatistics::getFireTime, DemFireStatistics::getId)
+                            DemFireStatistics::getFireNumber, DemFireStatistics::getFireTime, DemFireStatistics::getId)
                     .like(StringUtils.isNotBlank(fireNumber), DemFireStatistics::getFireNumber, fireNumber)
                     .orderByDesc(DemFireStatistics::getId);
             List<DemFireStatistics> list1 = this.list(queryWrapper1);
@@ -519,8 +519,8 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
         IPage<DemFireStatistics> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<DemFireStatistics> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(DemFireStatistics::getId, DemFireStatistics::getFireNumber, DemFireStatistics::getBurnedArea,
-                DemFireStatistics::getAffectedHouse, DemFireStatistics::getVictimNumber, DemFireStatistics::getDirectPropertyLoss,
-                DemFireStatistics::getFireTime, DemFireStatistics::getFireGrade)
+                        DemFireStatistics::getAffectedHouse, DemFireStatistics::getVictimNumber, DemFireStatistics::getDirectPropertyLoss,
+                        DemFireStatistics::getFireTime, DemFireStatistics::getFireGrade)
                 .like(StringUtils.isNotBlank(fireNumber), DemFireStatistics::getFireNumber, fireNumber)
                 .eq(id != null && id != 0, DemFireStatistics::getId, id)
                 .orderByDesc(DemFireStatistics::getId);
@@ -532,7 +532,7 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
             }
             LambdaQueryWrapper<DemFireStatisticsAttach> queryWrapper1 = Wrappers.lambdaQuery();
             queryWrapper1.select(DemFireStatisticsAttach::getId, DemFireStatisticsAttach::getFireNumber, DemFireStatisticsAttach::getInitialFuelType1,
-                    DemFireStatisticsAttach::getFireCauseType1, DemFireStatisticsAttach::getBuildName)
+                            DemFireStatisticsAttach::getFireCauseType1, DemFireStatisticsAttach::getBuildName)
                     .in(CollectionUtils.isNotEmpty(fireNumberList), DemFireStatisticsAttach::getFireNumber, fireNumberList);
             List<DemFireStatisticsAttach> list1 = demFireStatisticsAttachService.list(queryWrapper1);
             for (int i = 0; i < page.getRecords().size(); i++) {
@@ -564,15 +564,15 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
     }
 
     @Override
-    public List<FirePlaceExportVO> firePlaceListExport(String fireNumber){
+    public List<FirePlaceExportVO> firePlaceListExport(String fireNumber) {
         List<FirePlaceExportVO> list = new ArrayList<>();
         LambdaQueryWrapper<DemFireStatistics> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(DemFireStatistics::getId, DemFireStatistics::getFireNumber, DemFireStatistics::getBurnedArea,
-                DemFireStatistics::getAffectedHouse, DemFireStatistics::getVictimNumber, DemFireStatistics::getDirectPropertyLoss,
-                DemFireStatistics::getFireTime, DemFireStatistics::getFireGrade)
+                        DemFireStatistics::getAffectedHouse, DemFireStatistics::getVictimNumber, DemFireStatistics::getDirectPropertyLoss,
+                        DemFireStatistics::getFireTime, DemFireStatistics::getFireGrade)
                 .like(StringUtils.isNotBlank(fireNumber), DemFireStatistics::getFireNumber, fireNumber)
                 .orderByDesc(DemFireStatistics::getId);
-        List<DemFireStatistics> list1= this.list(queryWrapper);
+        List<DemFireStatistics> list1 = this.list(queryWrapper);
         if (CollectionUtils.isNotEmpty(list1)) {
             List<String> fireNumberList = new ArrayList<>();
             for (int i = 0; i < list1.size(); i++) {
@@ -580,7 +580,7 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
             }
             LambdaQueryWrapper<DemFireStatisticsAttach> queryWrapper1 = Wrappers.lambdaQuery();
             queryWrapper1.select(DemFireStatisticsAttach::getId, DemFireStatisticsAttach::getFireNumber, DemFireStatisticsAttach::getInitialFuelType1,
-                    DemFireStatisticsAttach::getFireCauseType1, DemFireStatisticsAttach::getBuildName)
+                            DemFireStatisticsAttach::getFireCauseType1, DemFireStatisticsAttach::getBuildName)
                     .in(CollectionUtils.isNotEmpty(fireNumberList), DemFireStatisticsAttach::getFireNumber, fireNumberList);
             List<DemFireStatisticsAttach> list2 = demFireStatisticsAttachService.list(queryWrapper1);
             for (int i = 0; i < list1.size(); i++) {
@@ -637,9 +637,9 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
         List<Object> list = new ArrayList<>();
         Date date = new Date();
         Date beginDayOfYear = DateUtils.getBeginDayOfYear(date);
-        //获取传入时间的最大时间和最小时间
+        // 获取传入时间的最大时间和最小时间
         int distanceOfTwoDate = Integer.parseInt(DateUtils.getYear(endTime1)) - Integer.parseInt(DateUtils.getYear(startTime1)) + 1;
-        //获取数据库全部项目的最小时间和最大时间
+        // 获取数据库全部项目的最小时间和最大时间
         QueryWrapper<DemFireStatistics> query = Wrappers.query();
         query.select("max(fire_time) as fireTime");
         DemFireStatistics one = this.getOne(query);
@@ -730,10 +730,10 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
             list.add(fireLevelRatioVo);
             fireCount += count;
         }
-        //排序
+        // 排序
         List<FireLevelRatioVO> orderByList = list.stream().sorted(Comparator.comparing(FireLevelRatioVO::getRadio).reversed()).limit(10).collect(Collectors.toList());
 
-        //差集求和
+        // 差集求和
         double sum = list.stream().filter(item -> !orderByList.contains(item)).mapToDouble(FireLevelRatioVO::getRadio).sum();
         orderByList.stream().filter(item -> "其他".equals(item.getFireType())).findAny()
                 .map(fireLevelRatio -> {
@@ -741,12 +741,12 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
                             return fireLevelRatio;
                         }
                 ).orElseGet(() -> {
-            FireLevelRatioVO fireLevelRatioVo = new FireLevelRatioVO();
-            fireLevelRatioVo.setFireType("其他");
-            fireLevelRatioVo.setRadio(sum);
-            orderByList.add(fireLevelRatioVo);
-            return fireLevelRatioVo;
-        });
+                    FireLevelRatioVO fireLevelRatioVo = new FireLevelRatioVO();
+                    fireLevelRatioVo.setFireType("其他");
+                    fireLevelRatioVo.setRadio(sum);
+                    orderByList.add(fireLevelRatioVo);
+                    return fireLevelRatioVo;
+                });
         int finalFireCount = fireCount;
         if (0 != finalFireCount) {
             orderByList.forEach(fireLevelRatio -> fireLevelRatio.setRadio(Arith.div(fireLevelRatio.getRadio(), finalFireCount)));
@@ -785,7 +785,7 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
         List<FireStatisticsPO> list = listmap
                 .stream()
                 .map(this::enhanceFireStatisticsPo).collect(Collectors.toList());
-        //筛选出精度和维度是空的数据
+        // 筛选出精度和维度是空的数据
         List<FireStatisticsPO> isNullData = list.stream()
                 .filter(fireStatisticsPo -> 0.00 == fireStatisticsPo.getLatitude())
                 .filter(fireStatisticsPo -> StringUtils.isNotBlank(fireStatisticsPo.getAddress()))
@@ -809,7 +809,7 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
     }
 
     @Override
-    public List<DemFireStatisticsScattorVO> fireStatisticScattor(String street, String lossType, String startTime, String endTime){
+    public List<DemFireStatisticsScattorVO> fireStatisticScattor(String street, String lossType, String startTime, String endTime) {
         List<DemFireStatisticsScattorVO> list = new ArrayList<>();
 //        LambdaQueryWrapper<DemFireStatistics> queryWrapper = Wrappers.lambdaQuery();
 //        List<DemFireStatistics> dataList = this.list(queryWrapper);
@@ -843,17 +843,17 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
 //        }
 
         LambdaQueryWrapper<DemFireStatistics> queryWrapper1 = Wrappers.lambdaQuery();
-        queryWrapper1.eq(StringUtils.isNotBlank(street),DemFireStatistics::getStreet,street)
-                .between(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime),DemFireStatistics::getFireTime,startTime,endTime);
-        if(StringUtils.isNotBlank(lossType)){
-            if(lossType.equals("亡人火灾")){
-                queryWrapper1.gt(DemFireStatistics::getDeathToll,0);
-            }else if(lossType.equals("伤人火灾")){
-                queryWrapper1.gt(DemFireStatistics::getInjuredNumber,0);
+        queryWrapper1.eq(StringUtils.isNotBlank(street), DemFireStatistics::getStreet, street)
+                .between(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime), DemFireStatistics::getFireTime, startTime, endTime);
+        if (StringUtils.isNotBlank(lossType)) {
+            if (lossType.equals("亡人火灾")) {
+                queryWrapper1.gt(DemFireStatistics::getDeathToll, 0);
+            } else if (lossType.equals("伤人火灾")) {
+                queryWrapper1.gt(DemFireStatistics::getInjuredNumber, 0);
             }
         }
         List<DemFireStatistics> dataList1 = this.list(queryWrapper1);
-        if(CollectionUtils.isNotEmpty(dataList1)){
+        if (CollectionUtils.isNotEmpty(dataList1)) {
             for (int i = 0; i < dataList1.size(); i++) {
                 DemFireStatisticsScattorVO scattorVO = new DemFireStatisticsScattorVO();
                 scattorVO.setFireNumber(dataList1.get(i).getFireNumber());
@@ -879,20 +879,20 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
     }
 
     @Override
-    public List<DemFireStatisticsCountScattorVO> fireStatisticCollect(String street, String startTime, String endTime){
+    public List<DemFireStatisticsCountScattorVO> fireStatisticCollect(String street, String startTime, String endTime) {
         List<DemFireStatisticsCountScattorVO> list = new ArrayList<>();
         QueryWrapper<DemFireStatistics> queryWrapper = Wrappers.query();
-        queryWrapper.select("ROUND(SUM(direct_property_loss)/10000,2) as directPropertyLossTotal","COUNT(*) as fireCount","ROUND(SUM(burned_area),2) as burnedAreaTotal","SUM(death_toll) as deathTollTotal","SUM(injured_number) as injuredNumberTotal")
-                .eq(StringUtils.isNotBlank(street),"street",street)
-                .between(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime),"fire_time",startTime,endTime);
-        List<Map<String,Object>> maps = this.listMaps(queryWrapper);
-        if(maps.size() > 0 && Integer.parseInt(maps.get(0).get("fireCount").toString()) > 0){
+        queryWrapper.select("ROUND(SUM(direct_property_loss)/10000,2) as directPropertyLossTotal", "COUNT(*) as fireCount", "ROUND(SUM(burned_area),2) as burnedAreaTotal", "SUM(death_toll) as deathTollTotal", "SUM(injured_number) as injuredNumberTotal")
+                .eq(StringUtils.isNotBlank(street), "street", street)
+                .between(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime), "fire_time", startTime, endTime);
+        List<Map<String, Object>> maps = this.listMaps(queryWrapper);
+        if (maps.size() > 0 && Integer.parseInt(maps.get(0).get("fireCount").toString()) > 0) {
             DemFireStatisticsCountScattorVO scattorVO = new DemFireStatisticsCountScattorVO();
             scattorVO.setDirectPropertyLossTotal(Double.parseDouble(maps.get(0).get("directPropertyLossTotal").toString()));
             scattorVO.setFireCount(Integer.parseInt(maps.get(0).get("fireCount").toString()));
             scattorVO.setBurnedAreaTotal(Double.parseDouble(maps.get(0).get("burnedAreaTotal").toString()));
-            scattorVO.setDeathTollTotal((int)Math.round(Double.parseDouble(maps.get(0).get("deathTollTotal").toString())));
-            scattorVO.setInjuredNumberTotal((int)Math.round(Double.parseDouble(maps.get(0).get("injuredNumberTotal").toString())));
+            scattorVO.setDeathTollTotal((int) Math.round(Double.parseDouble(maps.get(0).get("deathTollTotal").toString())));
+            scattorVO.setInjuredNumberTotal((int) Math.round(Double.parseDouble(maps.get(0).get("injuredNumberTotal").toString())));
             list.add(scattorVO);
         }
 
@@ -924,9 +924,9 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
 //        list = list.stream().filter(s -> s.get("region").toString().contains("派出所")).collect(Collectors.toList());
         list.forEach(s -> {
             FireBubbleVO fireBubbleVo = new FireBubbleVO();
-            if (s.get("region").toString().contains("派出所")){
-                fireBubbleVo.setRegion(s.get("region").toString().replace("派出所",""));
-            }else {
+            if (s.get("region").toString().contains("派出所")) {
+                fireBubbleVo.setRegion(s.get("region").toString().replace("派出所", ""));
+            } else {
                 fireBubbleVo.setRegion(s.get("region").toString());
             }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/ReservePlanServiceImpl.java

@@ -97,10 +97,6 @@ public class ReservePlanServiceImpl extends AbstractCrudService<ReservePlanMappe
                 map.put("creator", page.getRecords().get(i).getCreator());
                 map.put("createTime", page.getRecords().get(i).getCreateTime().format(fmt));
                 map.put("companyId", page.getRecords().get(i).getCompanyId());
-                map.put("updateTime",
-                        Optional.ofNullable(page.getRecords().get(i).getUpdateTime())
-                                .map(t -> t.format(fmt))
-                                .orElse(null));
                 list.add(map);
             }
         }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/util/MhScheduledImport.java

@@ -367,11 +367,11 @@ public class MhScheduledImport {
     // 调用API获取token的方法
     private static String getToken() {
         String url = "http://10.90.12.78:8085/Warehouse/bigdata/getToken?username=admin";
-        String urlTest = "https://aqpc.shxf-119.com/Warehouse/bigdata/getToken?username=admin";
+        // String urlTest = "https://aqpc.shxf-119.com/Warehouse/bigdata/getToken?username=admin";
         String token = null;
 
         try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
-            HttpGet request = new HttpGet(urlTest);
+            HttpGet request = new HttpGet(url);
 
             CloseableHttpResponse response = httpClient.execute(request);
             int statusCode = response.getStatusLine().getStatusCode();