ems/ems-cloud/ems-dev-adapter/pom.xml

@@ -140,6 +140,13 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/ClientInit.java

@@ -10,8 +10,8 @@
  */
 package com.ruoyi.ems;
 
-import com.ruoyi.ems.core.MqttTemplate;
-import com.ruoyi.ems.handle.RootMsgHandler;
+import com.ruoyi.ems.common.mqtt.MqttTemplate;
+import com.ruoyi.ems.common.handle.RootMsgHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/config/AcrelConfig.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/acrel/config/AcrelConfig.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.config;
+package com.ruoyi.ems.acrel.config;
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/controller/AcrelElecMonitorController.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/acrel/controller/AcrelElecMonitorController.java

@@ -8,9 +8,9 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.controller;
+package com.ruoyi.ems.acrel.controller;
 
-import com.ruoyi.ems.handle.AcrelElecMonitorHandler;
+import com.ruoyi.ems.acrel.handle.AcrelElecMonitorHandler;
 import com.ruoyi.ems.model.AbilityPayload;
 import com.ruoyi.ems.model.CallResponse;
 import io.swagger.annotations.Api;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/handle/AcrelElecMonitorHandler.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/acrel/handle/AcrelElecMonitorHandler.java

@@ -8,23 +8,24 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.handle;
+package com.ruoyi.ems.acrel.handle;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.ems.config.AcrelConfig;
-import com.ruoyi.ems.core.Acrel3000Template;
+import com.ruoyi.ems.acrel.config.AcrelConfig;
+import com.ruoyi.ems.acrel.retrofit.Acrel3000Template;
 import com.ruoyi.ems.domain.EmsDevice;
 import com.ruoyi.ems.domain.EmsObjAttr;
 import com.ruoyi.ems.domain.EmsObjAttrValue;
 import com.ruoyi.ems.domain.MeterDevice;
 import com.ruoyi.ems.enums.DevObjType;
+import com.ruoyi.ems.common.handle.BaseMeterDevHandler;
 import com.ruoyi.ems.model.AbilityPayload;
 import com.ruoyi.ems.model.CallResponse;
 import com.ruoyi.ems.model.QueryDevice;
-import com.ruoyi.ems.model.acrel.Circuit;
-import com.ruoyi.ems.model.acrel.MeterKeyValue;
-import com.ruoyi.ems.model.acrel.MeterUse;
+import com.ruoyi.ems.acrel.model.Circuit;
+import com.ruoyi.ems.acrel.model.MeterKeyValue;
+import com.ruoyi.ems.acrel.model.MeterUse;
 import com.ruoyi.ems.service.IEmsObjAttrService;
 import com.ruoyi.ems.util.PingUtils;
 import org.apache.commons.collections4.CollectionUtils;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/acrel/AlarmEventLog.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/acrel/model/AlarmEventLog.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.acrel;
+package com.ruoyi.ems.acrel.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/acrel/Circuit.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/acrel/model/Circuit.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.acrel;
+package com.ruoyi.ems.acrel.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/acrel/ConsumeReport.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/acrel/model/ConsumeReport.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.acrel;
+package com.ruoyi.ems.acrel.model;
 
 import lombok.Data;
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/acrel/EnergyValue.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/acrel/model/EnergyValue.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.acrel;
+package com.ruoyi.ems.acrel.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/acrel/MeterKeyValue.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/acrel/model/MeterKeyValue.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.acrel;
+package com.ruoyi.ems.acrel.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/acrel/MeterUse.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/acrel/model/MeterUse.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.acrel;
+package com.ruoyi.ems.acrel.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/acrel/ReportNode.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/acrel/model/ReportNode.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.acrel;
+package com.ruoyi.ems.acrel.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/acrel/Station.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/acrel/model/Station.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.acrel;
+package com.ruoyi.ems.acrel.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/acrel/StationEpiTime.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/acrel/model/StationEpiTime.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.acrel;
+package com.ruoyi.ems.acrel.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/acrel/StationType.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/acrel/model/StationType.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.acrel;
+package com.ruoyi.ems.acrel.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/acrel/Token.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/acrel/model/Token.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.acrel;
+package com.ruoyi.ems.acrel.model;
 
 import lombok.Data;
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/retrofit/Acrel3000Api.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/acrel/retrofit/Acrel3000Api.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.retrofit;
+package com.ruoyi.ems.acrel.retrofit;
 
 import okhttp3.RequestBody;
 import retrofit2.Call;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/core/Acrel3000Template.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/acrel/retrofit/Acrel3000Template.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.core;
+package com.ruoyi.ems.acrel.retrofit;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.support.retrofit.Retrofit2ConverterFactory;
@@ -16,15 +16,15 @@ import com.huashe.common.exception.Assert;
 import com.huashe.common.utils.DateUtils;
 import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.ems.config.AcrelConfig;
-import com.ruoyi.ems.model.acrel.AlarmEventLog;
-import com.ruoyi.ems.model.acrel.Circuit;
-import com.ruoyi.ems.model.acrel.ConsumeReport;
-import com.ruoyi.ems.model.acrel.MeterKeyValue;
-import com.ruoyi.ems.model.acrel.MeterUse;
-import com.ruoyi.ems.model.acrel.Station;
-import com.ruoyi.ems.model.acrel.Token;
-import com.ruoyi.ems.retrofit.Acrel3000Api;
+import com.ruoyi.ems.acrel.config.AcrelConfig;
+import com.ruoyi.ems.acrel.model.AlarmEventLog;
+import com.ruoyi.ems.acrel.model.Circuit;
+import com.ruoyi.ems.acrel.model.ConsumeReport;
+import com.ruoyi.ems.acrel.model.MeterKeyValue;
+import com.ruoyi.ems.acrel.model.MeterUse;
+import com.ruoyi.ems.acrel.model.Station;
+import com.ruoyi.ems.acrel.model.Token;
+import com.ruoyi.ems.common.retrofit.BaseApiTemplate;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/config/BaCtlConfig.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/ba/config/BaCtlConfig.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.config;
+package com.ruoyi.ems.ba.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/controller/BaCtlController.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/ba/controller/BaCtlController.java

@@ -8,9 +8,9 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.controller;
+package com.ruoyi.ems.ba.controller;
 
-import com.ruoyi.ems.handle.BaCtlHandler;
+import com.ruoyi.ems.ba.handle.BaCtlHandler;
 import com.ruoyi.ems.model.AbilityPayload;
 import com.ruoyi.ems.model.CallResponse;
 import io.swagger.annotations.Api;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/handle/BaCtlHandler.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/ba/handle/BaCtlHandler.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ems.handle;
+package com.ruoyi.ems.ba.handle;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
@@ -7,8 +7,8 @@ import com.huashe.common.exception.Assert;
 import com.huashe.common.exception.BusinessException;
 import com.huashe.common.utils.DateUtils;
 import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.ems.config.BaCtlConfig;
-import com.ruoyi.ems.core.BaCtlEnergyTemplate;
+import com.ruoyi.ems.ba.config.BaCtlConfig;
+import com.ruoyi.ems.ba.retrofit.BaCtlEnergyTemplate;
 import com.ruoyi.ems.domain.ElecMeterH;
 import com.ruoyi.ems.domain.ElecPgSupplyH;
 import com.ruoyi.ems.domain.EmsDevice;
@@ -17,15 +17,16 @@ import com.ruoyi.ems.domain.FdEnergyPriceConfig;
 import com.ruoyi.ems.domain.MeterDevice;
 import com.ruoyi.ems.domain.WaterMeterH;
 import com.ruoyi.ems.enums.DevObjType;
+import com.ruoyi.ems.common.handle.BaseMeterDevHandler;
 import com.ruoyi.ems.model.AbilityPayload;
 import com.ruoyi.ems.model.BoundaryObj;
-import com.ruoyi.ems.model.CallData;
+import com.ruoyi.ems.common.model.CallData;
 import com.ruoyi.ems.model.CallResponse;
 import com.ruoyi.ems.model.Price;
 import com.ruoyi.ems.model.QueryDevice;
-import com.ruoyi.ems.model.idenergy.CodesVal;
-import com.ruoyi.ems.model.idenergy.CodesValReq;
-import com.ruoyi.ems.model.idenergy.CodesValSetReq;
+import com.ruoyi.ems.ba.model.CodesVal;
+import com.ruoyi.ems.ba.model.CodesValReq;
+import com.ruoyi.ems.ba.model.CodesValSetReq;
 import com.ruoyi.ems.service.IEmsObjAttrValueService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/idenergy/CodesVal.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/ba/model/CodesVal.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.idenergy;
+package com.ruoyi.ems.ba.model;
 
 import lombok.Data;
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/idenergy/CodesValReq.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/ba/model/CodesValReq.java

@@ -8,13 +8,12 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.idenergy;
+package com.ruoyi.ems.ba.model;
 
 import lombok.Data;
 
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 /**

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/idenergy/CodesValSetReq.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/ba/model/CodesValSetReq.java

@@ -8,15 +8,13 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.idenergy;
+package com.ruoyi.ems.ba.model;
 
 import lombok.Data;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 /**
  * 设置下发

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/idenergy/Token.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/ba/model/Token.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.idenergy;
+package com.ruoyi.ems.ba.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/retrofit/BaCtlEnergyApi.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/ba/retrofit/BaCtlEnergyApi.java

@@ -8,10 +8,10 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.retrofit;
+package com.ruoyi.ems.ba.retrofit;
 
-import com.ruoyi.ems.model.idenergy.CodesValReq;
-import com.ruoyi.ems.model.idenergy.CodesValSetReq;
+import com.ruoyi.ems.ba.model.CodesValReq;
+import com.ruoyi.ems.ba.model.CodesValSetReq;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.GET;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/core/BaCtlEnergyTemplate.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/ba/retrofit/BaCtlEnergyTemplate.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.core;
+package com.ruoyi.ems.ba.retrofit;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.support.retrofit.Retrofit2ConverterFactory;
@@ -16,12 +16,12 @@ import com.alibaba.fastjson2.JSON;
 import com.huashe.common.exception.Assert;
 import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.ems.config.BaCtlConfig;
-import com.ruoyi.ems.model.CallData;
-import com.ruoyi.ems.model.idenergy.CodesValReq;
-import com.ruoyi.ems.model.idenergy.CodesValSetReq;
-import com.ruoyi.ems.model.idenergy.Token;
-import com.ruoyi.ems.retrofit.BaCtlEnergyApi;
+import com.ruoyi.ems.ba.config.BaCtlConfig;
+import com.ruoyi.ems.common.retrofit.BaseApiTemplate;
+import com.ruoyi.ems.common.model.CallData;
+import com.ruoyi.ems.ba.model.CodesValReq;
+import com.ruoyi.ems.ba.model.CodesValSetReq;
+import com.ruoyi.ems.ba.model.Token;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.apache.commons.lang3.StringUtils;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/controller/ChargingController.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/charging/controller/ChargingController.java

@@ -6,11 +6,11 @@
  * 修改时间:  2025/12/25
  * 修改内容:  新建充电桩能力调用API入口
  */
-package com.ruoyi.ems.controller;
+package com.ruoyi.ems.charging.controller;
 
 import com.ruoyi.ems.charging.config.ChargingPileServer;
 import com.ruoyi.ems.charging.core.ChargingPileSessionManager;
-import com.ruoyi.ems.charging.handler.ChargingHandler;
+import com.ruoyi.ems.charging.handle.ChargingHandler;
 import com.ruoyi.ems.charging.service.ChargingDataService;
 import com.ruoyi.ems.model.AbilityPayload;
 import com.ruoyi.ems.model.CallResponse;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/charging/core/ChargingPileChannelInitializer.java

@@ -7,7 +7,7 @@
  */
 package com.ruoyi.ems.charging.core;
 
-import com.ruoyi.ems.charging.handler.ChargingPileMessageHandler;
+import com.ruoyi.ems.charging.handle.ChargingPileMessageHandler;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.socket.SocketChannel;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/charging/handler/ChargingHandler.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/charging/handle/ChargingHandler.java

@@ -5,7 +5,7 @@
  * 修 改 人:  lvwenbin
  * 修改时间:  2026/1/9
  */
-package com.ruoyi.ems.charging.handler;
+package com.ruoyi.ems.charging.handle;
 
 import com.alibaba.fastjson2.JSON;
 import com.ruoyi.ems.charging.service.ChargingDeviceMappingCache;
@@ -16,7 +16,7 @@ import com.ruoyi.ems.domain.EmsDevice;
 import com.ruoyi.ems.domain.EmsObjAttrValue;
 import com.ruoyi.ems.enums.DevObjType;
 import com.ruoyi.ems.enums.DevOnlineStatus;
-import com.ruoyi.ems.handle.BaseDevHandler;
+import com.ruoyi.ems.common.handle.BaseDevHandler;
 import com.ruoyi.ems.model.AbilityPayload;
 import com.ruoyi.ems.model.CallResponse;
 import com.ruoyi.ems.model.QueryDevice;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/charging/handler/ChargingPileMessageHandler.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/charging/handle/ChargingPileMessageHandler.java

@@ -8,7 +8,7 @@
  *   1. 添加错误报文、交易记录、远程停机应答的处理
  *   2. 【新增】在channelInactive中调用ChargingDataService.onPileDisconnect更新设备离线状态
  */
-package com.ruoyi.ems.charging.handler;
+package com.ruoyi.ems.charging.handle;
 
 import com.ruoyi.ems.charging.core.ChargingPileSessionManager;
 import com.ruoyi.ems.charging.model.BaseFrame;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/TaskClacService.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/TaskClacService.java

@@ -8,12 +8,12 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems;
+package com.ruoyi.ems.common;
 
-import com.ruoyi.ems.config.AnalysisConfig;
+import com.ruoyi.ems.common.config.AnalysisConfig;
 import com.ruoyi.ems.domain.Area;
 import com.ruoyi.ems.domain.EmsFacs;
-import com.ruoyi.ems.handle.BaCtlHandler;
+import com.ruoyi.ems.ba.handle.BaCtlHandler;
 import com.ruoyi.ems.model.QueryMeter;
 import com.ruoyi.ems.service.IAreaService;
 import com.ruoyi.ems.service.IEmsFacsService;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/TaskColExecutor.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/TaskColExecutor.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems;
+package com.ruoyi.ems.common;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
@@ -18,14 +18,13 @@ import com.huashe.common.domain.model.WeatherForecast;
 import com.huashe.common.domain.model.WeatherRt;
 import com.huashe.common.exception.Assert;
 import com.huashe.common.utils.HttpUtils;
-import com.ruoyi.ems.config.DateAttrConfig;
-import com.ruoyi.ems.config.WeatherConfig;
-import com.ruoyi.ems.core.ObjectCache;
-import com.ruoyi.ems.handle.AcrelElecMonitorHandler;
-import com.ruoyi.ems.handle.BaCtlHandler;
-import com.ruoyi.ems.handle.GeekOpenCbHandler;
-import com.ruoyi.ems.handle.GrowattHandler;
-import com.ruoyi.ems.handle.SquareLightCtlHandler;
+import com.ruoyi.ems.common.config.DateAttrConfig;
+import com.ruoyi.ems.common.config.WeatherConfig;
+import com.ruoyi.ems.acrel.handle.AcrelElecMonitorHandler;
+import com.ruoyi.ems.ba.handle.BaCtlHandler;
+import com.ruoyi.ems.geekopen.handle.GeekOpenCbHandler;
+import com.ruoyi.ems.growatt.handle.GrowattHandler;
+import com.ruoyi.ems.squarelgt.handle.SquareLightCtlHandler;
 import com.ruoyi.ems.service.IDateService;
 import com.ruoyi.ems.service.IWeatherService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -33,7 +32,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.utils.URIBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -74,9 +72,6 @@ public class TaskColExecutor {
     @Resource
     private IDateService dateService;
 
-    @Autowired
-    private ObjectCache objectCache;
-
     @Qualifier("geekOpenCbHandler")
     @Resource
     private GeekOpenCbHandler geekOpenCbHandler;
@@ -98,15 +93,6 @@ public class TaskColExecutor {
     private GrowattHandler growattHandler;
 
     /**
-     * 定时清理过期设备上报响应
-     */
-    @Scheduled(cron = "0 0/10 * * * ?")
-    public void cleanDevResCache() {
-        int cnt = objectCache.cleanDevResCache();
-        log.debug("清理过期设备上报响应: {} 条", cnt);
-    }
-
-    /**
      * 定时刷新设备在线状态
      */
     @Scheduled(cron = "0 0/5 * * * ?")

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/config/AnalysisConfig.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/config/AnalysisConfig.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.config;
+package com.ruoyi.ems.common.config;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/config/AsyncConfig.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/config/AsyncConfig.java

@@ -6,7 +6,7 @@
  * 修改时间:  2025/12/26
  * 修改内容:  配置全局异步任务线程池，解决内存溢出问题
  */
-package com.ruoyi.ems.config;
+package com.ruoyi.ems.common.config;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/config/DateAttrConfig.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/config/DateAttrConfig.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.config;
+package com.ruoyi.ems.common.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/config/EmsConfig.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/config/EmsConfig.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.config;
+package com.ruoyi.ems.common.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/config/MqttConfig.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/config/MqttConfig.java

@@ -8,10 +8,10 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.config;
+package com.ruoyi.ems.common.config;
 
 
-import com.ruoyi.ems.core.MqttTemplate;
+import com.ruoyi.ems.common.mqtt.MqttTemplate;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/config/MqttServerProperty.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/config/MqttServerProperty.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.config;
+package com.ruoyi.ems.common.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/config/ThreadConfig.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/config/ThreadConfig.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.config;
+package com.ruoyi.ems.common.config;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/config/WeatherConfig.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/config/WeatherConfig.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.config;
+package com.ruoyi.ems.common.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/handle/BaseDevHandler.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/handle/BaseDevHandler.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.handle;
+package com.ruoyi.ems.common.handle;
 
 import com.huashe.common.utils.DateUtils;
 import com.ruoyi.common.redis.service.RedisService;
@@ -19,7 +19,7 @@ import com.ruoyi.ems.domain.EmsObjEventLog;
 import com.ruoyi.ems.enums.DevOnlineStatus;
 import com.ruoyi.ems.model.AbilityPayload;
 import com.ruoyi.ems.model.CallResponse;
-import com.ruoyi.ems.model.MqttCacheMsg;
+import com.ruoyi.ems.geekopen.MqttCacheMsg;
 import com.ruoyi.ems.service.IElecMeterHService;
 import com.ruoyi.ems.service.IElecPgSupplyHService;
 import com.ruoyi.ems.service.IEmsDeviceService;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/handle/BaseMeterDevHandler.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/handle/BaseMeterDevHandler.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.handle;
+package com.ruoyi.ems.common.handle;
 
 import com.huashe.common.utils.DateUtils;
 import com.ruoyi.ems.domain.ElecMeterH;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/handle/RootMsgHandler.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/handle/RootMsgHandler.java

@@ -8,9 +8,11 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.handle;
+package com.ruoyi.ems.common.handle;
 
-import com.ruoyi.ems.core.MqttMessageHandler;
+import com.ruoyi.ems.common.mqtt.MqttMessageHandler;
+import com.ruoyi.ems.geekopen.handle.GeekOpenCbHandler;
+import com.ruoyi.ems.keka.handle.Keka86BsHandler;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/controller/MockGccController.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/mock/MockGccController.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.controller;
+package com.ruoyi.ems.common.mock;
 
 import com.ruoyi.ems.model.AbilityPayload;
 import com.ruoyi.ems.model.CallResponse;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/controller/MockGczrController.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/mock/MockGczrController.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.controller;
+package com.ruoyi.ems.common.mock;
 
 import com.ruoyi.ems.model.AbilityPayload;
 import com.ruoyi.ems.model.CallResponse;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/controller/MockHmController.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/mock/MockHmController.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.controller;
+package com.ruoyi.ems.common.mock;
 
 import com.ruoyi.ems.model.AbilityPayload;
 import com.ruoyi.ems.model.CallResponse;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/controller/MockLjcyController.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/mock/MockLjcyController.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.controller;
+package com.ruoyi.ems.common.mock;
 
 import com.ruoyi.ems.model.AbilityPayload;
 import com.ruoyi.ems.model.CallResponse;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/controller/MockPileController.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/mock/MockPileController.java

@@ -5,9 +5,8 @@
  * 修 改 人:  lvwenbin
  * 修改时间:  2025/12/23
  */
-package com.ruoyi.ems.controller;
+package com.ruoyi.ems.common.mock;
 
-import com.ruoyi.ems.charging.mock.config.MockPileAutoConfiguration;
 import com.ruoyi.ems.charging.mock.model.MockGunState;
 import com.ruoyi.ems.charging.mock.simulator.MockPileClient;
 import com.ruoyi.ems.charging.mock.simulator.MockPileClientManager;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/controller/TestController.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/mock/TestController.java

@@ -8,19 +8,19 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.controller;
+package com.ruoyi.ems.common.mock;
 
 import com.alibaba.fastjson.JSON;
 import com.huashe.common.exception.BusinessException;
-import com.ruoyi.ems.config.BaCtlConfig;
-import com.ruoyi.ems.core.BaCtlEnergyTemplate;
-import com.ruoyi.ems.handle.BaCtlHandler;
-import com.ruoyi.ems.handle.GeekOpenCbHandler;
-import com.ruoyi.ems.handle.Keka86BsHandler;
-import com.ruoyi.ems.model.CallData;
+import com.ruoyi.ems.ba.config.BaCtlConfig;
+import com.ruoyi.ems.ba.retrofit.BaCtlEnergyTemplate;
+import com.ruoyi.ems.ba.handle.BaCtlHandler;
+import com.ruoyi.ems.geekopen.handle.GeekOpenCbHandler;
+import com.ruoyi.ems.keka.handle.Keka86BsHandler;
+import com.ruoyi.ems.common.model.CallData;
 import com.ruoyi.ems.model.CallResponse;
-import com.ruoyi.ems.model.ModbusCommand;
-import com.ruoyi.ems.model.idenergy.CodesValReq;
+import com.ruoyi.ems.keka.model.ModbusCommand;
+import com.ruoyi.ems.ba.model.CodesValReq;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/CallData.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/model/CallData.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model;
+package com.ruoyi.ems.common.model;
 
 import lombok.Getter;
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/core/MqttMessageHandler.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/mqtt/MqttMessageHandler.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.core;
+package com.ruoyi.ems.common.mqtt;
 
 /**
  * Mqtt消息处理

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/core/MqttTemplate.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/mqtt/MqttTemplate.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.core;
+package com.ruoyi.ems.common.mqtt;
 
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttCallback;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/core/BaseApiTemplate.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/retrofit/BaseApiTemplate.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.core;
+package com.ruoyi.ems.common.retrofit;
 
 import okhttp3.OkHttpClient;
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/retrofit/EmsApi.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/retrofit/EmsApi.java

@@ -5,7 +5,7 @@
  * 修 改 人:  lvwenbin
  * 修改时间:  2025/12/9
  */
-package com.ruoyi.ems.retrofit;
+package com.ruoyi.ems.common.retrofit;
 
 import retrofit2.Call;
 import retrofit2.http.Body;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/core/EmsApiTemplate.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/common/retrofit/EmsApiTemplate.java

@@ -5,12 +5,11 @@
  * 修 改 人:  lvwenbin
  * 修改时间:  2025/12/9
  */
-package com.ruoyi.ems.core;
+package com.ruoyi.ems.common.retrofit;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.support.retrofit.Retrofit2ConverterFactory;
-import com.ruoyi.ems.config.EmsConfig;
-import com.ruoyi.ems.retrofit.EmsApi;
+import com.ruoyi.ems.common.config.EmsConfig;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import retrofit2.Call;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/MqttCacheMsg.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/geekopen/MqttCacheMsg.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model;
+package com.ruoyi.ems.geekopen;
 
 import java.util.Date;
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/core/ObjectCache.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/geekopen/ObjectCache.java

@@ -8,9 +8,8 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.core;
+package com.ruoyi.ems.geekopen;
 
-import com.ruoyi.ems.model.MqttCacheMsg;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/controller/CircuitBreakerController.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/geekopen/controller/CircuitBreakerController.java

@@ -8,9 +8,9 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.controller;
+package com.ruoyi.ems.geekopen.controller;
 
-import com.ruoyi.ems.handle.BaseMeterDevHandler;
+import com.ruoyi.ems.common.handle.BaseMeterDevHandler;
 import com.ruoyi.ems.model.AbilityPayload;
 import com.ruoyi.ems.model.CallResponse;
 import io.swagger.annotations.Api;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/handle/GeekOpenCbHandler.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/geekopen/handle/GeekOpenCbHandler.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.handle;
+package com.ruoyi.ems.geekopen.handle;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.huashe.common.domain.JsonEntity;
@@ -16,10 +16,11 @@ import com.huashe.common.exception.Assert;
 import com.huashe.common.exception.BusinessException;
 import com.huashe.common.utils.DateUtils;
 import com.huashe.common.utils.ThreadUtils;
-import com.ruoyi.ems.config.EmsConfig;
-import com.ruoyi.ems.core.EmsApiTemplate;
-import com.ruoyi.ems.core.MqttTemplate;
-import com.ruoyi.ems.core.ObjectCache;
+import com.ruoyi.ems.common.handle.BaseMeterDevHandler;
+import com.ruoyi.ems.common.config.EmsConfig;
+import com.ruoyi.ems.common.retrofit.EmsApiTemplate;
+import com.ruoyi.ems.common.mqtt.MqttTemplate;
+import com.ruoyi.ems.geekopen.ObjectCache;
 import com.ruoyi.ems.domain.EmsDevice;
 import com.ruoyi.ems.domain.EmsObjAbilityCallLog;
 import com.ruoyi.ems.domain.EmsObjAttrValue;
@@ -27,7 +28,7 @@ import com.ruoyi.ems.domain.MeterDevice;
 import com.ruoyi.ems.enums.DevOnlineStatus;
 import com.ruoyi.ems.model.AbilityPayload;
 import com.ruoyi.ems.model.CallResponse;
-import com.ruoyi.ems.model.MqttCacheMsg;
+import com.ruoyi.ems.geekopen.MqttCacheMsg;
 import com.ruoyi.ems.model.QueryDevice;
 import com.ruoyi.ems.util.IdUtils;
 import org.apache.commons.collections4.CollectionUtils;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/config/GrowattConfig.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/growatt/config/GrowattConfig.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.config;
+package com.ruoyi.ems.growatt.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/controller/GrowattController.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/growatt/controller/GrowattController.java

@@ -8,9 +8,9 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.controller;
+package com.ruoyi.ems.growatt.controller;
 
-import com.ruoyi.ems.handle.GrowattHandler;
+import com.ruoyi.ems.growatt.handle.GrowattHandler;
 import com.ruoyi.ems.model.AbilityPayload;
 import com.ruoyi.ems.model.CallResponse;
 import io.swagger.annotations.Api;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/handle/GrowattHandler.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/growatt/handle/GrowattHandler.java

@@ -8,12 +8,13 @@
  * 修改单号:  <修改单号>
  * 修改内容:  完善采集器和逆变器数据同步功能
  */
-package com.ruoyi.ems.handle;
+package com.ruoyi.ems.growatt.handle;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.huashe.common.utils.DateUtils;
-import com.ruoyi.ems.config.GrowattConfig;
-import com.ruoyi.ems.core.GrowattTemplate;
+import com.ruoyi.ems.common.handle.BaseDevHandler;
+import com.ruoyi.ems.growatt.config.GrowattConfig;
+import com.ruoyi.ems.growatt.retrofit.GrowattTemplate;
 import com.ruoyi.ems.domain.EmsDevice;
 import com.ruoyi.ems.domain.EmsObjAttrValue;
 import com.ruoyi.ems.enums.DevObjType;
@@ -21,8 +22,8 @@ import com.ruoyi.ems.enums.DevOnlineStatus;
 import com.ruoyi.ems.model.AbilityPayload;
 import com.ruoyi.ems.model.CallResponse;
 import com.ruoyi.ems.model.QueryDevice;
-import com.ruoyi.ems.model.growatt.DataLogger;
-import com.ruoyi.ems.model.growatt.DeviceInfo;
+import com.ruoyi.ems.growatt.model.DataLogger;
+import com.ruoyi.ems.growatt.model.DeviceInfo;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/growatt/DataLogger.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/growatt/model/DataLogger.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.growatt;
+package com.ruoyi.ems.growatt.model;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.annotation.JSONField;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/growatt/DeviceInfo.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/growatt/model/DeviceInfo.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.growatt;
+package com.ruoyi.ems.growatt.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/retrofit/GrowattApi.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/growatt/retrofit/GrowattApi.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.retrofit;
+package com.ruoyi.ems.growatt.retrofit;
 
 import retrofit2.Call;
 import retrofit2.http.GET;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/core/GrowattTemplate.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/growatt/retrofit/GrowattTemplate.java

@@ -8,15 +8,15 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.core;
+package com.ruoyi.ems.growatt.retrofit;
 
 import com.alibaba.fastjson.support.retrofit.Retrofit2ConverterFactory;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.huashe.common.exception.Assert;
-import com.ruoyi.ems.model.growatt.DataLogger;
-import com.ruoyi.ems.model.growatt.DeviceInfo;
-import com.ruoyi.ems.retrofit.GrowattApi;
+import com.ruoyi.ems.common.retrofit.BaseApiTemplate;
+import com.ruoyi.ems.growatt.model.DataLogger;
+import com.ruoyi.ems.growatt.model.DeviceInfo;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.apache.commons.lang3.StringUtils;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/controller/ButtonSwitchController.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/keka/controller/ButtonSwitchController.java

@@ -8,10 +8,11 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.controller;
+package com.ruoyi.ems.keka.controller;
 
 import com.huashe.common.exception.BusinessException;
-import com.ruoyi.ems.handle.BaseDevHandler;
+import com.ruoyi.ems.common.handle.BaseDevHandler;
+import com.ruoyi.ems.geekopen.controller.CircuitBreakerController;
 import com.ruoyi.ems.model.AbilityPayload;
 import com.ruoyi.ems.model.CallResponse;
 import io.swagger.annotations.Api;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/handle/Keka86BsHandler.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/keka/handle/Keka86BsHandler.java

@@ -8,19 +8,20 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.handle;
+package com.ruoyi.ems.keka.handle;
 
 import com.huashe.common.exception.Assert;
-import com.ruoyi.ems.config.EmsConfig;
-import com.ruoyi.ems.core.EmsApiTemplate;
-import com.ruoyi.ems.core.MqttTemplate;
+import com.ruoyi.ems.common.handle.BaseDevHandler;
+import com.ruoyi.ems.common.config.EmsConfig;
+import com.ruoyi.ems.common.retrofit.EmsApiTemplate;
+import com.ruoyi.ems.common.mqtt.MqttTemplate;
 import com.ruoyi.ems.domain.EmsDevice;
 import com.ruoyi.ems.domain.EmsObjAttrValue;
 import com.ruoyi.ems.model.AbilityPayload;
 import com.ruoyi.ems.model.CallResponse;
-import com.ruoyi.ems.model.ModbusCommand;
+import com.ruoyi.ems.keka.model.ModbusCommand;
 import com.ruoyi.ems.model.QueryDevice;
-import com.ruoyi.ems.model.keka.DeviceStatus;
+import com.ruoyi.ems.keka.model.DeviceStatus;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/keka/DeviceStatus.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/keka/model/DeviceStatus.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.keka;
+package com.ruoyi.ems.keka.model;
 
 /**
  * 设备状态类

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/ModbusCommand.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/keka/model/ModbusCommand.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model;
+package com.ruoyi.ems.keka.model;
 
 /**
  * <一句话功能简述>

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/config/SquareLightCtlConfig.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/squarelgt/config/SquareLightCtlConfig.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.config;
+package com.ruoyi.ems.squarelgt.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/controller/SquareLightCtlController.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/squarelgt/controller/SquareLightCtlController.java

@@ -8,9 +8,10 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.controller;
+package com.ruoyi.ems.squarelgt.controller;
 
-import com.ruoyi.ems.handle.SquareLightCtlHandler;
+import com.ruoyi.ems.ba.controller.BaCtlController;
+import com.ruoyi.ems.squarelgt.handle.SquareLightCtlHandler;
 import com.ruoyi.ems.model.AbilityPayload;
 import com.ruoyi.ems.model.CallResponse;
 import io.swagger.annotations.Api;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/handle/SquareLightCtlHandler.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/squarelgt/handle/SquareLightCtlHandler.java

@@ -8,31 +8,32 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.handle;
+package com.ruoyi.ems.squarelgt.handle;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.huashe.common.domain.JsonEntity;
 import com.huashe.common.exception.Assert;
-import com.ruoyi.ems.config.SquareLightCtlConfig;
-import com.ruoyi.ems.core.SquareLightCtlTemplate;
+import com.ruoyi.ems.common.handle.BaseDevHandler;
+import com.ruoyi.ems.squarelgt.config.SquareLightCtlConfig;
+import com.ruoyi.ems.squarelgt.retrofit.SquareLightCtlTemplate;
 import com.ruoyi.ems.domain.EmsDevice;
 import com.ruoyi.ems.domain.EmsObjAttrValue;
 import com.ruoyi.ems.enums.DevObjType;
 import com.ruoyi.ems.model.AbilityPayload;
-import com.ruoyi.ems.model.CallData;
+import com.ruoyi.ems.common.model.CallData;
 import com.ruoyi.ems.model.CallResponse;
 import com.ruoyi.ems.model.QueryDevice;
-import com.ruoyi.ems.model.slightctl.BaselineInfo;
-import com.ruoyi.ems.model.slightctl.CcElecInfo;
-import com.ruoyi.ems.model.slightctl.DevSub;
-import com.ruoyi.ems.model.slightctl.DeviceInfo;
-import com.ruoyi.ems.model.slightctl.SlcDevice;
-import com.ruoyi.ems.model.slightctl.SlcDeviceLamp;
-import com.ruoyi.ems.model.slightctl.SlcProject;
-import com.ruoyi.ems.model.slightctl.SlcProjectSubset;
-import com.ruoyi.ems.model.slightctl.StatusInfo;
+import com.ruoyi.ems.squarelgt.model.BaselineInfo;
+import com.ruoyi.ems.squarelgt.model.CcElecInfo;
+import com.ruoyi.ems.squarelgt.model.DevSub;
+import com.ruoyi.ems.squarelgt.model.DeviceInfo;
+import com.ruoyi.ems.squarelgt.model.SlcDevice;
+import com.ruoyi.ems.squarelgt.model.SlcDeviceLamp;
+import com.ruoyi.ems.squarelgt.model.SlcProject;
+import com.ruoyi.ems.squarelgt.model.SlcProjectSubset;
+import com.ruoyi.ems.squarelgt.model.StatusInfo;
 import com.ruoyi.ems.util.PingUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/slightctl/AppLoginReq.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/squarelgt/model/AppLoginReq.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.slightctl;
+package com.ruoyi.ems.squarelgt.model;
 
 import lombok.Data;
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/slightctl/AppLoginRes.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/squarelgt/model/AppLoginRes.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.slightctl;
+package com.ruoyi.ems.squarelgt.model;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/slightctl/BaselineInfo.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/squarelgt/model/BaselineInfo.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.slightctl;
+package com.ruoyi.ems.squarelgt.model;
 
 import lombok.Data;
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/slightctl/CcElecInfo.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/squarelgt/model/CcElecInfo.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.slightctl;
+package com.ruoyi.ems.squarelgt.model;
 
 import lombok.Data;
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/slightctl/DevSub.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/squarelgt/model/DevSub.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.slightctl;
+package com.ruoyi.ems.squarelgt.model;
 
 import lombok.Data;
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/slightctl/DeviceInfo.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/squarelgt/model/DeviceInfo.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.slightctl;
+package com.ruoyi.ems.squarelgt.model;
 
 import lombok.Data;
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/slightctl/LightControlReq.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/squarelgt/model/LightControlReq.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.slightctl;
+package com.ruoyi.ems.squarelgt.model;
 
 import lombok.Data;
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/slightctl/SlcDevice.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/squarelgt/model/SlcDevice.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.slightctl;
+package com.ruoyi.ems.squarelgt.model;
 
 import lombok.Data;
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/slightctl/SlcDeviceLamp.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/squarelgt/model/SlcDeviceLamp.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.slightctl;
+package com.ruoyi.ems.squarelgt.model;
 
 import lombok.Data;
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/slightctl/SlcProject.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/squarelgt/model/SlcProject.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.slightctl;
+package com.ruoyi.ems.squarelgt.model;
 
 import lombok.Data;
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/slightctl/SlcProjectSubset.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/squarelgt/model/SlcProjectSubset.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.slightctl;
+package com.ruoyi.ems.squarelgt.model;
 
 import lombok.Data;
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/slightctl/SlcResponse.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/squarelgt/model/SlcResponse.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.slightctl;
+package com.ruoyi.ems.squarelgt.model;
 
 import lombok.Data;
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/slightctl/StatusInfo.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/squarelgt/model/StatusInfo.java

@@ -8,9 +8,8 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.slightctl;
+package com.ruoyi.ems.squarelgt.model;
 
-import io.swagger.models.auth.In;
 import lombok.Data;
 
 /**

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/model/slightctl/SyncStatusReq.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/squarelgt/model/SyncStatusReq.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.model.slightctl;
+package com.ruoyi.ems.squarelgt.model;
 
 import lombok.Data;
 

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/retrofit/SquareLightCtlApi.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/squarelgt/retrofit/SquareLightCtlApi.java

@@ -8,10 +8,10 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.retrofit;
+package com.ruoyi.ems.squarelgt.retrofit;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.ems.model.slightctl.AppLoginReq;
+import com.ruoyi.ems.squarelgt.model.AppLoginReq;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.GET;

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/core/SquareLightCtlTemplate.java → ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/squarelgt/retrofit/SquareLightCtlTemplate.java

@@ -8,23 +8,23 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.ruoyi.ems.core;
+package com.ruoyi.ems.squarelgt.retrofit;
 
 import com.alibaba.fastjson.support.retrofit.Retrofit2ConverterFactory;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.huashe.common.exception.Assert;
 import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.ems.config.SquareLightCtlConfig;
-import com.ruoyi.ems.model.CallData;
-import com.ruoyi.ems.model.slightctl.AppLoginReq;
-import com.ruoyi.ems.model.slightctl.AppLoginRes;
-import com.ruoyi.ems.model.slightctl.DeviceInfo;
-import com.ruoyi.ems.model.slightctl.SlcDevice;
-import com.ruoyi.ems.model.slightctl.SlcProject;
-import com.ruoyi.ems.model.slightctl.SlcProjectSubset;
-import com.ruoyi.ems.model.slightctl.SlcResponse;
-import com.ruoyi.ems.retrofit.SquareLightCtlApi;
+import com.ruoyi.ems.common.retrofit.BaseApiTemplate;
+import com.ruoyi.ems.squarelgt.config.SquareLightCtlConfig;
+import com.ruoyi.ems.common.model.CallData;
+import com.ruoyi.ems.squarelgt.model.AppLoginReq;
+import com.ruoyi.ems.squarelgt.model.AppLoginRes;
+import com.ruoyi.ems.squarelgt.model.DeviceInfo;
+import com.ruoyi.ems.squarelgt.model.SlcDevice;
+import com.ruoyi.ems.squarelgt.model.SlcProject;
+import com.ruoyi.ems.squarelgt.model.SlcProjectSubset;
+import com.ruoyi.ems.squarelgt.model.SlcResponse;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import retrofit2.Call;

ems/ems-cloud/ems-dev-adapter/src/main/resources/logback.xml

@@ -1,74 +1,157 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-	<property name="log.path" value="logs/ems-dev-adapter" />
-   <!-- 日志输出格式 -->
-	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+    <property name="log.path" value="logs/ems-dev-adapter" />
+    <!-- 日志输出格式 -->
+    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
-    <!-- 控制台输出 -->
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>${log.pattern}</pattern>
-		</encoder>
-	</appender>
-
-    <!-- 系统日志输出 -->
-	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>${log.pattern}</pattern>
-		</encoder>
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-	</appender>
+    <!-- 控制台输出（docker logs 看到的就是这个） -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+    </appender>
 
+    <!-- 全局错误日志 -->
     <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
+        <file>${log.path}/error.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+            <maxHistory>60</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
         </encoder>
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
             <level>ERROR</level>
-			<!-- 匹配时的操作：接收（记录） -->
             <onMatch>ACCEPT</onMatch>
-			<!-- 不匹配时的操作：拒绝（不记录） -->
             <onMismatch>DENY</onMismatch>
         </filter>
     </appender>
 
-    <!-- 系统模块日志级别控制  -->
-	<logger name="com.ruoyi" level="info" />
-	<!-- Spring日志级别控制  -->
-	<logger name="org.springframework" level="warn" />
+    <!-- ===================== 各模块独立日志 ===================== -->
+    <!-- 公共模块 -->
+    <appender name="common_appender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/common.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/common.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder><pattern>${log.pattern}</pattern></encoder>
+    </appender>
+    <!-- 安科瑞 -->
+    <appender name="acrel_appender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/acrel.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/acrel.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder><pattern>${log.pattern}</pattern></encoder>
+    </appender>
+    <!-- BA楼控 -->
+    <appender name="ba_appender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/ba.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/ba.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder><pattern>${log.pattern}</pattern></encoder>
+    </appender>
+    <!-- 充电桩 -->
+    <appender name="charging_appender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/charging.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/charging.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder><pattern>${log.pattern}</pattern></encoder>
+    </appender>
+    <!-- GeekOpen断路器 -->
+    <appender name="geekopen_appender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/geekopen.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/geekopen.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder><pattern>${log.pattern}</pattern></encoder>
+    </appender>
+    <!-- 古瑞瓦特光伏 -->
+    <appender name="growatt_appender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/growatt.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/growatt.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder><pattern>${log.pattern}</pattern></encoder>
+    </appender>
+    <!-- keka开关 -->
+    <appender name="keka_appender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/keka.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/keka.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder><pattern>${log.pattern}</pattern></encoder>
+    </appender>
+    <!-- 广场灯控 -->
+    <appender name="squarelight_appender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/squarelight.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/squarelight.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder><pattern>${log.pattern}</pattern></encoder>
+    </appender>
+
+    <!-- ===================== 包绑定 + 控制台输出全开 ===================== -->
+    <logger name="com.ruoyi.ems.acrel" level="info" additivity="false">
+        <appender-ref ref="acrel_appender" />
+        <appender-ref ref="console" />
+        <appender-ref ref="file_error" />
+    </logger>
+    <logger name="com.ruoyi.ems.ba" level="info" additivity="false">
+        <appender-ref ref="ba_appender" />
+        <appender-ref ref="console" />
+        <appender-ref ref="file_error" />
+    </logger>
+    <logger name="com.ruoyi.ems.charging" level="info" additivity="false">
+        <appender-ref ref="charging_appender" />
+        <appender-ref ref="console" />
+        <appender-ref ref="file_error" />
+    </logger>
+    <logger name="com.ruoyi.ems.common" level="info" additivity="false">
+        <appender-ref ref="common_appender" />
+        <appender-ref ref="console" />
+        <appender-ref ref="file_error" />
+    </logger>
+    <logger name="com.ruoyi.ems.geekopen" level="info" additivity="false">
+        <appender-ref ref="geekopen_appender" />
+        <appender-ref ref="console" />
+        <appender-ref ref="file_error" />
+    </logger>
+    <logger name="com.ruoyi.ems.growatt" level="info" additivity="false">
+        <appender-ref ref="growatt_appender" />
+        <appender-ref ref="console" />
+        <appender-ref ref="file_error" />
+    </logger>
+    <logger name="com.ruoyi.ems.keka" level="info" additivity="false">
+        <appender-ref ref="keka_appender" />
+        <appender-ref ref="console" />
+        <appender-ref ref="file_error" />
+    </logger>
+    <logger name="com.ruoyi.ems.squarelgt" level="info" additivity="false">
+        <appender-ref ref="squarelight_appender" />
+        <appender-ref ref="console" />
+        <appender-ref ref="file_error" />
+    </logger>
 
-	<root level="info">
-		<appender-ref ref="console" />
-	</root>
+    <!-- 基础包日志 -->
+    <logger name="com.ruoyi" level="info" />
+    <logger name="org.springframework" level="warn" />
 
-	<!--系统操作日志-->
-    <root level="INFO">
-        <appender-ref ref="file_info" />
+    <!-- root 只保留控制台 + 错误日志 -->
+    <root level="info">
+        <appender-ref ref="console" />
         <appender-ref ref="file_error" />
     </root>
-</configuration>
+</configuration>

ems/ems-cloud/ems-dev-adapter/src/test/java/com/huashe/test/Acrel3000Test.java

@@ -13,15 +13,15 @@ package com.huashe.test;
 import com.huashe.common.utils.DateUtils;
 import com.ruoyi.common.redis.service.RedisService;
 import com.ruoyi.ems.EmsDevAdpApplication;
-import com.ruoyi.ems.config.AcrelConfig;
-import com.ruoyi.ems.core.Acrel3000Template;
-import com.ruoyi.ems.model.acrel.AlarmEventLog;
-import com.ruoyi.ems.model.acrel.Circuit;
-import com.ruoyi.ems.model.acrel.ConsumeReport;
-import com.ruoyi.ems.model.acrel.MeterKeyValue;
-import com.ruoyi.ems.model.acrel.MeterUse;
-import com.ruoyi.ems.model.acrel.Station;
-import com.ruoyi.ems.model.acrel.Token;
+import com.ruoyi.ems.acrel.config.AcrelConfig;
+import com.ruoyi.ems.acrel.retrofit.Acrel3000Template;
+import com.ruoyi.ems.acrel.model.AlarmEventLog;
+import com.ruoyi.ems.acrel.model.Circuit;
+import com.ruoyi.ems.acrel.model.ConsumeReport;
+import com.ruoyi.ems.acrel.model.MeterKeyValue;
+import com.ruoyi.ems.acrel.model.MeterUse;
+import com.ruoyi.ems.acrel.model.Station;
+import com.ruoyi.ems.acrel.model.Token;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
 import org.junit.Before;

ems/ems-cloud/ems-dev-adapter/src/test/java/com/huashe/test/BaCtlTest.java

@@ -11,12 +11,12 @@
 package com.huashe.test;
 
 import com.ruoyi.ems.EmsDevAdpApplication;
-import com.ruoyi.ems.config.BaCtlConfig;
-import com.ruoyi.ems.core.BaCtlEnergyTemplate;
-import com.ruoyi.ems.model.CallData;
-import com.ruoyi.ems.model.idenergy.CodesVal;
-import com.ruoyi.ems.model.idenergy.CodesValReq;
-import com.ruoyi.ems.model.idenergy.CodesValSetReq;
+import com.ruoyi.ems.ba.config.BaCtlConfig;
+import com.ruoyi.ems.ba.retrofit.BaCtlEnergyTemplate;
+import com.ruoyi.ems.common.model.CallData;
+import com.ruoyi.ems.ba.model.CodesVal;
+import com.ruoyi.ems.ba.model.CodesValReq;
+import com.ruoyi.ems.ba.model.CodesValSetReq;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
 import org.junit.Test;

ems/ems-cloud/ems-dev-adapter/src/test/java/com/huashe/test/GrowattTest.java

@@ -12,10 +12,10 @@ package com.huashe.test;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.ems.EmsDevAdpApplication;
-import com.ruoyi.ems.config.GrowattConfig;
-import com.ruoyi.ems.core.GrowattTemplate;
-import com.ruoyi.ems.model.growatt.DataLogger;
-import com.ruoyi.ems.model.growatt.DeviceInfo;
+import com.ruoyi.ems.growatt.config.GrowattConfig;
+import com.ruoyi.ems.growatt.retrofit.GrowattTemplate;
+import com.ruoyi.ems.growatt.model.DataLogger;
+import com.ruoyi.ems.growatt.model.DeviceInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
 import org.junit.Test;
@@ -26,7 +26,6 @@ import org.springframework.test.context.junit4.SpringRunner;
 import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 /**
  * GrowattTest

ems/ems-cloud/ems-dev-adapter/src/test/java/com/huashe/test/SquareLightCtlTest.java

@@ -13,15 +13,15 @@ package com.huashe.test;
 import com.alibaba.fastjson2.JSONObject;
 import com.huashe.common.domain.JsonEntity;
 import com.ruoyi.ems.EmsDevAdpApplication;
-import com.ruoyi.ems.config.SquareLightCtlConfig;
-import com.ruoyi.ems.core.SquareLightCtlTemplate;
-import com.ruoyi.ems.handle.SquareLightCtlHandler;
-import com.ruoyi.ems.model.CallData;
-import com.ruoyi.ems.model.slightctl.AppLoginRes;
-import com.ruoyi.ems.model.slightctl.DeviceInfo;
-import com.ruoyi.ems.model.slightctl.SlcDevice;
-import com.ruoyi.ems.model.slightctl.SlcProject;
-import com.ruoyi.ems.model.slightctl.SlcProjectSubset;
+import com.ruoyi.ems.squarelgt.config.SquareLightCtlConfig;
+import com.ruoyi.ems.squarelgt.retrofit.SquareLightCtlTemplate;
+import com.ruoyi.ems.squarelgt.handle.SquareLightCtlHandler;
+import com.ruoyi.ems.common.model.CallData;
+import com.ruoyi.ems.squarelgt.model.AppLoginRes;
+import com.ruoyi.ems.squarelgt.model.DeviceInfo;
+import com.ruoyi.ems.squarelgt.model.SlcDevice;
+import com.ruoyi.ems.squarelgt.model.SlcProject;
+import com.ruoyi.ems.squarelgt.model.SlcProjectSubset;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
 import org.junit.Test;