1.统计统一调整为近30天

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/DPStatisticsServiceImpl.java

@@ -11,10 +11,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
@@ -87,7 +84,7 @@ public class DPStatisticsServiceImpl {
 
     private void setDefaultFilter(DPFilterParamDto dpFilterParamDto) {
         if (StringUtils.isEmpty(dpFilterParamDto.getBeginDate())) {
-            dpFilterParamDto.setBeginDate(DateUtil.lastMonth().toDateStr());
+            dpFilterParamDto.setBeginDate(cn.hutool.core.date.DateUtil.offsetDay(new Date(), -30).toDateStr());
         }
         if (StringUtils.isEmpty(dpFilterParamDto.getEndDate())) {
             dpFilterParamDto.setEndDate(DateUtil.today());

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/AQZSDPStatisticsServiceImpl.java

@@ -789,7 +789,7 @@ public class AQZSDPStatisticsServiceImpl {
 
     private void setDefaultFilter(DPFilterParamDto dpFilterParamDto) {
         if (StringUtils.isEmpty(dpFilterParamDto.getBeginDate())) {
-            dpFilterParamDto.setBeginDate(DateUtil.lastMonth().toDateStr());
+            dpFilterParamDto.setBeginDate(cn.hutool.core.date.DateUtil.offsetDay(new Date(), -30).toDateStr());
         }
         if (StringUtils.isEmpty(dpFilterParamDto.getEndDate())) {
             dpFilterParamDto.setEndDate(DateUtil.today());

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -215,7 +215,7 @@ public class JGDPStatisticsServiceImpl {
 
     private void setDefaultFilter(DPFilterParamDto dpFilterParamDto) {
         if (StringUtils.isEmpty(dpFilterParamDto.getBeginDate())) {
-            dpFilterParamDto.setBeginDate(DateUtil.lastMonth().toDateStr());
+            dpFilterParamDto.setBeginDate(cn.hutool.core.date.DateUtil.offsetDay(new Date(), -30).toDateStr());
         }
         if (StringUtils.isEmpty(dpFilterParamDto.getEndDate())) {
             dpFilterParamDto.setEndDate(DateUtil.today());

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JYJCDPStatisticsServiceImpl.java

@@ -168,7 +168,7 @@ public class JYJCDPStatisticsServiceImpl {
 
     private void setDefaultFilter(DPFilterParamDto dpFilterParamDto) {
         if (StringUtils.isEmpty(dpFilterParamDto.getBeginDate())) {
-            dpFilterParamDto.setBeginDate(DateUtil.lastMonth().toDateStr());
+            dpFilterParamDto.setBeginDate(cn.hutool.core.date.DateUtil.offsetDay(new Date(), -30).toDateStr());
         }
         if (StringUtils.isEmpty(dpFilterParamDto.getEndDate())) {
             dpFilterParamDto.setEndDate(DateUtil.today());

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/StCommonServiceImpl.java

@@ -227,6 +227,7 @@ public class StCommonServiceImpl {
         String length = techParamsPipelineMapper.sumPipeLengthByOrgCode(orgCode);
         BigDecimal lengthDecimal = new BigDecimal(length);
         if (lengthDecimal.compareTo(BigDecimal.ZERO) > 0) {
+            // 数据库的米换算成千米
             length = lengthDecimal.divide(new BigDecimal("1000"), 3, RoundingMode.HALF_UP).toPlainString();
         }
         result.put(DPMapStatisticsItemEnum.PRESSURE_PIPELINES.getCode(), length);

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/YJDPStatisticsServiceImpl.java

 package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
 
+import cn.hutool.core.date.DateTime;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,7 +11,6 @@ import com.yeejoin.amos.boot.module.statistics.api.dto.AlertUseUnitStatisticsDto
 import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertRescueStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertUseUnitStatisticsMapper;
-import com.yeejoin.amos.boot.module.statistics.api.mapper.CommonBaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.AlertPaperInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.DispatchPaper;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
@@ -366,7 +366,38 @@ public class YJDPStatisticsServiceImpl {
         Map<String, Object> result = new HashMap<>();
         // 统计完成的事件包括困人、故障
         Long num = alertStatisticsMapper.countEmergencyEventsByOrgCodeAndDate(orgCode, filterParamDto);
+        // 电梯总量(台)
+        result.put("dtCount", num);
+        // 曳引驱动乘客电梯(台)
+        result.put("zyqdcjdtCount", num);
+        // 曳引驱动载货电梯(台)
+        result.put("zyqdzhdtCount", num);
+        // 强制驱动载货电梯(台)
+        result.put("qzqdzgdtCount", num);
+        // 液压乘客电梯(台)
+        result.put("yackdtount", num);
+        // 液压载货电梯(台)
+        result.put("yyzhdtCount", num);
+        // 自动扶梯(台)
+        result.put("zdftCount", num);
+        // 自动人行道(台)
+        result.put("zdrxdCount", num);
+        // 防爆电梯(台)
+        result.put("fbdtCount", num);
+        // 消防员电梯(台)
+        result.put("xfydtCount", num);
+        // 杂物电梯(台)
+        result.put("zhdtCount", num);
+        // 应急事件(起)
         result.put("alarmCount", num);
+        // 困人救援事件(起)
+        result.put("krjysjCount", num);
+        // 故障维修(起)
+        result.put("gzwxCount", num);
+        // 投诉咨询(起)
+        result.put("tszxCount", num);
+        // 解救被困乘客数(人)
+        result.put("jjbkcksCount", num);
         return result;
     }
 
@@ -374,13 +405,12 @@ public class YJDPStatisticsServiceImpl {
     public Map<String, Object> getCenterMapCountDataForGlobal(DPFilterParamDto dpFilterParamDto) {
         this.setDefaultFilter(dpFilterParamDto);
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto);
-        // 1.报检数量统计
         return this.getCenterMapOverviewData(orgCode, dpFilterParamDto);
     }
 
     private void setDefaultFilter(DPFilterParamDto dpFilterParamDto) {
         if (StringUtils.isEmpty(dpFilterParamDto.getBeginDate())) {
-            dpFilterParamDto.setBeginDate(cn.hutool.core.date.DateUtil.lastMonth().toDateStr());
+            dpFilterParamDto.setBeginDate(cn.hutool.core.date.DateUtil.offsetDay(new Date(), -30).toDateStr());
         }
         if (StringUtils.isEmpty(dpFilterParamDto.getEndDate())) {
             dpFilterParamDto.setEndDate(cn.hutool.core.date.DateUtil.today());