1.地铁盘查5-23需求优化

src/main/java/com/metro/service/job/AdminDataShowTask.java

@@ -11,6 +11,7 @@ import com.metro.mapper.PassreCordsMapper;
 import com.metro.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -32,6 +33,7 @@ import java.util.stream.Collectors;
 @EnableScheduling   // 2.开启定时任务
 @EnableAsync
 @Slf4j
+@DependsOn("jperSonTask")
 public class AdminDataShowTask {
 
     @Resource
@@ -51,8 +53,11 @@ public class AdminDataShowTask {
     @Async
     public void dailyDataStatistics() {
         log.info("----------开始------每日数据统计-------------");
+        LambdaQueryWrapper<Company> companyWrapper = new LambdaQueryWrapper<>();
+        companyWrapper.isNotNull(Company::getBranchId);
+
         /*查询出所有*/
-        List<Company> companyList = companysMapper.selectList(new LambdaQueryWrapper<>());
+        List<Company> companyList = companysMapper.selectList(companyWrapper);
         companyList = companyList.stream().filter(p -> StringUtils.isNotEmpty(p.getCompanyId()) && StringUtils.isNotEmpty(p.getBranchId())).collect(Collectors.toList());
         companyList.add(new Company().setCompanyId("").setBranchId(""));
 

src/main/java/com/metro/service/job/AdminDataShowTodayTask.java

@@ -51,7 +51,7 @@ public class AdminDataShowTodayTask {
         log.info("----------开始------每日10分钟数据统计-------------");
 
         /*查询出所有站点*/
-        List<Company> companyList = companysMapper.selectList(new LambdaQueryWrapper<>());
+        List<Company> companyList = companysMapper.selectList(new LambdaQueryWrapper<Company>().isNotNull(Company::getBranchId));
         companyList = companyList.stream().filter(p -> StringUtils.isNotEmpty(p.getCompanyId()) && StringUtils.isNotEmpty(p.getBranchId())).collect(Collectors.toList());
         for (Company company : companyList) {
             List<PassreCordsLessVO> passreCordsLessVOS = passreCordsMapper.selectTodayDataNumber(company.getCompanyId(), company.getBranchId());

src/main/java/com/metro/service/job/JperSonTask.java

@@ -1,5 +1,7 @@
 package com.metro.service.job;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.metro.mapper.DataShowMapper;
 import com.metro.mapper.JPersonsMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Configuration;
@@ -7,7 +9,6 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
@@ -27,15 +28,18 @@ public class JperSonTask {
     @Resource
     @Lazy
     private JPersonsMapper jPersonsMapper;
+    @Resource
+    @Lazy
+    private DataShowMapper dataShowMapper;
 
     /*
     * 因为地铁盘查生产的admin的companyId和branchId是null
     * */
-    @Scheduled(cron = "0 0 0 * * ?", zone = "Asia/Shanghai")
     @PostConstruct
     @Async
     public void dailyDataStatistics() {
         log.info("----------开始------数据初始化-------------");
+        dataShowMapper.delete(new LambdaQueryWrapper<>());
         jPersonsMapper.updateJperson();
         jPersonsMapper.updateJperson1();
         log.info("----------完成------数据初始化-------------");

src/main/java/com/metro/service/job/WarFruitTask.java

@@ -7,6 +7,7 @@ import com.metro.mapper.PassreCordsMapper;
 import com.metro.mapper.WarFruitMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -27,6 +28,7 @@ import java.util.List;
 @EnableScheduling   // 2.开启定时任务
 @EnableAsync
 @Slf4j
+@DependsOn("jperSonTask")
 public class WarFruitTask {
 
     @Resource

src/main/resources/mapper/DataShowMapper.xml

@@ -26,6 +26,7 @@
         sum(number) as number
         from data_show
         <where>
+            company_id != '' and  branch_id !=''
             <if test="typeList != null and typeList.size()>0 ">
                 and type in
                 <foreach collection="typeList" item="type" index="index"