From 73bb5617e6aeb4ee8f7dfd4ad54b61d477969d86 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 10 六月 2025 20:22:06 +0800
Subject: [PATCH] 自动充放电自动化流程
---
src/main/java/com/whyc/service/BattWarehouseService.java | 62 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattWarehouseService.java b/src/main/java/com/whyc/service/BattWarehouseService.java
index 47f566b..8a7e569 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,13 +75,21 @@
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) {
QueryWrapper<BattWarehouse> query = Wrappers.query();
- query.eq("task_no",taskNo);
+ query.eq("task_no",taskNo).or().eq("charge_task_no",taskNo).or().eq("discharge_task_no",taskNo);
query.last(" limit 1");
return mapper.selectOne(query);
}
@@ -74,4 +106,22 @@
update.eq("id",id);
mapper.update((BattWarehouse) ActionUtil.objeNull,update);
}
+
+ public void finishChargeById(Integer id) {
+ UpdateWrapper<BattWarehouse> update = Wrappers.update();
+ update.set("charge_task_no",null);
+ update.set("charge_on_plan",0);
+ update.set("charge_time",Calendar.getInstance().getTime());
+ update.eq("id",id);
+ mapper.update((BattWarehouse) ActionUtil.objeNull,update);
+ }
+
+ public void finishDischargeById(Integer id) {
+ UpdateWrapper<BattWarehouse> update = Wrappers.update();
+ update.set("discharge_task_no",null);
+ update.set("discharge_on_plan",0);
+ update.set("discharge_time",Calendar.getInstance().getTime());
+ update.eq("id",id);
+ mapper.update((BattWarehouse) ActionUtil.objeNull,update);
+ }
}
--
Gitblit v1.9.1