From 7005c13237516d5dd965afb1b3c5aa734a01a661 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期三, 23 三月 2022 17:27:59 +0800
Subject: [PATCH] 最新版本

---
 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticScheduleImpl.java |   44 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticScheduleImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticScheduleImpl.java
index 155494d..166f111 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticScheduleImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticScheduleImpl.java
@@ -36,7 +36,10 @@
     @Autowired
     private IAlarmService iAlarmService;
 
-    @Scheduled(cron="0 0 * * * ?")//姣忔櫄鍑屾櫒1鐐规墽琛�
+    @Autowired
+    private ICarService iCarService;
+
+    @Scheduled(cron="0 0 5 * * ?")//姣忔櫄鍑屾櫒1鐐规墽琛�
     public void execute(){
         List<User> all = userService.findAll();
         for(User user:all){
@@ -57,8 +60,13 @@
                         one.setSafeDriving(0);//瀹夊叏椹鹃┒閲岀▼
                         one.setDriving(0);//椹鹃┒閲岀▼
                     }else{
-                        one.setSafeDriving(max-min);//瀹夊叏椹鹃┒閲岀▼
-                        one.setDriving(max-min);//椹鹃┒閲岀▼
+                        if(max==min){
+                            one.setSafeDriving(max);//瀹夊叏椹鹃┒閲岀▼
+                            one.setDriving(max);//椹鹃┒閲岀▼
+                        }else{
+                            one.setSafeDriving(max-min);//瀹夊叏椹鹃┒閲岀▼
+                            one.setDriving(max-min);//椹鹃┒閲岀▼
+                        }
                     }
 
                     QueryWrapper<DrivingRecord> wrapper2 = new QueryWrapper<>();
@@ -83,16 +91,20 @@
                 if(type2==1){
                     QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<>();
                     wrapper2.eq("user_id",user.getId());
+                    wrapper2.ne("status",0);
                     int count = iOrderTaskService.count(wrapper2);
                     one.setSends(count);//閰嶉�佹鏁�
 
-                    wrapper2.ne("status",0);
-                    int count2 = iOrderTaskService.count(wrapper2);
-                    one.setSends2(count2);//閫佽揪娆℃暟
+//                    QueryWrapper<OrderTask> wrapper22 = new QueryWrapper<>();
+//                    wrapper22.eq("user_id",user.getId());
+//                    wrapper22.eq("status",1);
+//                    int count2 = iOrderTaskService.count(wrapper22);
+                    one.setSends2(count);//閫佽揪娆℃暟
 
-                    QueryWrapper<Area> wrapper3 = new QueryWrapper<>();
-                    wrapper3.eq("user_id",user.getId());
-                    Area area = iAreaService.getOne(wrapper3);
+//                    QueryWrapper<Area> wrapper3 = new QueryWrapper<>();
+//                    wrapper3.eq("user_id",user.getId());
+//                    Area area = iAreaService.getOne(wrapper3);
+                    Area area  = getArea(user.getId());
                     if(area!=null){
                         QueryWrapper<Customer> wrapper4 = new QueryWrapper<>();
                         wrapper4.eq("area_id",area.getId());
@@ -121,4 +133,18 @@
         }
 
     }
+
+    public Area getArea(String userId){
+        QueryWrapper<Car> carQueryWrapper = new QueryWrapper<Car>();
+        carQueryWrapper.eq("follow_user_id",userId);
+        Car one = iCarService.getOne(carQueryWrapper);
+        if(one==null){
+            return null;
+        }else{
+            QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
+            wrapper.eq("car_id",one.getId());
+            Area area = iAreaService.getOne(wrapper);
+            return area;
+        }
+    }
 }

--
Gitblit v1.9.1