From 5005f4916ae1240cf4cd91bb4ed82be43598f568 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 10 六月 2025 20:10:32 +0800
Subject: [PATCH] 自动充放电自动化流程

---
 src/main/java/com/whyc/service/BattWarehouseService.java |   42 +++++++++++++++++++++++++++++++++++++-----
 1 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/whyc/service/BattWarehouseService.java b/src/main/java/com/whyc/service/BattWarehouseService.java
index 47f566b..f35bfab 100644
--- a/src/main/java/com/whyc/service/BattWarehouseService.java
+++ b/src/main/java/com/whyc/service/BattWarehouseService.java
@@ -34,12 +34,36 @@
         PageParam param = pageParamService.getActivatePeriod();
         Integer period = param.getValue();
         Calendar calendar = Calendar.getInstance();
-        calendar.add(Calendar.DATE,-period);
+        calendar.add(Calendar.DAY_OF_MONTH,-period);
 
         QueryWrapper<BattWarehouse> query = Wrappers.query();
         query.eq("on_plan",0);
-        //涓烘椿鍖栬繃 鎴栬�� 娲诲寲鏃堕棿瓒呰繃娲诲寲鍛ㄦ湡
-        query.isNull("activate_time").or().le("activate_time",calendar);
+        //鏈椿鍖栬繃 鎴栬�� 娲诲寲鏃堕棿瓒呰繃娲诲寲鍛ㄦ湡
+        query.isNull("activate_time").or().le("activate_time",calendar.getTime());
+        return mapper.selectList(query);
+    }
+
+    public List<BattWarehouse> getChargeList() {
+        Integer period = 1;
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.MONTH,-period);
+
+        QueryWrapper<BattWarehouse> query = Wrappers.query();
+        query.eq("charge_on_plan",0);
+        //鏈厖鐢佃繃 鎴栬�� 鍏呯數鏃堕棿瓒呰繃鍏呯數鍛ㄦ湡
+        query.isNull("charge_time").or().le("charge_time",calendar.getTime());
+        return mapper.selectList(query);
+    }
+
+    public List<BattWarehouse> getDischargeList() {
+        Integer period = 2;
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.MONTH,-period);
+
+        QueryWrapper<BattWarehouse> query = Wrappers.query();
+        query.eq("discharge_on_plan",0);
+        //鏈斁鐢佃繃 鎴栬�� 鏀剧數鏃堕棿瓒呰繃鏀剧數鍛ㄦ湡
+        query.isNull("discharge_time").or().le("discharge_time",calendar.getTime());
         return mapper.selectList(query);
     }
 
@@ -51,8 +75,16 @@
         mapper.insertBatchSomeColumn(listNew);
     }
 
-    public void updateBatchById(List<BattWarehouse> list) {
-        mapper.updateBatchById(list);
+    public void updateActivateBatchById(List<BattWarehouse> list) {
+        mapper.updateActivateBatchById(list);
+    }
+
+    public void updateChargeBatchById(List<BattWarehouse> list) {
+        mapper.updateChargeBatchById(list);
+    }
+
+    public void updateDischargeBatchById(List<BattWarehouse> list) {
+        mapper.updateDischargeBatchById(list);
     }
 
     public BattWarehouse getByTaskNo(String taskNo) {

--
Gitblit v1.9.1