能源业务侧集成改造

ems/ems-application/ems-admin/pom.xml

@@ -82,8 +82,8 @@
                     <artifactId>ruoyi-common-core</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>spring-web</artifactId>
-                    <groupId>org.springframework</groupId>
+                    <groupId>com.huashe.cloud</groupId>
+                    <artifactId>ruoyi-common-quartz</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -1,24 +1,25 @@
 package com.ruoyi.web.controller.common;
 
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-import javax.annotation.Resource;
-import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.FastByteArrayOutputStream;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.google.code.kaptcha.Producer;
+import com.huashe.common.constant.CacheConstants;
+import com.huashe.common.domain.AjaxResult;
+import com.huashe.common.utils.sign.Base64;
+import com.huashe.common.utils.uuid.IdUtils;
 import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.utils.sign.Base64;
-import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.system.service.ISysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.FastByteArrayOutputStream;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 验证码操作处理

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -1,9 +1,12 @@
 package com.ruoyi.web.controller.common;
 
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.huashe.common.domain.AjaxResult;
+import com.huashe.common.utils.StringUtils;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.framework.config.ServerConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,13 +16,11 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.framework.config.ServerConfig;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 通用请求处理

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/AdmEmsElecPgIndexController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -30,7 +30,7 @@ import java.util.List;
  * @date 2024-08-30
  */
 @RestController
-@RequestMapping("/elecPgIndex")
+@RequestMapping("/ems/elecPgIndex")
 @Api(value = "AdmEmsElecPgIndexController", description = "电网设施指标")
 public class AdmEmsElecPgIndexController extends BaseController
 {

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/AdmEmsIndexRangeController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -30,7 +30,7 @@ import java.util.List;
  * @date 2024-08-30
  */
 @RestController
-@RequestMapping("/indexRange")
+@RequestMapping("/ems/indexRange")
 @Api(value = "AdmEmsIndexRangeController", description = "能源指标范围")
 public class AdmEmsIndexRangeController extends BaseController
 {

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/AdmOpAlarmController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -31,7 +31,7 @@ import java.util.List;
  * @date 2024-08-26
  */
 @RestController
-@RequestMapping("/alarm-info")
+@RequestMapping("/ems/alarm-info")
 @Api(value = "AdmOpAlarmController", description = "能源设施告警")
 public class AdmOpAlarmController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/AdmOpAlarmPolicyController.java

@@ -1,9 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
-
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -31,7 +30,7 @@ import java.util.List;
  * @date 2024-08-26
  */
 @RestController
-@RequestMapping("/alarm")
+@RequestMapping("/ems/alarm")
 @Api(value = "AdmOpAlarmPolicyController", description = "能源设施告警策略")
 public class AdmOpAlarmPolicyController extends BaseController
 {

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/AdmOpInspectionReportController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -30,7 +30,7 @@ import java.util.List;
  * @date 2024-08-29
  */
 @RestController
-@RequestMapping("/inspectionReport")
+@RequestMapping("/ems/inspectionReport")
 @Api(value = "AdmOpInspectionReportController", description = "巡检报告")
 public class AdmOpInspectionReportController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/AreaController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.ems.domain.Area;
 import com.ruoyi.ems.domain.EmsFacs;
@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
  * @date 2024-11-01
  */
 @RestController
-@RequestMapping("/basecfg/area")
+@RequestMapping("/ems/basecfg/area")
 @Api(value = "AreaController", description = "区域管理")
 public class AreaController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/CaConfigController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -30,7 +30,7 @@ import java.util.List;
  * @date 2024-07-11
  */
 @RestController
-@RequestMapping("/basecfg/cacfg")
+@RequestMapping("/ems/basecfg/cacfg")
 @Api(value = "CaConfigController", description = "排放因子管理")
 public class CaConfigController extends BaseController
 {

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/CaEmissionForecastController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -30,7 +30,7 @@ import java.util.List;
  * @date 2024-08-12
  */
 @RestController
-@RequestMapping("/forecastCa")
+@RequestMapping("/ems/forecastCa")
 @Api(value = "CaEmissionForecastController", description = "碳排放预测数据接口")
 public class CaEmissionForecastController extends BaseController
 {

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/CaMeterDController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -30,7 +30,7 @@ import java.util.List;
  * @date 2024-08-12
  */
 @RestController
-@RequestMapping("/caMeterD")
+@RequestMapping("/ems/caMeterD")
 @Api(value = "CaMeterDController", description = "碳计量日数据访问接口")
 public class CaMeterDController extends BaseController
 {

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/ChargingBillController.java

@@ -20,8 +20,8 @@ package com.ruoyi.web.controller.ems;
  * @since [产品/模块版本]
  */
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.BusinessException;
 import com.ruoyi.ems.domain.ChargingBill;
 import com.ruoyi.ems.model.QueryChargingBill;
@@ -41,7 +41,7 @@ import java.util.List;
  * @date 2024-08-26
  */
 @RestController
-@RequestMapping("/charging/bill/")
+@RequestMapping("/ems/charging/bill/")
 @Api(value = "ChargingBillController", description = "计费账单服务")
 public class ChargingBillController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/CoChargingConfigController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.ems.domain.CoChargingConfig;
@@ -28,7 +28,7 @@ import java.util.List;
  * @date 2024-08-26
  */
 @RestController
-@RequestMapping("/basecfg/elecPrice/coCharging")
+@RequestMapping("/ems/basecfg/elecPrice/coCharging")
 @Api(value = "CoChargingConfigController", description = "商户能源计费配置")
 public class CoChargingConfigController extends BaseController
 {

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/DeviceComponentController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.ems.domain.EmsDeviceComponent;
@@ -28,7 +28,7 @@ import java.util.List;
  * @date 2024-09-23
  */
 @RestController
-@RequestMapping("/device/component")
+@RequestMapping("/ems/device/component")
 @Api(value = "DeviceController", description = "设备部件管理")
 public class DeviceComponentController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/DeviceController.java

@@ -1,9 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
-
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.BusinessException;
@@ -40,7 +39,7 @@ import java.util.List;
  * @date 2024-07-10
  */
 @RestController
-@RequestMapping("/device")
+@RequestMapping("/ems/device")
 @Api(value = "DeviceController", description = "能源设备管理")
 public class DeviceController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/ElecAttrController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.ems.domain.ElecAttr;
 import com.ruoyi.ems.service.IElecAttrService;
@@ -28,7 +28,7 @@ import java.util.List;
  * @date 2024-07-23
  */
 @RestController
-@RequestMapping("/basecfg/elec/attr")
+@RequestMapping("/ems/basecfg/elec/attr")
 @Api(value = "ElecAttrController", description = "用电属性管理")
 public class ElecAttrController extends BaseController {
     /**

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/ElecExpendForecastController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -30,7 +30,7 @@ import java.util.List;
  * @date 2024-08-12
  */
 @RestController
-@RequestMapping("/forecastConsume")
+@RequestMapping("/ems/forecastConsume")
 @Api(value = "ElecExpendForecastController", description = "电力消耗预测数据访问接口")
 public class ElecExpendForecastController extends BaseController
 {

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/ElecLoadIndexController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -28,7 +28,7 @@ import java.util.List;
  * @date 2024-08-09
  */
 @RestController
-@RequestMapping("/object/loadIndex")
+@RequestMapping("/ems/object/loadIndex")
 @Api(value = "ElecLoadIndexController", description = "电力负荷指标数据接口")
 public class ElecLoadIndexController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/ElecMeterHController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -31,7 +31,7 @@ import java.util.List;
  * @date 2024-12-03
  */
 @RestController
-@RequestMapping("/elecMeterH")
+@RequestMapping("/ems/elecMeterH")
 @Api(value = "ElecMeterHController", description = "用电计量-小时")
 public class ElecMeterHController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/ElecPgSupplyHController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -31,7 +31,7 @@ import java.util.List;
  * @date 2024-08-09
  */
 @RestController
-@RequestMapping("/pg/supply/hour")
+@RequestMapping("/ems/pg/supply/hour")
 @Api(value = "ElecPgSupplyHController", description = "电网供应计量")
 public class ElecPgSupplyHController extends BaseController
 {

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/ElecPriceController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -31,7 +31,7 @@ import java.util.List;
  * @date 2024-07-23
  */
 @RestController
-@RequestMapping("/basecfg/elecPrice")
+@RequestMapping("/ems/basecfg/elecPrice")
 @Api(value = "ElecPriceController", description = "国网电价管理")
 public class ElecPriceController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/ElecPriceStrategyController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -30,7 +30,7 @@ import java.util.List;
  * @date 2024-08-23
  */
 @RestController
-@RequestMapping("/basecfg/elecPrice/strategy")
+@RequestMapping("/ems/basecfg/elecPrice/strategy")
 @Api(value = "ElecPriceStrategyController", description = "峰谷电价策略管理")
 public class ElecPriceStrategyController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/ElecPriceStrategyHourController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -30,7 +30,7 @@ import java.util.List;
  * @date 2024-08-23
  */
 @RestController
-@RequestMapping("/basecfg/elecPrice/strategy/hour")
+@RequestMapping("/ems/basecfg/elecPrice/strategy/hour")
 @Api(value = "ElecPriceStrategyHourController", description = "峰谷电价小时策略参数")
 public class ElecPriceStrategyHourController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/ElecProdForecastController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -30,7 +30,7 @@ import java.util.List;
  * @date 2024-08-12
  */
 @RestController
-@RequestMapping("/predictionProd")
+@RequestMapping("/ems/predictionProd")
 @Api(value = "ElecProdForecastController", description = "电力产能预测数据接口")
 public class ElecProdForecastController extends BaseController
 {

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/ElecPvSupplyHController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -27,7 +27,7 @@ import java.util.List;
  * @date 2024-08-02
  */
 @RestController
-@RequestMapping("/prod/pv")
+@RequestMapping("/ems/prod/pv")
 @Api(value = "ElecPvSupplyHController", description = "光伏并网计量数据接口")
 public class ElecPvSupplyHController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/ElecStoreController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -33,7 +33,7 @@ import java.util.List;
  * @date 2024-08-09
  */
 @RestController
-@RequestMapping("/elec/store")
+@RequestMapping("/ems/elec/store")
 @Api(value = "ElecStoreHController", description = "能计量-小时数据接口")
 public class ElecStoreController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/ElecUseHController.java

@@ -2,7 +2,7 @@ package com.ruoyi.web.controller.ems;
 
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -29,7 +29,7 @@ import java.util.List;
  */
 @Deprecated
 @RestController
-@RequestMapping("/elec/use")
+@RequestMapping("/ems/elec/use")
 @Api(value = "ElecUseHController", description = "用电计量数据接口")
 public class ElecUseHController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/EmsCommonController.java

@@ -10,8 +10,8 @@
  */
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.ems.domain.DevProcess;
 import com.ruoyi.ems.domain.ElecPriceType;
 import com.ruoyi.ems.domain.EmsCls;
@@ -41,7 +41,7 @@ import java.util.List;
  * @since [产品/模块版本]
  */
 @RestController
-@RequestMapping("/common")
+@RequestMapping("/ems/common")
 @Api(value = "CommonController", description = "公共数据接口")
 public class EmsCommonController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/EmsDeviceRbookController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -30,7 +30,7 @@ import java.util.List;
  * @date 2024-09-10
  */
 @RestController
-@RequestMapping("/device/rbook")
+@RequestMapping("/ems/device/rbook")
 @Api(value = "EmsDeviceRbookController", description = "设备台账")
 public class EmsDeviceRbookController extends BaseController
 {

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/EmsDisStaCoalController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.ems.domain.EmsDisStaCoal;
@@ -28,7 +28,7 @@ import java.util.List;
  * @date 2024-12-02
  */
 @RestController
-@RequestMapping("/disStaCoal")
+@RequestMapping("/ems/disStaCoal")
 @Api(value = "EmsDisStaCoalController", description = "能源折标准煤维表")
 public class EmsDisStaCoalController extends BaseController
 {

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/EmsFacsController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -31,7 +31,7 @@ import java.util.List;
  * @date 2024-07-10
  */
 @RestController
-@RequestMapping("/basecfg/emsfacs")
+@RequestMapping("/ems/basecfg/emsfacs")
 @Api(value = "EmsFacsController", description = "能源设施管理")
 public class EmsFacsController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/EmsObjAbilityController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -29,7 +29,7 @@ import java.util.List;
  * @date 2024-09-23
  */
 @RestController
-@RequestMapping("/object/ability")
+@RequestMapping("/ems/object/ability")
 @Api(value = "EmsObjAbilityController", description = "能源对象能力管理")
 public class EmsObjAbilityController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/EmsObjAttrController.java

@@ -1,9 +1,9 @@
 package com.ruoyi.web.controller.ems;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.Assert;
@@ -41,7 +41,7 @@ import java.util.List;
  * @date 2024-09-23
  */
 @RestController
-@RequestMapping("/object/attr")
+@RequestMapping("/ems/object/attr")
 @Api(value = "EmsObjAttrController", description = "能源对象属性管理")
 public class EmsObjAttrController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/EmsObjAttrValueController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.ems.domain.EmsObjAttrValue;
 import com.ruoyi.ems.service.IEmsObjAttrValueService;
@@ -27,7 +27,7 @@ import java.util.List;
  * @date 2024-09-25
  */
 @RestController
-@RequestMapping("/object/attr/value")
+@RequestMapping("/ems/object/attr/value")
 @Api(value = "EmsObjAttrValueController", description = "能源对象属性值管理")
 public class EmsObjAttrValueController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/EmsObjEventController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.ems.domain.EmsObjEvent;
@@ -27,7 +27,7 @@ import java.util.List;
  * @date 2024-09-23
  */
 @RestController
-@RequestMapping("/object/event")
+@RequestMapping("/ems/object/event")
 @Api(value = "EmsObjEventController", description = "能源对象属性管理")
 public class EmsObjEventController extends BaseController
 {

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/EmsObjFlowRelController.java

@@ -1,11 +1,10 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.ems.domain.EmsObjFlowRel;
 import com.ruoyi.ems.service.IEmsObjFlowRelService;
 import io.swagger.annotations.Api;
@@ -29,7 +28,7 @@ import java.util.List;
  * @date 2024-07-10
  */
 @RestController
-@RequestMapping("/object/flowrel")
+@RequestMapping("/ems/object/flowrel")
 @Api(value = "EmsObjFlowRelController", description = "对象能流关系管理")
 public class EmsObjFlowRelController extends BaseController
 {

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/EmsObjModelController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.ems.domain.EmsObjModel;
@@ -28,7 +28,7 @@ import java.util.List;
  * @date 2024-09-23
  */
 @RestController
-@RequestMapping("/object/model")
+@RequestMapping("/ems/object/model")
 @Api(value = "EmsObjModelController", description = "能源对象模型管理")
 public class EmsObjModelController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/EmsSubsystemController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -30,7 +30,7 @@ import java.util.List;
  * @date 2024-08-16
  */
 @RestController
-@RequestMapping("/subsystem")
+@RequestMapping("/ems/subsystem")
 @Api(value = "EmsSubsystemController", description = "能源子系统管理")
 public class EmsSubsystemController extends BaseController
 {

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/EmsTagController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -30,7 +30,7 @@ import java.util.List;
  * @date 2024-08-16
  */
 @RestController
-@RequestMapping("/tag")
+@RequestMapping("/ems/tag")
 @Api(value = "EmsTagController", description = "标签管理管理")
 public class EmsTagController extends BaseController
 {

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/FacsCategoryController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -31,7 +31,7 @@ import java.util.List;
  * @date 2024-07-11
  */
 @RestController
-@RequestMapping("/basecfg/facsCategory")
+@RequestMapping("/ems/basecfg/facsCategory")
 @Api(value = "FacsCategoryController", description = "设施类别管理")
 public class FacsCategoryController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/MeterBoundaryRelController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.ems.domain.MeterBoundaryRel;
 import com.ruoyi.ems.service.IMeterBoundaryRelService;
@@ -28,7 +28,7 @@ import java.util.List;
  * @date 2024-12-09
  */
 @RestController
-@RequestMapping("/meterBoundaryRel")
+@RequestMapping("/ems/meterBoundaryRel")
 @Api(value = "MeterBoundaryRelController", description = "计量设备绑定边界对象关系")
 public class MeterBoundaryRelController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/MeterDeviceController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -30,7 +30,7 @@ import java.util.List;
  * @date 2024-08-08
  */
 @RestController
-@RequestMapping("/meterDevice")
+@RequestMapping("/ems/meterDevice")
 @Api(value = "MeterDeviceController", description = "计量设备管理")
 public class MeterDeviceController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/MeterReadingController.java

@@ -1,12 +1,12 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
+import com.huashe.common.utils.DateUtils;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.Assert;
 import com.ruoyi.common.exception.BusinessException;
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.ems.domain.MeterDevice;
 import com.ruoyi.ems.domain.MeterReading;
 import com.ruoyi.ems.model.QueryMeter;
@@ -36,7 +36,7 @@ import java.util.List;
  * @date 2024-08-28
  */
 @RestController
-@RequestMapping("/meterReading")
+@RequestMapping("/ems/meterReading")
 @Api(value = "MeterReadingManualController", description = "抄表管理")
 public class MeterReadingController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/OpEnergyStrategyController.java

@@ -1,9 +1,9 @@
 package com.ruoyi.web.controller.ems;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.BusinessException;
@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
  * @date 2024-08-08
  */
 @RestController
-@RequestMapping("/energyStrategy")
+@RequestMapping("/ems/energyStrategy")
 @Api(value = "OpEnergyStrategyController", description = "能源策略管理接口")
 public class OpEnergyStrategyController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/OpInspectionPlanController.java

@@ -1,12 +1,12 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
+import com.huashe.common.utils.uuid.Seq;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.utils.uuid.Seq;
 import com.ruoyi.ems.domain.OpInspectionTask;
 import com.ruoyi.ems.service.IOpInspectionPlanService;
 import io.swagger.annotations.Api;
@@ -31,7 +31,7 @@ import java.util.List;
  * @date 2024-08-29
  */
 @RestController
-@RequestMapping("/inspectionPlan")
+@RequestMapping("/ems/inspectionPlan")
 @Api(value = "OpInspectionPlanController", description = "巡检计划")
 public class OpInspectionPlanController extends BaseController {
     @Autowired

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/WaterMeterHController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.ems;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -31,7 +31,7 @@ import java.util.List;
  * @date 2024-12-03
  */
 @RestController
-@RequestMapping("/waterMeterH")
+@RequestMapping("/ems/waterMeterH")
 @Api(value = "WaterMeterHController", description = "用水计量-小时")
 public class WaterMeterHController extends BaseController
 {

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java

@@ -8,6 +8,9 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
+
+import com.huashe.common.constant.CacheConstants;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -17,9 +20,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.system.domain.SysCache;
 
 /**

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java

@@ -4,7 +4,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.framework.web.domain.Server;
 
 /**

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java

@@ -1,24 +1,25 @@
 package com.ruoyi.web.controller.monitor;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.service.SysPasswordService;
 import com.ruoyi.system.domain.SysLogininfor;
 import com.ruoyi.system.service.ISysLogininforService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 系统访问记录

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java

@@ -4,6 +4,9 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+
+import com.huashe.common.constant.CacheConstants;
+import com.huashe.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -12,14 +15,12 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysUserOnline;
 import com.ruoyi.system.service.ISysUserOnlineService;
 

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -1,7 +1,14 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
+import com.huashe.common.constant.UserConstants;
+import com.huashe.common.domain.AjaxResult;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.service.ISysDeptService;
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -13,14 +20,8 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.service.ISysDeptService;
+
+import java.util.List;
 
 /**
  * 部门信息
@@ -53,7 +54,8 @@ public class SysDeptController extends BaseController
     public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
     {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
-        depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
+        depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(
+            StringUtils.split(d.getAncestors(), ","), deptId + ""));
         return success(depts);
     }
 

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -3,6 +3,8 @@ package com.ruoyi.web.controller.system;
 import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.huashe.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -16,11 +18,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysDictTypeService;

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictType;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java

@@ -1,10 +1,10 @@
 package com.ruoyi.web.controller.system;
 
+import com.huashe.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.utils.StringUtils;
 
 /**
  * 首页

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginBody;

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -1,6 +1,9 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.List;
+
+import com.huashe.common.constant.UserConstants;
+import com.huashe.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -13,12 +16,10 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysMenuService;
 
 /**

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.SysNotice;

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -1,6 +1,8 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -13,12 +15,11 @@ import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
 import com.ruoyi.framework.web.service.TokenService;

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java

@@ -1,13 +1,13 @@
 package com.ruoyi.web.controller.system;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.RegisterBody;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.web.service.SysRegisterService;
 import com.ruoyi.system.service.ISysConfigService;
 

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -1,28 +1,15 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.huashe.common.domain.AjaxResult;
+import com.huashe.common.utils.StringUtils;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.service.SysPermissionService;
 import com.ruoyi.framework.web.service.TokenService;
@@ -30,6 +17,20 @@ import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 角色信息

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -3,6 +3,8 @@ package com.ruoyi.web.controller.system;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
+import com.huashe.common.utils.StringUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,14 +20,13 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysPostService;

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
+import com.huashe.common.utils.StringUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -14,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

ems/ems-application/ems-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://172.192.10.105:30002/ems_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: password
+                password: root
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ems/ems-application/ems-admin/src/main/resources/application.yml

@@ -68,9 +68,9 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: localhost
+    host: 172.192.10.105
     # 端口，默认为6379
-    port: 6379
+    port: 30013
     # 数据库索引
     database: 0
     # 密码

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/AdmEmsElecPgIndexController.java

@@ -2,7 +2,7 @@ package com.ruoyi.ems.controller;
 
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/AdmEmsIndexRangeController.java

@@ -1,28 +1,27 @@
 package com.ruoyi.ems.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
+import com.huashe.common.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.ems.domain.AdmEmsIndexRange;
+import com.ruoyi.ems.service.IAdmEmsIndexRangeService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.ems.domain.AdmEmsIndexRange;
-import com.ruoyi.ems.service.IAdmEmsIndexRangeService;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 能源指标范围Controller

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/AdmOpAlarmController.java

@@ -1,9 +1,14 @@
 package com.ruoyi.ems.controller;
 
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
+import com.huashe.common.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.ems.domain.AdmOpAlarm;
+import com.ruoyi.ems.service.IAdmOpAlarmService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -16,15 +21,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.ems.domain.AdmOpAlarm;
-import com.ruoyi.ems.service.IAdmOpAlarmService;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 能源设施告警Controller

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/AdmOpAlarmPolicyController.java

@@ -1,28 +1,27 @@
 package com.ruoyi.ems.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
+import com.huashe.common.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.ems.domain.AdmOpAlarmPolicy;
+import com.ruoyi.ems.service.IAdmOpAlarmPolicyService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.ems.domain.AdmOpAlarmPolicy;
-import com.ruoyi.ems.service.IAdmOpAlarmPolicyService;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 能源设施告警策略Controller

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/AdmOpInspectionReportController.java

@@ -1,9 +1,16 @@
 package com.ruoyi.ems.controller;
 
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
+import com.huashe.common.domain.AjaxResult;
+import com.huashe.common.utils.DateUtils;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.ems.domain.AdmOpInspectionReport;
+import com.ruoyi.ems.service.IAdmOpInspectionReportService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -15,17 +22,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.ems.domain.AdmOpInspectionReport;
-import com.ruoyi.ems.service.IAdmOpInspectionReportService;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 巡检报告Controller

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/AreaController.java

@@ -1,8 +1,7 @@
 package com.ruoyi.ems.controller;
 
-
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/CaConfigController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.ems.controller;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/CaEmissionForecastController.java

@@ -1,27 +1,27 @@
 package com.ruoyi.ems.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
+import com.huashe.common.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.ems.domain.CaEmissionForecast;
+import com.ruoyi.ems.service.ICaEmissionForecastService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.ems.domain.CaEmissionForecast;
-import com.ruoyi.ems.service.ICaEmissionForecastService;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 碳排放预测Controller

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/CaMeterDController.java

@@ -1,27 +1,27 @@
 package com.ruoyi.ems.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
+import com.huashe.common.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.ems.domain.CaMeterD;
+import com.ruoyi.ems.service.ICaMeterDService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.ems.domain.CaMeterD;
-import com.ruoyi.ems.service.ICaMeterDService;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 碳计量日Controller

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/ChargingBillController.java

@@ -20,9 +20,9 @@ package com.ruoyi.ems.controller;
  * @since [产品/模块版本]
  */
 
-import com.ruoyi.common.core.exception.BusinessException;
+import com.huashe.common.domain.AjaxResult;
+import com.huashe.common.exception.BusinessException;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.ems.domain.ChargingBill;
 import com.ruoyi.ems.model.QueryChargingBill;
 import com.ruoyi.ems.service.IChargingBillService;

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/CoChargingConfigController.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.controller;
 
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/CommonController.java

@@ -10,8 +10,8 @@
  */
 package com.ruoyi.ems.controller;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.ems.domain.DevProcess;
 import com.ruoyi.ems.domain.ElecPriceType;
 import com.ruoyi.ems.domain.EmsCls;

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/DeviceComponentController.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.controller;
 
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/DeviceController.java

@@ -1,10 +1,9 @@
 package com.ruoyi.ems.controller;
 
-
-import com.ruoyi.common.core.exception.BusinessException;
+import com.huashe.common.domain.AjaxResult;
+import com.huashe.common.exception.BusinessException;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/ElecAttrController.java

@@ -1,8 +1,7 @@
 package com.ruoyi.ems.controller;
 
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
@@ -20,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/ElecExpendForecastController.java

@@ -19,7 +19,7 @@ import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.ElecExpendForecast;
 import com.ruoyi.ems.service.IElecExpendForecastService;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/ElecLoadIndexController.java

@@ -2,7 +2,7 @@ package com.ruoyi.ems.controller;
 
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/ElecMeterHController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.ems.controller;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/ElecPgSupplyHController.java

@@ -1,22 +1,8 @@
 package com.ruoyi.ems.controller;
 
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
@@ -24,8 +10,19 @@ import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.ElecPgSupplyH;
 import com.ruoyi.ems.model.QueryIndex;
 import com.ruoyi.ems.service.IElecPgSupplyHService;
-
 import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 电网供应计量-小时Controller

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/ElecPriceController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.ems.controller;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/ElecPriceStrategyController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.ems.controller;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/ElecPriceStrategyHourController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.ems.controller;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/ElecProdForecastController.java

@@ -1,27 +1,27 @@
 package com.ruoyi.ems.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
+import com.huashe.common.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.ems.domain.ElecProdForecast;
+import com.ruoyi.ems.service.IElecProdForecastService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.ems.domain.ElecProdForecast;
-import com.ruoyi.ems.service.IElecProdForecastService;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 电力产能预测Controller

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/ElecPvSupplyHController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.ems.controller;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/ElecStoreController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.ems.controller;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/ElecUseHController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.ems.controller;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/EmsDeviceRbookController.java

@@ -1,27 +1,27 @@
 package com.ruoyi.ems.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
+import com.huashe.common.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.ems.domain.EmsDeviceRbook;
+import com.ruoyi.ems.service.IEmsDeviceRbookService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.ems.domain.EmsDeviceRbook;
-import com.ruoyi.ems.service.IEmsDeviceRbookService;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 设备台账Controller

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/EmsDisStaCoalController.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.controller;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/EmsFacsController.java

@@ -1,19 +1,20 @@
 package com.ruoyi.ems.controller;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletResponse;
-
+import com.huashe.common.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.Area;
+import com.ruoyi.ems.domain.EmsFacs;
 import com.ruoyi.ems.model.TreeEntity;
 import com.ruoyi.ems.service.IAreaService;
+import com.ruoyi.ems.service.IEmsFacsService;
 import com.ruoyi.ems.util.AreaUtils;
+import io.swagger.annotations.Api;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,18 +26,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.ems.domain.EmsFacs;
-import com.ruoyi.ems.service.IEmsFacsService;
-
-import io.swagger.annotations.Api;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 能源设施/系统Controller

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/EmsObjAbilityController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.ems.controller;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/EmsObjAttrController.java

@@ -1,9 +1,9 @@
 package com.ruoyi.ems.controller;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.core.exception.Assert;
+import com.huashe.common.domain.AjaxResult;
+import com.huashe.common.exception.Assert;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
@@ -12,14 +12,12 @@ import com.ruoyi.ems.domain.EmsDeviceComponent;
 import com.ruoyi.ems.domain.EmsFacs;
 import com.ruoyi.ems.domain.EmsObjAttr;
 import com.ruoyi.ems.domain.EmsObjAttrValue;
-
 import com.ruoyi.ems.enums.DevObjType;
 import com.ruoyi.ems.service.IEmsDeviceComponentService;
 import com.ruoyi.ems.service.IEmsDeviceService;
 import com.ruoyi.ems.service.IEmsFacsService;
 import com.ruoyi.ems.service.IEmsObjAttrService;
 import com.ruoyi.ems.service.IEmsObjAttrValueService;
-
 import io.swagger.annotations.Api;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/EmsObjAttrValueController.java

@@ -1,8 +1,7 @@
 package com.ruoyi.ems.controller;
 
-import com.alibaba.fastjson2.JSONObject;
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.ems.domain.EmsObjAttrValue;
@@ -19,9 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 能源对象属性值Controller