站点统计优化

admin/src/main/java/com/kym/admin/jobs/StationStatJob.java

@@ -61,22 +61,24 @@ public class StationStatJob {
         var startTime = LocalDateTime.of(statDay.toLocalDate(), LocalTime.MIN);
         var endTime = LocalDateTime.of(statDay.toLocalDate(), LocalTime.MAX);
         var chargeOrderList = getChargeOrders(startTime, endTime);
+        dayService.replaceBatch((Collection<StationStatDay>) getStationStat(chargeOrderList, true));
         dayService.saveBatch((Collection<StationStatDay>) getStationStat(chargeOrderList, true));
         log.info("执行站点日统计定时任务-结束");
     }
 
 
     /**
-     * 月统计，每月第一天下午15:00启动，统计上月数据
+     * 月统计，每月5日天下午15:00启动，统计上月数据
      */
-    @Scheduled(cron = "0 0 15 1 * ?")
+    @Scheduled(cron = "0 0 15 5 * ?")
     private void monthStat() {
         log.info("执行站点月统计定时任务-开始");
         var statMonth = LocalDateTime.now().minusMonths(1);
         var startTime = statMonth.with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN);
         var endTime = statMonth.with(TemporalAdjusters.lastDayOfMonth()).with(LocalTime.MAX);
         var chargeOrderList = getChargeOrders(startTime, endTime);
-        monthService.saveBatch((Collection<StationStatMonth>) getStationStat(chargeOrderList, false));
+        monthService.replaceBatch((Collection<StationStatMonth>) getStationStat(chargeOrderList, false));
+//        monthService.saveBatch((Collection<StationStatMonth>) getStationStat(chargeOrderList, false));
         log.info("执行站点月统计定时任务-结束");
     }
 

mapper/src/main/java/com/kym/mapper/admin/StationStatDayMapper.java

@@ -1,7 +1,7 @@
 package com.kym.mapper.admin;
 
 import com.kym.entity.admin.StationStatDay;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kym.mapper.mybatisplus.MyBaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-12-04
  */
-public interface StationStatDayMapper extends BaseMapper<StationStatDay> {
+public interface StationStatDayMapper extends MyBaseMapper<StationStatDay> {
 
 }

mapper/src/main/java/com/kym/mapper/admin/StationStatMonthMapper.java

@@ -1,7 +1,7 @@
 package com.kym.mapper.admin;
 
 import com.kym.entity.admin.StationStatMonth;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kym.mapper.mybatisplus.MyBaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author skyline
  * @since 2023-12-04
  */
-public interface StationStatMonthMapper extends BaseMapper<StationStatMonth> {
+public interface StationStatMonthMapper extends MyBaseMapper<StationStatMonth> {
 
 }

service/src/main/java/com/kym/service/admin/StationStatDayService.java

@@ -2,6 +2,7 @@ package com.kym.service.admin;
 
 import com.kym.entity.admin.StationStatDay;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.kym.service.mybatisplus.MyBaseService;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author skyline
  * @since 2023-12-04
  */
-public interface StationStatDayService extends IService<StationStatDay> {
+public interface StationStatDayService extends MyBaseService<StationStatDay> {
 
 }

service/src/main/java/com/kym/service/admin/StationStatMonthService.java

@@ -1,9 +1,11 @@
 package com.kym.service.admin;
 
+import com.github.yulichang.base.MPJBaseService;
 import com.kym.entity.admin.StationStatMonth;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kym.entity.admin.queryParams.StatementsQueryParam;
 import com.kym.entity.common.PageBean;
+import com.kym.service.mybatisplus.MyBaseService;
 
 /**
  * <p>
@@ -13,7 +15,7 @@ import com.kym.entity.common.PageBean;
  * @author skyline
  * @since 2023-12-04
  */
-public interface StationStatMonthService extends IService<StationStatMonth> {
+public interface StationStatMonthService extends MyBaseService<StationStatMonth> {
 
     PageBean<StationStatMonth> listStatMonth(StatementsQueryParam params);
 

service/src/main/java/com/kym/service/admin/impl/StationStatDayServiceImpl.java

@@ -4,6 +4,7 @@ import com.kym.entity.admin.StationStatDay;
 import com.kym.mapper.admin.StationStatDayMapper;
 import com.kym.service.admin.StationStatDayService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kym.service.mybatisplus.MyBaseServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +16,6 @@ import org.springframework.stereotype.Service;
  * @since 2023-12-04
  */
 @Service
-public class StationStatDayServiceImpl extends ServiceImpl<StationStatDayMapper, StationStatDay> implements StationStatDayService {
+public class StationStatDayServiceImpl extends MyBaseServiceImpl<StationStatDayMapper, StationStatDay> implements StationStatDayService {
 
 }

service/src/main/java/com/kym/service/admin/impl/StationStatMonthServiceImpl.java

@@ -1,6 +1,5 @@
 package com.kym.service.admin.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.kym.common.utils.CommUtil;
 import com.kym.entity.admin.StationStatMonth;
@@ -9,6 +8,7 @@ import com.kym.entity.common.PageBean;
 import com.kym.mapper.admin.StationStatMonthMapper;
 import com.kym.service.admin.StationStatMonthService;
 import com.kym.service.cache.KymCache;
+import com.kym.service.mybatisplus.MyBaseServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -20,7 +20,7 @@ import org.springframework.stereotype.Service;
  * @since 2023-12-04
  */
 @Service
-public class StationStatMonthServiceImpl extends ServiceImpl<StationStatMonthMapper, StationStatMonth> implements StationStatMonthService {
+public class StationStatMonthServiceImpl extends MyBaseServiceImpl<StationStatMonthMapper, StationStatMonth> implements StationStatMonthService {
 
     @Override
     public PageBean<StationStatMonth> listStatMonth(StatementsQueryParam params) {

service/src/main/java/com/kym/service/mybatisplus/MyBaseService.java

@@ -2,7 +2,6 @@ package com.kym.service.mybatisplus;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.yulichang.base.MPJBaseService;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.function.Function;
@@ -37,4 +36,5 @@ public interface MyBaseService<T> extends MPJBaseService<T> {
      * @return
      */
     boolean replaceBatch(Collection<T> entityList);
-}
+
+}