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/factory/InfoFactory.java |   71 ++++++++++++++++++++++++-----------
 1 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/whyc/factory/InfoFactory.java b/src/main/java/com/whyc/factory/InfoFactory.java
index 0f9e46e..0b7d20b 100644
--- a/src/main/java/com/whyc/factory/InfoFactory.java
+++ b/src/main/java/com/whyc/factory/InfoFactory.java
@@ -13,23 +13,11 @@
                 .setPowerModel(info.getPowerModel())
                 .setProtocol(info.getProtocol())
                 .setPowerIp(info.getPowerIp());
-        if(info.getProvice()!=null){
-            pinf.setProvice(info.getProvice());
-        }
-        if(info.getCity()!=null){
-            pinf.setCity(info.getCity());
-        }
-        if(info.getCountry()!=null){
-            pinf.setCountry(info.getCountry());
-        }
-        if(info.getStationName()!=null){
-            pinf.setStationName(info.getStationName());
-        }
-        if(info.getStationId()!=null){
-            pinf.setStationId(info.getStationId());
-        }
         if(info.getPowerId()!=null){
             pinf.setPowerId(info.getPowerId());
+        }
+        if(info.getPowerName()!=null){
+            pinf.setPowerName(info.getPowerName());
         }
         StationInf sinf=new StationInf();
         sinf.setProvice(info.getProvice())
@@ -39,26 +27,63 @@
                 .setStationType(info.getStationType())
                 .setLatitude(info.getLatitude())
                 .setLongitude(info.getLongitude());
+        if(info.getProvice()!=null){
+            sinf.setProvice(info.getProvice());
+        }
+        if(info.getCity()!=null){
+            sinf.setCity(info.getCity());
+        }
+        if(info.getCountry()!=null){
+            sinf.setCountry(info.getCountry());
+        }
+        if(info.getStationName()!=null){
+            sinf.setStationName(info.getStationName());
+        }
+        if(info.getStationId()!=null){
+            sinf.setStationId(info.getStationId());
+        }
         pinf.setSinf(sinf);
         return pinf;
     }
     //灏唅nfo瀵硅薄杞负鐢垫睜缁勫璞�
     public static BattInf infoToBatt(InfoDto info) {
         BattInf binf = new BattInf();
-        binf.setDevIp(info.getDevIp())
-                .setDevType(info.getDevType())
-                .setMoncapstd(info.getMoncapstd())
-                .setMoncount(info.getMoncount())
-                .setMonresstd(info.getMonresstd())
-                .setMonvolstd(info.getMonvolstd())
-                .setProduct(info.getProduct())
-                .setBattModel(info.getBattModel());
+        if(info.getDevType()!=null){
+            binf.setDevType(info.getDevType());
+        }
+        if(info.getMoncapstd()!=null){
+            binf.setMoncapstd(info.getMoncapstd());
+        }
+        if(info.getMoncount()!=null){
+            binf.setMoncount(info.getMoncount());
+        }
+        if(info.getMonresstd()!=null){
+            binf.setMonresstd(info.getMonresstd());
+        }
+        if(info.getMonvolstd()!=null){
+            binf.setMonvolstd(info.getMonvolstd());
+        }
+        if(info.getProduct()!=null){
+            binf.setProduct(info.getProduct());
+        }
+        if(info.getBattModel()!=null){
+            binf.setBattModel(info.getBattModel());
+        }
+        if(info.getDevIp()!=null){
+            binf.setDevIp(info.getDevIp());
+        }
         if(info.getBattgroupId()!=null){
             binf.setBattgroupId(info.getBattgroupId());
         }
+        if(info.getBattgroupName()!=null){
+            binf.setBattgroupName(info.getBattgroupName());
+        }
         if(info.getDevId()!=null){
             binf.setDevId(info.getDevId());
         }
+        if(info.getDevName()!=null){
+            binf.setDevName(info.getDevName());
+        }
         return binf;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1