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/StatisticPcScheduleImpl.java |   39 ++++++++++++++++++++++++++-------------
 1 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java
index 1156308..4b6bb0a 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java
@@ -1,6 +1,5 @@
 package cn.exrick.xboot.your.schedulings;
 import cn.exrick.xboot.core.common.redis.RedisTemplateHelper;
-import cn.exrick.xboot.core.entity.User;
 import cn.exrick.xboot.core.service.MessageService;
 import cn.exrick.xboot.core.service.UserService;
 import cn.exrick.xboot.your.entity.*;
@@ -11,9 +10,7 @@
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.io.IOException;
 import java.util.Date;
-import java.util.List;
 //澶у睆棣栭〉缁熻
 @Component
 public class StatisticPcScheduleImpl {
@@ -49,10 +46,10 @@
     private IRemoteCallService iRemoteCallService;
 
     @Autowired
-    private IEquipmentService iEquipmentService;
+    private IEventLogService eventLogService;
 
     @Autowired
-    private IEventLogService eventLogService;
+    private IOrderLogService iOrderLogService;
 
     public static final String HEAD = "statistic1::";
 
@@ -64,12 +61,13 @@
 
         redisTemplate.set(HEAD+"dept","3");//杞繍绔欐暟
         redisTemplate.set(HEAD+"area",iAreaService.count()+"");//鐗囧尯鏁�
-        redisTemplate.set(HEAD+"customer",iCustomerService.count()+"");//鍟嗘埛鏁�
+        int customNum = iCustomerService.count();
+        redisTemplate.set(HEAD+"customer",customNum+"");//鍟嗘埛鏁�
 
         redisTemplate.set(HEAD+"out",iDrivingRecordService.count()+"");//鍑鸿溅娆℃暟
         redisTemplate.set(HEAD+"driving",iUserStatisticService.sumDriving()+"");//琛岄┒閲岀▼
-        redisTemplate.set(HEAD+"num",iOrderTaskService.sumNum()+"");//閫佽揣鍖呮暟
-        redisTemplate.set(HEAD+"status",iOrderTaskService.sumStatus(1)+"");//鐢靛瓙绛炬敹娆℃暟
+        redisTemplate.set(HEAD+"num",iOrderLogService.sumNum()+"");//閫佽揣鍖呮暟
+        redisTemplate.set(HEAD+"status",getNum(2)+"");//鐢靛瓙绛炬敹娆℃暟
 
         redisTemplate.set(HEAD+"notice",messageService.getTotalCount()+"");//閫氱煡鍏憡鏉℃暟
         redisTemplate.set(HEAD+"video","0");//瑙嗛鐩戞帶娆℃暟
@@ -78,24 +76,39 @@
 
         redisTemplate.set(HEAD+"wx",iCustomerService.sumLogin()+"");//灏忕▼搴忕櫥闄嗘鏁�
         redisTemplate.set(HEAD+"wxRate",iCustomerService.countOpenId()+"");//灏忕▼搴忎娇鐢ㄧ巼
-        int i = iOrderTaskService.countLike();
+
+        int i = getNum(1);
         redisTemplate.set(HEAD+"like",i+"");//浜掑姩娆℃暟
-        int count = iOrderTaskService.count();
+        int count = iOrderLogService.sumNum();
         if(count==0){
             redisTemplate.set(HEAD+"likeRate","0");//浜掑姩鐜�
         }else{
-            redisTemplate.set(HEAD+"likeRate",(i*100)/count+"");//浜掑姩鐜�
+            redisTemplate.set(HEAD+"likeRate",(((i*100)/customNum)+1)+"");//浜掑姩鐜�
         }
 
+        String format = DateUtil.format(new Date(), "yyyy-MM-dd");
 
-        redisTemplate.set(HEAD+"outCar",iEquipmentService.countByTypeAndStatus(0)+"");//鍑哄彂杞﹁締
+        QueryWrapper<DrivingRecord> wp = new QueryWrapper<>();
+        wp.between("create_time",format+" 00:00:00",format+" 23:59:59");
+        redisTemplate.set(HEAD+"outCar",iDrivingRecordService.count(wp)+"");//鍑哄彂杞﹁締
+
         QueryWrapper<EventLog> wrapper2=new QueryWrapper<>();
         wrapper2.eq("type",5);
         redisTemplate.set(HEAD+"open",eventLogService.count(wrapper2)+"");//鍗遍櫓寮�鍚�
 
         QueryWrapper<Customer> wrapper = new QueryWrapper<>();
-        String format = DateUtil.format(new Date(), "yyyy-MM-dd");
         wrapper.between("create_time",format+" 00:00:00",format+" 23:59:59");
         redisTemplate.set(HEAD+"addCustomer",iCustomerService.count(wrapper)+"");//浠婃棩鏂板鍟嗘埛
     }
+
+    private int getNum(int type){
+        QueryWrapper<OrderLog> wp = new QueryWrapper<>();
+        wp.eq("type",type);
+        OrderLog one = iOrderLogService.getOne(wp);
+        if(one!=null){
+            return one.getNum();
+        }else{
+            return 0;
+        }
+    }
 }

--
Gitblit v1.9.1