From 518646badb078fe65c653ad6c999d6f026ca85b6 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 17 五月 2025 15:08:57 +0800
Subject: [PATCH] 查询机房,电源,电池组信息

---
 src/main/java/com/whyc/service/BattInfService.java |  140 ++++++++++++++++++++++++----------------------
 1 files changed, 74 insertions(+), 66 deletions(-)

diff --git a/src/main/java/com/whyc/service/BattInfService.java b/src/main/java/com/whyc/service/BattInfService.java
index f502949..f4fff5b 100644
--- a/src/main/java/com/whyc/service/BattInfService.java
+++ b/src/main/java/com/whyc/service/BattInfService.java
@@ -20,6 +20,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -110,24 +111,27 @@
     //鍒犻櫎鐢垫睜缁�
     @Transactional
     public Response delBatt(Integer stationId,  Integer powerId,Integer battgroupId) {
-        UpdateWrapper wrapper=new UpdateWrapper();
-        wrapper.eq("battgroup_id",battgroupId);
-        mapper.delete(wrapper);
-        //妫�娴嬪鏋減owerId涓嬬數姹犵粍鍒犻櫎瀹屼簡,瑕佸皢鐢垫簮涔熷垹闄ゆ帀
-        QueryWrapper wrapper1=new QueryWrapper();
-        wrapper1.eq("power_id",powerId);
-        List<BattInf> binfList=mapper.selectList(wrapper1);
-        if(binfList==null){
+        List<BattInf> binfList=new ArrayList<>();
+        if(battgroupId!=null){
+            UpdateWrapper wrapper=new UpdateWrapper();
+            wrapper.eq("battgroup_id",battgroupId);
+            mapper.delete(wrapper);
+            //妫�娴嬪鏋減owerId涓嬬數姹犵粍鍒犻櫎瀹屼簡,瑕佸皢鐢垫簮涔熷垹闄ゆ帀
+            QueryWrapper wrapper1=new QueryWrapper();
+            wrapper1.eq("power_id",powerId);
+            binfList=mapper.selectList(wrapper1);
+        }
+        if(binfList==null||binfList.size()==0){
             UpdateWrapper wrapper2=new UpdateWrapper();
             wrapper2.eq("power_id",powerId);
-            pinfMapper.delete(wrapper);
+            pinfMapper.delete(wrapper2);
             //鍒犻櫎鎵�鏈夊寘鏈虹粍涓嬬殑鐢垫簮
             bjService.delPowerInBaoji(powerId);
             //鍐嶆娴嬪鏋滄満鎴夸笅鐢垫簮涔熷叏鍒犻櫎浜嗭紝瑕佸皢鏈烘埧涔熷垹闄�
             QueryWrapper wrapper3=new QueryWrapper();
             wrapper3.eq("station_id",stationId);
             List<PowerInf> pinfList=pinfMapper.selectList(wrapper3);
-            if(pinfList==null){
+            if(pinfList==null||pinfList.size()==0){
                 UpdateWrapper wrapper4=new UpdateWrapper();
                 wrapper4.eq("station_id",stationId);
                 sinfMapper.delete(wrapper4);
@@ -159,7 +163,7 @@
             wrapper1.set("latitude",sinf.getLatitude());
         }
         wrapper1.eq("station_id",sinf.getStationId());
-        sinfMapper.update((StationInf) ActionUtil.objeNull,wrapper1);
+
         //鍐嶄慨鏀圭數婧愪俊鎭�
         UpdateWrapper wrapper2=new UpdateWrapper();
         if(pinf.getCompany()!=null){
@@ -178,7 +182,7 @@
             //妫�娴嬭鏈烘埧涓嬭淇敼鐨勭數婧愬悕鏄惁瀛樺湪
             QueryWrapper queryWrapper=new QueryWrapper();
             queryWrapper.eq("power_name",pinf.getPowerName());
-            queryWrapper.eq("station_id",pinf.getStationId());
+            queryWrapper.eq("station_id",sinf.getStationId());
             queryWrapper.last("limit 1");
             PowerInf juegep=pinfMapper.selectOne(queryWrapper);
             if(juegep!=null){
@@ -187,66 +191,70 @@
             wrapper2.set("power_name",pinf.getPowerName());
         }
         wrapper2.eq("power_id",pinf.getPowerId());
-        pinfMapper.update((PowerInf) ActionUtil.objeNull,wrapper2);
+
         //鏈�鍚庝慨鏀硅澶囦俊鎭�
         BattInf binf=InfoFactory.infoToBatt(info);
-        UpdateWrapper wrapper3=new UpdateWrapper();
-        if(binf.getDevIp()!=null){
-            wrapper3.set("dev_ip",binf.getDevIp());
-        }
-        if(binf.getDevName()!=null){
-            //妫�娴嬭鐢垫簮涓嬩慨鏀圭殑璁惧鍚嶆槸鍚﹀瓨鍦�
-            QueryWrapper queryWrapper1=new QueryWrapper();
-            queryWrapper1.eq("dev_name",binf.getDevName());
-            queryWrapper1.eq("power_id",pinf.getPowerId());
-            queryWrapper1.last("limit 1");
-            BattInf jueged=mapper.selectOne(queryWrapper1);
-            if(jueged!=null){
-                return new Response().set(1,false,"璇ョ數婧愪笅宸插瓨鍦�"+binf.getDevName()+"鐨勮澶�");
+        if(binf.getDevId()!=null) {
+            UpdateWrapper wrapper3 = new UpdateWrapper();
+            if (binf.getDevIp() != null) {
+                wrapper3.set("dev_ip", binf.getDevIp());
             }
-            wrapper3.set("dev_name",binf.getDevName());
-        }
-        if(binf.getDevType()!=null){
-            wrapper3.set("dev_type",binf.getDevType());
-        }
-        wrapper3.eq("dev_id",binf.getDevId());
-        mapper.update((BattInf) ActionUtil.objeNull,wrapper3);
+            if (binf.getDevName() != null) {
+                //妫�娴嬭鐢垫簮涓嬩慨鏀圭殑璁惧鍚嶆槸鍚﹀瓨鍦�
+                QueryWrapper queryWrapper1 = new QueryWrapper();
+                queryWrapper1.eq("dev_name", binf.getDevName());
+                queryWrapper1.eq("power_id", pinf.getPowerId());
+                queryWrapper1.last("limit 1");
+                BattInf jueged = mapper.selectOne(queryWrapper1);
+                if (jueged != null) {
+                    return new Response().set(1, false, "璇ョ數婧愪笅宸插瓨鍦�" + binf.getDevName() + "鐨勮澶�");
+                }
+                wrapper3.set("dev_name", binf.getDevName());
+            }
+            /*if(binf.getDevType()!=null){
+                wrapper3.set("dev_type",binf.getDevType());
+            }*/
+            wrapper3.eq("dev_id", binf.getDevId());
 
-        //淇敼鐢垫睜缁勪俊鎭�
-        UpdateWrapper wrapper4=new UpdateWrapper();
-        if(binf.getBattgroupName()!=null){
-            //妫�娴嬭鏈烘埧涓嬭淇敼鐨勭數婧愬悕鏄惁绮楀湪
-            QueryWrapper queryWrapper=new QueryWrapper();
-            queryWrapper.eq("battgroup_name",binf.getBattgroupName());
-            queryWrapper.eq("dev_id",binf.getDevId());
-            queryWrapper.last("limit 1");
-            BattInf juegeb=mapper.selectOne(queryWrapper);
-            if(juegeb!=null){
-                return new Response().set(1,false,"璇ヨ澶囦笅宸插瓨鍦�"+binf.getBattgroupName()+"鐨勭數姹犵粍");
+            //淇敼鐢垫睜缁勪俊鎭�
+            UpdateWrapper wrapper4 = new UpdateWrapper();
+            if (binf.getBattgroupName() != null) {
+                //妫�娴嬭鏈烘埧涓嬭淇敼鐨勭數婧愬悕鏄惁绮楀湪
+                QueryWrapper queryWrapper = new QueryWrapper();
+                queryWrapper.eq("battgroup_name", binf.getBattgroupName());
+                queryWrapper.eq("dev_id", binf.getDevId());
+                queryWrapper.last("limit 1");
+                BattInf juegeb = mapper.selectOne(queryWrapper);
+                if (juegeb != null) {
+                    return new Response().set(1, false, "璇ヨ澶囦笅宸插瓨鍦�" + binf.getBattgroupName() + "鐨勭數姹犵粍");
+                }
+                wrapper4.set("battgroup_name", binf.getBattgroupName());
             }
-            wrapper4.set("battgroup_name",binf.getBattgroupName());
+            if (binf.getMonvolstd() != null) {
+                wrapper4.set("monvolstd", binf.getMonvolstd());
+            }
+            if (binf.getMoncapstd() != null) {
+                wrapper4.set("moncapstd", binf.getMoncapstd());
+            }
+            if (binf.getMonresstd() != null) {
+                wrapper4.set("monresstd", binf.getMonresstd());
+            }
+            if (binf.getProduct() != null) {
+                wrapper4.set("product", binf.getProduct());
+            }
+            if (binf.getMoncount() != null) {
+                wrapper4.set("moncount", binf.getMoncount());
+            }
+            if (binf.getBattModel() != null) {
+                wrapper4.set("batt_model", binf.getBattModel());
+            }
+            wrapper4.eq("battgroup_id", binf.getBattgroupId());
+            mapper.update((BattInf) ActionUtil.objeNull,wrapper3);
+            mapper.update((BattInf) ActionUtil.objeNull,wrapper4);
         }
-        if(binf.getMonvolstd()!=null){
-            wrapper4.set("monvolstd",binf.getMonvolstd());
-        }
-        if(binf.getMoncapstd()!=null){
-            wrapper4.set("moncapstd",binf.getMoncapstd());
-        }
-        if(binf.getMonresstd()!=null){
-            wrapper4.set("monresstd",binf.getMonresstd());
-        }
-        if(binf.getProduct()!=null){
-            wrapper4.set("product",binf.getProduct());
-        }
-        if(binf.getMoncount()!=null){
-            wrapper4.set("moncount",binf.getMoncount());
-        }
-        if(binf.getBattModel()!=null){
-            wrapper4.set("batt_model",binf.getBattModel());
-        }
-        wrapper4.eq("battgroup_id",binf.getBattgroupId());
-        mapper.update((BattInf) ActionUtil.objeNull,wrapper4);
-        return new Response().set(1,true);
+        sinfMapper.update((StationInf) ActionUtil.objeNull,wrapper1);
+        pinfMapper.update((PowerInf) ActionUtil.objeNull,wrapper2);
+        return new Response().set(1,true,"淇敼淇℃伅鎴愬姛");
     }
     /*//淇敼鐢垫睜缁�
     public Response updateBatt(BattInf binf) {

--
Gitblit v1.9.1