From 41b0edfef4cf07ae772605ad11b7c62fa5cfc729 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 19 五月 2025 10:12:56 +0800
Subject: [PATCH] 编辑机房电源,电池组信息时不判断电源名设备名和电池组名

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

diff --git a/src/main/java/com/whyc/service/BattInfService.java b/src/main/java/com/whyc/service/BattInfService.java
index 638431a..b46b94c 100644
--- a/src/main/java/com/whyc/service/BattInfService.java
+++ b/src/main/java/com/whyc/service/BattInfService.java
@@ -217,7 +217,7 @@
         if(pinf.getPowerType()!=null){
             wrapper2.set("power_type",pinf.getPowerType());
         }
-        if(pinf.getPowerName()!=null){
+        /*if(pinf.getPowerName()!=null){
             //妫�娴嬭鏈烘埧涓嬭淇敼鐨勭數婧愬悕鏄惁瀛樺湪
             QueryWrapper queryWrapper1=new QueryWrapper();
             queryWrapper1.eq("power_name",pinf.getPowerName());
@@ -228,7 +228,7 @@
                 return new Response().set(1,false,"璇ユ満鎴夸笅宸插瓨鍦�"+pinf.getPowerName()+"鐨勭數婧�");
             }
             wrapper2.set("power_name",pinf.getPowerName());
-        }
+        }*/
         wrapper2.eq("power_id",pinf.getPowerId());
 
         //鏈�鍚庝慨鏀硅澶囦俊鎭�
@@ -238,7 +238,7 @@
             if (binf.getDevIp() != null) {
                 wrapper3.set("dev_ip", binf.getDevIp());
             }
-            if (binf.getDevName() != null) {
+           /* if (binf.getDevName() != null) {
                 //妫�娴嬭鐢垫簮涓嬩慨鏀圭殑璁惧鍚嶆槸鍚﹀瓨鍦�
                 QueryWrapper queryWrapper2 = new QueryWrapper();
                 queryWrapper2.eq("dev_name", binf.getDevName());
@@ -249,7 +249,7 @@
                     return new Response().set(1, false, "璇ョ數婧愪笅宸插瓨鍦�" + binf.getDevName() + "鐨勮澶�");
                 }
                 wrapper3.set("dev_name", binf.getDevName());
-            }
+            }*/
             /*if(binf.getDevType()!=null){
                 wrapper3.set("dev_type",binf.getDevType());
             }*/
@@ -257,7 +257,7 @@
 
             //淇敼鐢垫睜缁勪俊鎭�
             UpdateWrapper wrapper4 = new UpdateWrapper();
-            if (binf.getBattgroupName() != null) {
+            /*if (binf.getBattgroupName() != null) {
                 //妫�娴嬭鏈烘埧涓嬭淇敼鐨勭數婧愬悕鏄惁绮楀湪
                 QueryWrapper queryWrapper3 = new QueryWrapper();
                 queryWrapper3.eq("battgroup_name", binf.getBattgroupName());
@@ -268,7 +268,7 @@
                     return new Response().set(1, false, "璇ヨ澶囦笅宸插瓨鍦�" + binf.getBattgroupName() + "鐨勭數姹犵粍");
                 }
                 wrapper4.set("battgroup_name", binf.getBattgroupName());
-            }
+            }*/
             if (binf.getMonvolstd() != null) {
                 wrapper4.set("monvolstd", binf.getMonvolstd());
             }

--
Gitblit v1.9.1