每小时报表

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxReprotSameDayRealTimeInspectionStatisticsServiceImpl.java

@@ -2,17 +2,14 @@ package com.rongwei.bscommon.sys.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 import com.rongwei.bscommon.sys.service.ZhcxReprotSameDayRealTimeInspectionStatisticsLocationService;
 import com.rongwei.bsentity.domain.ZhcxReprotSameDayRealTimeInspectionStatisticsDo;
 import com.rongwei.bscommon.sys.dao.ZhcxReprotSameDayRealTimeInspectionStatisticsDao;
 import com.rongwei.bscommon.sys.service.ZhcxReprotSameDayRealTimeInspectionStatisticsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bsentity.domain.ZhcxReprotSameDayRealTimeInspectionStatisticsLocationDo;
+import com.rongwei.bsentity.dto.StatisticsDateDto;
 import com.rongwei.bsentity.vo.report.SameDayRealTimeInspectionVo;
-import com.rongwei.commonservice.service.dao.CommonSqlDao;
-import com.rongwei.rwadmincommon.system.dao.CommonDao;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,6 +41,23 @@ public class ZhcxReprotSameDayRealTimeInspectionStatisticsServiceImpl extends Se
     @Override
     public void genStatistics() {
 
+        //统计时间
+        StatisticsDateDto dateDto = getStatisticsDate();
+
+        //前一小时报验单
+        List<SameDayRealTimeInspectionVo> inspetionList = dao.getInspetion(dateDto.getStartTime(), dateDto.getEndTime());
+
+        //数据处理
+        analysisDataData(inspetionList, dateDto.getStatisticsTime());
+    }
+
+    /**
+     * 获取统计时间
+     *
+     * @return
+     */
+    private StatisticsDateDto getStatisticsDate() {
+
         Calendar calendar = Calendar.getInstance();
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         calendar.setTime(new Date());
@@ -64,11 +78,11 @@ public class ZhcxReprotSameDayRealTimeInspectionStatisticsServiceImpl extends Se
         //当前最后一小时
         String endTime = DateUtil.format(statisticsTime, "yyyy-MM-dd") + " 23:59:59";
 
-        //前一小时报验单
-        List<SameDayRealTimeInspectionVo> inspetionList = dao.getInspetion(dateFormat.format(date0), endTime);
-
-        //数据处理
-        analysisDataData(inspetionList, statisticsTime);
+        return StatisticsDateDto.builder()
+                .startTime(dateFormat.format(date0))
+                .endTime(endTime)
+                .statisticsTime(statisticsTime)
+                .build();
     }
 
     /**

business-entity/src/main/java/com/rongwei/bsentity/dto/StatisticsDateDto.java

@@ -0,0 +1,28 @@
+package com.rongwei.bsentity.dto;
+
+import lombok.*;
+
+import java.util.Date;
+
+@Setter
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class StatisticsDateDto {
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
+    /**
+     * 统计时间
+     */
+    private Date statisticsTime;
+}