近一周车流量统计查询接口及相关数据录入方法更改---便捷出入access

实体类更改---便捷出入对象 plat_access

project-common/src/main/java/com/project/common/utils/DateUtils.java

@@ -283,7 +283,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern(dateFormat);
 
         return IntStream.rangeClosed(1, n)
-                .mapToObj(i -> today.minusDays(n - i + 1))
+                .mapToObj(i -> today.minusDays(n - i))
                 .map(formatter::format)
                 .collect(Collectors.toList())
                 .stream()

project-zcustom/src/main/java/com/project/zcustom/domain/access/PlatAccess.java

@@ -105,8 +105,8 @@ public class PlatAccess extends CustomBaseEntity {
     /**
      * 前七天车数量
      */
-    @Excel(name = "前七天车数量")
-    @ApiModelProperty("前七天车数量")
-    private Long sevenDaysCarNum;
+    @Excel(name = "当天车数量")
+    @ApiModelProperty("当天车数量")
+    private Long intraCarNum;
 
 }

project-zcustom/src/main/java/com/project/zcustom/service/access/impl/PlatAccessServiceImpl.java

@@ -1,5 +1,6 @@
 package com.project.zcustom.service.access.impl;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.project.common.core.domain.search.PageParamVo;
 import com.project.common.utils.DateUtils;
 import com.project.zcustom.domain.access.PlatAccess;
@@ -203,18 +204,19 @@ public class PlatAccessServiceImpl extends ServiceImpl<PlatAccessMapper, PlatAcc
     }
 
     private void setPlatAccess(Map<String, Object> mapField, PlatAccess accessInfo) {
-        List<String> keyList = Arrays.asList("carLicense","guardCard","blackLists","intraDayCar","beforeDayCar","twoDayCar","threeDayCar","fourDayCar","fiveDayCar","sixDayCar");
-
+        List<String> keyList = Arrays.asList("carLicense","guardCard","blackLists");
         StringUtils.setFieldValue(accessInfo,mapField,keyList,0, PlatAccess::setCarLicenseNum,Long.class);
         StringUtils.setFieldValue(accessInfo,mapField,keyList,1, PlatAccess::setGuardCardNum,Long.class);
         StringUtils.setFieldValue(accessInfo,mapField,keyList,2, PlatAccess::setBlackListsNum,Long.class);
-        StringUtils.setFieldValue(accessInfo,StringUtils.getListToMap(mapField.get("intraDay").toString()),keyList,3, PlatAccess::setBeforeCarNum,Long.class);
-        StringUtils.setFieldValue(accessInfo,StringUtils.getListToMap(mapField.get("beforeDay").toString()),keyList,4, PlatAccess::setTwoDaysCarNum,Long.class);
-        StringUtils.setFieldValue(accessInfo,StringUtils.getListToMap(mapField.get("twoDay").toString()),keyList,5, PlatAccess::setThreeDaysCarNum,Long.class);
-        StringUtils.setFieldValue(accessInfo,StringUtils.getListToMap(mapField.get("threeDay").toString()),keyList,6, PlatAccess::setFourDaysCarNum,Long.class);
-        StringUtils.setFieldValue(accessInfo,StringUtils.getListToMap(mapField.get("fourDay").toString()),keyList,7, PlatAccess::setFiveDaysCarNum,Long.class);
-        StringUtils.setFieldValue(accessInfo,StringUtils.getListToMap(mapField.get("fiveDay").toString()),keyList,8, PlatAccess::setSixDaysCarNum,Long.class);
-        StringUtils.setFieldValue(accessInfo,StringUtils.getListToMap(mapField.get("sixDay").toString()),keyList,9, PlatAccess::setSevenDaysCarNum,Long.class);
+
+        List<String> list = Arrays.asList("intraDay","beforeDay","twoDay","threeDay","fourDay","fiveDay","sixDay");
+        accessInfo.setIntraCarNum(JSONObject.parseObject(JSONObject.parseObject(mapField.get(list.get(0)).toString(), Map.class).get(list.get(0) + "Car").toString(), Long.class));
+        accessInfo.setBeforeCarNum(JSONObject.parseObject(JSONObject.parseObject(mapField.get(list.get(1)).toString(), Map.class).get(list.get(1) + "Car").toString(), Long.class));
+        accessInfo.setTwoDaysCarNum(JSONObject.parseObject(JSONObject.parseObject(mapField.get(list.get(2)).toString(), Map.class).get(list.get(2) + "Car").toString(), Long.class));
+        accessInfo.setThreeDaysCarNum(JSONObject.parseObject(JSONObject.parseObject(mapField.get(list.get(3)).toString(), Map.class).get(list.get(3) + "Car").toString(), Long.class));
+        accessInfo.setFourDaysCarNum(JSONObject.parseObject(JSONObject.parseObject(mapField.get(list.get(4)).toString(), Map.class).get(list.get(4) + "Car").toString(), Long.class));
+        accessInfo.setFiveDaysCarNum(JSONObject.parseObject(JSONObject.parseObject(mapField.get(list.get(5)).toString(), Map.class).get(list.get(5) + "Car").toString(), Long.class));
+        accessInfo.setSixDaysCarNum(JSONObject.parseObject(JSONObject.parseObject(mapField.get(list.get(6)).toString(), Map.class).get(list.get(6) + "Car").toString(), Long.class));
     }
 
 
@@ -248,20 +250,20 @@ public class PlatAccessServiceImpl extends ServiceImpl<PlatAccessMapper, PlatAcc
     public Map<String, Object> getCarFlowData(String appOrg){
         // 获取7天前的日期
         List<String> dateList = DateUtils.generateDateList(7);
-        String fieldString = "before_car_num,two_days_car_num,three_days_car_num,four_days_car_num,five_days_car_num,six_days_car_num,seven_days_car_num";
+        String fieldString = "intra_car_num, before_car_num,two_days_car_num,three_days_car_num,four_days_car_num,five_days_car_num,six_days_car_num";
         if(Objects.equals(appOrg,"0000")){
-            fieldString = "sum(before_car_num) as before_car_num," +
+            fieldString = "sum(intra_car_num) as intra_car_num" +
+                    "sum(before_car_num) as before_car_num," +
                     "sum(two_days_car_num) as two_days_car_num," +
                     "sum(three_days_car_num) as three_days_car_num," +
                     "sum(four_days_car_num) as four_days_car_num," +
                     "sum(five_days_car_num) as five_days_car_num," +
-                    "sum(six_days_car_num) as six_days_car_num," +
-                    "sum(seven_days_car_num) as seven_days_car_num";
+                    "sum(six_days_car_num) as six_days_car_num";
         }
         PlatAccess platAccess = this.getPlatAccessByField("app_org", appOrg,fieldString);
         List<Long> valueList = StringUtils.getDefaultListLong(7);
         if(StringUtils.isNotNull(platAccess)){
-            valueList = Arrays.asList(platAccess.getBeforeCarNum(), platAccess.getTwoDaysCarNum(), platAccess.getThreeDaysCarNum(), platAccess.getFourDaysCarNum(), platAccess.getFiveDaysCarNum(), platAccess.getSixDaysCarNum(), platAccess.getSevenDaysCarNum());
+            valueList = Arrays.asList(platAccess.getIntraCarNum(), platAccess.getBeforeCarNum(), platAccess.getTwoDaysCarNum(), platAccess.getThreeDaysCarNum(), platAccess.getFourDaysCarNum(), platAccess.getFiveDaysCarNum(), platAccess.getSixDaysCarNum());
             // 倒序
             Collections.reverse(valueList);
         }