调整代码

src/main/java/com/ebei/screen/common/util/ParkUtils.java

@@ -253,6 +253,9 @@ public class ParkUtils {
      * @return
      */
     public static List<Map> sortDateList(List<Map> maps, String sortKey, boolean flag) {
+        if (CollUtil.isEmpty(maps)) {
+            return new ArrayList<>();
+        }
         int i = flag ? 1 : -1;
         if (StringUtils.isNotBlank(sortKey)) {
             Collections.sort(maps, (m1, m2) -> LocalDateTimeUtil.parse(m1.get(sortKey).toString(), DatePattern.NORM_DATETIME_PATTERN).isAfter(LocalDateTimeUtil.parse(m2.get(sortKey).toString(), DatePattern.NORM_DATETIME_PATTERN)) ? 1 * i : -1 * i);

src/main/java/com/ebei/screen/service/impl/ParkSystemServiceImpl.java

@@ -248,7 +248,7 @@ public class ParkSystemServiceImpl implements ParkSystemService {
             JSONObject exceptionData = exceptionObj != null ? exceptionObj.getJSONObject("data") : null;
             JSONObject exceptionObjOld = mongoTemplate.findById(code + "_" + formatOld, JSONObject.class, ParkType.EXCEPTION.getCode());
             ParkExceptionType.codeList().forEach(x -> exceptionCountResult.set(exceptionObj == null ? 0 : exceptionObj.getDouble(x + "Count").intValue() + exceptionCountResult.get()));
-            ParkExceptionType.codeList().forEach(x -> exceptionCountOldResult.set(exceptionObjOld == null ? 0 : exceptionObjOld.getDouble(x + "Count").intValue() + exceptionCountOldResult.get()));
+            ParkExceptionType.codeList().forEach(x -> exceptionCountOldResult.set(exceptionObjOld == null ? 0 : (exceptionObjOld.getDouble(x + "Count").intValue() + exceptionCountOldResult.get())));
             Double inCount = inObj == null ? 0 : inObj.getDouble("count");
             Double inCountOld = inObjOld == null ? 0 : inObjOld.getDouble("count");
             Double outCount = outObj == null ? 0 : outObj.getDouble("count");
@@ -605,7 +605,8 @@ public class ParkSystemServiceImpl implements ParkSystemService {
         ParkExceptionType.codeList().forEach(x -> result.set(x, 0));
         JSONObject obj = mongoTemplate.findById(ParkType.EXCEPTION.getCode(), JSONObject.class, ParkType.EXCEPTION.getCode());
         if (obj == null) {
-            return ResponseBuilder.ok(result);
+            result.keySet().forEach(x -> list.add(Levi.by("name", ParkExceptionType.getTypeByCode(x.toString()).getName()).set("code", x).set("count", result.get(x))));
+            return ResponseBuilder.ok(list);
         }
         parkCodeList.forEach(code -> ParkExceptionType.codeList().forEach(x -> result.set(x, result.getInt(x) + (obj.getInteger(x + "Count") == null ? 0 : obj.getInteger(x + "Count")))));
         result.keySet().forEach(x -> list.add(Levi.by("name", ParkExceptionType.getTypeByCode(x.toString()).getName()).set("code", x).set("count", result.get(x))));