代码整理

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.AreaBuilding;
 import com.ruoyi.ems.service.IAreaBuildingService;
+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;
@@ -31,6 +32,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/basecfg/area/building")
+@Api(value = "AreaBuildingController", description = "建筑管理")
 public class AreaBuildingController extends BaseController {
     @Autowired
     private IAreaBuildingService buildingService;

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

@@ -2,6 +2,8 @@ package com.ruoyi.ems.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,6 +31,7 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/basecfg/area/building/zoning")
+@Api(value = "AreaBuildingZoningController", description = "建筑功能分区管理")
 public class AreaBuildingZoningController extends BaseController
 {
     @Autowired

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

@@ -9,6 +9,10 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.Area;
 import com.ruoyi.ems.service.IAreaService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -31,6 +35,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/basecfg/area")
+@Api(value = "AreaController", description = "地块管理")
 public class AreaController extends BaseController {
     @Autowired
     private IAreaService areaService;

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.EmissionFactor;
 import com.ruoyi.ems.service.IEmissionFactorService;
+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;
@@ -30,6 +31,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/basecfg/cacfg")
+@Api(value = "CaConfigController", description = "排放因子管理")
 public class CaConfigController extends BaseController
 {
     @Autowired

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

@@ -1,8 +1,9 @@
 package com.ruoyi.ems.controller;
 
 import java.util.List;
-import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,8 +16,8 @@ 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.AdmEmsCaEmissionForecast;
-import com.ruoyi.ems.service.IAdmEmsCaEmissionForecastService;
+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;
@@ -30,20 +31,21 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/forecastCa")
-public class AdmEmsCaEmissionForecastController extends BaseController
+@Api(value = "CaEmissionForecastController", description = "碳排放预测数据接口")
+public class CaEmissionForecastController extends BaseController
 {
     @Autowired
-    private IAdmEmsCaEmissionForecastService admEmsCaEmissionForecastService;
+    private ICaEmissionForecastService caEmissionForecastService;
 
     /**
      * 查询碳排放预测列表
      */
     @RequiresPermissions("prediction:ca:list")
     @GetMapping("/list")
-    public TableDataInfo list(AdmEmsCaEmissionForecast admEmsCaEmissionForecast)
+    public TableDataInfo list(CaEmissionForecast CaEmissionForecast)
     {
         startPage();
-        List<AdmEmsCaEmissionForecast> list = admEmsCaEmissionForecastService.selectAdmEmsCaEmissionForecastList(admEmsCaEmissionForecast);
+        List<CaEmissionForecast> list = caEmissionForecastService.selectCaEmissionForecastList(CaEmissionForecast);
         return getDataTable(list);
     }
 
@@ -53,10 +55,10 @@ public class AdmEmsCaEmissionForecastController extends BaseController
     @RequiresPermissions("prediction:ca:export")
     @Log(title = "碳排放预测", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AdmEmsCaEmissionForecast admEmsCaEmissionForecast)
+    public void export(HttpServletResponse response, CaEmissionForecast CaEmissionForecast)
     {
-        List<AdmEmsCaEmissionForecast> list = admEmsCaEmissionForecastService.selectAdmEmsCaEmissionForecastList(admEmsCaEmissionForecast);
-        ExcelUtil<AdmEmsCaEmissionForecast> util = new ExcelUtil<AdmEmsCaEmissionForecast>(AdmEmsCaEmissionForecast.class);
+        List<CaEmissionForecast> list = caEmissionForecastService.selectCaEmissionForecastList(CaEmissionForecast);
+        ExcelUtil<CaEmissionForecast> util = new ExcelUtil<CaEmissionForecast>(CaEmissionForecast.class);
         util.exportExcel(response, list, "碳排放预测数据");
     }
 
@@ -67,7 +69,7 @@ public class AdmEmsCaEmissionForecastController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(admEmsCaEmissionForecastService.selectAdmEmsCaEmissionForecastById(id));
+        return success(caEmissionForecastService.selectCaEmissionForecastById(id));
     }
 
     /**
@@ -76,9 +78,9 @@ public class AdmEmsCaEmissionForecastController extends BaseController
     @RequiresPermissions("prediction:ca:add")
     @Log(title = "碳排放预测", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody AdmEmsCaEmissionForecast admEmsCaEmissionForecast)
+    public AjaxResult add(@RequestBody CaEmissionForecast CaEmissionForecast)
     {
-        return toAjax(admEmsCaEmissionForecastService.insertAdmEmsCaEmissionForecast(admEmsCaEmissionForecast));
+        return toAjax(caEmissionForecastService.insertCaEmissionForecast(CaEmissionForecast));
     }
 
     /**
@@ -87,9 +89,9 @@ public class AdmEmsCaEmissionForecastController extends BaseController
     @RequiresPermissions("prediction:ca:edit")
     @Log(title = "碳排放预测", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody AdmEmsCaEmissionForecast admEmsCaEmissionForecast)
+    public AjaxResult edit(@RequestBody CaEmissionForecast CaEmissionForecast)
     {
-        return toAjax(admEmsCaEmissionForecastService.updateAdmEmsCaEmissionForecast(admEmsCaEmissionForecast));
+        return toAjax(caEmissionForecastService.updateCaEmissionForecast(CaEmissionForecast));
     }
 
     /**
@@ -100,6 +102,6 @@ public class AdmEmsCaEmissionForecastController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(admEmsCaEmissionForecastService.deleteAdmEmsCaEmissionForecastByIds(ids));
+        return toAjax(caEmissionForecastService.deleteCaEmissionForecastByIds(ids));
     }
 }

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

@@ -1,8 +1,9 @@
 package com.ruoyi.ems.controller;
 
 import java.util.List;
-import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,8 +16,8 @@ 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.AdmEmsCaMeterD;
-import com.ruoyi.ems.service.IAdmEmsCaMeterDService;
+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;
@@ -30,20 +31,21 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/caMeterD")
-public class AdmEmsCaMeterDController extends BaseController
+@Api(value = "CaMeterDController", description = "碳计量日数据访问接口")
+public class CaMeterDController extends BaseController
 {
     @Autowired
-    private IAdmEmsCaMeterDService admEmsCaMeterDService;
+    private ICaMeterDService caMeterDService;
 
     /**
      * 查询碳计量日列表
      */
     @RequiresPermissions("ca-analysis:emission:list")
     @GetMapping("/list")
-    public TableDataInfo list(AdmEmsCaMeterD admEmsCaMeterD)
+    public TableDataInfo list(CaMeterD caMeterD)
     {
         startPage();
-        List<AdmEmsCaMeterD> list = admEmsCaMeterDService.selectAdmEmsCaMeterDList(admEmsCaMeterD);
+        List<CaMeterD> list = caMeterDService.selectCaMeterDList(caMeterD);
         return getDataTable(list);
     }
 
@@ -53,10 +55,10 @@ public class AdmEmsCaMeterDController extends BaseController
     @RequiresPermissions("ca-analysis:emission:export")
     @Log(title = "碳计量日", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AdmEmsCaMeterD admEmsCaMeterD)
+    public void export(HttpServletResponse response, CaMeterD caMeterD)
     {
-        List<AdmEmsCaMeterD> list = admEmsCaMeterDService.selectAdmEmsCaMeterDList(admEmsCaMeterD);
-        ExcelUtil<AdmEmsCaMeterD> util = new ExcelUtil<AdmEmsCaMeterD>(AdmEmsCaMeterD.class);
+        List<CaMeterD> list = caMeterDService.selectCaMeterDList(caMeterD);
+        ExcelUtil<CaMeterD> util = new ExcelUtil<CaMeterD>(CaMeterD.class);
         util.exportExcel(response, list, "碳计量日数据");
     }
 
@@ -67,7 +69,7 @@ public class AdmEmsCaMeterDController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(admEmsCaMeterDService.selectAdmEmsCaMeterDById(id));
+        return success(caMeterDService.selectCaMeterDById(id));
     }
 
     /**
@@ -76,9 +78,9 @@ public class AdmEmsCaMeterDController extends BaseController
     @RequiresPermissions("ca-analysis:emission:add")
     @Log(title = "碳计量日", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody AdmEmsCaMeterD admEmsCaMeterD)
+    public AjaxResult add(@RequestBody CaMeterD caMeterD)
     {
-        return toAjax(admEmsCaMeterDService.insertAdmEmsCaMeterD(admEmsCaMeterD));
+        return toAjax(caMeterDService.insertCaMeterD(caMeterD));
     }
 
     /**
@@ -87,9 +89,9 @@ public class AdmEmsCaMeterDController extends BaseController
     @RequiresPermissions("ca-analysis:emission:edit")
     @Log(title = "碳计量日", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody AdmEmsCaMeterD admEmsCaMeterD)
+    public AjaxResult edit(@RequestBody CaMeterD caMeterD)
     {
-        return toAjax(admEmsCaMeterDService.updateAdmEmsCaMeterD(admEmsCaMeterD));
+        return toAjax(caMeterDService.updateCaMeterD(caMeterD));
     }
 
     /**
@@ -100,6 +102,6 @@ public class AdmEmsCaMeterDController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(admEmsCaMeterDService.deleteAdmEmsCaMeterDByIds(ids));
+        return toAjax(caMeterDService.deleteCaMeterDByIds(ids));
     }
 }

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

@@ -21,6 +21,8 @@ import com.ruoyi.ems.service.IDevcTypeService;
 import com.ruoyi.ems.service.IElecValencyTypeService;
 import com.ruoyi.ems.service.IEmsClsService;
 import com.ruoyi.ems.service.IEmsTagService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -40,6 +42,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/common")
+@Api(value = "CommonController", description = "公共数据接口")
 public class CommonController extends BaseController {
     @Autowired
     private IElecValencyTypeService valencyTypeService;
@@ -59,17 +62,19 @@ public class CommonController extends BaseController {
      * @return 分类列表
      */
     @GetMapping(value = "/elecvalency/type")
+    @ApiOperation(value = "getElecValencyType", notes = "维表-查询电价分类列表")
     public AjaxResult getElecValencyType() {
         List<ElecValencyType> types = valencyTypeService.selectElecValencyTypeList(new ElecValencyType());
         return success(types);
     }
 
     /**
-     * 电价分类
+     * 能源种类数
      *
-     * @return 分类列表
+     * @return 能源种类数
      */
     @GetMapping(value = "/emscls/tree")
+    @ApiOperation(value = "getEmsClsTree", notes = "树结构-查询能源种类树")
     public AjaxResult getEmsClsTree() {
         List<TreeEntity> types = emsClsService.selectEmsClsTreeList(new EmsCls());
         return success(types);
@@ -81,6 +86,7 @@ public class CommonController extends BaseController {
      * @return 分类列表
      */
     @GetMapping(value = "/devc/type")
+    @ApiOperation(value = "getDevcType", notes = "维表-查询能源设备种类列表")
     public AjaxResult getDevcType() {
         List<DevcType> types = devcTypeService.selectDevcTypeList(new DevcType());
         return success(types);
@@ -92,6 +98,7 @@ public class CommonController extends BaseController {
      * @return 标签列表
      */
     @GetMapping(value = "/emstag")
+    @ApiOperation(value = "getEmsTag", notes = "维表-查询标签列表")
     public AjaxResult getEmsTag(@RequestParam(name = "tagModel", required = false) String tagModel) {
         EmsTag param = new EmsTag();
         param.setTagModel(tagModel);

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

@@ -15,6 +15,7 @@ import com.ruoyi.ems.domain.vo.QueryDevice;
 import com.ruoyi.ems.service.IAreaBuildingService;
 import com.ruoyi.ems.service.IAreaBuildingZoningService;
 import com.ruoyi.ems.service.IEmsDeviceService;
+import io.swagger.annotations.Api;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +41,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/device")
+@Api(value = "DeviceController", description = "能源设备管理")
 public class DeviceController extends BaseController {
     @Autowired
     private IEmsDeviceService deviceService;

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.ElecEqptType;
 import com.ruoyi.ems.service.IElecEqptTypeService;
+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;
@@ -23,13 +24,14 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
- * 动力柜电器设备类型Controller
+ * 动力柜电气设备类型Controller
  * 
  * @author ruoyi
  * @date 2024-08-20
  */
 @RestController
 @RequestMapping("/elecEqpt/type")
+@Api(value = "ElecEqptTypeController", description = "维表-动力柜电气设备类型")
 public class ElecEqptTypeController extends BaseController
 {
     @Autowired

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

@@ -1,8 +1,9 @@
 package com.ruoyi.ems.controller;
 
 import java.util.List;
-import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,8 +16,8 @@ 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.AdmEmsElecExpendForecast;
-import com.ruoyi.ems.service.IAdmEmsElecExpendForecastService;
+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.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -30,20 +31,21 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/forecastConsume")
-public class AdmEmsElecExpendForecastController extends BaseController
+@Api(value = "ElecExpendForecastController", description = "电力消耗预测数据访问接口")
+public class ElecExpendForecastController extends BaseController
 {
     @Autowired
-    private IAdmEmsElecExpendForecastService admEmsElecExpendForecastService;
+    private IElecExpendForecastService elecExpendForecastService;
 
     /**
      * 查询电力消耗预测列表
      */
     @RequiresPermissions("prediction:consume:list")
     @GetMapping("/list")
-    public TableDataInfo list(AdmEmsElecExpendForecast admEmsElecExpendForecast)
+    public TableDataInfo list(ElecExpendForecast elecExpendForecast)
     {
         startPage();
-        List<AdmEmsElecExpendForecast> list = admEmsElecExpendForecastService.selectAdmEmsElecExpendForecastList(admEmsElecExpendForecast);
+        List<ElecExpendForecast> list = elecExpendForecastService.selectElecExpendForecastList(elecExpendForecast);
         return getDataTable(list);
     }
 
@@ -53,10 +55,10 @@ public class AdmEmsElecExpendForecastController extends BaseController
     @RequiresPermissions("prediction:consume:export")
     @Log(title = "电力消耗预测", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AdmEmsElecExpendForecast admEmsElecExpendForecast)
+    public void export(HttpServletResponse response, ElecExpendForecast elecExpendForecast)
     {
-        List<AdmEmsElecExpendForecast> list = admEmsElecExpendForecastService.selectAdmEmsElecExpendForecastList(admEmsElecExpendForecast);
-        ExcelUtil<AdmEmsElecExpendForecast> util = new ExcelUtil<AdmEmsElecExpendForecast>(AdmEmsElecExpendForecast.class);
+        List<ElecExpendForecast> list = elecExpendForecastService.selectElecExpendForecastList(elecExpendForecast);
+        ExcelUtil<ElecExpendForecast> util = new ExcelUtil<ElecExpendForecast>(ElecExpendForecast.class);
         util.exportExcel(response, list, "电力消耗预测数据");
     }
 
@@ -67,7 +69,7 @@ public class AdmEmsElecExpendForecastController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(admEmsElecExpendForecastService.selectAdmEmsElecExpendForecastById(id));
+        return success(elecExpendForecastService.selectElecExpendForecastById(id));
     }
 
     /**
@@ -76,9 +78,9 @@ public class AdmEmsElecExpendForecastController extends BaseController
     @RequiresPermissions("prediction:consume:add")
     @Log(title = "电力消耗预测", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody AdmEmsElecExpendForecast admEmsElecExpendForecast)
+    public AjaxResult add(@RequestBody ElecExpendForecast elecExpendForecast)
     {
-        return toAjax(admEmsElecExpendForecastService.insertAdmEmsElecExpendForecast(admEmsElecExpendForecast));
+        return toAjax(elecExpendForecastService.insertElecExpendForecast(elecExpendForecast));
     }
 
     /**
@@ -87,9 +89,9 @@ public class AdmEmsElecExpendForecastController extends BaseController
     @RequiresPermissions("prediction:consume:edit")
     @Log(title = "电力消耗预测", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody AdmEmsElecExpendForecast admEmsElecExpendForecast)
+    public AjaxResult edit(@RequestBody ElecExpendForecast elecExpendForecast)
     {
-        return toAjax(admEmsElecExpendForecastService.updateAdmEmsElecExpendForecast(admEmsElecExpendForecast));
+        return toAjax(elecExpendForecastService.updateElecExpendForecast(elecExpendForecast));
     }
 
     /**
@@ -100,6 +102,6 @@ public class AdmEmsElecExpendForecastController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(admEmsElecExpendForecastService.deleteAdmEmsElecExpendForecastByIds(ids));
+        return toAjax(elecExpendForecastService.deleteElecExpendForecastByIds(ids));
     }
 }

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

@@ -1,8 +1,9 @@
 package com.ruoyi.ems.controller;
 
 import java.util.List;
-import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,8 +16,8 @@ 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.AdmEmsElecLoadIndex;
-import com.ruoyi.ems.service.IAdmEmsElecLoadIndexService;
+import com.ruoyi.ems.domain.ElecLoadIndex;
+import com.ruoyi.ems.service.IElecLoadIndexService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -30,20 +31,21 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/loadIndex")
-public class AdmEmsElecLoadIndexController extends BaseController
+@Api(value = "ElecLoadIndexController", description = "电力负荷设施指标数据接口")
+public class ElecLoadIndexController extends BaseController
 {
     @Autowired
-    private IAdmEmsElecLoadIndexService admEmsElecLoadIndexService;
+    private IElecLoadIndexService emsElecLoadIndexService;
 
     /**
      * 查询电力负荷设施指标列表
      */
     @RequiresPermissions("ems:loadIndex:list")
     @GetMapping("/list")
-    public TableDataInfo list(AdmEmsElecLoadIndex admEmsElecLoadIndex)
+    public TableDataInfo list(ElecLoadIndex admEmsElecLoadIndex)
     {
         startPage();
-        List<AdmEmsElecLoadIndex> list = admEmsElecLoadIndexService.selectAdmEmsElecLoadIndexList(admEmsElecLoadIndex);
+        List<ElecLoadIndex> list = emsElecLoadIndexService.selectElecLoadIndexList(admEmsElecLoadIndex);
         return getDataTable(list);
     }
 
@@ -53,10 +55,10 @@ public class AdmEmsElecLoadIndexController extends BaseController
     @RequiresPermissions("ems:loadIndex:export")
     @Log(title = "电力负荷设施指标", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AdmEmsElecLoadIndex admEmsElecLoadIndex)
+    public void export(HttpServletResponse response, ElecLoadIndex admEmsElecLoadIndex)
     {
-        List<AdmEmsElecLoadIndex> list = admEmsElecLoadIndexService.selectAdmEmsElecLoadIndexList(admEmsElecLoadIndex);
-        ExcelUtil<AdmEmsElecLoadIndex> util = new ExcelUtil<AdmEmsElecLoadIndex>(AdmEmsElecLoadIndex.class);
+        List<ElecLoadIndex> list = emsElecLoadIndexService.selectElecLoadIndexList(admEmsElecLoadIndex);
+        ExcelUtil<ElecLoadIndex> util = new ExcelUtil<ElecLoadIndex>(ElecLoadIndex.class);
         util.exportExcel(response, list, "电力负荷设施指标数据");
     }
 
@@ -67,7 +69,7 @@ public class AdmEmsElecLoadIndexController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(admEmsElecLoadIndexService.selectAdmEmsElecLoadIndexById(id));
+        return success(emsElecLoadIndexService.selectElecLoadIndexById(id));
     }
 
     /**
@@ -76,9 +78,9 @@ public class AdmEmsElecLoadIndexController extends BaseController
     @RequiresPermissions("ems:loadIndex:add")
     @Log(title = "电力负荷设施指标", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody AdmEmsElecLoadIndex admEmsElecLoadIndex)
+    public AjaxResult add(@RequestBody ElecLoadIndex admEmsElecLoadIndex)
     {
-        return toAjax(admEmsElecLoadIndexService.insertAdmEmsElecLoadIndex(admEmsElecLoadIndex));
+        return toAjax(emsElecLoadIndexService.insertElecLoadIndex(admEmsElecLoadIndex));
     }
 
     /**
@@ -87,9 +89,9 @@ public class AdmEmsElecLoadIndexController extends BaseController
     @RequiresPermissions("ems:loadIndex:edit")
     @Log(title = "电力负荷设施指标", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody AdmEmsElecLoadIndex admEmsElecLoadIndex)
+    public AjaxResult edit(@RequestBody ElecLoadIndex admEmsElecLoadIndex)
     {
-        return toAjax(admEmsElecLoadIndexService.updateAdmEmsElecLoadIndex(admEmsElecLoadIndex));
+        return toAjax(emsElecLoadIndexService.updateElecLoadIndex(admEmsElecLoadIndex));
     }
 
     /**
@@ -100,6 +102,6 @@ public class AdmEmsElecLoadIndexController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(admEmsElecLoadIndexService.deleteAdmEmsElecLoadIndexByIds(ids));
+        return toAjax(emsElecLoadIndexService.deleteElecLoadIndexByIds(ids));
     }
 }

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

@@ -2,6 +2,8 @@ package com.ruoyi.ems.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,8 +16,8 @@ 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.EmsPgSupplyH;
-import com.ruoyi.ems.service.IEmsPgSupplyHService;
+import com.ruoyi.ems.domain.ElecPgSupplyH;
+import com.ruoyi.ems.service.IElecPgSupplyHService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -29,20 +31,21 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pg/supply/hour")
-public class EmsPgSupplyHController extends BaseController
+@Api(value = "ElecPgSupplyHController", description = "电网供应计量")
+public class ElecPgSupplyHController extends BaseController
 {
     @Autowired
-    private IEmsPgSupplyHService emsPgSupplyHService;
+    private IElecPgSupplyHService pgSupplyHService;
 
     /**
      * 查询电网供应计量-小时列表
      */
     @RequiresPermissions("power-mgr:pg:list")
     @GetMapping("/list")
-    public TableDataInfo list(EmsPgSupplyH admEmsPgSupplyH)
+    public TableDataInfo list(ElecPgSupplyH admEmsPgSupplyH)
     {
         startPage();
-        List<EmsPgSupplyH> list = emsPgSupplyHService.selectEmsPgSupplyHList(admEmsPgSupplyH);
+        List<ElecPgSupplyH> list = pgSupplyHService.selectPgSupplyHList(admEmsPgSupplyH);
         return getDataTable(list);
     }
 
@@ -52,10 +55,10 @@ public class EmsPgSupplyHController extends BaseController
     @RequiresPermissions("power-mgr:pg:export")
     @Log(title = "电网供应计量-小时", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, EmsPgSupplyH admEmsPgSupplyH)
+    public void export(HttpServletResponse response, ElecPgSupplyH admEmsPgSupplyH)
     {
-        List<EmsPgSupplyH> list = emsPgSupplyHService.selectEmsPgSupplyHList(admEmsPgSupplyH);
-        ExcelUtil<EmsPgSupplyH> util = new ExcelUtil<EmsPgSupplyH>(EmsPgSupplyH.class);
+        List<ElecPgSupplyH> list = pgSupplyHService.selectPgSupplyHList(admEmsPgSupplyH);
+        ExcelUtil<ElecPgSupplyH> util = new ExcelUtil<ElecPgSupplyH>(ElecPgSupplyH.class);
         util.exportExcel(response, list, "电网供应计量-小时数据");
     }
 
@@ -66,7 +69,7 @@ public class EmsPgSupplyHController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(emsPgSupplyHService.selectEmsPgSupplyHById(id));
+        return success(pgSupplyHService.selectPgSupplyHById(id));
     }
 
     /**
@@ -75,9 +78,9 @@ public class EmsPgSupplyHController extends BaseController
     @RequiresPermissions("power-mgr:pg:add")
     @Log(title = "电网供应计量-小时", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody EmsPgSupplyH admEmsPgSupplyH)
+    public AjaxResult add(@RequestBody ElecPgSupplyH admEmsPgSupplyH)
     {
-        return toAjax(emsPgSupplyHService.insertEmsPgSupplyH(admEmsPgSupplyH));
+        return toAjax(pgSupplyHService.insertPgSupplyH(admEmsPgSupplyH));
     }
 
     /**
@@ -86,9 +89,9 @@ public class EmsPgSupplyHController extends BaseController
     @RequiresPermissions("power-mgr:pg:edit")
     @Log(title = "电网供应计量-小时", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody EmsPgSupplyH admEmsPgSupplyH)
+    public AjaxResult edit(@RequestBody ElecPgSupplyH admEmsPgSupplyH)
     {
-        return toAjax(emsPgSupplyHService.updateEmsPgSupplyH(admEmsPgSupplyH));
+        return toAjax(pgSupplyHService.updatePgSupplyH(admEmsPgSupplyH));
     }
 
     /**
@@ -99,6 +102,6 @@ public class EmsPgSupplyHController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(emsPgSupplyHService.deleteEmsPgSupplyHByIds(ids));
+        return toAjax(pgSupplyHService.deletePgSupplyHByIds(ids));
     }
 }

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

@@ -1,8 +1,9 @@
 package com.ruoyi.ems.controller;
 
 import java.util.List;
-import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,8 +16,8 @@ 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.AdmEmsElecProdForecast;
-import com.ruoyi.ems.service.IAdmEmsElecProdForecastService;
+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;
@@ -30,20 +31,21 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/predictionProd")
-public class AdmEmsElecProdForecastController extends BaseController
+@Api(value = "ElecProdForecastController", description = "电力产能预测数据接口")
+public class ElecProdForecastController extends BaseController
 {
     @Autowired
-    private IAdmEmsElecProdForecastService admEmsElecProdForecastService;
+    private IElecProdForecastService elecProdForecastService;
 
     /**
      * 查询电力产能预测列表
      */
     @RequiresPermissions("prediction:prod:list")
     @GetMapping("/list")
-    public TableDataInfo list(AdmEmsElecProdForecast admEmsElecProdForecast)
+    public TableDataInfo list(ElecProdForecast elecProdForecast)
     {
         startPage();
-        List<AdmEmsElecProdForecast> list = admEmsElecProdForecastService.selectAdmEmsElecProdForecastList(admEmsElecProdForecast);
+        List<ElecProdForecast> list = elecProdForecastService.selectElecProdForecastList(elecProdForecast);
         return getDataTable(list);
     }
 
@@ -53,10 +55,10 @@ public class AdmEmsElecProdForecastController extends BaseController
     @RequiresPermissions("prediction:prod:export")
     @Log(title = "电力产能预测", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AdmEmsElecProdForecast admEmsElecProdForecast)
+    public void export(HttpServletResponse response, ElecProdForecast elecProdForecast)
     {
-        List<AdmEmsElecProdForecast> list = admEmsElecProdForecastService.selectAdmEmsElecProdForecastList(admEmsElecProdForecast);
-        ExcelUtil<AdmEmsElecProdForecast> util = new ExcelUtil<AdmEmsElecProdForecast>(AdmEmsElecProdForecast.class);
+        List<ElecProdForecast> list = elecProdForecastService.selectElecProdForecastList(elecProdForecast);
+        ExcelUtil<ElecProdForecast> util = new ExcelUtil<ElecProdForecast>(ElecProdForecast.class);
         util.exportExcel(response, list, "电力产能预测数据");
     }
 
@@ -67,7 +69,7 @@ public class AdmEmsElecProdForecastController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(admEmsElecProdForecastService.selectAdmEmsElecProdForecastById(id));
+        return success(elecProdForecastService.selectElecProdForecastById(id));
     }
 
     /**
@@ -76,9 +78,9 @@ public class AdmEmsElecProdForecastController extends BaseController
     @RequiresPermissions("prediction:prod:add")
     @Log(title = "电力产能预测", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody AdmEmsElecProdForecast admEmsElecProdForecast)
+    public AjaxResult add(@RequestBody ElecProdForecast elecProdForecast)
     {
-        return toAjax(admEmsElecProdForecastService.insertAdmEmsElecProdForecast(admEmsElecProdForecast));
+        return toAjax(elecProdForecastService.insertElecProdForecast(elecProdForecast));
     }
 
     /**
@@ -87,9 +89,9 @@ public class AdmEmsElecProdForecastController extends BaseController
     @RequiresPermissions("prediction:prod:edit")
     @Log(title = "电力产能预测", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody AdmEmsElecProdForecast admEmsElecProdForecast)
+    public AjaxResult edit(@RequestBody ElecProdForecast elecProdForecast)
     {
-        return toAjax(admEmsElecProdForecastService.updateAdmEmsElecProdForecast(admEmsElecProdForecast));
+        return toAjax(elecProdForecastService.updateElecProdForecast(elecProdForecast));
     }
 
     /**
@@ -100,6 +102,6 @@ public class AdmEmsElecProdForecastController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(admEmsElecProdForecastService.deleteAdmEmsElecProdForecastByIds(ids));
+        return toAjax(elecProdForecastService.deleteElecProdForecastByIds(ids));
     }
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/EmsElecStoreHController.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/ElecStoreHController.java

@@ -2,6 +2,8 @@ package com.ruoyi.ems.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,8 +16,8 @@ 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.EmsElecStoreH;
-import com.ruoyi.ems.service.IEmsElecStoreHService;
+import com.ruoyi.ems.domain.ElecStoreH;
+import com.ruoyi.ems.service.IElecStoreHService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -29,20 +31,21 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/elec/store/hour")
-public class EmsElecStoreHController extends BaseController
+@Api(value = "ElecStoreHController", description = "能计量-小时数据接口")
+public class ElecStoreHController extends BaseController
 {
     @Autowired
-    private IEmsElecStoreHService admEmsElecStoreHService;
+    private IElecStoreHService elecStoreHService;
 
     /**
      * 查询储能计量-小时列表
      */
     @RequiresPermissions("power-mgr:gs:list")
     @GetMapping("/list")
-    public TableDataInfo list(EmsElecStoreH admEmsElecStoreH)
+    public TableDataInfo list(ElecStoreH admEmsElecStoreH)
     {
         startPage();
-        List<EmsElecStoreH> list = admEmsElecStoreHService.selectEmsElecStoreHList(admEmsElecStoreH);
+        List<ElecStoreH> list = elecStoreHService.selectElecStoreHList(admEmsElecStoreH);
         return getDataTable(list);
     }
 
@@ -52,10 +55,10 @@ public class EmsElecStoreHController extends BaseController
     @RequiresPermissions("power-mgr:gs:export")
     @Log(title = "储能计量-小时", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, EmsElecStoreH admEmsElecStoreH)
+    public void export(HttpServletResponse response, ElecStoreH admEmsElecStoreH)
     {
-        List<EmsElecStoreH> list = admEmsElecStoreHService.selectEmsElecStoreHList(admEmsElecStoreH);
-        ExcelUtil<EmsElecStoreH> util = new ExcelUtil<EmsElecStoreH>(EmsElecStoreH.class);
+        List<ElecStoreH> list = elecStoreHService.selectElecStoreHList(admEmsElecStoreH);
+        ExcelUtil<ElecStoreH> util = new ExcelUtil<ElecStoreH>(ElecStoreH.class);
         util.exportExcel(response, list, "储能计量-小时数据");
     }
 
@@ -66,7 +69,7 @@ public class EmsElecStoreHController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(admEmsElecStoreHService.selectEmsElecStoreHById(id));
+        return success(elecStoreHService.selectElecStoreHById(id));
     }
 
     /**
@@ -75,9 +78,9 @@ public class EmsElecStoreHController extends BaseController
     @RequiresPermissions("power-mgr:gs:add")
     @Log(title = "储能计量-小时", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody EmsElecStoreH admEmsElecStoreH)
+    public AjaxResult add(@RequestBody ElecStoreH admEmsElecStoreH)
     {
-        return toAjax(admEmsElecStoreHService.insertEmsElecStoreH(admEmsElecStoreH));
+        return toAjax(elecStoreHService.insertElecStoreH(admEmsElecStoreH));
     }
 
     /**
@@ -86,9 +89,9 @@ public class EmsElecStoreHController extends BaseController
     @RequiresPermissions("power-mgr:gs:edit")
     @Log(title = "储能计量-小时", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody EmsElecStoreH admEmsElecStoreH)
+    public AjaxResult edit(@RequestBody ElecStoreH admEmsElecStoreH)
     {
-        return toAjax(admEmsElecStoreHService.updateEmsElecStoreH(admEmsElecStoreH));
+        return toAjax(elecStoreHService.updateElecStoreH(admEmsElecStoreH));
     }
 
     /**
@@ -99,6 +102,6 @@ public class EmsElecStoreHController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(admEmsElecStoreHService.deleteEmsElecStoreHByIds(ids));
+        return toAjax(elecStoreHService.deleteElecStoreHByIds(ids));
     }
 }

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

@@ -7,8 +7,9 @@ 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.EmsFacsUseH;
-import com.ruoyi.ems.service.IEmsFacsUseHService;
+import com.ruoyi.ems.domain.ElecUseH;
+import com.ruoyi.ems.service.IElecUseHService;
+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;
@@ -30,20 +31,21 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/elec/use/hour")
-public class EmsFacsUseHController extends BaseController
+@Api(value = "ElecUseHController", description = "用电计量数据接口")
+public class ElecUseHController extends BaseController
 {
     @Autowired
-    private IEmsFacsUseHService emsFacsUseHService;
+    private IElecUseHService elecUseHService;
 
     /**
      * 查询用能计量-小时列表
      */
     @RequiresPermissions("ems:h:list")
     @GetMapping("/list")
-    public TableDataInfo list(EmsFacsUseH admEmsFacsUseH)
+    public TableDataInfo list(ElecUseH admEmsFacsUseH)
     {
         startPage();
-        List<EmsFacsUseH> list = emsFacsUseHService.selectEmsFacsUseHList(admEmsFacsUseH);
+        List<ElecUseH> list = elecUseHService.selectElecUseHList(admEmsFacsUseH);
         return getDataTable(list);
     }
 
@@ -53,10 +55,10 @@ public class EmsFacsUseHController extends BaseController
     @RequiresPermissions("ems:h:export")
     @Log(title = "用能计量-小时", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, EmsFacsUseH admEmsFacsUseH)
+    public void export(HttpServletResponse response, ElecUseH admEmsFacsUseH)
     {
-        List<EmsFacsUseH> list = emsFacsUseHService.selectEmsFacsUseHList(admEmsFacsUseH);
-        ExcelUtil<EmsFacsUseH> util = new ExcelUtil<EmsFacsUseH>(EmsFacsUseH.class);
+        List<ElecUseH> list = elecUseHService.selectElecUseHList(admEmsFacsUseH);
+        ExcelUtil<ElecUseH> util = new ExcelUtil<ElecUseH>(ElecUseH.class);
         util.exportExcel(response, list, "用能计量-小时数据");
     }
 
@@ -67,7 +69,7 @@ public class EmsFacsUseHController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(emsFacsUseHService.selectEmsFacsUseHById(id));
+        return success(elecUseHService.selectElecUseHById(id));
     }
 
     /**
@@ -76,9 +78,9 @@ public class EmsFacsUseHController extends BaseController
     @RequiresPermissions("ems:h:add")
     @Log(title = "用能计量-小时", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody EmsFacsUseH admEmsFacsUseH)
+    public AjaxResult add(@RequestBody ElecUseH admEmsFacsUseH)
     {
-        return toAjax(emsFacsUseHService.insertEmsFacsUseH(admEmsFacsUseH));
+        return toAjax(elecUseHService.insertElecUseH(admEmsFacsUseH));
     }
 
     /**
@@ -87,9 +89,9 @@ public class EmsFacsUseHController extends BaseController
     @RequiresPermissions("ems:h:edit")
     @Log(title = "用能计量-小时", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody EmsFacsUseH admEmsFacsUseH)
+    public AjaxResult edit(@RequestBody ElecUseH admEmsFacsUseH)
     {
-        return toAjax(emsFacsUseHService.updateEmsFacsUseH(admEmsFacsUseH));
+        return toAjax(elecUseHService.updateElecUseH(admEmsFacsUseH));
     }
 
     /**
@@ -100,6 +102,6 @@ public class EmsFacsUseHController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(emsFacsUseHService.deleteEmsFacsUseHByIds(ids));
+        return toAjax(elecUseHService.deleteElecUseHByIds(ids));
     }
 }

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.ElecValencyConfig;
 import com.ruoyi.ems.service.IElecValencyConfigService;
+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;
@@ -30,6 +31,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/basecfg/elecvalency")
+@Api(value = "ElecValencyController", description = "国网电价管理")
 public class ElecValencyController extends BaseController {
     @Autowired
     private IElecValencyConfigService configService;

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

@@ -9,7 +9,7 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.AreaElectricityAttr;
 import com.ruoyi.ems.service.IAreaElectricityAttrService;
-import com.ruoyi.ems.service.IElecValencyConfigService;
+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;
@@ -31,6 +31,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/basecfg/electricity")
+@Api(value = "ElectricityController", description = "国网电价策略管理")
 public class ElectricityController extends BaseController {
     /**
      * 用电属性服务
@@ -38,9 +39,6 @@ public class ElectricityController extends BaseController {
     @Autowired
     private IAreaElectricityAttrService attrService;
 
-    @Autowired
-    private IElecValencyConfigService configService;
-
     /**
      * 查询服务区用电属性列表
      */

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.EmsTag;
 import com.ruoyi.ems.service.IEmsTagService;
+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;
@@ -30,6 +31,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/tag")
+@Api(value = "EmsTagController", description = "标签管理管理")
 public class EmsTagController extends BaseController
 {
     @Autowired

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

@@ -10,6 +10,7 @@ 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,6 +33,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/basecfg/emsfacs")
+@Api(value = "FacsTypeController", description = "能源设施管理")
 public class FacsController extends BaseController
 {
     @Autowired

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.EmsFacsFlowRel;
 import com.ruoyi.ems.service.IEmsFacsFlowRelService;
+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;
@@ -30,6 +31,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/basecfg/flowrel")
+@Api(value = "FacsFlowRelController", description = "能流关系管理")
 public class FacsFlowRelController extends BaseController
 {
     @Autowired

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.EmsFacsType;
 import com.ruoyi.ems.service.IEmsFacsTypeService;
+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;
@@ -30,6 +31,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/basecfg/facstype")
+@Api(value = "FacsTypeController", description = "设施分类管理")
 public class FacsTypeController extends BaseController
 {
     @Autowired

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.MeterDevice;
 import com.ruoyi.ems.service.IMeterDeviceService;
+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;
@@ -30,6 +31,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/meterDevice")
+@Api(value = "MeterDeviceController", description = "计量设备管理")
 public class MeterDeviceController extends BaseController {
     @Autowired
     private IMeterDeviceService meterDeviceService;

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/AdmOpEnergyStrategyController.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/OpEnergyStrategyController.java

@@ -1,8 +1,9 @@
 package com.ruoyi.ems.controller;
 
 import java.util.List;
-import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,8 +16,8 @@ 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.AdmOpEnergyStrategy;
-import com.ruoyi.ems.service.IAdmOpEnergyStrategyService;
+import com.ruoyi.ems.domain.OpEnergyStrategy;
+import com.ruoyi.ems.service.IOpEnergyStrategyService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -30,20 +31,21 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/energyStrategy")
-public class AdmOpEnergyStrategyController extends BaseController
+@Api(value = "OpEnergyStrategyController", description = "能源策略管理接口")
+public class OpEnergyStrategyController extends BaseController
 {
     @Autowired
-    private IAdmOpEnergyStrategyService admOpEnergyStrategyService;
+    private IOpEnergyStrategyService admOpEnergyStrategyService;
 
     /**
      * 查询能源策略列表
      */
     @RequiresPermissions("power-mgr:strategy:list")
     @GetMapping("/list")
-    public TableDataInfo list(AdmOpEnergyStrategy admOpEnergyStrategy)
+    public TableDataInfo list(OpEnergyStrategy admOpEnergyStrategy)
     {
         startPage();
-        List<AdmOpEnergyStrategy> list = admOpEnergyStrategyService.selectAdmOpEnergyStrategyList(admOpEnergyStrategy);
+        List<OpEnergyStrategy> list = admOpEnergyStrategyService.selectOpEnergyStrategyList(admOpEnergyStrategy);
         return getDataTable(list);
     }
 
@@ -53,10 +55,10 @@ public class AdmOpEnergyStrategyController extends BaseController
     @RequiresPermissions("power-mgr:strategy:export")
     @Log(title = "能源策略", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AdmOpEnergyStrategy admOpEnergyStrategy)
+    public void export(HttpServletResponse response, OpEnergyStrategy admOpEnergyStrategy)
     {
-        List<AdmOpEnergyStrategy> list = admOpEnergyStrategyService.selectAdmOpEnergyStrategyList(admOpEnergyStrategy);
-        ExcelUtil<AdmOpEnergyStrategy> util = new ExcelUtil<AdmOpEnergyStrategy>(AdmOpEnergyStrategy.class);
+        List<OpEnergyStrategy> list = admOpEnergyStrategyService.selectOpEnergyStrategyList(admOpEnergyStrategy);
+        ExcelUtil<OpEnergyStrategy> util = new ExcelUtil<OpEnergyStrategy>(OpEnergyStrategy.class);
         util.exportExcel(response, list, "能源策略数据");
     }
 
@@ -67,7 +69,7 @@ public class AdmOpEnergyStrategyController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(admOpEnergyStrategyService.selectAdmOpEnergyStrategyById(id));
+        return success(admOpEnergyStrategyService.selectOpEnergyStrategyById(id));
     }
 
     /**
@@ -76,9 +78,9 @@ public class AdmOpEnergyStrategyController extends BaseController
     @RequiresPermissions("power-mgr:strategy:add")
     @Log(title = "能源策略", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody AdmOpEnergyStrategy admOpEnergyStrategy)
+    public AjaxResult add(@RequestBody OpEnergyStrategy admOpEnergyStrategy)
     {
-        return toAjax(admOpEnergyStrategyService.insertAdmOpEnergyStrategy(admOpEnergyStrategy));
+        return toAjax(admOpEnergyStrategyService.insertOpEnergyStrategy(admOpEnergyStrategy));
     }
 
     /**
@@ -87,9 +89,9 @@ public class AdmOpEnergyStrategyController extends BaseController
     @RequiresPermissions("power-mgr:strategy:edit")
     @Log(title = "能源策略", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody AdmOpEnergyStrategy admOpEnergyStrategy)
+    public AjaxResult edit(@RequestBody OpEnergyStrategy admOpEnergyStrategy)
     {
-        return toAjax(admOpEnergyStrategyService.updateAdmOpEnergyStrategy(admOpEnergyStrategy));
+        return toAjax(admOpEnergyStrategyService.updateOpEnergyStrategy(admOpEnergyStrategy));
     }
 
     /**
@@ -100,6 +102,6 @@ public class AdmOpEnergyStrategyController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(admOpEnergyStrategyService.deleteAdmOpEnergyStrategyByIds(ids));
+        return toAjax(admOpEnergyStrategyService.deleteOpEnergyStrategyByIds(ids));
     }
 }

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.PowerBox;
 import com.ruoyi.ems.service.IPowerBoxService;
+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;
@@ -30,6 +31,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/powerBox")
+@Api(value = "PowerBoxController", description = "动力箱/配电箱管理")
 public class PowerBoxController extends BaseController
 {
     @Autowired

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

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.ems.domain.PowerBoxElecEqpt;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,6 +31,7 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/powerBox/elecEqpt")
+@Api(value = "PowerBoxElecEqptController", description = "动力箱配电元器件管理")
 public class PowerBoxElecEqptController extends BaseController
 {
     @Autowired

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.ElecPvPriceConfig;
 import com.ruoyi.ems.service.IPvPriceConfigService;
+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;
@@ -30,6 +31,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/basecfg/pvprice")
+@Api(value = "PvPriceConfigController", description = "光伏电价管理")
 public class PvPriceConfigController extends BaseController
 {
     @Autowired

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/AdmEmsPvSupplyHController.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/PvSupplyHController.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
 
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,49 +18,50 @@ 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;
-import com.ruoyi.ems.domain.AdmEmsPvSupplyH;
-import com.ruoyi.ems.service.IAdmEmsPvSupplyHService;
+import com.ruoyi.ems.domain.PvSupplyH;
+import com.ruoyi.ems.service.IPvSupplyHService;
 
 /**
- * 光伏并网计量光伏并网计量-小时Controller
+ * 光伏并网计量-小时Controller
  *
  * @author ruoyi
  * @date 2024-08-02
  */
 @RestController
 @RequestMapping("/prod")
-public class AdmEmsPvSupplyHController extends BaseController {
+@Api(value = "PvSupplyHController", description = "光伏并网计量数据接口")
+public class PvSupplyHController extends BaseController {
     @Autowired
-    private IAdmEmsPvSupplyHService admEmsPvSupplyHService;
+    private IPvSupplyHService admEmsPvSupplyHService;
     /**
      * 查询光伏并网计量光伏并网计量-小时列表
      */
     @RequiresPermissions("ems:prod:list")
     @GetMapping("/list")
-    public AjaxResult list(AdmEmsPvSupplyH admEmsPvSupplyH) {
-        List<AdmEmsPvSupplyH> list = admEmsPvSupplyHService.selectAdmEmsPvSupplyHList(admEmsPvSupplyH);
+    public AjaxResult list(PvSupplyH admEmsPvSupplyH) {
+        List<PvSupplyH> list = admEmsPvSupplyHService.selectPvSupplyHList(admEmsPvSupplyH);
         return success(list);
     }
 
     @RequiresPermissions("ems:prod:list")
     @GetMapping("/list/prod/this/day/index")
-    public AjaxResult listProdIndex(AdmEmsPvSupplyH admEmsPvSupplyH) {
+    public AjaxResult listProdIndex(PvSupplyH admEmsPvSupplyH) {
         admEmsPvSupplyH.setDate(DateUtils.getNowDate());
-        List<AdmEmsPvSupplyH> list = admEmsPvSupplyHService.selectAreaSupplyH(admEmsPvSupplyH);
+        List<PvSupplyH> list = admEmsPvSupplyHService.selectAreaSupplyH(admEmsPvSupplyH);
         return success(list);
     }
 
     @RequiresPermissions("ems:prod:list")
     @GetMapping("/list/prod/this/month/index")
-    public AjaxResult listProdMonthIndex(AdmEmsPvSupplyH admEmsPvSupplyH) {
-        List<AdmEmsPvSupplyH> list = admEmsPvSupplyHService.selectAreaSupplyH(admEmsPvSupplyH);
+    public AjaxResult listProdMonthIndex(PvSupplyH admEmsPvSupplyH) {
+        List<PvSupplyH> list = admEmsPvSupplyHService.selectAreaSupplyH(admEmsPvSupplyH);
         return success(list);
     }
 
     @RequiresPermissions("ems:prod:list")
     @GetMapping("/list/prod/this/year/index")
-    public AjaxResult listProdYearIndex(AdmEmsPvSupplyH admEmsPvSupplyH) {
-        List<AdmEmsPvSupplyH> list = admEmsPvSupplyHService.selectAreaSupplyH(admEmsPvSupplyH);
+    public AjaxResult listProdYearIndex(PvSupplyH admEmsPvSupplyH) {
+        List<PvSupplyH> list = admEmsPvSupplyHService.selectAreaSupplyH(admEmsPvSupplyH);
         return success(list);
     }
 
@@ -69,9 +71,9 @@ public class AdmEmsPvSupplyHController extends BaseController {
     @RequiresPermissions("ems:prod:export")
     @Log(title = "光伏并网计量光伏并网计量-小时", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AdmEmsPvSupplyH admEmsPvSupplyH) {
-        List<AdmEmsPvSupplyH> list = admEmsPvSupplyHService.selectAdmEmsPvSupplyHList(admEmsPvSupplyH);
-        ExcelUtil<AdmEmsPvSupplyH> util = new ExcelUtil<AdmEmsPvSupplyH>(AdmEmsPvSupplyH.class);
+    public void export(HttpServletResponse response, PvSupplyH admEmsPvSupplyH) {
+        List<PvSupplyH> list = admEmsPvSupplyHService.selectPvSupplyHList(admEmsPvSupplyH);
+        ExcelUtil<PvSupplyH> util = new ExcelUtil<PvSupplyH>(PvSupplyH.class);
         util.exportExcel(response, list, "光伏并网计量光伏并网计量-小时数据");
     }
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AdmEmsCaEmissionForecast.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/CaEmissionForecast.java

@@ -13,7 +13,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-08-12
  */
-public class AdmEmsCaEmissionForecast extends BaseEntity
+public class CaEmissionForecast extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AdmEmsCaMeterD.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/CaMeterD.java

@@ -13,7 +13,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-08-12
  */
-public class AdmEmsCaMeterD extends BaseEntity
+public class CaMeterD extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AdmEmsElecExpendForecast.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/ElecExpendForecast.java

@@ -13,7 +13,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-08-12
  */
-public class AdmEmsElecExpendForecast extends BaseEntity
+public class ElecExpendForecast extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AdmEmsElecLoadIndex.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/ElecLoadIndex.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-08-09
  */
-public class AdmEmsElecLoadIndex extends BaseEntity {
+public class ElecLoadIndex extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/EmsPgSupplyH.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/ElecPgSupplyH.java

@@ -14,7 +14,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-08-09
  */
-public class EmsPgSupplyH extends BaseEntity
+public class ElecPgSupplyH extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AdmEmsElecProdForecast.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/ElecProdForecast.java

@@ -13,7 +13,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-08-12
  */
-public class AdmEmsElecProdForecast extends BaseEntity
+public class ElecProdForecast extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/EmsElecStoreH.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/ElecStoreH.java

@@ -16,7 +16,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-08-09
  */
-public class EmsElecStoreH extends BaseEntity {
+public class ElecStoreH extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/EmsFacsUseH.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/ElecUseH.java

@@ -14,7 +14,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-08-15
  */
-public class EmsFacsUseH extends BaseEntity
+public class ElecUseH extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/EmsFacs.java

@@ -58,7 +58,7 @@ public class EmsFacs extends BaseEntity
     private String manufacturer;
 
     /** 扩展属性 */
-    private transient List<EmsFacsAttr> facsAttrs;
+    private List<EmsFacsAttr> facsAttrs;
 
     public void setId(Long id) 
     {

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AdmOpEnergyStrategy.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/OpEnergyStrategy.java

@@ -11,7 +11,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-08-08
  */
-public class AdmOpEnergyStrategy extends BaseEntity
+public class OpEnergyStrategy extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AdmEmsPvSupplyH.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/PvSupplyH.java

@@ -11,12 +11,12 @@ import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 
 /**
- * 光伏并网计量光伏并网计量-小时对象 adm_ems_pv_supply_h
+ * 光伏并网计量-小时对象 adm_ems_pv_supply_h
  *
  * @author ruoyi
  * @date 2024-08-02
  */
-public class AdmEmsPvSupplyH extends BaseEntity {
+public class PvSupplyH extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/AdmEmsElecExpendForecastMapper.java

@@ -1,61 +0,0 @@
-package com.ruoyi.ems.mapper;
-
-import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsElecExpendForecast;
-
-/**
- * 电力消耗预测Mapper接口
- * 
- * @author ruoyi
- * @date 2024-08-12
- */
-public interface AdmEmsElecExpendForecastMapper 
-{
-    /**
-     * 查询电力消耗预测
-     * 
-     * @param id 电力消耗预测主键
-     * @return 电力消耗预测
-     */
-    public AdmEmsElecExpendForecast selectAdmEmsElecExpendForecastById(Long id);
-
-    /**
-     * 查询电力消耗预测列表
-     * 
-     * @param admEmsElecExpendForecast 电力消耗预测
-     * @return 电力消耗预测集合
-     */
-    public List<AdmEmsElecExpendForecast> selectAdmEmsElecExpendForecastList(AdmEmsElecExpendForecast admEmsElecExpendForecast);
-
-    /**
-     * 新增电力消耗预测
-     * 
-     * @param admEmsElecExpendForecast 电力消耗预测
-     * @return 结果
-     */
-    public int insertAdmEmsElecExpendForecast(AdmEmsElecExpendForecast admEmsElecExpendForecast);
-
-    /**
-     * 修改电力消耗预测
-     * 
-     * @param admEmsElecExpendForecast 电力消耗预测
-     * @return 结果
-     */
-    public int updateAdmEmsElecExpendForecast(AdmEmsElecExpendForecast admEmsElecExpendForecast);
-
-    /**
-     * 删除电力消耗预测
-     * 
-     * @param id 电力消耗预测主键
-     * @return 结果
-     */
-    public int deleteAdmEmsElecExpendForecastById(Long id);
-
-    /**
-     * 批量删除电力消耗预测
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteAdmEmsElecExpendForecastByIds(Long[] ids);
-}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/AdmEmsCaEmissionForecastMapper.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/CaEmissionForecastMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.mapper;
 
 import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsCaEmissionForecast;
+import com.ruoyi.ems.domain.CaEmissionForecast;
 
 /**
  * 碳排放预测Mapper接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.AdmEmsCaEmissionForecast;
  * @author ruoyi
  * @date 2024-08-12
  */
-public interface AdmEmsCaEmissionForecastMapper 
+public interface CaEmissionForecastMapper
 {
     /**
      * 查询碳排放预测
@@ -17,7 +17,7 @@ public interface AdmEmsCaEmissionForecastMapper
      * @param id 碳排放预测主键
      * @return 碳排放预测
      */
-    public AdmEmsCaEmissionForecast selectAdmEmsCaEmissionForecastById(Long id);
+     CaEmissionForecast selectCaEmissionForecastById(Long id);
 
     /**
      * 查询碳排放预测列表
@@ -25,7 +25,7 @@ public interface AdmEmsCaEmissionForecastMapper
      * @param admEmsCaEmissionForecast 碳排放预测
      * @return 碳排放预测集合
      */
-    public List<AdmEmsCaEmissionForecast> selectAdmEmsCaEmissionForecastList(AdmEmsCaEmissionForecast admEmsCaEmissionForecast);
+     List<CaEmissionForecast> selectCaEmissionForecastList(CaEmissionForecast admEmsCaEmissionForecast);
 
     /**
      * 新增碳排放预测
@@ -33,7 +33,7 @@ public interface AdmEmsCaEmissionForecastMapper
      * @param admEmsCaEmissionForecast 碳排放预测
      * @return 结果
      */
-    public int insertAdmEmsCaEmissionForecast(AdmEmsCaEmissionForecast admEmsCaEmissionForecast);
+     int insertCaEmissionForecast(CaEmissionForecast admEmsCaEmissionForecast);
 
     /**
      * 修改碳排放预测
@@ -41,7 +41,7 @@ public interface AdmEmsCaEmissionForecastMapper
      * @param admEmsCaEmissionForecast 碳排放预测
      * @return 结果
      */
-    public int updateAdmEmsCaEmissionForecast(AdmEmsCaEmissionForecast admEmsCaEmissionForecast);
+     int updateCaEmissionForecast(CaEmissionForecast admEmsCaEmissionForecast);
 
     /**
      * 删除碳排放预测
@@ -49,7 +49,7 @@ public interface AdmEmsCaEmissionForecastMapper
      * @param id 碳排放预测主键
      * @return 结果
      */
-    public int deleteAdmEmsCaEmissionForecastById(Long id);
+     int deleteCaEmissionForecastById(Long id);
 
     /**
      * 批量删除碳排放预测
@@ -57,5 +57,5 @@ public interface AdmEmsCaEmissionForecastMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAdmEmsCaEmissionForecastByIds(Long[] ids);
+     int deleteCaEmissionForecastByIds(Long[] ids);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/AdmEmsCaMeterDMapper.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/CaMeterDMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.mapper;
 
 import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsCaMeterD;
+import com.ruoyi.ems.domain.CaMeterD;
 
 /**
  * 碳计量日Mapper接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.AdmEmsCaMeterD;
  * @author ruoyi
  * @date 2024-08-12
  */
-public interface AdmEmsCaMeterDMapper 
+public interface CaMeterDMapper
 {
     /**
      * 查询碳计量日
@@ -17,31 +17,31 @@ public interface AdmEmsCaMeterDMapper
      * @param id 碳计量日主键
      * @return 碳计量日
      */
-    public AdmEmsCaMeterD selectAdmEmsCaMeterDById(Long id);
+     CaMeterD selectCaMeterDById(Long id);
 
     /**
      * 查询碳计量日列表
      * 
-     * @param admEmsCaMeterD 碳计量日
+     * @param caMeterD 碳计量日
      * @return 碳计量日集合
      */
-    public List<AdmEmsCaMeterD> selectAdmEmsCaMeterDList(AdmEmsCaMeterD admEmsCaMeterD);
+     List<CaMeterD> selectCaMeterDList(CaMeterD caMeterD);
 
     /**
      * 新增碳计量日
      * 
-     * @param admEmsCaMeterD 碳计量日
+     * @param caMeterD 碳计量日
      * @return 结果
      */
-    public int insertAdmEmsCaMeterD(AdmEmsCaMeterD admEmsCaMeterD);
+     int insertCaMeterD(CaMeterD caMeterD);
 
     /**
      * 修改碳计量日
      * 
-     * @param admEmsCaMeterD 碳计量日
+     * @param caMeterD 碳计量日
      * @return 结果
      */
-    public int updateAdmEmsCaMeterD(AdmEmsCaMeterD admEmsCaMeterD);
+     int updateCaMeterD(CaMeterD caMeterD);
 
     /**
      * 删除碳计量日
@@ -49,7 +49,7 @@ public interface AdmEmsCaMeterDMapper
      * @param id 碳计量日主键
      * @return 结果
      */
-    public int deleteAdmEmsCaMeterDById(Long id);
+     int deleteCaMeterDById(Long id);
 
     /**
      * 批量删除碳计量日
@@ -57,5 +57,5 @@ public interface AdmEmsCaMeterDMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAdmEmsCaMeterDByIds(Long[] ids);
+     int deleteCaMeterDByIds(Long[] ids);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/ElecExpendForecastMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.ems.mapper;
+
+import java.util.List;
+import com.ruoyi.ems.domain.ElecExpendForecast;
+
+/**
+ * 电力消耗预测Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-08-12
+ */
+public interface ElecExpendForecastMapper
+{
+    /**
+     * 查询电力消耗预测
+     * 
+     * @param id 电力消耗预测主键
+     * @return 电力消耗预测
+     */
+     ElecExpendForecast selectElecExpendForecastById(Long id);
+
+    /**
+     * 查询电力消耗预测列表
+     * 
+     * @param emsElecExpendForecast 电力消耗预测
+     * @return 电力消耗预测集合
+     */
+     List<ElecExpendForecast> selectElecExpendForecastList(ElecExpendForecast emsElecExpendForecast);
+
+    /**
+     * 新增电力消耗预测
+     * 
+     * @param emsElecExpendForecast 电力消耗预测
+     * @return 结果
+     */
+     int insertElecExpendForecast(ElecExpendForecast emsElecExpendForecast);
+
+    /**
+     * 修改电力消耗预测
+     * 
+     * @param emsElecExpendForecast 电力消耗预测
+     * @return 结果
+     */
+     int updateElecExpendForecast(ElecExpendForecast emsElecExpendForecast);
+
+    /**
+     * 删除电力消耗预测
+     * 
+     * @param id 电力消耗预测主键
+     * @return 结果
+     */
+     int deleteElecExpendForecastById(Long id);
+
+    /**
+     * 批量删除电力消耗预测
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+     int deleteElecExpendForecastByIds(Long[] ids);
+}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/AdmEmsElecLoadIndexMapper.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/ElecLoadIndexMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.mapper;
 
 import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsElecLoadIndex;
+import com.ruoyi.ems.domain.ElecLoadIndex;
 
 /**
  * 电力负荷设施指标Mapper接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.AdmEmsElecLoadIndex;
  * @author ruoyi
  * @date 2024-08-09
  */
-public interface AdmEmsElecLoadIndexMapper 
+public interface ElecLoadIndexMapper
 {
     /**
      * 查询电力负荷设施指标
@@ -17,31 +17,31 @@ public interface AdmEmsElecLoadIndexMapper
      * @param id 电力负荷设施指标主键
      * @return 电力负荷设施指标
      */
-    public AdmEmsElecLoadIndex selectAdmEmsElecLoadIndexById(Long id);
+     ElecLoadIndex selectElecLoadIndexById(Long id);
 
     /**
      * 查询电力负荷设施指标列表
      * 
-     * @param admEmsElecLoadIndex 电力负荷设施指标
+     * @param elecLoadIndex 电力负荷设施指标
      * @return 电力负荷设施指标集合
      */
-    public List<AdmEmsElecLoadIndex> selectAdmEmsElecLoadIndexList(AdmEmsElecLoadIndex admEmsElecLoadIndex);
+     List<ElecLoadIndex> selectElecLoadIndexList(ElecLoadIndex elecLoadIndex);
 
     /**
      * 新增电力负荷设施指标
      * 
-     * @param admEmsElecLoadIndex 电力负荷设施指标
+     * @param elecLoadIndex 电力负荷设施指标
      * @return 结果
      */
-    public int insertAdmEmsElecLoadIndex(AdmEmsElecLoadIndex admEmsElecLoadIndex);
+     int insertElecLoadIndex(ElecLoadIndex elecLoadIndex);
 
     /**
      * 修改电力负荷设施指标
      * 
-     * @param admEmsElecLoadIndex 电力负荷设施指标
+     * @param elecLoadIndex 电力负荷设施指标
      * @return 结果
      */
-    public int updateAdmEmsElecLoadIndex(AdmEmsElecLoadIndex admEmsElecLoadIndex);
+     int updateElecLoadIndex(ElecLoadIndex elecLoadIndex);
 
     /**
      * 删除电力负荷设施指标
@@ -49,7 +49,7 @@ public interface AdmEmsElecLoadIndexMapper
      * @param id 电力负荷设施指标主键
      * @return 结果
      */
-    public int deleteAdmEmsElecLoadIndexById(Long id);
+     int deleteElecLoadIndexById(Long id);
 
     /**
      * 批量删除电力负荷设施指标
@@ -57,5 +57,5 @@ public interface AdmEmsElecLoadIndexMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAdmEmsElecLoadIndexByIds(Long[] ids);
+     int deleteElecLoadIndexByIds(Long[] ids);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/EmsPgSupplyHMapper.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/ElecPgSupplyHMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.mapper;
 
 import java.util.List;
-import com.ruoyi.ems.domain.EmsPgSupplyH;
+import com.ruoyi.ems.domain.ElecPgSupplyH;
 
 /**
  * 电网供应计量-小时Mapper接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.EmsPgSupplyH;
  * @author ruoyi
  * @date 2024-08-09
  */
-public interface EmsPgSupplyHMapper
+public interface ElecPgSupplyHMapper
 {
     /**
      * 查询电网供应计量-小时
@@ -17,31 +17,31 @@ public interface EmsPgSupplyHMapper
      * @param id 电网供应计量-小时主键
      * @return 电网供应计量-小时
      */
-     EmsPgSupplyH selectEmsPgSupplyHById(Long id);
+     ElecPgSupplyH selectPgSupplyHById(Long id);
 
     /**
      * 查询电网供应计量-小时列表
      * 
-     * @param admEmsPgSupplyH 电网供应计量-小时
+     * @param elecPgSupplyH 电网供应计量-小时
      * @return 电网供应计量-小时集合
      */
-     List<EmsPgSupplyH> selectEmsPgSupplyHList(EmsPgSupplyH admEmsPgSupplyH);
+     List<ElecPgSupplyH> selectPgSupplyHList(ElecPgSupplyH elecPgSupplyH);
 
     /**
      * 新增电网供应计量-小时
      * 
-     * @param admEmsPgSupplyH 电网供应计量-小时
+     * @param elecPgSupplyH 电网供应计量-小时
      * @return 结果
      */
-     int insertEmsPgSupplyH(EmsPgSupplyH admEmsPgSupplyH);
+     int insertPgSupplyH(ElecPgSupplyH elecPgSupplyH);
 
     /**
      * 修改电网供应计量-小时
      * 
-     * @param admEmsPgSupplyH 电网供应计量-小时
+     * @param elecPgSupplyH 电网供应计量-小时
      * @return 结果
      */
-     int updateEmsPgSupplyH(EmsPgSupplyH admEmsPgSupplyH);
+     int updatePgSupplyH(ElecPgSupplyH elecPgSupplyH);
 
     /**
      * 删除电网供应计量-小时
@@ -49,7 +49,7 @@ public interface EmsPgSupplyHMapper
      * @param id 电网供应计量-小时主键
      * @return 结果
      */
-     int deleteEmsPgSupplyHById(Long id);
+     int deletePgSupplyHById(Long id);
 
     /**
      * 批量删除电网供应计量-小时
@@ -57,5 +57,5 @@ public interface EmsPgSupplyHMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-     int deleteEmsPgSupplyHByIds(Long[] ids);
+     int deletePgSupplyHByIds(Long[] ids);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/AdmEmsElecProdForecastMapper.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/ElecProdForecastMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.mapper;
 
 import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsElecProdForecast;
+import com.ruoyi.ems.domain.ElecProdForecast;
 
 /**
  * 电力产能预测Mapper接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.AdmEmsElecProdForecast;
  * @author ruoyi
  * @date 2024-08-12
  */
-public interface AdmEmsElecProdForecastMapper 
+public interface ElecProdForecastMapper
 {
     /**
      * 查询电力产能预测
@@ -17,31 +17,31 @@ public interface AdmEmsElecProdForecastMapper
      * @param id 电力产能预测主键
      * @return 电力产能预测
      */
-    public AdmEmsElecProdForecast selectAdmEmsElecProdForecastById(Long id);
+     ElecProdForecast selectElecProdForecastById(Long id);
 
     /**
      * 查询电力产能预测列表
      * 
-     * @param admEmsElecProdForecast 电力产能预测
+     * @param elecProdForecast 电力产能预测
      * @return 电力产能预测集合
      */
-    public List<AdmEmsElecProdForecast> selectAdmEmsElecProdForecastList(AdmEmsElecProdForecast admEmsElecProdForecast);
+     List<ElecProdForecast> selectElecProdForecastList(ElecProdForecast elecProdForecast);
 
     /**
      * 新增电力产能预测
      * 
-     * @param admEmsElecProdForecast 电力产能预测
+     * @param elecProdForecast 电力产能预测
      * @return 结果
      */
-    public int insertAdmEmsElecProdForecast(AdmEmsElecProdForecast admEmsElecProdForecast);
+     int insertElecProdForecast(ElecProdForecast elecProdForecast);
 
     /**
      * 修改电力产能预测
      * 
-     * @param admEmsElecProdForecast 电力产能预测
+     * @param elecProdForecast 电力产能预测
      * @return 结果
      */
-    public int updateAdmEmsElecProdForecast(AdmEmsElecProdForecast admEmsElecProdForecast);
+     int updateElecProdForecast(ElecProdForecast elecProdForecast);
 
     /**
      * 删除电力产能预测
@@ -49,7 +49,7 @@ public interface AdmEmsElecProdForecastMapper
      * @param id 电力产能预测主键
      * @return 结果
      */
-    public int deleteAdmEmsElecProdForecastById(Long id);
+     int deleteElecProdForecastById(Long id);
 
     /**
      * 批量删除电力产能预测
@@ -57,5 +57,5 @@ public interface AdmEmsElecProdForecastMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAdmEmsElecProdForecastByIds(Long[] ids);
+     int deleteElecProdForecastByIds(Long[] ids);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/EmsFacsUseHMapper.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/ElecUseHMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.ems.mapper;
 
-import com.ruoyi.ems.domain.EmsFacsUseH;
+import com.ruoyi.ems.domain.ElecUseH;
 
 import java.util.List;
 
@@ -10,7 +10,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2024-08-15
  */
-public interface EmsFacsUseHMapper
+public interface ElecUseHMapper
 {
     /**
      * 查询用能计量-小时
@@ -18,31 +18,31 @@ public interface EmsFacsUseHMapper
      * @param id 用能计量-小时主键
      * @return 用能计量-小时
      */
-     EmsFacsUseH selectEmsFacsUseHById(Long id);
+     ElecUseH selectElecUseHById(Long id);
 
     /**
      * 查询用能计量-小时列表
      * 
-     * @param admEmsFacsUseH 用能计量-小时
+     * @param elecUseH 用能计量-小时
      * @return 用能计量-小时集合
      */
-     List<EmsFacsUseH> selectEmsFacsUseHList(EmsFacsUseH admEmsFacsUseH);
+     List<ElecUseH> selectElecUseHList(ElecUseH elecUseH);
 
     /**
      * 新增用能计量-小时
      * 
-     * @param admEmsFacsUseH 用能计量-小时
+     * @param elecUseH 用能计量-小时
      * @return 结果
      */
-     int insertEmsFacsUseH(EmsFacsUseH admEmsFacsUseH);
+     int insertElecUseH(ElecUseH elecUseH);
 
     /**
      * 修改用能计量-小时
      * 
-     * @param admEmsFacsUseH 用能计量-小时
+     * @param elecUseH 用能计量-小时
      * @return 结果
      */
-     int updateEmsFacsUseH(EmsFacsUseH admEmsFacsUseH);
+     int updateElecUseH(ElecUseH elecUseH);
 
     /**
      * 删除用能计量-小时
@@ -50,7 +50,7 @@ public interface EmsFacsUseHMapper
      * @param id 用能计量-小时主键
      * @return 结果
      */
-     int deleteEmsFacsUseHById(Long id);
+     int deleteElecUseHById(Long id);
 
     /**
      * 批量删除用能计量-小时
@@ -58,5 +58,5 @@ public interface EmsFacsUseHMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-     int deleteEmsFacsUseHByIds(Long[] ids);
+     int deleteElecUseHByIds(Long[] ids);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/EmsElecStoreHMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.mapper;
 
 import java.util.List;
-import com.ruoyi.ems.domain.EmsElecStoreH;
+import com.ruoyi.ems.domain.ElecStoreH;
 
 /**
  * 储能计量-小时Mapper接口
@@ -17,7 +17,7 @@ public interface EmsElecStoreHMapper
      * @param id 储能计量-小时主键
      * @return 储能计量-小时
      */
-     EmsElecStoreH selectEmsElecStoreHById(Long id);
+     ElecStoreH selectEmsElecStoreHById(Long id);
 
     /**
      * 查询储能计量-小时列表
@@ -25,7 +25,7 @@ public interface EmsElecStoreHMapper
      * @param admEmsElecStoreH 储能计量-小时
      * @return 储能计量-小时集合
      */
-     List<EmsElecStoreH> selectEmsElecStoreHList(EmsElecStoreH admEmsElecStoreH);
+     List<ElecStoreH> selectEmsElecStoreHList(ElecStoreH admEmsElecStoreH);
 
     /**
      * 新增储能计量-小时
@@ -33,7 +33,7 @@ public interface EmsElecStoreHMapper
      * @param admEmsElecStoreH 储能计量-小时
      * @return 结果
      */
-     int insertEmsElecStoreH(EmsElecStoreH admEmsElecStoreH);
+     int insertEmsElecStoreH(ElecStoreH admEmsElecStoreH);
 
     /**
      * 修改储能计量-小时
@@ -41,7 +41,7 @@ public interface EmsElecStoreHMapper
      * @param admEmsElecStoreH 储能计量-小时
      * @return 结果
      */
-     int updateEmsElecStoreH(EmsElecStoreH admEmsElecStoreH);
+     int updateEmsElecStoreH(ElecStoreH admEmsElecStoreH);
 
     /**
      * 删除储能计量-小时

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/EmsFacsSubtypeMapper.java

@@ -38,10 +38,10 @@ public interface EmsFacsSubtypeMapper {
     /**
      * 批量新增能源设施/系统子类
      *
-     * @param emsFacsSubtypes 能源设施/系统子类列表
+     * @param list 能源设施/系统子类列表
      * @return 结果
      */
-    void insertFacsSubtypeBatch(List<EmsFacsSubtype> emsFacsSubtypes);
+    void insertFacsSubtypeBatch(List<EmsFacsSubtype> list);
 
     /**
      * 修改能源设施/系统子类

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/AdmOpEnergyStrategyMapper.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/OpEnergyStrategyMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.mapper;
 
 import java.util.List;
-import com.ruoyi.ems.domain.AdmOpEnergyStrategy;
+import com.ruoyi.ems.domain.OpEnergyStrategy;
 
 /**
  * 能源策略Mapper接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.AdmOpEnergyStrategy;
  * @author ruoyi
  * @date 2024-08-08
  */
-public interface AdmOpEnergyStrategyMapper 
+public interface OpEnergyStrategyMapper
 {
     /**
      * 查询能源策略
@@ -17,31 +17,31 @@ public interface AdmOpEnergyStrategyMapper
      * @param id 能源策略主键
      * @return 能源策略
      */
-    public AdmOpEnergyStrategy selectAdmOpEnergyStrategyById(Long id);
+     OpEnergyStrategy selectOpEnergyStrategyById(Long id);
 
     /**
      * 查询能源策略列表
      * 
-     * @param admOpEnergyStrategy 能源策略
+     * @param opEnergyStrategy 能源策略
      * @return 能源策略集合
      */
-    public List<AdmOpEnergyStrategy> selectAdmOpEnergyStrategyList(AdmOpEnergyStrategy admOpEnergyStrategy);
+     List<OpEnergyStrategy> selectOpEnergyStrategyList(OpEnergyStrategy opEnergyStrategy);
 
     /**
      * 新增能源策略
      * 
-     * @param admOpEnergyStrategy 能源策略
+     * @param opEnergyStrategy 能源策略
      * @return 结果
      */
-    public int insertAdmOpEnergyStrategy(AdmOpEnergyStrategy admOpEnergyStrategy);
+     int insertOpEnergyStrategy(OpEnergyStrategy opEnergyStrategy);
 
     /**
      * 修改能源策略
      * 
-     * @param admOpEnergyStrategy 能源策略
+     * @param opEnergyStrategy 能源策略
      * @return 结果
      */
-    public int updateAdmOpEnergyStrategy(AdmOpEnergyStrategy admOpEnergyStrategy);
+     int updateOpEnergyStrategy(OpEnergyStrategy opEnergyStrategy);
 
     /**
      * 删除能源策略
@@ -49,7 +49,7 @@ public interface AdmOpEnergyStrategyMapper
      * @param id 能源策略主键
      * @return 结果
      */
-    public int deleteAdmOpEnergyStrategyById(Long id);
+     int deleteOpEnergyStrategyById(Long id);
 
     /**
      * 批量删除能源策略
@@ -57,5 +57,5 @@ public interface AdmOpEnergyStrategyMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAdmOpEnergyStrategyByIds(Long[] ids);
+     int deleteOpEnergyStrategyByIds(Long[] ids);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/AdmEmsPvSupplyHMapper.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/PvSupplyHMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.mapper;
 
 import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsPvSupplyH;
+import com.ruoyi.ems.domain.PvSupplyH;
 
 /**
  * 光伏并网计量光伏并网计量-小时Mapper接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.AdmEmsPvSupplyH;
  * @author ruoyi
  * @date 2024-08-02
  */
-public interface AdmEmsPvSupplyHMapper
+public interface PvSupplyHMapper
 {
     /**
      * 查询光伏并网计量光伏并网计量-小时
@@ -17,34 +17,34 @@ public interface AdmEmsPvSupplyHMapper
      * @param id 光伏并网计量光伏并网计量-小时主键
      * @return 光伏并网计量光伏并网计量-小时
      */
-    public AdmEmsPvSupplyH selectAdmEmsPvSupplyHById(Long id);
+     PvSupplyH selectPvSupplyHById(Long id);
 
     /**
      * 查询光伏并网计量光伏并网计量-小时列表
      *
-     * @param admEmsPvSupplyH 光伏并网计量光伏并网计量-小时
+     * @param pvSupplyH 光伏并网计量光伏并网计量-小时
      * @return 光伏并网计量光伏并网计量-小时集合
      */
-    public List<AdmEmsPvSupplyH> selectAdmEmsPvSupplyHList(AdmEmsPvSupplyH admEmsPvSupplyH);
+     List<PvSupplyH> selectPvSupplyHList(PvSupplyH pvSupplyH);
 
-    public List<AdmEmsPvSupplyH> selectAreaSupplyH(AdmEmsPvSupplyH admEmsPvSupplyH);
+     List<PvSupplyH> selectAreaSupplyH(PvSupplyH pvSupplyH);
 
 
     /**
      * 新增光伏并网计量光伏并网计量-小时
      *
-     * @param admEmsPvSupplyH 光伏并网计量光伏并网计量-小时
+     * @param pvSupplyH 光伏并网计量光伏并网计量-小时
      * @return 结果
      */
-    public int insertAdmEmsPvSupplyH(AdmEmsPvSupplyH admEmsPvSupplyH);
+     int insertPvSupplyH(PvSupplyH pvSupplyH);
 
     /**
      * 修改光伏并网计量光伏并网计量-小时
      *
-     * @param admEmsPvSupplyH 光伏并网计量光伏并网计量-小时
+     * @param pvSupplyH 光伏并网计量光伏并网计量-小时
      * @return 结果
      */
-    public int updateAdmEmsPvSupplyH(AdmEmsPvSupplyH admEmsPvSupplyH);
+     int updatePvSupplyH(PvSupplyH pvSupplyH);
 
     /**
      * 删除光伏并网计量光伏并网计量-小时
@@ -52,7 +52,7 @@ public interface AdmEmsPvSupplyHMapper
      * @param id 光伏并网计量光伏并网计量-小时主键
      * @return 结果
      */
-    public int deleteAdmEmsPvSupplyHById(Long id);
+     int deletePvSupplyHById(Long id);
 
     /**
      * 批量删除光伏并网计量光伏并网计量-小时
@@ -60,5 +60,5 @@ public interface AdmEmsPvSupplyHMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAdmEmsPvSupplyHByIds(Long[] ids);
+     int deletePvSupplyHByIds(Long[] ids);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IAdmEmsCaEmissionForecastService.java

@@ -1,61 +0,0 @@
-package com.ruoyi.ems.service;
-
-import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsCaEmissionForecast;
-
-/**
- * 碳排放预测Service接口
- * 
- * @author ruoyi
- * @date 2024-08-12
- */
-public interface IAdmEmsCaEmissionForecastService 
-{
-    /**
-     * 查询碳排放预测
-     * 
-     * @param id 碳排放预测主键
-     * @return 碳排放预测
-     */
-    public AdmEmsCaEmissionForecast selectAdmEmsCaEmissionForecastById(Long id);
-
-    /**
-     * 查询碳排放预测列表
-     * 
-     * @param admEmsCaEmissionForecast 碳排放预测
-     * @return 碳排放预测集合
-     */
-    public List<AdmEmsCaEmissionForecast> selectAdmEmsCaEmissionForecastList(AdmEmsCaEmissionForecast admEmsCaEmissionForecast);
-
-    /**
-     * 新增碳排放预测
-     * 
-     * @param admEmsCaEmissionForecast 碳排放预测
-     * @return 结果
-     */
-    public int insertAdmEmsCaEmissionForecast(AdmEmsCaEmissionForecast admEmsCaEmissionForecast);
-
-    /**
-     * 修改碳排放预测
-     * 
-     * @param admEmsCaEmissionForecast 碳排放预测
-     * @return 结果
-     */
-    public int updateAdmEmsCaEmissionForecast(AdmEmsCaEmissionForecast admEmsCaEmissionForecast);
-
-    /**
-     * 批量删除碳排放预测
-     * 
-     * @param ids 需要删除的碳排放预测主键集合
-     * @return 结果
-     */
-    public int deleteAdmEmsCaEmissionForecastByIds(Long[] ids);
-
-    /**
-     * 删除碳排放预测信息
-     * 
-     * @param id 碳排放预测主键
-     * @return 结果
-     */
-    public int deleteAdmEmsCaEmissionForecastById(Long id);
-}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IAdmEmsPvSupplyHService.java

@@ -1,63 +0,0 @@
-package com.ruoyi.ems.service;
-
-import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsPvSupplyH;
-
-/**
- * 光伏并网计量光伏并网计量-小时Service接口
- *
- * @author ruoyi
- * @date 2024-08-02
- */
-public interface IAdmEmsPvSupplyHService
-{
-    /**
-     * 查询光伏并网计量光伏并网计量-小时
-     *
-     * @param id 光伏并网计量光伏并网计量-小时主键
-     * @return 光伏并网计量光伏并网计量-小时
-     */
-    public AdmEmsPvSupplyH selectAdmEmsPvSupplyHById(Long id);
-
-    /**
-     * 查询光伏并网计量光伏并网计量-小时列表
-     *
-     * @param admEmsPvSupplyH 光伏并网计量光伏并网计量-小时
-     * @return 光伏并网计量光伏并网计量-小时集合
-     */
-    public List<AdmEmsPvSupplyH> selectAdmEmsPvSupplyHList(AdmEmsPvSupplyH admEmsPvSupplyH);
-
-
-    public List<AdmEmsPvSupplyH> selectAreaSupplyH(AdmEmsPvSupplyH admEmsPvSupplyH);
-    /**
-     * 新增光伏并网计量光伏并网计量-小时
-     *
-     * @param admEmsPvSupplyH 光伏并网计量光伏并网计量-小时
-     * @return 结果
-     */
-    public int insertAdmEmsPvSupplyH(AdmEmsPvSupplyH admEmsPvSupplyH);
-
-    /**
-     * 修改光伏并网计量光伏并网计量-小时
-     *
-     * @param admEmsPvSupplyH 光伏并网计量光伏并网计量-小时
-     * @return 结果
-     */
-    public int updateAdmEmsPvSupplyH(AdmEmsPvSupplyH admEmsPvSupplyH);
-
-    /**
-     * 批量删除光伏并网计量光伏并网计量-小时
-     *
-     * @param ids 需要删除的光伏并网计量光伏并网计量-小时主键集合
-     * @return 结果
-     */
-    public int deleteAdmEmsPvSupplyHByIds(Long[] ids);
-
-    /**
-     * 删除光伏并网计量光伏并网计量-小时信息
-     *
-     * @param id 光伏并网计量光伏并网计量-小时主键
-     * @return 结果
-     */
-    public int deleteAdmEmsPvSupplyHById(Long id);
-}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/ICaEmissionForecastService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.ems.service;
+
+import java.util.List;
+import com.ruoyi.ems.domain.CaEmissionForecast;
+
+/**
+ * 碳排放预测Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-08-12
+ */
+public interface ICaEmissionForecastService
+{
+    /**
+     * 查询碳排放预测
+     * 
+     * @param id 碳排放预测主键
+     * @return 碳排放预测
+     */
+     CaEmissionForecast selectCaEmissionForecastById(Long id);
+
+    /**
+     * 查询碳排放预测列表
+     * 
+     * @param caEmissionForecast 碳排放预测
+     * @return 碳排放预测集合
+     */
+     List<CaEmissionForecast> selectCaEmissionForecastList(CaEmissionForecast caEmissionForecast);
+
+    /**
+     * 新增碳排放预测
+     * 
+     * @param caEmissionForecast 碳排放预测
+     * @return 结果
+     */
+     int insertCaEmissionForecast(CaEmissionForecast caEmissionForecast);
+
+    /**
+     * 修改碳排放预测
+     * 
+     * @param caEmissionForecast 碳排放预测
+     * @return 结果
+     */
+     int updateCaEmissionForecast(CaEmissionForecast caEmissionForecast);
+
+    /**
+     * 批量删除碳排放预测
+     * 
+     * @param ids 需要删除的碳排放预测主键集合
+     * @return 结果
+     */
+     int deleteCaEmissionForecastByIds(Long[] ids);
+
+    /**
+     * 删除碳排放预测信息
+     * 
+     * @param id 碳排放预测主键
+     * @return 结果
+     */
+     int deleteCaEmissionForecastById(Long id);
+}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IAdmEmsCaMeterDService.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/ICaMeterDService.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.service;
 
 import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsCaMeterD;
+import com.ruoyi.ems.domain.CaMeterD;
 
 /**
  * 碳计量日Service接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.AdmEmsCaMeterD;
  * @author ruoyi
  * @date 2024-08-12
  */
-public interface IAdmEmsCaMeterDService 
+public interface ICaMeterDService
 {
     /**
      * 查询碳计量日
@@ -17,7 +17,7 @@ public interface IAdmEmsCaMeterDService
      * @param id 碳计量日主键
      * @return 碳计量日
      */
-    public AdmEmsCaMeterD selectAdmEmsCaMeterDById(Long id);
+     CaMeterD selectCaMeterDById(Long id);
 
     /**
      * 查询碳计量日列表
@@ -25,23 +25,23 @@ public interface IAdmEmsCaMeterDService
      * @param admEmsCaMeterD 碳计量日
      * @return 碳计量日集合
      */
-    public List<AdmEmsCaMeterD> selectAdmEmsCaMeterDList(AdmEmsCaMeterD admEmsCaMeterD);
+     List<CaMeterD> selectCaMeterDList(CaMeterD caMeterD);
 
     /**
      * 新增碳计量日
      * 
-     * @param admEmsCaMeterD 碳计量日
+     * @param caMeterD 碳计量日
      * @return 结果
      */
-    public int insertAdmEmsCaMeterD(AdmEmsCaMeterD admEmsCaMeterD);
+     int insertCaMeterD(CaMeterD caMeterD);
 
     /**
      * 修改碳计量日
      * 
-     * @param admEmsCaMeterD 碳计量日
+     * @param caMeterD 碳计量日
      * @return 结果
      */
-    public int updateAdmEmsCaMeterD(AdmEmsCaMeterD admEmsCaMeterD);
+     int updateCaMeterD(CaMeterD caMeterD);
 
     /**
      * 批量删除碳计量日
@@ -49,7 +49,7 @@ public interface IAdmEmsCaMeterDService
      * @param ids 需要删除的碳计量日主键集合
      * @return 结果
      */
-    public int deleteAdmEmsCaMeterDByIds(Long[] ids);
+     int deleteCaMeterDByIds(Long[] ids);
 
     /**
      * 删除碳计量日信息
@@ -57,5 +57,5 @@ public interface IAdmEmsCaMeterDService
      * @param id 碳计量日主键
      * @return 结果
      */
-    public int deleteAdmEmsCaMeterDById(Long id);
+     int deleteCaMeterDById(Long id);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IAdmEmsElecExpendForecastService.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IElecExpendForecastService.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.service;
 
 import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsElecExpendForecast;
+import com.ruoyi.ems.domain.ElecExpendForecast;
 
 /**
  * 电力消耗预测Service接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.AdmEmsElecExpendForecast;
  * @author ruoyi
  * @date 2024-08-12
  */
-public interface IAdmEmsElecExpendForecastService 
+public interface IElecExpendForecastService
 {
     /**
      * 查询电力消耗预测
@@ -17,31 +17,31 @@ public interface IAdmEmsElecExpendForecastService
      * @param id 电力消耗预测主键
      * @return 电力消耗预测
      */
-    public AdmEmsElecExpendForecast selectAdmEmsElecExpendForecastById(Long id);
+     ElecExpendForecast selectElecExpendForecastById(Long id);
 
     /**
      * 查询电力消耗预测列表
      * 
-     * @param admEmsElecExpendForecast 电力消耗预测
+     * @param emsElecExpendForecast 电力消耗预测
      * @return 电力消耗预测集合
      */
-    public List<AdmEmsElecExpendForecast> selectAdmEmsElecExpendForecastList(AdmEmsElecExpendForecast admEmsElecExpendForecast);
+     List<ElecExpendForecast> selectElecExpendForecastList(ElecExpendForecast emsElecExpendForecast);
 
     /**
      * 新增电力消耗预测
      * 
-     * @param admEmsElecExpendForecast 电力消耗预测
+     * @param emsElecExpendForecast 电力消耗预测
      * @return 结果
      */
-    public int insertAdmEmsElecExpendForecast(AdmEmsElecExpendForecast admEmsElecExpendForecast);
+     int insertElecExpendForecast(ElecExpendForecast emsElecExpendForecast);
 
     /**
      * 修改电力消耗预测
      * 
-     * @param admEmsElecExpendForecast 电力消耗预测
+     * @param emsElecExpendForecast 电力消耗预测
      * @return 结果
      */
-    public int updateAdmEmsElecExpendForecast(AdmEmsElecExpendForecast admEmsElecExpendForecast);
+     int updateElecExpendForecast(ElecExpendForecast emsElecExpendForecast);
 
     /**
      * 批量删除电力消耗预测
@@ -49,7 +49,7 @@ public interface IAdmEmsElecExpendForecastService
      * @param ids 需要删除的电力消耗预测主键集合
      * @return 结果
      */
-    public int deleteAdmEmsElecExpendForecastByIds(Long[] ids);
+     int deleteElecExpendForecastByIds(Long[] ids);
 
     /**
      * 删除电力消耗预测信息
@@ -57,5 +57,5 @@ public interface IAdmEmsElecExpendForecastService
      * @param id 电力消耗预测主键
      * @return 结果
      */
-    public int deleteAdmEmsElecExpendForecastById(Long id);
+     int deleteElecExpendForecastById(Long id);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IAdmEmsElecLoadIndexService.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IElecLoadIndexService.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.service;
 
 import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsElecLoadIndex;
+import com.ruoyi.ems.domain.ElecLoadIndex;
 
 /**
  * 电力负荷设施指标Service接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.AdmEmsElecLoadIndex;
  * @author ruoyi
  * @date 2024-08-09
  */
-public interface IAdmEmsElecLoadIndexService 
+public interface IElecLoadIndexService
 {
     /**
      * 查询电力负荷设施指标
@@ -17,31 +17,31 @@ public interface IAdmEmsElecLoadIndexService
      * @param id 电力负荷设施指标主键
      * @return 电力负荷设施指标
      */
-    public AdmEmsElecLoadIndex selectAdmEmsElecLoadIndexById(Long id);
+     ElecLoadIndex selectElecLoadIndexById(Long id);
 
     /**
      * 查询电力负荷设施指标列表
      * 
-     * @param admEmsElecLoadIndex 电力负荷设施指标
+     * @param emsElecLoadIndex 电力负荷设施指标
      * @return 电力负荷设施指标集合
      */
-    public List<AdmEmsElecLoadIndex> selectAdmEmsElecLoadIndexList(AdmEmsElecLoadIndex admEmsElecLoadIndex);
+     List<ElecLoadIndex> selectElecLoadIndexList(ElecLoadIndex emsElecLoadIndex);
 
     /**
      * 新增电力负荷设施指标
      * 
-     * @param admEmsElecLoadIndex 电力负荷设施指标
+     * @param emsElecLoadIndex 电力负荷设施指标
      * @return 结果
      */
-    public int insertAdmEmsElecLoadIndex(AdmEmsElecLoadIndex admEmsElecLoadIndex);
+     int insertElecLoadIndex(ElecLoadIndex emsElecLoadIndex);
 
     /**
      * 修改电力负荷设施指标
      * 
-     * @param admEmsElecLoadIndex 电力负荷设施指标
+     * @param emsElecLoadIndex 电力负荷设施指标
      * @return 结果
      */
-    public int updateAdmEmsElecLoadIndex(AdmEmsElecLoadIndex admEmsElecLoadIndex);
+     int updateElecLoadIndex(ElecLoadIndex emsElecLoadIndex);
 
     /**
      * 批量删除电力负荷设施指标
@@ -49,7 +49,7 @@ public interface IAdmEmsElecLoadIndexService
      * @param ids 需要删除的电力负荷设施指标主键集合
      * @return 结果
      */
-    public int deleteAdmEmsElecLoadIndexByIds(Long[] ids);
+     int deleteElecLoadIndexByIds(Long[] ids);
 
     /**
      * 删除电力负荷设施指标信息
@@ -57,5 +57,5 @@ public interface IAdmEmsElecLoadIndexService
      * @param id 电力负荷设施指标主键
      * @return 结果
      */
-    public int deleteAdmEmsElecLoadIndexById(Long id);
+     int deleteElecLoadIndexById(Long id);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IEmsPgSupplyHService.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IElecPgSupplyHService.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.service;
 
 import java.util.List;
-import com.ruoyi.ems.domain.EmsPgSupplyH;
+import com.ruoyi.ems.domain.ElecPgSupplyH;
 
 /**
  * 电网供应计量-小时Service接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.EmsPgSupplyH;
  * @author ruoyi
  * @date 2024-08-09
  */
-public interface IEmsPgSupplyHService
+public interface IElecPgSupplyHService
 {
     /**
      * 查询电网供应计量-小时
@@ -17,31 +17,31 @@ public interface IEmsPgSupplyHService
      * @param id 电网供应计量-小时主键
      * @return 电网供应计量-小时
      */
-     EmsPgSupplyH selectEmsPgSupplyHById(Long id);
+     ElecPgSupplyH selectPgSupplyHById(Long id);
 
     /**
      * 查询电网供应计量-小时列表
      * 
-     * @param admEmsPgSupplyH 电网供应计量-小时
+     * @param pgSupplyH 电网供应计量-小时
      * @return 电网供应计量-小时集合
      */
-     List<EmsPgSupplyH> selectEmsPgSupplyHList(EmsPgSupplyH admEmsPgSupplyH);
+     List<ElecPgSupplyH> selectPgSupplyHList(ElecPgSupplyH pgSupplyH);
 
     /**
      * 新增电网供应计量-小时
      * 
-     * @param admEmsPgSupplyH 电网供应计量-小时
+     * @param pgSupplyH 电网供应计量-小时
      * @return 结果
      */
-     int insertEmsPgSupplyH(EmsPgSupplyH admEmsPgSupplyH);
+     int insertPgSupplyH(ElecPgSupplyH pgSupplyH);
 
     /**
      * 修改电网供应计量-小时
      * 
-     * @param admEmsPgSupplyH 电网供应计量-小时
+     * @param pgSupplyH 电网供应计量-小时
      * @return 结果
      */
-     int updateEmsPgSupplyH(EmsPgSupplyH admEmsPgSupplyH);
+     int updatePgSupplyH(ElecPgSupplyH pgSupplyH);
 
     /**
      * 批量删除电网供应计量-小时
@@ -49,7 +49,7 @@ public interface IEmsPgSupplyHService
      * @param ids 需要删除的电网供应计量-小时主键集合
      * @return 结果
      */
-     int deleteEmsPgSupplyHByIds(Long[] ids);
+     int deletePgSupplyHByIds(Long[] ids);
 
     /**
      * 删除电网供应计量-小时信息
@@ -57,5 +57,5 @@ public interface IEmsPgSupplyHService
      * @param id 电网供应计量-小时主键
      * @return 结果
      */
-     int deleteEmsPgSupplyHById(Long id);
+     int deletePgSupplyHById(Long id);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IAdmEmsElecProdForecastService.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IElecProdForecastService.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.service;
 
 import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsElecProdForecast;
+import com.ruoyi.ems.domain.ElecProdForecast;
 
 /**
  * 电力产能预测Service接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.AdmEmsElecProdForecast;
  * @author ruoyi
  * @date 2024-08-12
  */
-public interface IAdmEmsElecProdForecastService 
+public interface IElecProdForecastService
 {
     /**
      * 查询电力产能预测
@@ -17,31 +17,31 @@ public interface IAdmEmsElecProdForecastService
      * @param id 电力产能预测主键
      * @return 电力产能预测
      */
-    public AdmEmsElecProdForecast selectAdmEmsElecProdForecastById(Long id);
+     ElecProdForecast selectElecProdForecastById(Long id);
 
     /**
      * 查询电力产能预测列表
      * 
-     * @param admEmsElecProdForecast 电力产能预测
+     * @param elecProdForecast 电力产能预测
      * @return 电力产能预测集合
      */
-    public List<AdmEmsElecProdForecast> selectAdmEmsElecProdForecastList(AdmEmsElecProdForecast admEmsElecProdForecast);
+     List<ElecProdForecast> selectElecProdForecastList(ElecProdForecast elecProdForecast);
 
     /**
      * 新增电力产能预测
      * 
-     * @param admEmsElecProdForecast 电力产能预测
+     * @param elecProdForecast 电力产能预测
      * @return 结果
      */
-    public int insertAdmEmsElecProdForecast(AdmEmsElecProdForecast admEmsElecProdForecast);
+     int insertElecProdForecast(ElecProdForecast elecProdForecast);
 
     /**
      * 修改电力产能预测
      * 
-     * @param admEmsElecProdForecast 电力产能预测
+     * @param elecProdForecast 电力产能预测
      * @return 结果
      */
-    public int updateAdmEmsElecProdForecast(AdmEmsElecProdForecast admEmsElecProdForecast);
+     int updateElecProdForecast(ElecProdForecast elecProdForecast);
 
     /**
      * 批量删除电力产能预测
@@ -49,7 +49,7 @@ public interface IAdmEmsElecProdForecastService
      * @param ids 需要删除的电力产能预测主键集合
      * @return 结果
      */
-    public int deleteAdmEmsElecProdForecastByIds(Long[] ids);
+     int deleteElecProdForecastByIds(Long[] ids);
 
     /**
      * 删除电力产能预测信息
@@ -57,5 +57,5 @@ public interface IAdmEmsElecProdForecastService
      * @param id 电力产能预测主键
      * @return 结果
      */
-    public int deleteAdmEmsElecProdForecastById(Long id);
+     int deleteElecProdForecastById(Long id);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IEmsElecStoreHService.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IElecStoreHService.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.service;
 
 import java.util.List;
-import com.ruoyi.ems.domain.EmsElecStoreH;
+import com.ruoyi.ems.domain.ElecStoreH;
 
 /**
  * 储能计量-小时Service接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.EmsElecStoreH;
  * @author ruoyi
  * @date 2024-08-09
  */
-public interface IEmsElecStoreHService
+public interface IElecStoreHService
 {
     /**
      * 查询储能计量-小时
@@ -17,31 +17,31 @@ public interface IEmsElecStoreHService
      * @param id 储能计量-小时主键
      * @return 储能计量-小时
      */
-     EmsElecStoreH selectEmsElecStoreHById(Long id);
+     ElecStoreH selectElecStoreHById(Long id);
 
     /**
      * 查询储能计量-小时列表
      * 
-     * @param admEmsElecStoreH 储能计量-小时
+     * @param elecStoreH 储能计量-小时
      * @return 储能计量-小时集合
      */
-     List<EmsElecStoreH> selectEmsElecStoreHList(EmsElecStoreH admEmsElecStoreH);
+     List<ElecStoreH> selectElecStoreHList(ElecStoreH elecStoreH);
 
     /**
      * 新增储能计量-小时
      * 
-     * @param admEmsElecStoreH 储能计量-小时
+     * @param elecStoreH 储能计量-小时
      * @return 结果
      */
-     int insertEmsElecStoreH(EmsElecStoreH admEmsElecStoreH);
+     int insertElecStoreH(ElecStoreH elecStoreH);
 
     /**
      * 修改储能计量-小时
      * 
-     * @param admEmsElecStoreH 储能计量-小时
+     * @param elecStoreH 储能计量-小时
      * @return 结果
      */
-     int updateEmsElecStoreH(EmsElecStoreH admEmsElecStoreH);
+     int updateElecStoreH(ElecStoreH elecStoreH);
 
     /**
      * 批量删除储能计量-小时
@@ -49,7 +49,7 @@ public interface IEmsElecStoreHService
      * @param ids 需要删除的储能计量-小时主键集合
      * @return 结果
      */
-     int deleteEmsElecStoreHByIds(Long[] ids);
+     int deleteElecStoreHByIds(Long[] ids);
 
     /**
      * 删除储能计量-小时信息
@@ -57,5 +57,5 @@ public interface IEmsElecStoreHService
      * @param id 储能计量-小时主键
      * @return 结果
      */
-     int deleteEmsElecStoreHById(Long id);
+     int deleteElecStoreHById(Long id);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IEmsFacsUseHService.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IElecUseHService.java

@@ -1,6 +1,6 @@
 package com.ruoyi.ems.service;
 
-import com.ruoyi.ems.domain.EmsFacsUseH;
+import com.ruoyi.ems.domain.ElecUseH;
 
 import java.util.List;
 
@@ -10,7 +10,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2024-08-15
  */
-public interface IEmsFacsUseHService
+public interface IElecUseHService
 {
     /**
      * 查询用能计量-小时
@@ -18,31 +18,31 @@ public interface IEmsFacsUseHService
      * @param id 用能计量-小时主键
      * @return 用能计量-小时
      */
-     EmsFacsUseH selectEmsFacsUseHById(Long id);
+     ElecUseH selectElecUseHById(Long id);
 
     /**
      * 查询用能计量-小时列表
      * 
-     * @param admEmsFacsUseH 用能计量-小时
+     * @param elecUseH 用能计量-小时
      * @return 用能计量-小时集合
      */
-     List<EmsFacsUseH> selectEmsFacsUseHList(EmsFacsUseH admEmsFacsUseH);
+     List<ElecUseH> selectElecUseHList(ElecUseH elecUseH);
 
     /**
      * 新增用能计量-小时
      * 
-     * @param admEmsFacsUseH 用能计量-小时
+     * @param elecUseH 用能计量-小时
      * @return 结果
      */
-     int insertEmsFacsUseH(EmsFacsUseH admEmsFacsUseH);
+     int insertElecUseH(ElecUseH elecUseH);
 
     /**
      * 修改用能计量-小时
      * 
-     * @param admEmsFacsUseH 用能计量-小时
+     * @param elecUseH 用能计量-小时
      * @return 结果
      */
-     int updateEmsFacsUseH(EmsFacsUseH admEmsFacsUseH);
+     int updateElecUseH(ElecUseH elecUseH);
 
     /**
      * 批量删除用能计量-小时
@@ -50,7 +50,7 @@ public interface IEmsFacsUseHService
      * @param ids 需要删除的用能计量-小时主键集合
      * @return 结果
      */
-     int deleteEmsFacsUseHByIds(Long[] ids);
+     int deleteElecUseHByIds(Long[] ids);
 
     /**
      * 删除用能计量-小时信息
@@ -58,5 +58,5 @@ public interface IEmsFacsUseHService
      * @param id 用能计量-小时主键
      * @return 结果
      */
-     int deleteEmsFacsUseHById(Long id);
+     int deleteElecUseHById(Long id);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IEmsFacsSubtypeService.java

@@ -39,7 +39,7 @@ public interface IEmsFacsSubtypeService {
      * @param emsFacsSubtypes 能源设施/系统子类列表
      * @return 结果
      */
-    void insertFacsSubtypeBatch(String facsType, List<EmsFacsSubtype> emsFacsSubtypes);
+    void insertFacsSubtypeBatch(List<EmsFacsSubtype> emsFacsSubtypes);
 
     /**
      * 修改能源设施/系统子类

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IAdmOpEnergyStrategyService.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IOpEnergyStrategyService.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.service;
 
 import java.util.List;
-import com.ruoyi.ems.domain.AdmOpEnergyStrategy;
+import com.ruoyi.ems.domain.OpEnergyStrategy;
 
 /**
  * 能源策略Service接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.AdmOpEnergyStrategy;
  * @author ruoyi
  * @date 2024-08-08
  */
-public interface IAdmOpEnergyStrategyService 
+public interface IOpEnergyStrategyService
 {
     /**
      * 查询能源策略
@@ -17,31 +17,31 @@ public interface IAdmOpEnergyStrategyService
      * @param id 能源策略主键
      * @return 能源策略
      */
-    public AdmOpEnergyStrategy selectAdmOpEnergyStrategyById(Long id);
+     OpEnergyStrategy selectOpEnergyStrategyById(Long id);
 
     /**
      * 查询能源策略列表
      * 
-     * @param admOpEnergyStrategy 能源策略
+     * @param opEnergyStrategy 能源策略
      * @return 能源策略集合
      */
-    public List<AdmOpEnergyStrategy> selectAdmOpEnergyStrategyList(AdmOpEnergyStrategy admOpEnergyStrategy);
+     List<OpEnergyStrategy> selectOpEnergyStrategyList(OpEnergyStrategy opEnergyStrategy);
 
     /**
      * 新增能源策略
      * 
-     * @param admOpEnergyStrategy 能源策略
+     * @param opEnergyStrategy 能源策略
      * @return 结果
      */
-    public int insertAdmOpEnergyStrategy(AdmOpEnergyStrategy admOpEnergyStrategy);
+     int insertOpEnergyStrategy(OpEnergyStrategy opEnergyStrategy);
 
     /**
      * 修改能源策略
      * 
-     * @param admOpEnergyStrategy 能源策略
+     * @param opEnergyStrategy 能源策略
      * @return 结果
      */
-    public int updateAdmOpEnergyStrategy(AdmOpEnergyStrategy admOpEnergyStrategy);
+     int updateOpEnergyStrategy(OpEnergyStrategy opEnergyStrategy);
 
     /**
      * 批量删除能源策略
@@ -49,7 +49,7 @@ public interface IAdmOpEnergyStrategyService
      * @param ids 需要删除的能源策略主键集合
      * @return 结果
      */
-    public int deleteAdmOpEnergyStrategyByIds(Long[] ids);
+     int deleteOpEnergyStrategyByIds(Long[] ids);
 
     /**
      * 删除能源策略信息
@@ -57,5 +57,5 @@ public interface IAdmOpEnergyStrategyService
      * @param id 能源策略主键
      * @return 结果
      */
-    public int deleteAdmOpEnergyStrategyById(Long id);
+     int deleteOpEnergyStrategyById(Long id);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IPvSupplyHService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.ems.service;
+
+import java.util.List;
+import com.ruoyi.ems.domain.PvSupplyH;
+
+/**
+ * 光伏并网计量-小时Service接口
+ *
+ * @author ruoyi
+ * @date 2024-08-02
+ */
+public interface IPvSupplyHService
+{
+    /**
+     * 查询光伏并网计量-小时
+     *
+     * @param id 光伏并网计量-小时主键
+     * @return 光伏并网计量-小时
+     */
+     PvSupplyH selectPvSupplyHById(Long id);
+
+    /**
+     * 查询光伏并网计量-小时列表
+     *
+     * @param admEmsPvSupplyH 光伏并网计量-小时
+     * @return 光伏并网计量-小时集合
+     */
+     List<PvSupplyH> selectPvSupplyHList(PvSupplyH admEmsPvSupplyH);
+
+
+     List<PvSupplyH> selectAreaSupplyH(PvSupplyH admEmsPvSupplyH);
+    /**
+     * 新增光伏并网计量-小时
+     *
+     * @param admEmsPvSupplyH 光伏并网计量-小时
+     * @return 结果
+     */
+     int insertPvSupplyH(PvSupplyH admEmsPvSupplyH);
+
+    /**
+     * 修改光伏并网计量-小时
+     *
+     * @param admEmsPvSupplyH 光伏并网计量-小时
+     * @return 结果
+     */
+     int updatePvSupplyH(PvSupplyH admEmsPvSupplyH);
+
+    /**
+     * 批量删除光伏并网计量-小时
+     *
+     * @param ids 需要删除的光伏并网计量-小时主键集合
+     * @return 结果
+     */
+     int deletePvSupplyHByIds(Long[] ids);
+
+    /**
+     * 删除光伏并网计量-小时信息
+     *
+     * @param id 光伏并网计量-小时主键
+     * @return 结果
+     */
+     int deletePvSupplyHById(Long id);
+}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/AdmEmsCaEmissionForecastServiceImpl.java

@@ -1,93 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.ems.mapper.AdmEmsCaEmissionForecastMapper;
-import com.ruoyi.ems.domain.AdmEmsCaEmissionForecast;
-import com.ruoyi.ems.service.IAdmEmsCaEmissionForecastService;
-
-/**
- * 碳排放预测Service业务层处理
- * 
- * @author ruoyi
- * @date 2024-08-12
- */
-@Service
-public class AdmEmsCaEmissionForecastServiceImpl implements IAdmEmsCaEmissionForecastService 
-{
-    @Autowired
-    private AdmEmsCaEmissionForecastMapper admEmsCaEmissionForecastMapper;
-
-    /**
-     * 查询碳排放预测
-     * 
-     * @param id 碳排放预测主键
-     * @return 碳排放预测
-     */
-    @Override
-    public AdmEmsCaEmissionForecast selectAdmEmsCaEmissionForecastById(Long id)
-    {
-        return admEmsCaEmissionForecastMapper.selectAdmEmsCaEmissionForecastById(id);
-    }
-
-    /**
-     * 查询碳排放预测列表
-     * 
-     * @param admEmsCaEmissionForecast 碳排放预测
-     * @return 碳排放预测
-     */
-    @Override
-    public List<AdmEmsCaEmissionForecast> selectAdmEmsCaEmissionForecastList(AdmEmsCaEmissionForecast admEmsCaEmissionForecast)
-    {
-        return admEmsCaEmissionForecastMapper.selectAdmEmsCaEmissionForecastList(admEmsCaEmissionForecast);
-    }
-
-    /**
-     * 新增碳排放预测
-     * 
-     * @param admEmsCaEmissionForecast 碳排放预测
-     * @return 结果
-     */
-    @Override
-    public int insertAdmEmsCaEmissionForecast(AdmEmsCaEmissionForecast admEmsCaEmissionForecast)
-    {
-        return admEmsCaEmissionForecastMapper.insertAdmEmsCaEmissionForecast(admEmsCaEmissionForecast);
-    }
-
-    /**
-     * 修改碳排放预测
-     * 
-     * @param admEmsCaEmissionForecast 碳排放预测
-     * @return 结果
-     */
-    @Override
-    public int updateAdmEmsCaEmissionForecast(AdmEmsCaEmissionForecast admEmsCaEmissionForecast)
-    {
-        return admEmsCaEmissionForecastMapper.updateAdmEmsCaEmissionForecast(admEmsCaEmissionForecast);
-    }
-
-    /**
-     * 批量删除碳排放预测
-     * 
-     * @param ids 需要删除的碳排放预测主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmEmsCaEmissionForecastByIds(Long[] ids)
-    {
-        return admEmsCaEmissionForecastMapper.deleteAdmEmsCaEmissionForecastByIds(ids);
-    }
-
-    /**
-     * 删除碳排放预测信息
-     * 
-     * @param id 碳排放预测主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmEmsCaEmissionForecastById(Long id)
-    {
-        return admEmsCaEmissionForecastMapper.deleteAdmEmsCaEmissionForecastById(id);
-    }
-}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/AdmEmsCaMeterDServiceImpl.java

@@ -1,93 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.ems.mapper.AdmEmsCaMeterDMapper;
-import com.ruoyi.ems.domain.AdmEmsCaMeterD;
-import com.ruoyi.ems.service.IAdmEmsCaMeterDService;
-
-/**
- * 碳计量日Service业务层处理
- * 
- * @author ruoyi
- * @date 2024-08-12
- */
-@Service
-public class AdmEmsCaMeterDServiceImpl implements IAdmEmsCaMeterDService 
-{
-    @Autowired
-    private AdmEmsCaMeterDMapper admEmsCaMeterDMapper;
-
-    /**
-     * 查询碳计量日
-     * 
-     * @param id 碳计量日主键
-     * @return 碳计量日
-     */
-    @Override
-    public AdmEmsCaMeterD selectAdmEmsCaMeterDById(Long id)
-    {
-        return admEmsCaMeterDMapper.selectAdmEmsCaMeterDById(id);
-    }
-
-    /**
-     * 查询碳计量日列表
-     * 
-     * @param admEmsCaMeterD 碳计量日
-     * @return 碳计量日
-     */
-    @Override
-    public List<AdmEmsCaMeterD> selectAdmEmsCaMeterDList(AdmEmsCaMeterD admEmsCaMeterD)
-    {
-        return admEmsCaMeterDMapper.selectAdmEmsCaMeterDList(admEmsCaMeterD);
-    }
-
-    /**
-     * 新增碳计量日
-     * 
-     * @param admEmsCaMeterD 碳计量日
-     * @return 结果
-     */
-    @Override
-    public int insertAdmEmsCaMeterD(AdmEmsCaMeterD admEmsCaMeterD)
-    {
-        return admEmsCaMeterDMapper.insertAdmEmsCaMeterD(admEmsCaMeterD);
-    }
-
-    /**
-     * 修改碳计量日
-     * 
-     * @param admEmsCaMeterD 碳计量日
-     * @return 结果
-     */
-    @Override
-    public int updateAdmEmsCaMeterD(AdmEmsCaMeterD admEmsCaMeterD)
-    {
-        return admEmsCaMeterDMapper.updateAdmEmsCaMeterD(admEmsCaMeterD);
-    }
-
-    /**
-     * 批量删除碳计量日
-     * 
-     * @param ids 需要删除的碳计量日主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmEmsCaMeterDByIds(Long[] ids)
-    {
-        return admEmsCaMeterDMapper.deleteAdmEmsCaMeterDByIds(ids);
-    }
-
-    /**
-     * 删除碳计量日信息
-     * 
-     * @param id 碳计量日主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmEmsCaMeterDById(Long id)
-    {
-        return admEmsCaMeterDMapper.deleteAdmEmsCaMeterDById(id);
-    }
-}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/AdmEmsElecExpendForecastServiceImpl.java

@@ -1,93 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.ems.mapper.AdmEmsElecExpendForecastMapper;
-import com.ruoyi.ems.domain.AdmEmsElecExpendForecast;
-import com.ruoyi.ems.service.IAdmEmsElecExpendForecastService;
-
-/**
- * 电力消耗预测Service业务层处理
- * 
- * @author ruoyi
- * @date 2024-08-12
- */
-@Service
-public class AdmEmsElecExpendForecastServiceImpl implements IAdmEmsElecExpendForecastService 
-{
-    @Autowired
-    private AdmEmsElecExpendForecastMapper admEmsElecExpendForecastMapper;
-
-    /**
-     * 查询电力消耗预测
-     * 
-     * @param id 电力消耗预测主键
-     * @return 电力消耗预测
-     */
-    @Override
-    public AdmEmsElecExpendForecast selectAdmEmsElecExpendForecastById(Long id)
-    {
-        return admEmsElecExpendForecastMapper.selectAdmEmsElecExpendForecastById(id);
-    }
-
-    /**
-     * 查询电力消耗预测列表
-     * 
-     * @param admEmsElecExpendForecast 电力消耗预测
-     * @return 电力消耗预测
-     */
-    @Override
-    public List<AdmEmsElecExpendForecast> selectAdmEmsElecExpendForecastList(AdmEmsElecExpendForecast admEmsElecExpendForecast)
-    {
-        return admEmsElecExpendForecastMapper.selectAdmEmsElecExpendForecastList(admEmsElecExpendForecast);
-    }
-
-    /**
-     * 新增电力消耗预测
-     * 
-     * @param admEmsElecExpendForecast 电力消耗预测
-     * @return 结果
-     */
-    @Override
-    public int insertAdmEmsElecExpendForecast(AdmEmsElecExpendForecast admEmsElecExpendForecast)
-    {
-        return admEmsElecExpendForecastMapper.insertAdmEmsElecExpendForecast(admEmsElecExpendForecast);
-    }
-
-    /**
-     * 修改电力消耗预测
-     * 
-     * @param admEmsElecExpendForecast 电力消耗预测
-     * @return 结果
-     */
-    @Override
-    public int updateAdmEmsElecExpendForecast(AdmEmsElecExpendForecast admEmsElecExpendForecast)
-    {
-        return admEmsElecExpendForecastMapper.updateAdmEmsElecExpendForecast(admEmsElecExpendForecast);
-    }
-
-    /**
-     * 批量删除电力消耗预测
-     * 
-     * @param ids 需要删除的电力消耗预测主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmEmsElecExpendForecastByIds(Long[] ids)
-    {
-        return admEmsElecExpendForecastMapper.deleteAdmEmsElecExpendForecastByIds(ids);
-    }
-
-    /**
-     * 删除电力消耗预测信息
-     * 
-     * @param id 电力消耗预测主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmEmsElecExpendForecastById(Long id)
-    {
-        return admEmsElecExpendForecastMapper.deleteAdmEmsElecExpendForecastById(id);
-    }
-}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/AdmEmsElecProdForecastServiceImpl.java

@@ -1,93 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.ems.mapper.AdmEmsElecProdForecastMapper;
-import com.ruoyi.ems.domain.AdmEmsElecProdForecast;
-import com.ruoyi.ems.service.IAdmEmsElecProdForecastService;
-
-/**
- * 电力产能预测Service业务层处理
- * 
- * @author ruoyi
- * @date 2024-08-12
- */
-@Service
-public class AdmEmsElecProdForecastServiceImpl implements IAdmEmsElecProdForecastService 
-{
-    @Autowired
-    private AdmEmsElecProdForecastMapper admEmsElecProdForecastMapper;
-
-    /**
-     * 查询电力产能预测
-     * 
-     * @param id 电力产能预测主键
-     * @return 电力产能预测
-     */
-    @Override
-    public AdmEmsElecProdForecast selectAdmEmsElecProdForecastById(Long id)
-    {
-        return admEmsElecProdForecastMapper.selectAdmEmsElecProdForecastById(id);
-    }
-
-    /**
-     * 查询电力产能预测列表
-     * 
-     * @param admEmsElecProdForecast 电力产能预测
-     * @return 电力产能预测
-     */
-    @Override
-    public List<AdmEmsElecProdForecast> selectAdmEmsElecProdForecastList(AdmEmsElecProdForecast admEmsElecProdForecast)
-    {
-        return admEmsElecProdForecastMapper.selectAdmEmsElecProdForecastList(admEmsElecProdForecast);
-    }
-
-    /**
-     * 新增电力产能预测
-     * 
-     * @param admEmsElecProdForecast 电力产能预测
-     * @return 结果
-     */
-    @Override
-    public int insertAdmEmsElecProdForecast(AdmEmsElecProdForecast admEmsElecProdForecast)
-    {
-        return admEmsElecProdForecastMapper.insertAdmEmsElecProdForecast(admEmsElecProdForecast);
-    }
-
-    /**
-     * 修改电力产能预测
-     * 
-     * @param admEmsElecProdForecast 电力产能预测
-     * @return 结果
-     */
-    @Override
-    public int updateAdmEmsElecProdForecast(AdmEmsElecProdForecast admEmsElecProdForecast)
-    {
-        return admEmsElecProdForecastMapper.updateAdmEmsElecProdForecast(admEmsElecProdForecast);
-    }
-
-    /**
-     * 批量删除电力产能预测
-     * 
-     * @param ids 需要删除的电力产能预测主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmEmsElecProdForecastByIds(Long[] ids)
-    {
-        return admEmsElecProdForecastMapper.deleteAdmEmsElecProdForecastByIds(ids);
-    }
-
-    /**
-     * 删除电力产能预测信息
-     * 
-     * @param id 电力产能预测主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmEmsElecProdForecastById(Long id)
-    {
-        return admEmsElecProdForecastMapper.deleteAdmEmsElecProdForecastById(id);
-    }
-}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/AdmEmsPvSupplyHServiceImpl.java

@@ -1,91 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.ems.mapper.AdmEmsPvSupplyHMapper;
-import com.ruoyi.ems.domain.AdmEmsPvSupplyH;
-import com.ruoyi.ems.service.IAdmEmsPvSupplyHService;
-
-/**
- * 光伏并网计量光伏并网计量-小时Service业务层处理
- *
- * @author ruoyi
- * @date 2024-08-02
- */
-@Service
-public class AdmEmsPvSupplyHServiceImpl implements IAdmEmsPvSupplyHService {
-    @Autowired
-    private AdmEmsPvSupplyHMapper admEmsPvSupplyHMapper;
-
-    /**
-     * 查询光伏并网计量光伏并网计量-小时
-     *
-     * @param id 光伏并网计量光伏并网计量-小时主键
-     * @return 光伏并网计量光伏并网计量-小时
-     */
-    @Override
-    public AdmEmsPvSupplyH selectAdmEmsPvSupplyHById(Long id) {
-        return admEmsPvSupplyHMapper.selectAdmEmsPvSupplyHById(id);
-    }
-
-    /**
-     * 查询光伏并网计量光伏并网计量-小时列表
-     *
-     * @param admEmsPvSupplyH 光伏并网计量光伏并网计量-小时
-     * @return 光伏并网计量光伏并网计量-小时
-     */
-    @Override
-    public List<AdmEmsPvSupplyH> selectAdmEmsPvSupplyHList(AdmEmsPvSupplyH admEmsPvSupplyH) {
-        return admEmsPvSupplyHMapper.selectAdmEmsPvSupplyHList(admEmsPvSupplyH);
-    }
-
-    @Override
-    public List<AdmEmsPvSupplyH> selectAreaSupplyH(AdmEmsPvSupplyH admEmsPvSupplyH) {
-        return admEmsPvSupplyHMapper.selectAreaSupplyH(admEmsPvSupplyH);
-    }
-
-    /**
-     * 新增光伏并网计量光伏并网计量-小时
-     *
-     * @param admEmsPvSupplyH 光伏并网计量光伏并网计量-小时
-     * @return 结果
-     */
-    @Override
-    public int insertAdmEmsPvSupplyH(AdmEmsPvSupplyH admEmsPvSupplyH) {
-        return admEmsPvSupplyHMapper.insertAdmEmsPvSupplyH(admEmsPvSupplyH);
-    }
-
-    /**
-     * 修改光伏并网计量光伏并网计量-小时
-     *
-     * @param admEmsPvSupplyH 光伏并网计量光伏并网计量-小时
-     * @return 结果
-     */
-    @Override
-    public int updateAdmEmsPvSupplyH(AdmEmsPvSupplyH admEmsPvSupplyH) {
-        return admEmsPvSupplyHMapper.updateAdmEmsPvSupplyH(admEmsPvSupplyH);
-    }
-
-    /**
-     * 批量删除光伏并网计量光伏并网计量-小时
-     *
-     * @param ids 需要删除的光伏并网计量光伏并网计量-小时主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmEmsPvSupplyHByIds(Long[] ids) {
-        return admEmsPvSupplyHMapper.deleteAdmEmsPvSupplyHByIds(ids);
-    }
-
-    /**
-     * 删除光伏并网计量光伏并网计量-小时信息
-     *
-     * @param id 光伏并网计量光伏并网计量-小时主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmEmsPvSupplyHById(Long id) {
-        return admEmsPvSupplyHMapper.deleteAdmEmsPvSupplyHById(id);
-    }
-}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/CaEmissionForecastServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.ems.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ems.mapper.CaEmissionForecastMapper;
+import com.ruoyi.ems.domain.CaEmissionForecast;
+import com.ruoyi.ems.service.ICaEmissionForecastService;
+
+/**
+ * 碳排放预测Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-08-12
+ */
+@Service
+public class CaEmissionForecastServiceImpl implements ICaEmissionForecastService
+{
+    @Autowired
+    private CaEmissionForecastMapper caEmissionForecastMapper;
+
+    /**
+     * 查询碳排放预测
+     * 
+     * @param id 碳排放预测主键
+     * @return 碳排放预测
+     */
+    @Override
+    public CaEmissionForecast selectCaEmissionForecastById(Long id)
+    {
+        return caEmissionForecastMapper.selectCaEmissionForecastById(id);
+    }
+
+    /**
+     * 查询碳排放预测列表
+     * 
+     * @param admEmsCaEmissionForecast 碳排放预测
+     * @return 碳排放预测
+     */
+    @Override
+    public List<CaEmissionForecast> selectCaEmissionForecastList(CaEmissionForecast admEmsCaEmissionForecast)
+    {
+        return caEmissionForecastMapper.selectCaEmissionForecastList(admEmsCaEmissionForecast);
+    }
+
+    /**
+     * 新增碳排放预测
+     * 
+     * @param admEmsCaEmissionForecast 碳排放预测
+     * @return 结果
+     */
+    @Override
+    public int insertCaEmissionForecast(CaEmissionForecast admEmsCaEmissionForecast)
+    {
+        return caEmissionForecastMapper.insertCaEmissionForecast(admEmsCaEmissionForecast);
+    }
+
+    /**
+     * 修改碳排放预测
+     * 
+     * @param admEmsCaEmissionForecast 碳排放预测
+     * @return 结果
+     */
+    @Override
+    public int updateCaEmissionForecast(CaEmissionForecast admEmsCaEmissionForecast)
+    {
+        return caEmissionForecastMapper.updateCaEmissionForecast(admEmsCaEmissionForecast);
+    }
+
+    /**
+     * 批量删除碳排放预测
+     * 
+     * @param ids 需要删除的碳排放预测主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCaEmissionForecastByIds(Long[] ids)
+    {
+        return caEmissionForecastMapper.deleteCaEmissionForecastByIds(ids);
+    }
+
+    /**
+     * 删除碳排放预测信息
+     * 
+     * @param id 碳排放预测主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCaEmissionForecastById(Long id)
+    {
+        return caEmissionForecastMapper.deleteCaEmissionForecastById(id);
+    }
+}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/CaMeterDServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.ems.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ems.mapper.CaMeterDMapper;
+import com.ruoyi.ems.domain.CaMeterD;
+import com.ruoyi.ems.service.ICaMeterDService;
+
+/**
+ * 碳计量日Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-08-12
+ */
+@Service
+public class CaMeterDServiceImpl implements ICaMeterDService
+{
+    @Autowired
+    private CaMeterDMapper caMeterDMapper;
+
+    /**
+     * 查询碳计量日
+     * 
+     * @param id 碳计量日主键
+     * @return 碳计量日
+     */
+    @Override
+    public CaMeterD selectCaMeterDById(Long id)
+    {
+        return caMeterDMapper.selectCaMeterDById(id);
+    }
+
+    /**
+     * 查询碳计量日列表
+     * 
+     * @param caMeterD 碳计量日
+     * @return 碳计量日
+     */
+    @Override
+    public List<CaMeterD> selectCaMeterDList(CaMeterD caMeterD)
+    {
+        return caMeterDMapper.selectCaMeterDList(caMeterD);
+    }
+
+    /**
+     * 新增碳计量日
+     * 
+     * @param caMeterD 碳计量日
+     * @return 结果
+     */
+    @Override
+    public int insertCaMeterD(CaMeterD caMeterD)
+    {
+        return caMeterDMapper.insertCaMeterD(caMeterD);
+    }
+
+    /**
+     * 修改碳计量日
+     * 
+     * @param caMeterD 碳计量日
+     * @return 结果
+     */
+    @Override
+    public int updateCaMeterD(CaMeterD caMeterD)
+    {
+        return caMeterDMapper.updateCaMeterD(caMeterD);
+    }
+
+    /**
+     * 批量删除碳计量日
+     * 
+     * @param ids 需要删除的碳计量日主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCaMeterDByIds(Long[] ids)
+    {
+        return caMeterDMapper.deleteCaMeterDByIds(ids);
+    }
+
+    /**
+     * 删除碳计量日信息
+     * 
+     * @param id 碳计量日主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCaMeterDById(Long id)
+    {
+        return caMeterDMapper.deleteCaMeterDById(id);
+    }
+}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/ElecExpendForecastServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.ems.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ems.mapper.ElecExpendForecastMapper;
+import com.ruoyi.ems.domain.ElecExpendForecast;
+import com.ruoyi.ems.service.IElecExpendForecastService;
+
+/**
+ * 电力消耗预测Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-08-12
+ */
+@Service
+public class ElecExpendForecastServiceImpl implements IElecExpendForecastService
+{
+    @Autowired
+    private ElecExpendForecastMapper emsElecExpendForecastMapper;
+
+    /**
+     * 查询电力消耗预测
+     * 
+     * @param id 电力消耗预测主键
+     * @return 电力消耗预测
+     */
+    @Override
+    public ElecExpendForecast selectElecExpendForecastById(Long id)
+    {
+        return emsElecExpendForecastMapper.selectElecExpendForecastById(id);
+    }
+
+    /**
+     * 查询电力消耗预测列表
+     * 
+     * @param admEmsElecExpendForecast 电力消耗预测
+     * @return 电力消耗预测
+     */
+    @Override
+    public List<ElecExpendForecast> selectElecExpendForecastList(ElecExpendForecast admEmsElecExpendForecast)
+    {
+        return emsElecExpendForecastMapper.selectElecExpendForecastList(admEmsElecExpendForecast);
+    }
+
+    /**
+     * 新增电力消耗预测
+     * 
+     * @param admEmsElecExpendForecast 电力消耗预测
+     * @return 结果
+     */
+    @Override
+    public int insertElecExpendForecast(ElecExpendForecast admEmsElecExpendForecast)
+    {
+        return emsElecExpendForecastMapper.insertElecExpendForecast(admEmsElecExpendForecast);
+    }
+
+    /**
+     * 修改电力消耗预测
+     * 
+     * @param admEmsElecExpendForecast 电力消耗预测
+     * @return 结果
+     */
+    @Override
+    public int updateElecExpendForecast(ElecExpendForecast admEmsElecExpendForecast)
+    {
+        return emsElecExpendForecastMapper.updateElecExpendForecast(admEmsElecExpendForecast);
+    }
+
+    /**
+     * 批量删除电力消耗预测
+     * 
+     * @param ids 需要删除的电力消耗预测主键
+     * @return 结果
+     */
+    @Override
+    public int deleteElecExpendForecastByIds(Long[] ids)
+    {
+        return emsElecExpendForecastMapper.deleteElecExpendForecastByIds(ids);
+    }
+
+    /**
+     * 删除电力消耗预测信息
+     * 
+     * @param id 电力消耗预测主键
+     * @return 结果
+     */
+    @Override
+    public int deleteElecExpendForecastById(Long id)
+    {
+        return emsElecExpendForecastMapper.deleteElecExpendForecastById(id);
+    }
+}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/AdmEmsElecLoadIndexServiceImpl.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/ElecLoadIndexServiceImpl.java

@@ -3,9 +3,9 @@ package com.ruoyi.ems.service.impl;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.ems.mapper.AdmEmsElecLoadIndexMapper;
-import com.ruoyi.ems.domain.AdmEmsElecLoadIndex;
-import com.ruoyi.ems.service.IAdmEmsElecLoadIndexService;
+import com.ruoyi.ems.mapper.ElecLoadIndexMapper;
+import com.ruoyi.ems.domain.ElecLoadIndex;
+import com.ruoyi.ems.service.IElecLoadIndexService;
 
 /**
  * 电力负荷设施指标Service业务层处理
@@ -14,10 +14,10 @@ import com.ruoyi.ems.service.IAdmEmsElecLoadIndexService;
  * @date 2024-08-09
  */
 @Service
-public class AdmEmsElecLoadIndexServiceImpl implements IAdmEmsElecLoadIndexService 
+public class ElecLoadIndexServiceImpl implements IElecLoadIndexService
 {
     @Autowired
-    private AdmEmsElecLoadIndexMapper admEmsElecLoadIndexMapper;
+    private ElecLoadIndexMapper elecLoadIndexMapper;
 
     /**
      * 查询电力负荷设施指标
@@ -26,9 +26,9 @@ public class AdmEmsElecLoadIndexServiceImpl implements IAdmEmsElecLoadIndexServi
      * @return 电力负荷设施指标
      */
     @Override
-    public AdmEmsElecLoadIndex selectAdmEmsElecLoadIndexById(Long id)
+    public ElecLoadIndex selectElecLoadIndexById(Long id)
     {
-        return admEmsElecLoadIndexMapper.selectAdmEmsElecLoadIndexById(id);
+        return elecLoadIndexMapper.selectElecLoadIndexById(id);
     }
 
     /**
@@ -38,9 +38,9 @@ public class AdmEmsElecLoadIndexServiceImpl implements IAdmEmsElecLoadIndexServi
      * @return 电力负荷设施指标
      */
     @Override
-    public List<AdmEmsElecLoadIndex> selectAdmEmsElecLoadIndexList(AdmEmsElecLoadIndex admEmsElecLoadIndex)
+    public List<ElecLoadIndex> selectElecLoadIndexList(ElecLoadIndex admEmsElecLoadIndex)
     {
-        return admEmsElecLoadIndexMapper.selectAdmEmsElecLoadIndexList(admEmsElecLoadIndex);
+        return elecLoadIndexMapper.selectElecLoadIndexList(admEmsElecLoadIndex);
     }
 
     /**
@@ -50,9 +50,9 @@ public class AdmEmsElecLoadIndexServiceImpl implements IAdmEmsElecLoadIndexServi
      * @return 结果
      */
     @Override
-    public int insertAdmEmsElecLoadIndex(AdmEmsElecLoadIndex admEmsElecLoadIndex)
+    public int insertElecLoadIndex(ElecLoadIndex admEmsElecLoadIndex)
     {
-        return admEmsElecLoadIndexMapper.insertAdmEmsElecLoadIndex(admEmsElecLoadIndex);
+        return elecLoadIndexMapper.insertElecLoadIndex(admEmsElecLoadIndex);
     }
 
     /**
@@ -62,9 +62,9 @@ public class AdmEmsElecLoadIndexServiceImpl implements IAdmEmsElecLoadIndexServi
      * @return 结果
      */
     @Override
-    public int updateAdmEmsElecLoadIndex(AdmEmsElecLoadIndex admEmsElecLoadIndex)
+    public int updateElecLoadIndex(ElecLoadIndex admEmsElecLoadIndex)
     {
-        return admEmsElecLoadIndexMapper.updateAdmEmsElecLoadIndex(admEmsElecLoadIndex);
+        return elecLoadIndexMapper.updateElecLoadIndex(admEmsElecLoadIndex);
     }
 
     /**
@@ -74,9 +74,9 @@ public class AdmEmsElecLoadIndexServiceImpl implements IAdmEmsElecLoadIndexServi
      * @return 结果
      */
     @Override
-    public int deleteAdmEmsElecLoadIndexByIds(Long[] ids)
+    public int deleteElecLoadIndexByIds(Long[] ids)
     {
-        return admEmsElecLoadIndexMapper.deleteAdmEmsElecLoadIndexByIds(ids);
+        return elecLoadIndexMapper.deleteElecLoadIndexByIds(ids);
     }
 
     /**
@@ -86,8 +86,8 @@ public class AdmEmsElecLoadIndexServiceImpl implements IAdmEmsElecLoadIndexServi
      * @return 结果
      */
     @Override
-    public int deleteAdmEmsElecLoadIndexById(Long id)
+    public int deleteElecLoadIndexById(Long id)
     {
-        return admEmsElecLoadIndexMapper.deleteAdmEmsElecLoadIndexById(id);
+        return elecLoadIndexMapper.deleteElecLoadIndexById(id);
     }
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/ElecProdForecastServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.ems.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ems.mapper.ElecProdForecastMapper;
+import com.ruoyi.ems.domain.ElecProdForecast;
+import com.ruoyi.ems.service.IElecProdForecastService;
+
+/**
+ * 电力产能预测Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-08-12
+ */
+@Service
+public class ElecProdForecastServiceImpl implements IElecProdForecastService
+{
+    @Autowired
+    private ElecProdForecastMapper admEmsElecProdForecastMapper;
+
+    /**
+     * 查询电力产能预测
+     * 
+     * @param id 电力产能预测主键
+     * @return 电力产能预测
+     */
+    @Override
+    public ElecProdForecast selectElecProdForecastById(Long id)
+    {
+        return admEmsElecProdForecastMapper.selectElecProdForecastById(id);
+    }
+
+    /**
+     * 查询电力产能预测列表
+     * 
+     * @param admEmsElecProdForecast 电力产能预测
+     * @return 电力产能预测
+     */
+    @Override
+    public List<ElecProdForecast> selectElecProdForecastList(ElecProdForecast admEmsElecProdForecast)
+    {
+        return admEmsElecProdForecastMapper.selectElecProdForecastList(admEmsElecProdForecast);
+    }
+
+    /**
+     * 新增电力产能预测
+     * 
+     * @param admEmsElecProdForecast 电力产能预测
+     * @return 结果
+     */
+    @Override
+    public int insertElecProdForecast(ElecProdForecast admEmsElecProdForecast)
+    {
+        return admEmsElecProdForecastMapper.insertElecProdForecast(admEmsElecProdForecast);
+    }
+
+    /**
+     * 修改电力产能预测
+     * 
+     * @param admEmsElecProdForecast 电力产能预测
+     * @return 结果
+     */
+    @Override
+    public int updateElecProdForecast(ElecProdForecast admEmsElecProdForecast)
+    {
+        return admEmsElecProdForecastMapper.updateElecProdForecast(admEmsElecProdForecast);
+    }
+
+    /**
+     * 批量删除电力产能预测
+     * 
+     * @param ids 需要删除的电力产能预测主键
+     * @return 结果
+     */
+    @Override
+    public int deleteElecProdForecastByIds(Long[] ids)
+    {
+        return admEmsElecProdForecastMapper.deleteElecProdForecastByIds(ids);
+    }
+
+    /**
+     * 删除电力产能预测信息
+     * 
+     * @param id 电力产能预测主键
+     * @return 结果
+     */
+    @Override
+    public int deleteElecProdForecastById(Long id)
+    {
+        return admEmsElecProdForecastMapper.deleteElecProdForecastById(id);
+    }
+}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/EmsElecStoreHServiceImpl.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/ElecStoreHServiceImpl.java

@@ -4,8 +4,8 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.ems.mapper.EmsElecStoreHMapper;
-import com.ruoyi.ems.domain.EmsElecStoreH;
-import com.ruoyi.ems.service.IEmsElecStoreHService;
+import com.ruoyi.ems.domain.ElecStoreH;
+import com.ruoyi.ems.service.IElecStoreHService;
 
 /**
  * 储能计量-小时Service业务层处理
@@ -14,10 +14,10 @@ import com.ruoyi.ems.service.IEmsElecStoreHService;
  * @date 2024-08-09
  */
 @Service
-public class EmsElecStoreHServiceImpl implements IEmsElecStoreHService
+public class ElecStoreHServiceImpl implements IElecStoreHService
 {
     @Autowired
-    private EmsElecStoreHMapper emsElecStoreHMapper;
+    private EmsElecStoreHMapper elecStoreHMapper;
 
     /**
      * 查询储能计量-小时
@@ -26,9 +26,9 @@ public class EmsElecStoreHServiceImpl implements IEmsElecStoreHService
      * @return 储能计量-小时
      */
     @Override
-    public EmsElecStoreH selectEmsElecStoreHById(Long id)
+    public ElecStoreH selectElecStoreHById(Long id)
     {
-        return emsElecStoreHMapper.selectEmsElecStoreHById(id);
+        return elecStoreHMapper.selectEmsElecStoreHById(id);
     }
 
     /**
@@ -38,9 +38,9 @@ public class EmsElecStoreHServiceImpl implements IEmsElecStoreHService
      * @return 储能计量-小时
      */
     @Override
-    public List<EmsElecStoreH> selectEmsElecStoreHList(EmsElecStoreH admEmsElecStoreH)
+    public List<ElecStoreH> selectElecStoreHList(ElecStoreH admEmsElecStoreH)
     {
-        return emsElecStoreHMapper.selectEmsElecStoreHList(admEmsElecStoreH);
+        return elecStoreHMapper.selectEmsElecStoreHList(admEmsElecStoreH);
     }
 
     /**
@@ -50,9 +50,9 @@ public class EmsElecStoreHServiceImpl implements IEmsElecStoreHService
      * @return 结果
      */
     @Override
-    public int insertEmsElecStoreH(EmsElecStoreH admEmsElecStoreH)
+    public int insertElecStoreH(ElecStoreH admEmsElecStoreH)
     {
-        return emsElecStoreHMapper.insertEmsElecStoreH(admEmsElecStoreH);
+        return elecStoreHMapper.insertEmsElecStoreH(admEmsElecStoreH);
     }
 
     /**
@@ -62,9 +62,9 @@ public class EmsElecStoreHServiceImpl implements IEmsElecStoreHService
      * @return 结果
      */
     @Override
-    public int updateEmsElecStoreH(EmsElecStoreH admEmsElecStoreH)
+    public int updateElecStoreH(ElecStoreH admEmsElecStoreH)
     {
-        return emsElecStoreHMapper.updateEmsElecStoreH(admEmsElecStoreH);
+        return elecStoreHMapper.updateEmsElecStoreH(admEmsElecStoreH);
     }
 
     /**
@@ -74,9 +74,9 @@ public class EmsElecStoreHServiceImpl implements IEmsElecStoreHService
      * @return 结果
      */
     @Override
-    public int deleteEmsElecStoreHByIds(Long[] ids)
+    public int deleteElecStoreHByIds(Long[] ids)
     {
-        return emsElecStoreHMapper.deleteEmsElecStoreHByIds(ids);
+        return elecStoreHMapper.deleteEmsElecStoreHByIds(ids);
     }
 
     /**
@@ -86,8 +86,8 @@ public class EmsElecStoreHServiceImpl implements IEmsElecStoreHService
      * @return 结果
      */
     @Override
-    public int deleteEmsElecStoreHById(Long id)
+    public int deleteElecStoreHById(Long id)
     {
-        return emsElecStoreHMapper.deleteEmsElecStoreHById(id);
+        return elecStoreHMapper.deleteEmsElecStoreHById(id);
     }
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/EmsFacsUseHServiceImpl.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/ElecUseHServiceImpl.java

@@ -2,9 +2,9 @@ package com.ruoyi.ems.service.impl;
 
 import java.util.List;
 
-import com.ruoyi.ems.domain.EmsFacsUseH;
-import com.ruoyi.ems.mapper.EmsFacsUseHMapper;
-import com.ruoyi.ems.service.IEmsFacsUseHService;
+import com.ruoyi.ems.domain.ElecUseH;
+import com.ruoyi.ems.mapper.ElecUseHMapper;
+import com.ruoyi.ems.service.IElecUseHService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -15,10 +15,10 @@ import org.springframework.stereotype.Service;
  * @date 2024-08-15
  */
 @Service
-public class EmsFacsUseHServiceImpl implements IEmsFacsUseHService
+public class ElecUseHServiceImpl implements IElecUseHService
 {
     @Autowired
-    private EmsFacsUseHMapper emsFacsUseHMapper;
+    private ElecUseHMapper elecUseHMapper;
 
     /**
      * 查询用能计量-小时
@@ -27,45 +27,45 @@ public class EmsFacsUseHServiceImpl implements IEmsFacsUseHService
      * @return 用能计量-小时
      */
     @Override
-    public EmsFacsUseH selectEmsFacsUseHById(Long id)
+    public ElecUseH selectElecUseHById(Long id)
     {
-        return emsFacsUseHMapper.selectEmsFacsUseHById(id);
+        return elecUseHMapper.selectElecUseHById(id);
     }
 
     /**
      * 查询用能计量-小时列表
      * 
-     * @param EmsFacsUseH 用能计量-小时
+     * @param ElecUseH 用能计量-小时
      * @return 用能计量-小时
      */
     @Override
-    public List<EmsFacsUseH> selectEmsFacsUseHList(EmsFacsUseH EmsFacsUseH)
+    public List<ElecUseH> selectElecUseHList(ElecUseH ElecUseH)
     {
-        return emsFacsUseHMapper.selectEmsFacsUseHList(EmsFacsUseH);
+        return elecUseHMapper.selectElecUseHList(ElecUseH);
     }
 
     /**
      * 新增用能计量-小时
      * 
-     * @param EmsFacsUseH 用能计量-小时
+     * @param ElecUseH 用能计量-小时
      * @return 结果
      */
     @Override
-    public int insertEmsFacsUseH(EmsFacsUseH EmsFacsUseH)
+    public int insertElecUseH(ElecUseH ElecUseH)
     {
-        return emsFacsUseHMapper.insertEmsFacsUseH(EmsFacsUseH);
+        return elecUseHMapper.insertElecUseH(ElecUseH);
     }
 
     /**
      * 修改用能计量-小时
      * 
-     * @param EmsFacsUseH 用能计量-小时
+     * @param ElecUseH 用能计量-小时
      * @return 结果
      */
     @Override
-    public int updateEmsFacsUseH(EmsFacsUseH EmsFacsUseH)
+    public int updateElecUseH(ElecUseH ElecUseH)
     {
-        return emsFacsUseHMapper.updateEmsFacsUseH(EmsFacsUseH);
+        return elecUseHMapper.updateElecUseH(ElecUseH);
     }
 
     /**
@@ -75,9 +75,9 @@ public class EmsFacsUseHServiceImpl implements IEmsFacsUseHService
      * @return 结果
      */
     @Override
-    public int deleteEmsFacsUseHByIds(Long[] ids)
+    public int deleteElecUseHByIds(Long[] ids)
     {
-        return emsFacsUseHMapper.deleteEmsFacsUseHByIds(ids);
+        return elecUseHMapper.deleteElecUseHByIds(ids);
     }
 
     /**
@@ -87,8 +87,8 @@ public class EmsFacsUseHServiceImpl implements IEmsFacsUseHService
      * @return 结果
      */
     @Override
-    public int deleteEmsFacsUseHById(Long id)
+    public int deleteElecUseHById(Long id)
     {
-        return emsFacsUseHMapper.deleteEmsFacsUseHById(id);
+        return elecUseHMapper.deleteElecUseHById(id);
     }
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/EmsFacsSubtypeServiceImpl.java

@@ -53,11 +53,7 @@ public class EmsFacsSubtypeServiceImpl implements IEmsFacsSubtypeService {
     }
 
     @Override
-    public void insertFacsSubtypeBatch(String facsTypeCode, List<EmsFacsSubtype> emsFacsSubtypes) {
-        emsFacsSubtypes.forEach(facsSubtype -> {
-            facsSubtype.setParentCode(facsTypeCode);
-        });
-
+    public void insertFacsSubtypeBatch(List<EmsFacsSubtype> emsFacsSubtypes) {
         emsFacsSubtypeMapper.insertFacsSubtypeBatch(emsFacsSubtypes);
     }
 

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/EmsFacsTypeServiceImpl.java

@@ -77,7 +77,7 @@ public class EmsFacsTypeServiceImpl implements IEmsFacsTypeService {
 
         if (CollectionUtils.isNotEmpty(emsFacsType.getSubtypeList())) {
             facsSubtypeService.deleteFacsSubtypeByParentCode(emsFacsType.getCode());
-            facsSubtypeService.insertFacsSubtypeBatch(emsFacsType.getCode(), emsFacsType.getSubtypeList());
+            facsSubtypeService.insertFacsSubtypeBatch(emsFacsType.getSubtypeList());
         }
         else {
             facsSubtypeService.deleteFacsSubtypeByParentCode(emsFacsType.getCode());
@@ -98,7 +98,7 @@ public class EmsFacsTypeServiceImpl implements IEmsFacsTypeService {
 
         if (CollectionUtils.isNotEmpty(emsFacsType.getSubtypeList())) {
             facsSubtypeService.deleteFacsSubtypeByParentCode(emsFacsType.getCode());
-            facsSubtypeService.insertFacsSubtypeBatch(emsFacsType.getCode(), emsFacsType.getSubtypeList());
+            facsSubtypeService.insertFacsSubtypeBatch(emsFacsType.getSubtypeList());
         }
         else {
             facsSubtypeService.deleteFacsSubtypeByParentCode(emsFacsType.getCode());

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/EmsPgSupplyHServiceImpl.java

@@ -3,9 +3,9 @@ package com.ruoyi.ems.service.impl;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.ems.mapper.EmsPgSupplyHMapper;
-import com.ruoyi.ems.domain.EmsPgSupplyH;
-import com.ruoyi.ems.service.IEmsPgSupplyHService;
+import com.ruoyi.ems.mapper.ElecPgSupplyHMapper;
+import com.ruoyi.ems.domain.ElecPgSupplyH;
+import com.ruoyi.ems.service.IElecPgSupplyHService;
 
 /**
  * 电网供应计量-小时Service业务层处理
@@ -14,10 +14,10 @@ import com.ruoyi.ems.service.IEmsPgSupplyHService;
  * @date 2024-08-09
  */
 @Service
-public class EmsPgSupplyHServiceImpl implements IEmsPgSupplyHService
+public class EmsPgSupplyHServiceImpl implements IElecPgSupplyHService
 {
     @Autowired
-    private EmsPgSupplyHMapper emsPgSupplyHMapper;
+    private ElecPgSupplyHMapper emsPgSupplyHMapper;
 
     /**
      * 查询电网供应计量-小时
@@ -26,9 +26,9 @@ public class EmsPgSupplyHServiceImpl implements IEmsPgSupplyHService
      * @return 电网供应计量-小时
      */
     @Override
-    public EmsPgSupplyH selectEmsPgSupplyHById(Long id)
+    public ElecPgSupplyH selectPgSupplyHById(Long id)
     {
-        return emsPgSupplyHMapper.selectEmsPgSupplyHById(id);
+        return emsPgSupplyHMapper.selectPgSupplyHById(id);
     }
 
     /**
@@ -38,9 +38,9 @@ public class EmsPgSupplyHServiceImpl implements IEmsPgSupplyHService
      * @return 电网供应计量-小时
      */
     @Override
-    public List<EmsPgSupplyH> selectEmsPgSupplyHList(EmsPgSupplyH admEmsPgSupplyH)
+    public List<ElecPgSupplyH> selectPgSupplyHList(ElecPgSupplyH admEmsPgSupplyH)
     {
-        return emsPgSupplyHMapper.selectEmsPgSupplyHList(admEmsPgSupplyH);
+        return emsPgSupplyHMapper.selectPgSupplyHList(admEmsPgSupplyH);
     }
 
     /**
@@ -50,9 +50,9 @@ public class EmsPgSupplyHServiceImpl implements IEmsPgSupplyHService
      * @return 结果
      */
     @Override
-    public int insertEmsPgSupplyH(EmsPgSupplyH admEmsPgSupplyH)
+    public int insertPgSupplyH(ElecPgSupplyH admEmsPgSupplyH)
     {
-        return emsPgSupplyHMapper.insertEmsPgSupplyH(admEmsPgSupplyH);
+        return emsPgSupplyHMapper.insertPgSupplyH(admEmsPgSupplyH);
     }
 
     /**
@@ -62,9 +62,9 @@ public class EmsPgSupplyHServiceImpl implements IEmsPgSupplyHService
      * @return 结果
      */
     @Override
-    public int updateEmsPgSupplyH(EmsPgSupplyH admEmsPgSupplyH)
+    public int updatePgSupplyH(ElecPgSupplyH admEmsPgSupplyH)
     {
-        return emsPgSupplyHMapper.updateEmsPgSupplyH(admEmsPgSupplyH);
+        return emsPgSupplyHMapper.updatePgSupplyH(admEmsPgSupplyH);
     }
 
     /**
@@ -74,9 +74,9 @@ public class EmsPgSupplyHServiceImpl implements IEmsPgSupplyHService
      * @return 结果
      */
     @Override
-    public int deleteEmsPgSupplyHByIds(Long[] ids)
+    public int deletePgSupplyHByIds(Long[] ids)
     {
-        return emsPgSupplyHMapper.deleteEmsPgSupplyHByIds(ids);
+        return emsPgSupplyHMapper.deletePgSupplyHByIds(ids);
     }
 
     /**
@@ -86,8 +86,8 @@ public class EmsPgSupplyHServiceImpl implements IEmsPgSupplyHService
      * @return 结果
      */
     @Override
-    public int deleteEmsPgSupplyHById(Long id)
+    public int deletePgSupplyHById(Long id)
     {
-        return emsPgSupplyHMapper.deleteEmsPgSupplyHById(id);
+        return emsPgSupplyHMapper.deletePgSupplyHById(id);
     }
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/AdmOpEnergyStrategyServiceImpl.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/OpEnergyStrategyServiceImpl.java

@@ -4,9 +4,9 @@ import java.util.List;
 import com.ruoyi.common.core.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.ems.mapper.AdmOpEnergyStrategyMapper;
-import com.ruoyi.ems.domain.AdmOpEnergyStrategy;
-import com.ruoyi.ems.service.IAdmOpEnergyStrategyService;
+import com.ruoyi.ems.mapper.OpEnergyStrategyMapper;
+import com.ruoyi.ems.domain.OpEnergyStrategy;
+import com.ruoyi.ems.service.IOpEnergyStrategyService;
 
 /**
  * 能源策略Service业务层处理
@@ -15,10 +15,10 @@ import com.ruoyi.ems.service.IAdmOpEnergyStrategyService;
  * @date 2024-08-08
  */
 @Service
-public class AdmOpEnergyStrategyServiceImpl implements IAdmOpEnergyStrategyService 
+public class OpEnergyStrategyServiceImpl implements IOpEnergyStrategyService
 {
     @Autowired
-    private AdmOpEnergyStrategyMapper admOpEnergyStrategyMapper;
+    private OpEnergyStrategyMapper opEnergyStrategyMapper;
 
     /**
      * 查询能源策略
@@ -27,9 +27,9 @@ public class AdmOpEnergyStrategyServiceImpl implements IAdmOpEnergyStrategyServi
      * @return 能源策略
      */
     @Override
-    public AdmOpEnergyStrategy selectAdmOpEnergyStrategyById(Long id)
+    public OpEnergyStrategy selectOpEnergyStrategyById(Long id)
     {
-        return admOpEnergyStrategyMapper.selectAdmOpEnergyStrategyById(id);
+        return opEnergyStrategyMapper.selectOpEnergyStrategyById(id);
     }
 
     /**
@@ -39,9 +39,9 @@ public class AdmOpEnergyStrategyServiceImpl implements IAdmOpEnergyStrategyServi
      * @return 能源策略
      */
     @Override
-    public List<AdmOpEnergyStrategy> selectAdmOpEnergyStrategyList(AdmOpEnergyStrategy admOpEnergyStrategy)
+    public List<OpEnergyStrategy> selectOpEnergyStrategyList(OpEnergyStrategy admOpEnergyStrategy)
     {
-        return admOpEnergyStrategyMapper.selectAdmOpEnergyStrategyList(admOpEnergyStrategy);
+        return opEnergyStrategyMapper.selectOpEnergyStrategyList(admOpEnergyStrategy);
     }
 
     /**
@@ -51,10 +51,10 @@ public class AdmOpEnergyStrategyServiceImpl implements IAdmOpEnergyStrategyServi
      * @return 结果
      */
     @Override
-    public int insertAdmOpEnergyStrategy(AdmOpEnergyStrategy admOpEnergyStrategy)
+    public int insertOpEnergyStrategy(OpEnergyStrategy admOpEnergyStrategy)
     {
         admOpEnergyStrategy.setCreateTime(DateUtils.getNowDate());
-        return admOpEnergyStrategyMapper.insertAdmOpEnergyStrategy(admOpEnergyStrategy);
+        return opEnergyStrategyMapper.insertOpEnergyStrategy(admOpEnergyStrategy);
     }
 
     /**
@@ -64,10 +64,10 @@ public class AdmOpEnergyStrategyServiceImpl implements IAdmOpEnergyStrategyServi
      * @return 结果
      */
     @Override
-    public int updateAdmOpEnergyStrategy(AdmOpEnergyStrategy admOpEnergyStrategy)
+    public int updateOpEnergyStrategy(OpEnergyStrategy admOpEnergyStrategy)
     {
         admOpEnergyStrategy.setUpdateTime(DateUtils.getNowDate());
-        return admOpEnergyStrategyMapper.updateAdmOpEnergyStrategy(admOpEnergyStrategy);
+        return opEnergyStrategyMapper.updateOpEnergyStrategy(admOpEnergyStrategy);
     }
 
     /**
@@ -77,9 +77,9 @@ public class AdmOpEnergyStrategyServiceImpl implements IAdmOpEnergyStrategyServi
      * @return 结果
      */
     @Override
-    public int deleteAdmOpEnergyStrategyByIds(Long[] ids)
+    public int deleteOpEnergyStrategyByIds(Long[] ids)
     {
-        return admOpEnergyStrategyMapper.deleteAdmOpEnergyStrategyByIds(ids);
+        return opEnergyStrategyMapper.deleteOpEnergyStrategyByIds(ids);
     }
 
     /**
@@ -89,8 +89,8 @@ public class AdmOpEnergyStrategyServiceImpl implements IAdmOpEnergyStrategyServi
      * @return 结果
      */
     @Override
-    public int deleteAdmOpEnergyStrategyById(Long id)
+    public int deleteOpEnergyStrategyById(Long id)
     {
-        return admOpEnergyStrategyMapper.deleteAdmOpEnergyStrategyById(id);
+        return opEnergyStrategyMapper.deleteOpEnergyStrategyById(id);
     }
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/PvSupplyHServiceImpl.java

@@ -0,0 +1,91 @@
+package com.ruoyi.ems.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ems.mapper.PvSupplyHMapper;
+import com.ruoyi.ems.domain.PvSupplyH;
+import com.ruoyi.ems.service.IPvSupplyHService;
+
+/**
+ * 光伏并网计量光伏并网计量-小时Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-08-02
+ */
+@Service
+public class PvSupplyHServiceImpl implements IPvSupplyHService {
+    @Autowired
+    private PvSupplyHMapper pvSupplyHMapper;
+
+    /**
+     * 查询光伏并网计量光伏并网计量-小时
+     *
+     * @param id 光伏并网计量光伏并网计量-小时主键
+     * @return 光伏并网计量光伏并网计量-小时
+     */
+    @Override
+    public PvSupplyH selectPvSupplyHById(Long id) {
+        return pvSupplyHMapper.selectPvSupplyHById(id);
+    }
+
+    /**
+     * 查询光伏并网计量光伏并网计量-小时列表
+     *
+     * @param PvSupplyH 光伏并网计量光伏并网计量-小时
+     * @return 光伏并网计量光伏并网计量-小时
+     */
+    @Override
+    public List<PvSupplyH> selectPvSupplyHList(PvSupplyH PvSupplyH) {
+        return pvSupplyHMapper.selectPvSupplyHList(PvSupplyH);
+    }
+
+    @Override
+    public List<PvSupplyH> selectAreaSupplyH(PvSupplyH PvSupplyH) {
+        return pvSupplyHMapper.selectAreaSupplyH(PvSupplyH);
+    }
+
+    /**
+     * 新增光伏并网计量光伏并网计量-小时
+     *
+     * @param PvSupplyH 光伏并网计量光伏并网计量-小时
+     * @return 结果
+     */
+    @Override
+    public int insertPvSupplyH(PvSupplyH PvSupplyH) {
+        return pvSupplyHMapper.insertPvSupplyH(PvSupplyH);
+    }
+
+    /**
+     * 修改光伏并网计量光伏并网计量-小时
+     *
+     * @param PvSupplyH 光伏并网计量光伏并网计量-小时
+     * @return 结果
+     */
+    @Override
+    public int updatePvSupplyH(PvSupplyH PvSupplyH) {
+        return pvSupplyHMapper.updatePvSupplyH(PvSupplyH);
+    }
+
+    /**
+     * 批量删除光伏并网计量光伏并网计量-小时
+     *
+     * @param ids 需要删除的光伏并网计量光伏并网计量-小时主键
+     * @return 结果
+     */
+    @Override
+    public int deletePvSupplyHByIds(Long[] ids) {
+        return pvSupplyHMapper.deletePvSupplyHByIds(ids);
+    }
+
+    /**
+     * 删除光伏并网计量光伏并网计量-小时信息
+     *
+     * @param id 光伏并网计量光伏并网计量-小时主键
+     * @return 结果
+     */
+    @Override
+    public int deletePvSupplyHById(Long id) {
+        return pvSupplyHMapper.deletePvSupplyHById(id);
+    }
+}

ems-cloud/ems-modules/ems-server/src/main/resources/application-local.yml

@@ -1,5 +1,8 @@
 # spring配置
 spring:
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   redis:
     host: 172.192.10.105
     port: 30013
@@ -51,5 +54,4 @@ mybatis:
 # swagger配置
 swagger:
   title: 能源模块接口文档
-  license: Powered By huashe
   enabled: true

ems-cloud/ems-modules/ems-server/src/main/resources/banner.txt

@@ -1,10 +1,10 @@
 Spring Boot Version: ${spring-boot.version}
 Spring Application Name: ${spring.application.name}
-                            _                           _                    
-                           (_)                         | |                   
- _ __  _   _   ___   _   _  _  ______  ___  _   _  ___ | |_   ___  _ __ ___  
-| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \ 
-| |   | |_| || (_) || |_| || |        \__ \| |_| |\__ \| |_ |  __/| | | | | |
-|_|    \__,_| \___/  \__, ||_|        |___/ \__, ||___/ \__| \___||_| |_| |_|
-                      __/ |                  __/ |                           
-                     |___/                  |___/                            
+                        _            _____               _____
+                       (_)          |  ___|             /  ___|
+ _ __ _   _  ___  _   _ _   ______  | |__ _ __ ___  ___ \ `--.  ___ _ ____   _____ _ __
+| '__| | | |/ _ \| | | | | |______| |  __| '_ ` _ \/ __| `--. \/ _ \ '__\ \ / / _ \ '__|
+| |  | |_| | (_) | |_| | |          | |__| | | | | \__ \/\__/ /  __/ |   \ V /  __/ |
+|_|   \__,_|\___/ \__, |_|          \____/_| |_| |_|___/\____/ \___|_|    \_/ \___|_|
+                   __/ |
+                  |___/

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/AdmEmsCaEmissionForecastMapper.xml → ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/CaEmissionForecastMapper.xml

@@ -2,21 +2,21 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ems.mapper.AdmEmsCaEmissionForecastMapper">
+<mapper namespace="com.ruoyi.ems.mapper.CaEmissionForecastMapper">
 
-    <resultMap type="com.ruoyi.ems.domain.AdmEmsCaEmissionForecast" id="AdmEmsCaEmissionForecastResult">
+    <resultMap type="com.ruoyi.ems.domain.CaEmissionForecast" id="CaEmissionForecastResult">
         <result property="id"    column="id"    />
         <result property="areaCode"    column="area_code"    />
         <result property="date"    column="date"    />
         <result property="caEmission"    column="ca_emission"    />
     </resultMap>
 
-    <sql id="selectAdmEmsCaEmissionForecastVo">
+    <sql id="selectCaEmissionForecastVo">
         select id, area_code, date, ca_emission from adm_ems_ca_emission_forecast
     </sql>
 
-    <select id="selectAdmEmsCaEmissionForecastList" parameterType="com.ruoyi.ems.domain.AdmEmsCaEmissionForecast" resultMap="AdmEmsCaEmissionForecastResult">
-        <include refid="selectAdmEmsCaEmissionForecastVo"/>
+    <select id="selectCaEmissionForecastList" parameterType="com.ruoyi.ems.domain.CaEmissionForecast" resultMap="CaEmissionForecastResult">
+        <include refid="selectCaEmissionForecastVo"/>
         <where>
             <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
             <if test="date != null "> and date = #{date}</if>
@@ -24,12 +24,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectAdmEmsCaEmissionForecastById" parameterType="Long" resultMap="AdmEmsCaEmissionForecastResult">
-        <include refid="selectAdmEmsCaEmissionForecastVo"/>
+    <select id="selectCaEmissionForecastById" parameterType="Long" resultMap="CaEmissionForecastResult">
+        <include refid="selectCaEmissionForecastVo"/>
         where id = #{id}
     </select>
 
-    <insert id="insertAdmEmsCaEmissionForecast" parameterType="com.ruoyi.ems.domain.AdmEmsCaEmissionForecast" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertCaEmissionForecast" parameterType="com.ruoyi.ems.domain.CaEmissionForecast" useGeneratedKeys="true" keyProperty="id">
         insert into adm_ems_ca_emission_forecast
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code,</if>
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateAdmEmsCaEmissionForecast" parameterType="com.ruoyi.ems.domain.AdmEmsCaEmissionForecast">
+    <update id="updateCaEmissionForecast" parameterType="com.ruoyi.ems.domain.CaEmissionForecast">
         update adm_ems_ca_emission_forecast
         <trim prefix="SET" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
@@ -53,11 +53,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteAdmEmsCaEmissionForecastById" parameterType="Long">
+    <delete id="deleteCaEmissionForecastById" parameterType="Long">
         delete from adm_ems_ca_emission_forecast where id = #{id}
     </delete>
 
-    <delete id="deleteAdmEmsCaEmissionForecastByIds" parameterType="String">
+    <delete id="deleteCaEmissionForecastByIds" parameterType="String">
         delete from adm_ems_ca_emission_forecast where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/AdmEmsCaMeterDMapper.xml → ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/CaMeterDMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ems.mapper.AdmEmsCaMeterDMapper">
+<mapper namespace="com.ruoyi.ems.mapper.CaMeterDMapper">
 
-    <resultMap type="com.ruoyi.ems.domain.AdmEmsCaMeterD" id="AdmEmsCaMeterDResult">
+    <resultMap type="com.ruoyi.ems.domain.CaMeterD" id="CaMeterDResult">
         <result property="id"    column="id"    />
         <result property="areaCode"    column="area_code"    />
         <result property="date"    column="date"    />
@@ -12,12 +12,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="caSinkQuantity"    column="ca_sink_quantity"    />
     </resultMap>
 
-    <sql id="selectAdmEmsCaMeterDVo">
+    <sql id="selectCaMeterDVo">
         select id, area_code, date, ca_emission_quantity, ca_sink_quantity from adm_ems_ca_meter_d
     </sql>
 
-    <select id="selectAdmEmsCaMeterDList" parameterType="com.ruoyi.ems.domain.AdmEmsCaMeterD" resultMap="AdmEmsCaMeterDResult">
-        <include refid="selectAdmEmsCaMeterDVo"/>
+    <select id="selectCaMeterDList" parameterType="com.ruoyi.ems.domain.CaMeterD" resultMap="CaMeterDResult">
+        <include refid="selectCaMeterDVo"/>
         <where>
             <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
             <if test="date != null "> and date = #{date}</if>
@@ -26,12 +26,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectAdmEmsCaMeterDById" parameterType="Long" resultMap="AdmEmsCaMeterDResult">
-        <include refid="selectAdmEmsCaMeterDVo"/>
+    <select id="selectCaMeterDById" parameterType="Long" resultMap="CaMeterDResult">
+        <include refid="selectCaMeterDVo"/>
         where id = #{id}
     </select>
 
-    <insert id="insertAdmEmsCaMeterD" parameterType="com.ruoyi.ems.domain.AdmEmsCaMeterD" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertCaMeterD" parameterType="com.ruoyi.ems.domain.CaMeterD" useGeneratedKeys="true" keyProperty="id">
         insert into adm_ems_ca_meter_d
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code,</if>
@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateAdmEmsCaMeterD" parameterType="com.ruoyi.ems.domain.AdmEmsCaMeterD">
+    <update id="updateCaMeterD" parameterType="com.ruoyi.ems.domain.CaMeterD">
         update adm_ems_ca_meter_d
         <trim prefix="SET" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
@@ -58,11 +58,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteAdmEmsCaMeterDById" parameterType="Long">
+    <delete id="deleteCaMeterDById" parameterType="Long">
         delete from adm_ems_ca_meter_d where id = #{id}
     </delete>
 
-    <delete id="deleteAdmEmsCaMeterDByIds" parameterType="String">
+    <delete id="deleteCaMeterDByIds" parameterType="String">
         delete from adm_ems_ca_meter_d where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/AdmEmsElecExpendForecastMapper.xml → ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/ElecExpendForecastMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ems.mapper.AdmEmsElecExpendForecastMapper">
+<mapper namespace="com.ruoyi.ems.mapper.ElecExpendForecastMapper">
 
-    <resultMap type="com.ruoyi.ems.domain.AdmEmsElecExpendForecast" id="AdmEmsElecExpendForecastResult">
+    <resultMap type="com.ruoyi.ems.domain.ElecExpendForecast" id="ElecExpendForecastResult">
         <result property="id"    column="id"    />
         <result property="areaCode"    column="area_code"    />
         <result property="objCode"    column="obj_code"    />
@@ -13,12 +13,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="elecUseQuantity"    column="elec_use_quantity"    />
     </resultMap>
 
-    <sql id="selectAdmEmsElecExpendForecastVo">
+    <sql id="selectElecExpendForecastVo">
         select id, area_code, obj_code, obj_type, date, elec_use_quantity from adm_ems_elec_expend_forecast
     </sql>
 
-    <select id="selectAdmEmsElecExpendForecastList" parameterType="com.ruoyi.ems.domain.AdmEmsElecExpendForecast" resultMap="AdmEmsElecExpendForecastResult">
-        <include refid="selectAdmEmsElecExpendForecastVo"/>
+    <select id="selectElecExpendForecastList" parameterType="com.ruoyi.ems.domain.ElecExpendForecast" resultMap="ElecExpendForecastResult">
+        <include refid="selectElecExpendForecastVo"/>
         <where>
             <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
             <if test="objCode != null  and objCode != ''"> and obj_code = #{objCode}</if>
@@ -28,12 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectAdmEmsElecExpendForecastById" parameterType="Long" resultMap="AdmEmsElecExpendForecastResult">
-        <include refid="selectAdmEmsElecExpendForecastVo"/>
+    <select id="selectElecExpendForecastById" parameterType="Long" resultMap="ElecExpendForecastResult">
+        <include refid="selectElecExpendForecastVo"/>
         where id = #{id}
     </select>
 
-    <insert id="insertAdmEmsElecExpendForecast" parameterType="com.ruoyi.ems.domain.AdmEmsElecExpendForecast" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertElecExpendForecast" parameterType="com.ruoyi.ems.domain.ElecExpendForecast" useGeneratedKeys="true" keyProperty="id">
         insert into adm_ems_elec_expend_forecast
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code,</if>
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateAdmEmsElecExpendForecast" parameterType="com.ruoyi.ems.domain.AdmEmsElecExpendForecast">
+    <update id="updateElecExpendForecast" parameterType="com.ruoyi.ems.domain.ElecExpendForecast">
         update adm_ems_elec_expend_forecast
         <trim prefix="SET" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
@@ -63,11 +63,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteAdmEmsElecExpendForecastById" parameterType="Long">
+    <delete id="deleteElecExpendForecastById" parameterType="Long">
         delete from adm_ems_elec_expend_forecast where id = #{id}
     </delete>
 
-    <delete id="deleteAdmEmsElecExpendForecastByIds" parameterType="String">
+    <delete id="deleteElecExpendForecastByIds" parameterType="String">
         delete from adm_ems_elec_expend_forecast where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/AdmEmsElecLoadIndexMapper.xml → ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/ElecLoadIndexMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ems.mapper.AdmEmsElecLoadIndexMapper">
+<mapper namespace="com.ruoyi.ems.mapper.ElecLoadIndexMapper">
 
-    <resultMap type="com.ruoyi.ems.domain.AdmEmsElecLoadIndex" id="AdmEmsElecLoadIndexResult">
+    <resultMap type="com.ruoyi.ems.domain.ElecLoadIndex" id="ElecLoadIndexResult">
         <result property="id"    column="id"    />
         <result property="areaCode"    column="area_code"    />
         <result property="facsCode"    column="facs_code"    />
@@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="power"    column="power"    />
     </resultMap>
 
-    <sql id="selectAdmEmsElecLoadIndexVo">
+    <sql id="selectElecLoadIndexVo">
         SELECT
             loadIndex.id,
             loadIndex.area_code,
@@ -33,8 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             INNER JOIN adm_service_area area ON loadIndex.area_code = area.area_code
     </sql>
 
-    <select id="selectAdmEmsElecLoadIndexList" parameterType="com.ruoyi.ems.domain.AdmEmsElecLoadIndex" resultType="com.ruoyi.ems.domain.AdmEmsElecLoadIndex">
-        <include refid="selectAdmEmsElecLoadIndexVo"/>
+    <select id="selectElecLoadIndexList" parameterType="com.ruoyi.ems.domain.ElecLoadIndex" resultType="com.ruoyi.ems.domain.ElecLoadIndex">
+        <include refid="selectElecLoadIndexVo"/>
         <where>
             <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
             <if test="facsCode != null  and facsCode != ''"> and facs_code = #{facsCode}</if>
@@ -45,12 +45,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectAdmEmsElecLoadIndexById" parameterType="Long" resultMap="AdmEmsElecLoadIndexResult">
-        <include refid="selectAdmEmsElecLoadIndexVo"/>
+    <select id="selectElecLoadIndexById" parameterType="Long" resultMap="ElecLoadIndexResult">
+        <include refid="selectElecLoadIndexVo"/>
         where id = #{id}
     </select>
 
-    <insert id="insertAdmEmsElecLoadIndex" parameterType="com.ruoyi.ems.domain.AdmEmsElecLoadIndex" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertElecLoadIndex" parameterType="com.ruoyi.ems.domain.ElecLoadIndex" useGeneratedKeys="true" keyProperty="id">
         insert into adm_ems_elec_load_index
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code,</if>
@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateAdmEmsElecLoadIndex" parameterType="com.ruoyi.ems.domain.AdmEmsElecLoadIndex">
+    <update id="updateElecLoadIndex" parameterType="com.ruoyi.ems.domain.ElecLoadIndex">
         update adm_ems_elec_load_index
         <trim prefix="SET" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
@@ -86,11 +86,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteAdmEmsElecLoadIndexById" parameterType="Long">
+    <delete id="deleteElecLoadIndexById" parameterType="Long">
         delete from adm_ems_elec_load_index where id = #{id}
     </delete>
 
-    <delete id="deleteAdmEmsElecLoadIndexByIds" parameterType="String">
+    <delete id="deleteElecLoadIndexByIds" parameterType="String">
         delete from adm_ems_elec_load_index where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/EmsPgSupplyHMapper.xml → ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/ElecPgSupplyHMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ems.mapper.EmsPgSupplyHMapper">
+<mapper namespace="com.ruoyi.ems.mapper.ElecPgSupplyHMapper">
 
-    <resultMap type="com.ruoyi.ems.domain.EmsPgSupplyH" id="EmsPgSupplyHResult">
+    <resultMap type="com.ruoyi.ems.domain.ElecPgSupplyH" id="PgSupplyHResult">
         <result property="id"    column="id"    />
         <result property="areaCode"    column="area_code"    />
         <result property="areaName"    column="area_name"    />
@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="upElecEarn"    column="up_elec_earn"    />
     </resultMap>
 
-    <sql id="selectEmsPgSupplyHVo">
+    <sql id="selectPgSupplyHVo">
         select
             pg.`id`, pg.`area_code`, a.`area_name`, a.`short_name` as area_short_name, pg.`facs_code`, f.`facs_name`, pg.`date`, pg.`time`, pg.`time_index`, pg.`meter_type`, pg.`meter_unit_price`, pg.`use_elec_reading`, pg.`use_elec_quantity`, pg.`use_elec_cost`, pg.`up_elec_reading`, pg.`up_elec_quantity`, pg.`up_elec_earn`
         from adm_ems_pg_supply_h pg
@@ -32,8 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN adm_ems_facs f ON pg.`facs_code` = f.`facs_code`
     </sql>
 
-    <select id="selectEmsPgSupplyHList" parameterType="com.ruoyi.ems.domain.EmsPgSupplyH" resultMap="EmsPgSupplyHResult">
-        <include refid="selectEmsPgSupplyHVo"/>
+    <select id="selectEmsPgSupplyHList" parameterType="com.ruoyi.ems.domain.ElecPgSupplyH" resultMap="PgSupplyHResult">
+        <include refid="selectPgSupplyHVo"/>
         <where>
             <if test="areaCode != null  and areaCode != ''"> and pg.`area_code` = #{areaCode}</if>
             <if test="facsCode != null  and facsCode != ''"> and pg.`facs_code` = #{facsCode}</if>
@@ -51,12 +51,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectEmsPgSupplyHById" parameterType="Long" resultMap="EmsPgSupplyHResult">
-        <include refid="selectEmsPgSupplyHVo"/>
+    <select id="selectPgSupplyHById" parameterType="Long" resultMap="PgSupplyHResult">
+        <include refid="selectPgSupplyHVo"/>
         where pg.`id` = #{id}
     </select>
 
-    <insert id="insertEmsPgSupplyH" parameterType="com.ruoyi.ems.domain.EmsPgSupplyH" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertPgSupplyH" parameterType="com.ruoyi.ems.domain.ElecPgSupplyH" useGeneratedKeys="true" keyProperty="id">
         insert into adm_ems_pg_supply_h
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code,</if>
@@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateEmsPgSupplyH" parameterType="com.ruoyi.ems.domain.EmsPgSupplyH">
+    <update id="updatePgSupplyH" parameterType="com.ruoyi.ems.domain.ElecPgSupplyH">
         update adm_ems_pg_supply_h
         <trim prefix="SET" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
@@ -110,11 +110,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteEmsPgSupplyHById" parameterType="Long">
+    <delete id="deletePgSupplyHById" parameterType="Long">
         delete from adm_ems_pg_supply_h where id = #{id}
     </delete>
 
-    <delete id="deleteEmsPgSupplyHByIds" parameterType="String">
+    <delete id="deletePgSupplyHByIds" parameterType="String">
         delete from adm_ems_pg_supply_h where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/AdmEmsElecProdForecastMapper.xml → ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/ElecProdForecastMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ems.mapper.AdmEmsElecProdForecastMapper">
+<mapper namespace="com.ruoyi.ems.mapper.ElecProdForecastMapper">
 
-    <resultMap type="com.ruoyi.ems.domain.AdmEmsElecProdForecast" id="AdmEmsElecProdForecastResult">
+    <resultMap type="com.ruoyi.ems.domain.ElecProdForecast" id="ElecProdForecastResult">
         <result property="id" column="id"/>
         <result property="areaCode" column="area_code"/>
         <result property="facsCode" column="facs_code"/>
@@ -13,7 +13,7 @@
         <result property="avgPower" column="avg_power"/>
     </resultMap>
 
-    <sql id="selectAdmEmsElecProdForecastVo">
+    <sql id="selectElecProdForecastVo">
         SELECT forecast.id,
                forecast.area_code,
                forecast.facs_code,
@@ -26,9 +26,9 @@
             INNER JOIN adm_service_area area ON forecast.area_code = area.area_code
     </sql>
 
-    <select id="selectAdmEmsElecProdForecastList" parameterType="com.ruoyi.ems.domain.AdmEmsElecProdForecast"
-            resultType="com.ruoyi.ems.domain.AdmEmsElecProdForecast">
-        <include refid="selectAdmEmsElecProdForecastVo"/>
+    <select id="selectElecProdForecastList" parameterType="com.ruoyi.ems.domain.ElecProdForecast"
+            resultType="com.ruoyi.ems.domain.ElecProdForecast">
+        <include refid="selectElecProdForecastVo"/>
         <where>
             <if test="areaCode != null  and areaCode != ''">and area_code = #{areaCode}</if>
             <if test="facsCode != null  and facsCode != ''">and facs_code = #{facsCode}</if>
@@ -38,13 +38,13 @@
         </where>
     </select>
 
-    <select id="selectAdmEmsElecProdForecastById" parameterType="Long"
-            resultType="com.ruoyi.ems.domain.AdmEmsElecProdForecast">
-        <include refid="selectAdmEmsElecProdForecastVo"/>
+    <select id="selectElecProdForecastById" parameterType="Long"
+            resultType="com.ruoyi.ems.domain.ElecProdForecast">
+        <include refid="selectElecProdForecastVo"/>
         where id = #{id}
     </select>
 
-    <insert id="insertAdmEmsElecProdForecast" parameterType="com.ruoyi.ems.domain.AdmEmsElecProdForecast"
+    <insert id="insertElecProdForecast" parameterType="com.ruoyi.ems.domain.ElecProdForecast"
             useGeneratedKeys="true" keyProperty="id">
         insert into adm_ems_elec_prod_forecast
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -63,7 +63,7 @@
         </trim>
     </insert>
 
-    <update id="updateAdmEmsElecProdForecast" parameterType="com.ruoyi.ems.domain.AdmEmsElecProdForecast">
+    <update id="updateElecProdForecast" parameterType="com.ruoyi.ems.domain.ElecProdForecast">
         update adm_ems_elec_prod_forecast
         <trim prefix="SET" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
@@ -75,13 +75,13 @@
         where id = #{id}
     </update>
 
-    <delete id="deleteAdmEmsElecProdForecastById" parameterType="Long">
+    <delete id="deleteElecProdForecastById" parameterType="Long">
         delete
         from adm_ems_elec_prod_forecast
         where id = #{id}
     </delete>
 
-    <delete id="deleteAdmEmsElecProdForecastByIds" parameterType="String">
+    <delete id="deleteElecProdForecastByIds" parameterType="String">
         delete from adm_ems_elec_prod_forecast where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/EmsFacsUseHMapper.xml → ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/ElecUseHMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ems.mapper.EmsFacsUseHMapper">
+<mapper namespace="com.ruoyi.ems.mapper.ElecUseHMapper">
     
-    <resultMap type="com.ruoyi.ems.domain.EmsFacsUseH" id="emsFacsUseHResult">
+    <resultMap type="com.ruoyi.ems.domain.ElecUseH" id="elecUseHResult">
         <result property="id"    column="id"    />
         <result property="areaCode"    column="area_code"    />
         <result property="areaName"    column="area_name"    />
@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="elecCost"    column="elec_cost"    />
     </resultMap>
 
-    <sql id="selectEmsFacsUseHVo">
+    <sql id="selectElecUseHVo">
         select
             u.id, u.area_code, a.area_name, a.short_name as area_short_name, u.facs_code, f.facs_name, u.facs_type, u.facs_subtype, u.`date`, u.`time`, u.time_index, u.elec_reading, u.elec_quantity, u.elec_cost
         from adm_ems_facs_use_h u
@@ -29,8 +29,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN adm_ems_facs f ON u.`facs_code` = f.`facs_code`
     </sql>
 
-    <select id="selectEmsFacsUseHList" parameterType="com.ruoyi.ems.domain.EmsFacsUseH" resultMap="emsFacsUseHResult">
-        <include refid="selectEmsFacsUseHVo"/>
+    <select id="selectElecUseHList" parameterType="com.ruoyi.ems.domain.ElecUseH" resultMap="elecUseHResult">
+        <include refid="selectElecUseHVo"/>
         <where>  
             <if test="areaCode != null  and areaCode != ''"> and u.area_code = #{areaCode}</if>
             <if test="facsCode != null  and facsCode != ''"> and u.facs_code = #{facsCode}</if>
@@ -45,12 +45,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectEmsFacsUseHById" parameterType="Long" resultMap="emsFacsUseHResult">
-        <include refid="selectEmsFacsUseHVo"/>
+    <select id="selectElecUseHById" parameterType="Long" resultMap="elecUseHResult">
+        <include refid="selectElecUseHVo"/>
         where u.`id` = #{id}
     </select>
         
-    <insert id="insertEmsFacsUseH" parameterType="com.ruoyi.ems.domain.EmsFacsUseH" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertElecUseH" parameterType="com.ruoyi.ems.domain.ElecUseH" useGeneratedKeys="true" keyProperty="id">
         insert into adm_ems_facs_use_h
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code,</if>
@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateEmsFacsUseH" parameterType="com.ruoyi.ems.domain.EmsFacsUseH">
+    <update id="updateElecUseH" parameterType="com.ruoyi.ems.domain.ElecUseH">
         update adm_ems_facs_use_h
         <trim prefix="SET" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
@@ -95,11 +95,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteEmsFacsUseHById" parameterType="Long">
+    <delete id="deleteElecUseHById" parameterType="Long">
         delete from adm_ems_facs_use_h where id = #{id}
     </delete>
 
-    <delete id="deleteEmsFacsUseHByIds" parameterType="String">
+    <delete id="deleteElecUseHByIds" parameterType="String">
         delete from adm_ems_facs_use_h where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/EmsElecStoreHMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.ems.mapper.EmsElecStoreHMapper">
 
-    <resultMap type="com.ruoyi.ems.domain.EmsElecStoreH" id="EmsElecStoreHResult">
+    <resultMap type="com.ruoyi.ems.domain.ElecStoreH" id="EmsElecStoreHResult">
         <result property="id"    column="id"    />
         <result property="areaCode"    column="area_code"    />
         <result property="areaName"       column="area_name"    />
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN adm_service_area area ON st.area_code = area.area_code
     </sql>
 
-    <select id="selectEmsElecStoreHList" parameterType="com.ruoyi.ems.domain.EmsElecStoreH" resultMap="EmsElecStoreHResult">
+    <select id="selectEmsElecStoreHList" parameterType="com.ruoyi.ems.domain.ElecStoreH" resultMap="EmsElecStoreHResult">
         <include refid="selectEmsElecStoreHVo"/>
         <where>
             <if test="areaCode != null  and areaCode != ''"> and st.area_code = #{areaCode}</if>
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where st.id = #{id}
     </select>
 
-    <insert id="insertEmsElecStoreH" parameterType="com.ruoyi.ems.domain.EmsElecStoreH" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertEmsElecStoreH" parameterType="com.ruoyi.ems.domain.ElecStoreH" useGeneratedKeys="true" keyProperty="id">
         insert into adm_ems_elec_store_h
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code,</if>
@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateEmsElecStoreH" parameterType="com.ruoyi.ems.domain.EmsElecStoreH">
+    <update id="updateEmsElecStoreH" parameterType="com.ruoyi.ems.domain.ElecStoreH">
         update adm_ems_elec_store_h
         <trim prefix="SET" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/EmsFacsSubtypeMapper.xml

@@ -36,11 +36,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertFacsSubtype" parameterType="com.ruoyi.ems.domain.EmsFacsSubtype" useGeneratedKeys="true" keyProperty="id">
         insert into dim_ems_facs_subtype
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="code != null and code != ''">code,</if>
-            <if test="name != null and name != ''">name,</if>
-            <if test="parentCode != null and parentCode != ''">parent_code,</if>
-            <if test="desc != null">desc,</if>
-            <if test="version != null">version,</if>
+            <if test="code != null and code != ''">`code`,</if>
+            <if test="name != null and name != ''">`name`,</if>
+            <if test="parentCode != null and parentCode != ''">`parent_code`,</if>
+            <if test="desc != null">`desc`,</if>
+            <if test="version != null">`version`,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="code != null and code != ''">#{code},</if>
@@ -52,36 +52,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <insert id="insertFacsSubtypeBatch" parameterType="java.util.List">
-        insert into dim_ems_facs_subtype (code, name, parent_code, desc, version) values
-        <foreach collection="emsFacsSubtypes" item="subtype" index="index" separator=",">
-            (#{subtype.code},#{subtype.name},#{subtype.parent_code},#{subtype.desc},#{subtype.version})
+        insert into dim_ems_facs_subtype (`code`, `name`, `parent_code`, `desc`, `version`) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.code},#{item.name},#{item.parentCode},#{item.desc},#{item.version})
         </foreach>
     </insert>
 
     <update id="updateFacsSubtype" parameterType="com.ruoyi.ems.domain.EmsFacsSubtype">
         update dim_ems_facs_subtype
         <trim prefix="SET" suffixOverrides=",">
-            <if test="code != null and code != ''">code = #{code},</if>
-            <if test="name != null and name != ''">name = #{name},</if>
-            <if test="parentCode != null and parentCode != ''">parent_code = #{parentCode},</if>
-            <if test="desc != null">desc = #{desc},</if>
-            <if test="version != null">version = #{version},</if>
+            <if test="code != null and code != ''">`code` = #{code},</if>
+            <if test="name != null and name != ''">`name` = #{name},</if>
+            <if test="parentCode != null and parentCode != ''">`parent_code` = #{parentCode},</if>
+            <if test="desc != null">`desc` = #{desc},</if>
+            <if test="version != null">`version` = #{version},</if>
         </trim>
         where id = #{id}
     </update>
 
     <delete id="deleteFacsSubtypeById" parameterType="Long">
-        delete from dim_ems_facs_subtype where id = #{id}
+        delete from dim_ems_facs_subtype where `id` = #{id}
     </delete>
 
     <delete id="deleteFacsSubtypeByIds" parameterType="String">
-        delete from dim_ems_facs_subtype where id in
+        delete from dim_ems_facs_subtype where `id` in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
 
     <delete id="deleteFacsSubtypeByParentCode" parameterType="String">
-        delete from dim_ems_facs_subtype where parent_code = #{code}
+        delete from dim_ems_facs_subtype where `parent_code` = #{code}
     </delete>
 </mapper>

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/EmsFacsTypeMapper.xml

@@ -50,12 +50,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateFacsType" parameterType="com.ruoyi.ems.domain.EmsFacsType">
         update dim_ems_facs_type
         <trim prefix="SET" suffixOverrides=",">
-            <if test="code != null and code != ''">code = #{code},</if>
-            <if test="name != null and name != ''">name = #{name},</if>
-            <if test="desc != null">desc = #{desc},</if>
-            <if test="version != null">version = #{version},</if>
+            <if test="code != null and code != ''">`code` = #{code},</if>
+            <if test="name != null and name != ''">`name` = #{name},</if>
+            <if test="desc != null">`desc` = #{desc},</if>
+            <if test="version != null">`version` = #{version},</if>
         </trim>
-        where id = #{id}
+        where `id` = #{id}
     </update>
 
     <delete id="deleteFacsTypeById" parameterType="Long">

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/AdmOpEnergyStrategyMapper.xml → ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/OpEnergyStrategyMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ems.mapper.AdmOpEnergyStrategyMapper">
+<mapper namespace="com.ruoyi.ems.mapper.OpEnergyStrategyMapper">
 
-    <resultMap type="com.ruoyi.ems.domain.AdmOpEnergyStrategy" id="AdmOpEnergyStrategyResult">
+    <resultMap type="com.ruoyi.ems.domain.OpEnergyStrategy" id="OpEnergyStrategyResult">
         <result property="id"    column="id"    />
         <result property="strategyCode"    column="strategy_code"    />
         <result property="strategyName"    column="strategy_name"    />
@@ -17,12 +17,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
-    <sql id="selectAdmOpEnergyStrategyVo">
+    <sql id="selectOpEnergyStrategyVo">
         select id, strategy_code, strategy_name, strategy_desc, strategy_type, exec_mode, exec_rule, allow_modify, create_time, update_time from adm_op_energy_strategy
     </sql>
 
-    <select id="selectAdmOpEnergyStrategyList" parameterType="com.ruoyi.ems.domain.AdmOpEnergyStrategy" resultMap="AdmOpEnergyStrategyResult">
-        <include refid="selectAdmOpEnergyStrategyVo"/>
+    <select id="selectOpEnergyStrategyList" parameterType="com.ruoyi.ems.domain.OpEnergyStrategy" resultMap="OpEnergyStrategyResult">
+        <include refid="selectOpEnergyStrategyVo"/>
         <where>
             <if test="strategyCode != null  and strategyCode != ''"> and strategy_code = #{strategyCode}</if>
             <if test="strategyName != null  and strategyName != ''"> and strategy_name like concat('%', #{strategyName}, '%')</if>
@@ -34,12 +34,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectAdmOpEnergyStrategyById" parameterType="Long" resultMap="AdmOpEnergyStrategyResult">
-        <include refid="selectAdmOpEnergyStrategyVo"/>
+    <select id="selectOpEnergyStrategyById" parameterType="Long" resultMap="OpEnergyStrategyResult">
+        <include refid="selectOpEnergyStrategyVo"/>
         where id = #{id}
     </select>
 
-    <insert id="insertAdmOpEnergyStrategy" parameterType="com.ruoyi.ems.domain.AdmOpEnergyStrategy" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertOpEnergyStrategy" parameterType="com.ruoyi.ems.domain.OpEnergyStrategy" useGeneratedKeys="true" keyProperty="id">
         insert into adm_op_energy_strategy
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="strategyCode != null and strategyCode != ''">strategy_code,</if>
@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateAdmOpEnergyStrategy" parameterType="com.ruoyi.ems.domain.AdmOpEnergyStrategy">
+    <update id="updateOpEnergyStrategy" parameterType="com.ruoyi.ems.domain.OpEnergyStrategy">
         update adm_op_energy_strategy
         <trim prefix="SET" suffixOverrides=",">
             <if test="strategyCode != null and strategyCode != ''">strategy_code = #{strategyCode},</if>
@@ -81,11 +81,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteAdmOpEnergyStrategyById" parameterType="Long">
+    <delete id="deleteOpEnergyStrategyById" parameterType="Long">
         delete from adm_op_energy_strategy where id = #{id}
     </delete>
 
-    <delete id="deleteAdmOpEnergyStrategyByIds" parameterType="String">
+    <delete id="deleteOpEnergyStrategyByIds" parameterType="String">
         delete from adm_op_energy_strategy where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/AdmEmsPvSupplyHMapper.xml → ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/PvSupplyHMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ems.mapper.AdmEmsPvSupplyHMapper">
-    <resultMap type="com.ruoyi.ems.domain.AdmEmsPvSupplyH" id="AdmEmsPvSupplyHResult">
+<mapper namespace="com.ruoyi.ems.mapper.PvSupplyHMapper">
+    <resultMap type="com.ruoyi.ems.domain.PvSupplyH" id="PvSupplyHResult">
         <result property="id"    column="id"    />
         <result property="areaCode"    column="area_code"    />
         <result property="facsCode"    column="facs_code"    />
@@ -17,12 +17,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="elecEarn"    column="elec_earn"    />
     </resultMap>
 
-    <sql id="selectAdmEmsPvSupplyHVo">
+    <sql id="selectPvSupplyHVo">
         select id, area_code, facs_code, date, time, time_index, meter_type, meter_unit_price, elec_reading, elec_quantity, elec_earn from adm_ems_pv_supply_h
     </sql>
 
-    <select id="selectAdmEmsPvSupplyHList" parameterType="com.ruoyi.ems.domain.AdmEmsPvSupplyH" resultMap="AdmEmsPvSupplyHResult">
-        <include refid="selectAdmEmsPvSupplyHVo"/>
+    <select id="selectPvSupplyHList" parameterType="com.ruoyi.ems.domain.PvSupplyH" resultMap="PvSupplyHResult">
+        <include refid="selectPvSupplyHVo"/>
         <where>
             <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
             <if test="facsCode != null  and facsCode != ''"> and facs_code = #{facsCode}</if>
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="elecEarn != null "> and elec_earn = #{elecEarn}</if>
         </where>
     </select>
-    <select id="selectAreaSupplyH" parameterType="com.ruoyi.ems.domain.AdmEmsPvSupplyH" resultMap="AdmEmsPvSupplyHResult">
+    <select id="selectAreaSupplyH" parameterType="com.ruoyi.ems.domain.PvSupplyH" resultMap="PvSupplyHResult">
         SELECT area_code, DATE, time_index, SUM( elec_quantity ) elec_quantity
         FROM
             adm_ems_pv_supply_h
@@ -50,12 +50,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             time_index ASC
     </select>
 
-    <select id="selectAdmEmsPvSupplyHById" parameterType="Long" resultMap="AdmEmsPvSupplyHResult">
-        <include refid="selectAdmEmsPvSupplyHVo"/>
+    <select id="selectPvSupplyHById" parameterType="Long" resultMap="PvSupplyHResult">
+        <include refid="selectPvSupplyHVo"/>
         where id = #{id}
     </select>
 
-    <insert id="insertAdmEmsPvSupplyH" parameterType="com.ruoyi.ems.domain.AdmEmsPvSupplyH" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertPvSupplyH" parameterType="com.ruoyi.ems.domain.PvSupplyH" useGeneratedKeys="true" keyProperty="id">
         insert into adm_ems_pv_supply_h
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code,</if>
@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateAdmEmsPvSupplyH" parameterType="com.ruoyi.ems.domain.AdmEmsPvSupplyH">
+    <update id="updatePvSupplyH" parameterType="com.ruoyi.ems.domain.PvSupplyH">
         update adm_ems_pv_supply_h
         <trim prefix="SET" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
@@ -100,11 +100,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteAdmEmsPvSupplyHById" parameterType="Long">
+    <delete id="deletePvSupplyHById" parameterType="Long">
         delete from adm_ems_pv_supply_h where id = #{id}
     </delete>
 
-    <delete id="deleteAdmEmsPvSupplyHByIds" parameterType="String">
+    <delete id="deletePvSupplyHByIds" parameterType="String">
         delete from adm_ems_pv_supply_h where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}

ems-cloud/ems-modules/ruoyi-system/src/main/resources/application-local.yml

@@ -1,5 +1,8 @@
 # spring配置
 spring:
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   redis:
     host: 172.192.10.105
     port: 30013
@@ -50,5 +53,4 @@ mybatis:
 # swagger配置
 swagger:
   title: 系统模块接口文档
-  license: Powered By ruoyi
-  licenseUrl: https://ruoyi.vip
+  enabled: true

ems-cloud/sql/ems_sys.sql

@@ -224,8 +224,9 @@ insert into sys_menu values ('187',  '垃圾厨余',       '9',   '8',  'adapter
 insert into sys_menu values ('188',  '能耗监测',       '9',   '9',  'adapter-nhjc',       'adapter/nhjc/index',       '', 1, 0, 'C', '0', '0',   'adapter:nhjc:list',      'econsumption',    'admin', sysdate(), '', null, '能耗监测');
 insert into sys_menu values ('189',  '设备管理',       '9',   '10', 'adapter-devc',       'adapter/devc/index',       '', 1, 0, 'M', '0', '0',   'adapter:devc:list',      'devicemgr',         'admin', sysdate(), '', null, '设备管理');
 
-insert into sys_menu values ('998',  '表单构建',       '99',   '1',  'build',              'tool/build/index',       '', 1, 0, 'C', '0', '0',   'tool:build:list',        'build',          'admin', sysdate(), '', null, '表单构建菜单');
-insert into sys_menu values ('999',  '代码生成',       '99',   '2',  'gen',                'tool/gen/index',         '', 1, 0, 'C', '0', '0',   'tool:gen:list',          'code',           'admin', sysdate(), '', null, '代码生成菜单');
+insert into sys_menu values ('997',  '表单构建',       '99',   '1',  'build',              'tool/build/index',       '', 1, 0, 'C', '0', '0',   'tool:build:list',        'build',          'admin', sysdate(), '', null, '表单构建菜单');
+insert into sys_menu values ('998',  '代码生成',       '99',   '2',  'gen',                'tool/gen/index',         '', 1, 0, 'C', '0', '0',   'tool:gen:list',          'code',           'admin', sysdate(), '', null, '代码生成菜单');
+insert into sys_menu values ('999',  '系统接口',       '99',   '3',  'http://localhost:9100/swagger-ui/index.html',   '', '', 0, 0, 'C', '0', '0', 'tool:swagger:list',   'swagger',        'admin', sysdate(), '', null, '系统接口菜单');
 
 -- 三级菜单
 -- 预测菜单