From 86863b25ad19b08038bd16ad9f9a428cc2519810 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 19 五月 2025 09:12:31 +0800
Subject: [PATCH] 电源下新建一个设备一个电池组和已有的设备下添加第二组电池组
---
src/main/java/com/whyc/service/BattInfService.java | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattInfService.java b/src/main/java/com/whyc/service/BattInfService.java
index 38c56d8..364764b 100644
--- a/src/main/java/com/whyc/service/BattInfService.java
+++ b/src/main/java/com/whyc/service/BattInfService.java
@@ -76,18 +76,39 @@
//璁惧涓嬫坊鍔犵數姹犵粍
@Transactional
public void addBatt(BattInf addbinf) {
- //鑾峰彇璁惧鐨勯�氱敤淇℃伅
- QueryWrapper wrapper=new QueryWrapper();
- wrapper.eq("dev_id",addbinf.getDevId());
- wrapper.select("dev_name","dev_type","dev_num","dev_ip","power_id","station_id");
- wrapper.last("limit 1");
- BattInf binf=mapper.selectOne(wrapper);
- addbinf.setPowerId(binf.getPowerId());
- addbinf.setStationId(binf.getStationId());
- addbinf.setDevName(binf.getDevName());
- addbinf.setDevType(binf.getDevType());
- addbinf.setDevNum(binf.getDevNum());
- addbinf.setDevIp(binf.getDevIp());
+ if(addbinf.getAddBinfFlag()==1){
+ //鑾峰彇璁惧鐨勯�氱敤淇℃伅
+ QueryWrapper wrapper=new QueryWrapper();
+ wrapper.eq("dev_id",addbinf.getDevId());
+ wrapper.select("dev_name","dev_type","dev_num","dev_ip","power_id","station_id");
+ wrapper.last("limit 1");
+ BattInf binf=mapper.selectOne(wrapper);
+ addbinf.setPowerId(binf.getPowerId());
+ addbinf.setStationId(binf.getStationId());
+ addbinf.setDevName(binf.getDevName());
+ addbinf.setDevType(binf.getDevType());
+ addbinf.setDevNum(binf.getDevNum());
+ addbinf.setDevIp(binf.getDevIp());
+ }else{//鐢垫簮涓嬫柊寤轰竴涓澶�
+ //妫�娴嬬數婧愪笅鏄惁瀛樺湪璁惧
+ int devNum=mapper.getMaxDevNum(addbinf.getPowerId());
+ if(devNum==0){
+ devNum=1;
+ }else{
+ devNum+=1;
+ }
+ addbinf.setDevNum(devNum);
+ addbinf.setDevName(addbinf.getDevType()+devNum);
+ //鑾峰彇瀵瑰簲鐨勮澶噄d,鐢垫睜缁�
+ int devId = mapper.getMaxdevId();
+ int battGroupId=mapper.getMaxBattGroupId();
+ if (devId == 0) {//鏁版嵁搴撲腑娌℃湁绔欑偣
+ devId = 10001;
+ } else {
+ devId += 1;
+ }
+ addbinf.setDevId(devId);
+ }
//妫�娴嬭澶囦笅鏄惁瀛樺湪鐢垫睜缁�
int battgroupNum=mapper.getMaxBattgroupNum(addbinf.getDevId());
if(battgroupNum==0){
--
Gitblit v1.9.1