From 02ccfc21d5d4f767bbd92ecda89cdfcc3283728c Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 11 六月 2025 08:38:26 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem into master
---
src/main/java/com/whyc/factory/InfoFactory.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/factory/InfoFactory.java b/src/main/java/com/whyc/factory/InfoFactory.java
index ad6ea0c..8ba5086 100644
--- a/src/main/java/com/whyc/factory/InfoFactory.java
+++ b/src/main/java/com/whyc/factory/InfoFactory.java
@@ -13,7 +13,9 @@
.setPowerType(info.getPowerType())
.setPowerModel(info.getPowerModel())
.setProtocol(info.getProtocol())
- .setPowerIp(info.getPowerIp());
+ .setPowerIp(info.getPowerIp())
+ .setModelCfg(info.getModelCfg())
+ .setPowerInuseTime(info.getPowerInuseTime());
if(info.getPowerId()!=null){
pinf.setPowerId(info.getPowerId());
}
@@ -85,6 +87,9 @@
if(info.getDevName()!=null){
binf.setDevName(info.getDevName());
}
+ if(info.getInuseTime()!=null){
+ binf.setInuseTime(info.getInuseTime());
+ }
return binf;
}
}
\ No newline at end of file
--
Gitblit v1.9.1