From 3c1c7bff7cfc265def561c84d7d9c2c17c4bbb84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=BA=AC=E9=80=9A?= <2405957150@qq.com>
Date: Tue, 29 Jul 2025 16:50:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasend/dianxin/task/StandardTask.java   | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/bootdo/datasend/dianxin/task/StandardTask.java b/src/main/java/com/bootdo/datasend/dianxin/task/StandardTask.java
index cb21be1..b6cd881 100644
--- a/src/main/java/com/bootdo/datasend/dianxin/task/StandardTask.java
+++ b/src/main/java/com/bootdo/datasend/dianxin/task/StandardTask.java
@@ -18,6 +18,8 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -258,10 +260,10 @@ public class StandardTask {
                 requestDataListDTO.setGatewaySN(deviceInfo.getGeminiSn());
             }
             requestDataListDTO.setPassTime(StringKit.toString(h.getPassTime()));
-            if (h.getPlatePic()!=null){
+            if (h.getPlatePic() != null) {
                 requestDataListDTO.setPlatePicBase64(Base64Util.getBase64ByUrl(h.getPlatePic()));
             }
-            if (h.getGlobalPic()!=null){
+            if (h.getGlobalPic() != null) {
                 requestDataListDTO.setGlobalPicBase64(Base64Util.getBase64ByUrl(h.getGlobalPic()));
             }
             requestDataListDTO.setPlateNo(h.getPlateNo());
@@ -338,16 +340,16 @@ public class StandardTask {
             requestDataListDTO.setDeviceSN(h.getGbsChannelNo());
             requestDataListDTO.setValidType(Integer.valueOf(h.getDirection()));
             requestDataListDTO.setPassTime(StringKit.toString(h.getPassTime()));
-            if (h.getPersonPic()!=null){
+            if (h.getPersonPic() != null) {
                 requestDataListDTO.setGlobalPicBase64(Base64Util.getBase64ByUrl(h.getPersonPic()));
             }
             requestDataListDTO.setPersonPic(h.getPersonPic());
             requestDataListDTO.setGlobalPic(h.getPersonPic());
             requestDataListDTO.setCardNo(h.getCardno());
             requestDataListDTO.setDeviceSN(h.getGbsChannelNo());
-            if (h.getOpenResult().contains("成功")){
+            if (h.getOpenResult().contains("成功")) {
                 requestDataListDTO.setValidResult((short) 1);
-            }else {
+            } else {
                 requestDataListDTO.setValidResult((short) 0);
             }
             requestDataListDTO.setUserName(h.getUserName());
@@ -438,7 +440,6 @@ public class StandardTask {
 //    }
 
 
-
     public boolean sendHighThrowMq(HighThrowDto bean) {
         try {
             rabbitTemplate.convertAndSend("warnrecord", "routing.key.warnrecord", JSON.toJSONString(bean));
@@ -497,9 +498,9 @@ public class StandardTask {
             dataListDTO.setDeviceType(h.getDeviceType());
             dataListDTO.setDeviceSN(h.getDeviceSN());
             dataListDTO.setHeartbeatTime(h.getHeartbeatTime());
-            if (h.getIsOnline() == null){
+            if (h.getIsOnline() == null) {
                 dataListDTO.setIsOnline(0);
-            }else {
+            } else {
                 dataListDTO.setIsOnline(h.getIsOnline());
             }
             dataListDTO.setIsOpenAccount(h.getIsOpenAccount());
@@ -588,17 +589,20 @@ public class StandardTask {
     }
 
 
-
-
     /**
      * 推送电表设备用电信息
      */
 //    @Scheduled(cron = "0/5 * * * * ? ")
     @Scheduled(cron = "0 30 2 * * ?")
     public void DevicePowerInfoRecord() {
-
+        LocalDateTime now = LocalDateTime.now();
+//        昨天
+        LocalDateTime yesterday = now.minusDays(1);
+//        转成yyyy-MM-dd HH:mm:ss格式
+        String format = yesterday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         List<DevicePowerInfo> lists = devicePowerInfoService.list(new QueryWrapper<DevicePowerInfo>()
                 .eq("is_send", "0")
+                .like("use_date", format)
                 .last("limit 100")
         );
 
@@ -641,4 +645,14 @@ public class StandardTask {
 
         }
     }
+
+    public static void main(String[] args) {
+        LocalDateTime now = LocalDateTime.now();
+//        昨天
+        LocalDateTime yesterday = now.minusDays(1);
+//        转成yyyy-MM-dd HH:mm:ss格式
+        String format = yesterday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        System.out.println(format);
+        System.out.println(yesterday);
+    }
 }