业务配置更新

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

@@ -13,12 +13,12 @@ package com.ruoyi.ems.controller;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.ems.domain.DevcType;
-import com.ruoyi.ems.domain.ElecValencyType;
+import com.ruoyi.ems.domain.ElecPriceType;
 import com.ruoyi.ems.domain.EmsCls;
 import com.ruoyi.ems.domain.EmsTag;
 import com.ruoyi.ems.domain.vo.TreeEntity;
 import com.ruoyi.ems.service.IDevcTypeService;
-import com.ruoyi.ems.service.IElecValencyTypeService;
+import com.ruoyi.ems.service.IElecPriceTypeService;
 import com.ruoyi.ems.service.IEmsClsService;
 import com.ruoyi.ems.service.IEmsTagService;
 import io.swagger.annotations.Api;
@@ -45,7 +45,7 @@ import java.util.List;
 @Api(value = "CommonController", description = "公共数据接口")
 public class CommonController extends BaseController {
     @Autowired
-    private IElecValencyTypeService valencyTypeService;
+    private IElecPriceTypeService valencyTypeService;
 
     @Autowired
     private IEmsClsService emsClsService;
@@ -61,10 +61,10 @@ public class CommonController extends BaseController {
      *
      * @return 分类列表
      */
-    @GetMapping(value = "/elecvalency/type")
-    @ApiOperation(value = "getElecValencyType", notes = "维表-查询电价分类列表")
-    public AjaxResult getElecValencyType() {
-        List<ElecValencyType> types = valencyTypeService.selectElecValencyTypeList(new ElecValencyType());
+    @GetMapping(value = "/elecprice/type")
+    @ApiOperation(value = "getElecPriceType", notes = "维表-查询电价分类列表")
+    public AjaxResult getElecPriceType() {
+        List<ElecPriceType> types = valencyTypeService.selectElecPriceTypeList(new ElecPriceType());
         return success(types);
     }
 

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

@@ -7,8 +7,8 @@ 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.AreaElectricityAttr;
-import com.ruoyi.ems.service.IAreaElectricityAttrService;
+import com.ruoyi.ems.domain.ElecAttr;
+import com.ruoyi.ems.service.IElecAttrService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -30,23 +30,23 @@ import java.util.List;
  * @date 2024-07-23
  */
 @RestController
-@RequestMapping("/basecfg/electricity")
-@Api(value = "ElectricityController", description = "国网电价策略管理")
-public class ElectricityController extends BaseController {
+@RequestMapping("/basecfg/elec/attr")
+@Api(value = "ElecAttrController", description = "用电属性管理")
+public class ElecAttrController extends BaseController {
     /**
      * 用电属性服务
      */
     @Autowired
-    private IAreaElectricityAttrService attrService;
+    private IElecAttrService attrService;
 
     /**
      * 查询服务区用电属性列表
      */
     @RequiresPermissions("basecfg:price:list")
-    @GetMapping("/attr/list")
-    public TableDataInfo list(AreaElectricityAttr areaElectricityAttr) {
+    @GetMapping("/list")
+    public TableDataInfo list(ElecAttr areaElectricityAttr) {
         startPage();
-        List<AreaElectricityAttr> list = attrService.selectAreaElectricityAttrList(areaElectricityAttr);
+        List<ElecAttr> list = attrService.selectElecAttrList(areaElectricityAttr);
         return getDataTable(list);
     }
 
@@ -54,11 +54,11 @@ public class ElectricityController extends BaseController {
      * 导出服务区用电属性列表
      */
     @RequiresPermissions("basecfg:price:export")
-    @Log(title = "服务区用电属性", businessType = BusinessType.EXPORT)
-    @PostMapping("/attr/export")
-    public void export(HttpServletResponse response, AreaElectricityAttr areaElectricityAttr) {
-        List<AreaElectricityAttr> list = attrService.selectAreaElectricityAttrList(areaElectricityAttr);
-        ExcelUtil<AreaElectricityAttr> util = new ExcelUtil<AreaElectricityAttr>(AreaElectricityAttr.class);
+    @Log(title = "导出服务区用电属性", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ElecAttr areaElectricityAttr) {
+        List<ElecAttr> list = attrService.selectElecAttrList(areaElectricityAttr);
+        ExcelUtil<ElecAttr> util = new ExcelUtil<ElecAttr>(ElecAttr.class);
         util.exportExcel(response, list, "服务区用电属性数据");
     }
 
@@ -66,38 +66,38 @@ public class ElectricityController extends BaseController {
      * 获取服务区用电属性详细信息
      */
     @RequiresPermissions("basecfg:price:query")
-    @GetMapping(value = "/attr/{id}")
+    @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(attrService.selectAreaElectricityAttrById(id));
+        return success(attrService.selectElecAttrById(id));
     }
 
     /**
      * 新增服务区用电属性
      */
     @RequiresPermissions("basecfg:price:add")
-    @Log(title = "服务区用电属性", businessType = BusinessType.INSERT)
-    @PostMapping(value = "/attr")
-    public AjaxResult add(@RequestBody AreaElectricityAttr areaElectricityAttr) {
-        return toAjax(attrService.insertAreaElectricityAttr(areaElectricityAttr));
+    @Log(title = "新增服务区用电属性", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ElecAttr areaElectricityAttr) {
+        return toAjax(attrService.insertElecAttr(areaElectricityAttr));
     }
 
     /**
      * 修改服务区用电属性
      */
     @RequiresPermissions("basecfg:price:edit")
-    @Log(title = "服务区用电属性", businessType = BusinessType.UPDATE)
-    @PutMapping(value = "/attr")
-    public AjaxResult edit(@RequestBody AreaElectricityAttr areaElectricityAttr) {
-        return toAjax(attrService.updateAreaElectricityAttr(areaElectricityAttr));
+    @Log(title = "更新服务区用电属性", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ElecAttr areaElectricityAttr) {
+        return toAjax(attrService.updateElecAttr(areaElectricityAttr));
     }
 
     /**
      * 删除服务区用电属性
      */
     @RequiresPermissions("basecfg:price:remove")
-    @Log(title = "服务区用电属性", businessType = BusinessType.DELETE)
-    @DeleteMapping("/attr/{ids}")
+    @Log(title = "删除服务区用电属性", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(attrService.deleteAreaElectricityAttrByIds(ids));
+        return toAjax(attrService.deleteElecAttrByIds(ids));
     }
 }

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

@@ -0,0 +1,179 @@
+package com.ruoyi.ems.controller;
+
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.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.ElecGwPriceConfig;
+import com.ruoyi.ems.domain.ElecPvPriceConfig;
+import com.ruoyi.ems.service.IElecPriceConfigService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 电价配置Controller
+ *
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+@RestController
+@RequestMapping("/basecfg/elecPrice")
+@Api(value = "ElecPriceController", description = "国网电价管理")
+public class ElecPriceController extends BaseController {
+    @Autowired
+    private IElecPriceConfigService configService;
+
+    /**
+     * 查询电价配置列表
+     */
+    @RequiresPermissions("basecfg:price:list")
+    @GetMapping("/gw/list")
+    public TableDataInfo listGw(ElecGwPriceConfig elecValencyConfig) {
+        startPage();
+        List<ElecGwPriceConfig> list = configService.selectGwElecPriceConfigList(elecValencyConfig);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出电价配置列表
+     */
+    @RequiresPermissions("basecfg:price:export")
+    @Log(title = "国网电价配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/gw/export")
+    public void exportGw(HttpServletResponse response, ElecGwPriceConfig elecValencyConfig) {
+        List<ElecGwPriceConfig> list = configService.selectGwElecPriceConfigList(elecValencyConfig);
+        ExcelUtil<ElecGwPriceConfig> util = new ExcelUtil<>(ElecGwPriceConfig.class);
+        util.exportExcel(response, list, "国网电价配置数据");
+    }
+
+    /**
+     * 获取电价配置详细信息
+     */
+    @RequiresPermissions("basecfg:price:query")
+    @GetMapping(value = "/gw/{id}")
+    public AjaxResult getGwInfo(@PathVariable("id") Long id) {
+        return success(configService.selectGwElecPriceConfigById(id));
+    }
+
+    /**
+     * 新增电价配置
+     */
+    @RequiresPermissions("basecfg:price:add")
+    @Log(title = "电价配置", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/gw")
+    public AjaxResult addGw(@RequestBody ElecGwPriceConfig elecValencyConfig) {
+        return toAjax(configService.insertGwElecPriceConfig(elecValencyConfig));
+    }
+
+    /**
+     * 修改电价配置
+     */
+    @RequiresPermissions("basecfg:price:edit")
+    @Log(title = "电价配置", businessType = BusinessType.UPDATE)
+    @PutMapping(value = "/gw")
+    public AjaxResult editGw(@RequestBody ElecGwPriceConfig elecValencyConfig) {
+        return toAjax(configService.updateGwElecPriceConfig(elecValencyConfig));
+    }
+
+    /**
+     * 删除电价配置
+     */
+    @RequiresPermissions("basecfg:price:remove")
+    @Log(title = "电价配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/gw/{ids}")
+    public AjaxResult removeGw(@PathVariable Long[] ids) {
+        return toAjax(configService.deleteGwElecPriceConfigByIds(ids));
+    }
+
+    /**
+     * 列出价格列表
+     * @return 价格列表
+     */
+    @GetMapping("/gw/listall")
+    public AjaxResult listAllGw() {
+        List<ElecGwPriceConfig> list = configService.selectGwElecPriceConfigList(new ElecGwPriceConfig());
+        return success(list);
+    }
+
+    /**
+     * 查询光伏电价配置列表
+     */
+    @RequiresPermissions("basecfg:price:list")
+    @GetMapping("/pv/list")
+    public TableDataInfo listPv(ElecPvPriceConfig pvPriceConfig)
+    {
+        startPage();
+        List<ElecPvPriceConfig> list = configService.selectPvPriceConfigList(pvPriceConfig);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出光伏电价配置列表
+     */
+    @RequiresPermissions("basecfg:price:export")
+    @Log(title = "光伏电价配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/pv/export")
+    public void exportPv(HttpServletResponse response, ElecPvPriceConfig pvPriceConfig)
+    {
+        List<ElecPvPriceConfig> list = configService.selectPvPriceConfigList(pvPriceConfig);
+        ExcelUtil<ElecPvPriceConfig> util = new ExcelUtil<>(ElecPvPriceConfig.class);
+        util.exportExcel(response, list, "光伏电价配置数据");
+    }
+
+    /**
+     * 获取光伏电价配置详细信息
+     */
+    @RequiresPermissions("basecfg:price:query")
+    @GetMapping(value = "/pv/{id}")
+    public AjaxResult getPvInfo(@PathVariable("id") Long id)
+    {
+        return success(configService.selectPvPriceConfigById(id));
+    }
+
+    /**
+     * 新增光伏电价配置
+     */
+    @RequiresPermissions("basecfg:price:add")
+    @Log(title = "光伏电价配置", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/pv")
+    public AjaxResult addPv(@RequestBody ElecPvPriceConfig pvPriceConfig)
+    {
+        return toAjax(configService.insertPvPriceConfig(pvPriceConfig));
+    }
+
+    /**
+     * 修改光伏电价配置
+     */
+    @RequiresPermissions("basecfg:price:edit")
+    @Log(title = "光伏电价配置", businessType = BusinessType.UPDATE)
+    @PutMapping(value = "/pv")
+    public AjaxResult editPv(@RequestBody ElecPvPriceConfig pvPriceConfig)
+    {
+        return toAjax(configService.updatePvPriceConfig(pvPriceConfig));
+    }
+
+    /**
+     * 删除光伏电价配置
+     */
+    @RequiresPermissions("basecfg:price:remove")
+    @Log(title = "光伏电价配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/pv/{ids}")
+    public AjaxResult removePv(@PathVariable Long[] ids)
+    {
+        return toAjax(configService.deletePvPriceConfigByIds(ids));
+    }
+}

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

@@ -1,110 +0,0 @@
-package com.ruoyi.ems.controller;
-
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.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.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;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 电价配置Controller
- *
- * @author ruoyi
- * @date 2024-07-23
- */
-@RestController
-@RequestMapping("/basecfg/elecvalency")
-@Api(value = "ElecValencyController", description = "国网电价管理")
-public class ElecValencyController extends BaseController {
-    @Autowired
-    private IElecValencyConfigService configService;
-
-    /**
-     * 查询电价配置列表
-     */
-    @RequiresPermissions("basecfg:price:list")
-    @GetMapping("/list")
-    public TableDataInfo list(ElecValencyConfig elecValencyConfig) {
-        startPage();
-        List<ElecValencyConfig> list = configService.selectElecValencyConfigList(elecValencyConfig);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出电价配置列表
-     */
-    @RequiresPermissions("basecfg:price:export")
-    @Log(title = "电价配置", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, ElecValencyConfig elecValencyConfig) {
-        List<ElecValencyConfig> list = configService.selectElecValencyConfigList(elecValencyConfig);
-        ExcelUtil<ElecValencyConfig> util = new ExcelUtil<>(ElecValencyConfig.class);
-        util.exportExcel(response, list, "电价配置数据");
-    }
-
-    /**
-     * 获取电价配置详细信息
-     */
-    @RequiresPermissions("basecfg:price:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(configService.selectElecValencyConfigById(id));
-    }
-
-    /**
-     * 新增电价配置
-     */
-    @RequiresPermissions("basecfg:price:add")
-    @Log(title = "电价配置", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody ElecValencyConfig elecValencyConfig) {
-        return toAjax(configService.insertElecValencyConfig(elecValencyConfig));
-    }
-
-    /**
-     * 修改电价配置
-     */
-    @RequiresPermissions("basecfg:price:edit")
-    @Log(title = "电价配置", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody ElecValencyConfig elecValencyConfig) {
-        return toAjax(configService.updateElecValencyConfig(elecValencyConfig));
-    }
-
-    /**
-     * 删除电价配置
-     */
-    @RequiresPermissions("basecfg:price:remove")
-    @Log(title = "电价配置", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(configService.deleteElecValencyConfigByIds(ids));
-    }
-
-    /**
-     * 列出价格列表
-     * @return 价格列表
-     */
-    @GetMapping("/listall")
-    public AjaxResult listAll() {
-        List<ElecValencyConfig> list = configService.selectElecValencyConfigList(new ElecValencyConfig());
-        return success(list);
-    }
-}

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

@@ -0,0 +1,107 @@
+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;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.ems.domain.EmsFacsAbility;
+import com.ruoyi.ems.service.IEmsFacsAbilityService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 能源设施能力Controller
+ * 
+ * @author ruoyi
+ * @date 2024-08-22
+ */
+@RestController
+@RequestMapping("/basecfg/emsfacs/ability")
+@Api(value = "EmsFacsAbilityController", description = "能源设施能力特性管理")
+public class EmsFacsAbilityController extends BaseController
+{
+    @Autowired
+    private IEmsFacsAbilityService emsFacsAbilityService;
+
+    /**
+     * 查询能源设施能力列表
+     */
+    @RequiresPermissions("ems:ability:list")
+    @GetMapping("/list")
+    public TableDataInfo list(EmsFacsAbility admEmsFacsAbility)
+    {
+        startPage();
+        List<EmsFacsAbility> list = emsFacsAbilityService.selectEmsFacsAbilityList(admEmsFacsAbility);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出能源设施能力列表
+     */
+    @RequiresPermissions("ems:ability:export")
+    @Log(title = "能源设施能力", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, EmsFacsAbility admEmsFacsAbility)
+    {
+        List<EmsFacsAbility> list = emsFacsAbilityService.selectEmsFacsAbilityList(admEmsFacsAbility);
+        ExcelUtil<EmsFacsAbility> util = new ExcelUtil<EmsFacsAbility>(EmsFacsAbility.class);
+        util.exportExcel(response, list, "能源设施能力数据");
+    }
+
+    /**
+     * 获取能源设施能力详细信息
+     */
+    @RequiresPermissions("ems:ability:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(emsFacsAbilityService.selectEmsFacsAbilityById(id));
+    }
+
+    /**
+     * 新增能源设施能力
+     */
+    @RequiresPermissions("ems:ability:add")
+    @Log(title = "能源设施能力", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody EmsFacsAbility admEmsFacsAbility)
+    {
+        return toAjax(emsFacsAbilityService.insertEmsFacsAbility(admEmsFacsAbility));
+    }
+
+    /**
+     * 修改能源设施能力
+     */
+    @RequiresPermissions("ems:ability:edit")
+    @Log(title = "能源设施能力", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody EmsFacsAbility admEmsFacsAbility)
+    {
+        return toAjax(emsFacsAbilityService.updateEmsFacsAbility(admEmsFacsAbility));
+    }
+
+    /**
+     * 删除能源设施能力
+     */
+    @RequiresPermissions("ems:ability:remove")
+    @Log(title = "能源设施能力", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(emsFacsAbilityService.deleteEmsFacsAbilityByIds(ids));
+    }
+}

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

@@ -0,0 +1,118 @@
+package com.ruoyi.ems.controller;
+
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.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.EmsFacsAttr;
+import com.ruoyi.ems.service.IEmsFacsAttrService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 能源设施属性Controller
+ * 
+ * @author ruoyi
+ * @date 2024-08-22
+ */
+@RestController
+@RequestMapping("/basecfg/emsfacs/attr")
+@Api(value = "EmsFacsAttrController", description = "能源设施属性管理")
+public class EmsFacsAttrController extends BaseController
+{
+    @Autowired
+    private IEmsFacsAttrService facsAttrService;
+
+    /**
+     * 查询能源设施属性列表
+     */
+    @RequiresPermissions("basecfg:emsfacs:list")
+    @GetMapping("/list")
+    public TableDataInfo list(EmsFacsAttr emsFacsAttr)
+    {
+        startPage();
+        List<EmsFacsAttr> list = facsAttrService.selectEmsFacsAttrList(emsFacsAttr);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出能源设施属性列表
+     */
+    @RequiresPermissions("basecfg:emsfacs:export")
+    @Log(title = "能源设施属性", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, EmsFacsAttr emsFacsAttr)
+    {
+        List<EmsFacsAttr> list = facsAttrService.selectEmsFacsAttrList(emsFacsAttr);
+        ExcelUtil<EmsFacsAttr> util = new ExcelUtil<EmsFacsAttr>(EmsFacsAttr.class);
+        util.exportExcel(response, list, "能源设施属性数据");
+    }
+
+    /**
+     * 获取能源设施属性详细信息
+     */
+    @RequiresPermissions("basecfg:emsfacs:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(facsAttrService.selectEmsFacsAttrById(id));
+    }
+
+    /**
+     * 新增能源设施属性
+     */
+    @RequiresPermissions("basecfg:emsfacs:add")
+    @Log(title = "能源设施属性", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody EmsFacsAttr emsFacsAttr)
+    {
+        return toAjax(facsAttrService.insertEmsFacsAttr(emsFacsAttr));
+    }
+
+    /**
+     * 新增能源设施属性
+     */
+    @RequiresPermissions("basecfg:emsfacs:add")
+    @Log(title = "能源设施属性", businessType = BusinessType.INSERT)
+    @PostMapping("/batch")
+    public AjaxResult addBatch(@RequestBody List<EmsFacsAttr> emsFacsAttrs)
+    {
+        return toAjax(facsAttrService.insertEmsFacsAttrBatch(emsFacsAttrs));
+    }
+
+    /**
+     * 修改能源设施属性
+     */
+    @RequiresPermissions("basecfg:emsfacs:edit")
+    @Log(title = "能源设施属性", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody EmsFacsAttr emsFacsAttr)
+    {
+        return toAjax(facsAttrService.updateEmsFacsAttr(emsFacsAttr));
+    }
+
+    /**
+     * 删除能源设施属性
+     */
+    @RequiresPermissions("basecfg:emsfacs:remove")
+    @Log(title = "能源设施属性", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(facsAttrService.deleteEmsFacsAttrByIds(ids));
+    }
+}

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

@@ -33,8 +33,8 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/basecfg/emsfacs")
-@Api(value = "FacsTypeController", description = "能源设施管理")
-public class FacsController extends BaseController
+@Api(value = "EmsFacsController", description = "能源设施管理")
+public class EmsFacsController extends BaseController
 {
     @Autowired
     private IEmsFacsService emsFacsService;
@@ -80,9 +80,9 @@ public class FacsController extends BaseController
     @RequiresPermissions("basecfg:emsfacs:add")
     @Log(title = "能源设施/系统", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody EmsFacs admEmsFacs)
+    public AjaxResult add(@RequestBody EmsFacs emsFacs)
     {
-        return toAjax(emsFacsService.insertEmsFacs(admEmsFacs));
+        return toAjax(emsFacsService.insertEmsFacs(emsFacs));
     }
 
     /**

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

@@ -0,0 +1,118 @@
+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;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.ems.domain.EmsFacsEvent;
+import com.ruoyi.ems.service.IEmsFacsEventService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 能源设施事件Controller
+ * 
+ * @author ruoyi
+ * @date 2024-08-22
+ */
+@RestController
+@RequestMapping("/basecfg/emsfacs/event")
+@Api(value = "EmsFacsEventController", description = "能源设施事件特性管理")
+public class EmsFacsEventController extends BaseController
+{
+    @Autowired
+    private IEmsFacsEventService emsFacsEventService;
+
+    /**
+     * 查询能源设施事件列表
+     */
+    @RequiresPermissions("ems:event:list")
+    @GetMapping("/list")
+    public TableDataInfo list(EmsFacsEvent admEmsFacsEvent)
+    {
+        startPage();
+        List<EmsFacsEvent> list = emsFacsEventService.selectEmsFacsEventList(admEmsFacsEvent);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出能源设施事件列表
+     */
+    @RequiresPermissions("ems:event:export")
+    @Log(title = "能源设施事件", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, EmsFacsEvent admEmsFacsEvent)
+    {
+        List<EmsFacsEvent> list = emsFacsEventService.selectEmsFacsEventList(admEmsFacsEvent);
+        ExcelUtil<EmsFacsEvent> util = new ExcelUtil<EmsFacsEvent>(EmsFacsEvent.class);
+        util.exportExcel(response, list, "能源设施事件数据");
+    }
+
+    /**
+     * 获取能源设施事件详细信息
+     */
+    @RequiresPermissions("ems:event:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(emsFacsEventService.selectEmsFacsEventById(id));
+    }
+
+    /**
+     * 新增能源设施事件
+     */
+    @RequiresPermissions("ems:event:add")
+    @Log(title = "能源设施事件", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody EmsFacsEvent admEmsFacsEvent)
+    {
+        return toAjax(emsFacsEventService.insertEmsFacsEvent(admEmsFacsEvent));
+    }
+
+    /**
+     * 新增能源设施事件
+     */
+    @RequiresPermissions("ems:event:add")
+    @Log(title = "能源设施事件", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/batch")
+    public AjaxResult addBatch(@RequestBody List<EmsFacsEvent> emsFacsEvents)
+    {
+        return toAjax(emsFacsEventService.insertEmsFacsEventBatch(emsFacsEvents));
+    }
+
+    /**
+     * 修改能源设施事件
+     */
+    @RequiresPermissions("ems:event:edit")
+    @Log(title = "能源设施事件", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody EmsFacsEvent admEmsFacsEvent)
+    {
+        return toAjax(emsFacsEventService.updateEmsFacsEvent(admEmsFacsEvent));
+    }
+
+    /**
+     * 删除能源设施事件
+     */
+    @RequiresPermissions("ems:event:remove")
+    @Log(title = "能源设施事件", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(emsFacsEventService.deleteEmsFacsEventByIds(ids));
+    }
+}

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.EmsSubsystem;
 import com.ruoyi.ems.service.IEmsSubsystemService;
+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("/subsystem")
+@Api(value = "EmsSubsystemController", description = "能源子系统管理")
 public class EmsSubsystemController extends BaseController
 {
     @Autowired

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

@@ -1,107 +0,0 @@
-package com.ruoyi.ems.controller;
-
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.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.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;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 光伏电价配置Controller
- * 
- * @author ruoyi
- * @date 2024-08-19
- */
-@RestController
-@RequestMapping("/basecfg/pvprice")
-@Api(value = "PvPriceConfigController", description = "光伏电价管理")
-public class PvPriceConfigController extends BaseController
-{
-    @Autowired
-    private IPvPriceConfigService sysPvPriceConfigService;
-
-    /**
-     * 查询光伏电价配置列表
-     */
-    @RequiresPermissions("basecfg:price:list")
-    @GetMapping("/list")
-    public TableDataInfo list(ElecPvPriceConfig pvPriceConfig)
-    {
-        startPage();
-        List<ElecPvPriceConfig> list = sysPvPriceConfigService.selectPvPriceConfigList(pvPriceConfig);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出光伏电价配置列表
-     */
-    @RequiresPermissions("basecfg:price:export")
-    @Log(title = "光伏电价配置", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, ElecPvPriceConfig pvPriceConfig)
-    {
-        List<ElecPvPriceConfig> list = sysPvPriceConfigService.selectPvPriceConfigList(pvPriceConfig);
-        ExcelUtil<ElecPvPriceConfig> util = new ExcelUtil<>(ElecPvPriceConfig.class);
-        util.exportExcel(response, list, "光伏电价配置数据");
-    }
-
-    /**
-     * 获取光伏电价配置详细信息
-     */
-    @RequiresPermissions("basecfg:price:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return success(sysPvPriceConfigService.selectPvPriceConfigById(id));
-    }
-
-    /**
-     * 新增光伏电价配置
-     */
-    @RequiresPermissions("basecfg:price:add")
-    @Log(title = "光伏电价配置", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody ElecPvPriceConfig pvPriceConfig)
-    {
-        return toAjax(sysPvPriceConfigService.insertPvPriceConfig(pvPriceConfig));
-    }
-
-    /**
-     * 修改光伏电价配置
-     */
-    @RequiresPermissions("basecfg:price:edit")
-    @Log(title = "光伏电价配置", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody ElecPvPriceConfig pvPriceConfig)
-    {
-        return toAjax(sysPvPriceConfigService.updatePvPriceConfig(pvPriceConfig));
-    }
-
-    /**
-     * 删除光伏电价配置
-     */
-    @RequiresPermissions("basecfg:price:remove")
-    @Log(title = "光伏电价配置", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(sysPvPriceConfigService.deletePvPriceConfigByIds(ids));
-    }
-}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AreaElectricityAttr.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/ElecAttr.java

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

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/ElecValencyConfig.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/ElecGwPriceConfig.java

@@ -6,12 +6,12 @@ import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 
 /**
- * 电价配置对象 sys_electrovalency_config
+ * 国网电价配置对象 sys_gw_elecprice_config
  * 
  * @author ruoyi
  * @date 2024-07-23
  */
-public class ElecValencyConfig extends BaseEntity
+public class ElecGwPriceConfig extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/ElecValencyType.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/ElecPriceType.java

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

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

@@ -1,106 +0,0 @@
-package com.ruoyi.ems.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-
-/**
- * 电价策略小时对象 sys_electrovalency_strategy_hour
- * 
- * @author ruoyi
- * @date 2024-07-23
- */
-public class ElecValencyHourStrategy extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    public ElecValencyHourStrategy(){
-        super();
-    }
-
-    public ElecValencyHourStrategy(String strategyCode){
-        super();
-        this.strategyCode = strategyCode;
-    }
-
-    /** 序号 */
-    private Long id;
-
-    /** 策略代码 */
-    @Excel(name = "策略代码")
-    private String strategyCode;
-
-    /** 开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date startTime;
-
-    /** 结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date endTime;
-
-    /** 计量类型 */
-    @Excel(name = "计量类型")
-    private Long type;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setStrategyCode(String strategyCode) 
-    {
-        this.strategyCode = strategyCode;
-    }
-
-    public String getStrategyCode() 
-    {
-        return strategyCode;
-    }
-    public void setStartTime(Date startTime) 
-    {
-        this.startTime = startTime;
-    }
-
-    public Date getStartTime() 
-    {
-        return startTime;
-    }
-    public void setEndTime(Date endTime) 
-    {
-        this.endTime = endTime;
-    }
-
-    public Date getEndTime() 
-    {
-        return endTime;
-    }
-    public void setType(Long type) 
-    {
-        this.type = type;
-    }
-
-    public Long getType() 
-    {
-        return type;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("strategyCode", getStrategyCode())
-            .append("startTime", getStartTime())
-            .append("endTime", getEndTime())
-            .append("type", getType())
-            .toString();
-    }
-}

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

@@ -1,113 +0,0 @@
-package com.ruoyi.ems.domain;
-
-import java.util.Date;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-
-/**
- * 电价策略对象 sys_electrovalency_strategy
- * 
- * @author ruoyi
- * @date 2024-07-23
- */
-public class ElecValencyStrategy extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 序号 */
-    private Long id;
-
-    /** 策略代码 */
-    @Excel(name = "策略代码")
-    private String strategyCode;
-
-    /** 策略名称 */
-    @Excel(name = "策略名称")
-    private String strategyName;
-
-    /** 执行日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "执行日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date date;
-
-    /** 优先级 */
-    @Excel(name = "优先级")
-    private Long priority;
-
-    /**
-     * 小时策略
-     */
-    private List<ElecValencyHourStrategy> hourStrategys;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setStrategyCode(String strategyCode) 
-    {
-        this.strategyCode = strategyCode;
-    }
-
-    public String getStrategyCode() 
-    {
-        return strategyCode;
-    }
-    public void setStrategyName(String strategyName) 
-    {
-        this.strategyName = strategyName;
-    }
-
-    public String getStrategyName() 
-    {
-        return strategyName;
-    }
-    public void setDate(Date date) 
-    {
-        this.date = date;
-    }
-
-    public Date getDate() 
-    {
-        return date;
-    }
-    public void setPriority(Long priority) 
-    {
-        this.priority = priority;
-    }
-
-    public Long getPriority() 
-    {
-        return priority;
-    }
-
-    public List<ElecValencyHourStrategy> getHourStrategys() {
-        return hourStrategys;
-    }
-
-    public void setHourStrategys(List<ElecValencyHourStrategy> hourStrategys) {
-        this.hourStrategys = hourStrategys;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("strategyCode", getStrategyCode())
-            .append("strategyName", getStrategyName())
-            .append("date", getDate())
-            .append("priority", getPriority())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

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

@@ -53,9 +53,15 @@ public class EmsFacs extends BaseEntity
     @Excel(name = "归属区域")
     private String refAreaName;
 
-    /** 扩展属性 */
+    /** 设施属性 */
     private List<EmsFacsAttr> facsAttrs;
 
+    /** 设施能力 */
+    private List<EmsFacsAbility> facsAbilities;
+
+    /** 设施事件 */
+    private List<EmsFacsEvent> facsEvents;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -152,6 +158,22 @@ public class EmsFacs extends BaseEntity
         this.refAreaName = refAreaName;
     }
 
+    public List<EmsFacsAbility> getFacsAbilities() {
+        return facsAbilities;
+    }
+
+    public void setFacsAbilities(List<EmsFacsAbility> facsAbilities) {
+        this.facsAbilities = facsAbilities;
+    }
+
+    public List<EmsFacsEvent> getFacsEvents() {
+        return facsEvents;
+    }
+
+    public void setFacsEvents(List<EmsFacsEvent> facsEvents) {
+        this.facsEvents = facsEvents;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -0,0 +1,102 @@
+package com.ruoyi.ems.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 能源设施能力对象 adm_ems_facs_ability
+ * 
+ * @author ruoyi
+ * @date 2024-08-22
+ */
+public class EmsFacsAbility extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 序号 */
+    private Long id;
+
+    /** 设施代码 */
+    @Excel(name = "设施代码")
+    private String facsCode;
+
+    /** 能力名称 */
+    @Excel(name = "能力名称")
+    private String abilityName;
+
+    /** 能力描述 */
+    @Excel(name = "能力描述")
+    private String abilityDesc;
+
+    /** 属性值 */
+    @Excel(name = "属性值")
+    private String abilityParam;
+
+    public EmsFacsAbility() {
+        super();
+    }
+
+    public EmsFacsAbility(String facsCode){
+        super();
+        this.facsCode = facsCode;
+    }
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setFacsCode(String facsCode) 
+    {
+        this.facsCode = facsCode;
+    }
+
+    public String getFacsCode() 
+    {
+        return facsCode;
+    }
+    public void setAbilityName(String abilityName) 
+    {
+        this.abilityName = abilityName;
+    }
+
+    public String getAbilityName() 
+    {
+        return abilityName;
+    }
+    public void setAbilityDesc(String abilityDesc) 
+    {
+        this.abilityDesc = abilityDesc;
+    }
+
+    public String getAbilityDesc() 
+    {
+        return abilityDesc;
+    }
+    public void setAbilityParam(String abilityParam) 
+    {
+        this.abilityParam = abilityParam;
+    }
+
+    public String getAbilityParam() 
+    {
+        return abilityParam;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("facsCode", getFacsCode())
+            .append("abilityName", getAbilityName())
+            .append("abilityDesc", getAbilityDesc())
+            .append("abilityParam", getAbilityParam())
+            .toString();
+    }
+}

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

@@ -0,0 +1,130 @@
+package com.ruoyi.ems.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 能源设施事件对象 adm_ems_facs_event
+ *
+ * @author ruoyi
+ * @date 2024-08-22
+ */
+public class EmsFacsEvent extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    private Long id;
+
+    /**
+     * 设施代码
+     */
+    @Excel(name = "设施代码")
+    private String facsCode;
+
+    /**
+     * 事件名称
+     */
+    @Excel(name = "事件名称")
+    private String eventName;
+
+    /**
+     * 事件类型
+     */
+    @Excel(name = "事件类型")
+    private Long eventType;
+
+    /**
+     * 事件描述
+     */
+    @Excel(name = "事件描述")
+    private String eventDesc;
+
+    /**
+     * 事件代码
+     */
+    @Excel(name = "事件代码")
+    private String eventCode;
+
+    /**
+     * 外系统事件代码
+     */
+    @Excel(name = "外系统事件代码")
+    private String extEventCode;
+
+    public EmsFacsEvent() {
+        super();
+    }
+
+    public EmsFacsEvent(String facsCode) {
+        super();
+        this.facsCode = facsCode;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setFacsCode(String facsCode) {
+        this.facsCode = facsCode;
+    }
+
+    public String getFacsCode() {
+        return facsCode;
+    }
+
+    public void setEventName(String eventName) {
+        this.eventName = eventName;
+    }
+
+    public String getEventName() {
+        return eventName;
+    }
+
+    public void setEventType(Long eventType) {
+        this.eventType = eventType;
+    }
+
+    public Long getEventType() {
+        return eventType;
+    }
+
+    public void setEventDesc(String eventDesc) {
+        this.eventDesc = eventDesc;
+    }
+
+    public String getEventDesc() {
+        return eventDesc;
+    }
+
+    public void setEventCode(String eventCode) {
+        this.eventCode = eventCode;
+    }
+
+    public String getEventCode() {
+        return eventCode;
+    }
+
+    public void setExtEventCode(String extEventCode) {
+        this.extEventCode = extEventCode;
+    }
+
+    public String getExtEventCode() {
+        return extEventCode;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId())
+            .append("facsCode", getFacsCode()).append("eventName", getEventName()).append("eventType", getEventType())
+            .append("eventDesc", getEventDesc()).append("eventCode", getEventCode())
+            .append("extEventCode", getExtEventCode()).toString();
+    }
+}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/AreaElectricityAttrMapper.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/ElecAttrMapper.java

@@ -2,7 +2,7 @@ package com.ruoyi.ems.mapper;
 
 import java.util.List;
 
-import com.ruoyi.ems.domain.AreaElectricityAttr;
+import com.ruoyi.ems.domain.ElecAttr;
 
 /**
  * 服务区用电属性Mapper接口
@@ -10,14 +10,14 @@ import com.ruoyi.ems.domain.AreaElectricityAttr;
  * @author ruoyi
  * @date 2024-07-23
  */
-public interface AreaElectricityAttrMapper {
+public interface ElecAttrMapper {
     /**
      * 查询服务区用电属性
      *
      * @param id 服务区用电属性主键
      * @return 服务区用电属性
      */
-    AreaElectricityAttr selectAreaElectricityAttrById(Long id);
+    ElecAttr selectElecAttrById(Long id);
 
     /**
      * 查询服务区用电属性列表
@@ -25,7 +25,7 @@ public interface AreaElectricityAttrMapper {
      * @param areaElectricityAttr 服务区用电属性
      * @return 服务区用电属性集合
      */
-    List<AreaElectricityAttr> selectAreaElectricityAttrList(AreaElectricityAttr areaElectricityAttr);
+    List<ElecAttr> selectElecAttrList(ElecAttr areaElectricityAttr);
 
     /**
      * 新增服务区用电属性
@@ -33,7 +33,7 @@ public interface AreaElectricityAttrMapper {
      * @param areaElectricityAttr 服务区用电属性
      * @return 结果
      */
-    int insertAreaElectricityAttr(AreaElectricityAttr areaElectricityAttr);
+    int insertElecAttr(ElecAttr areaElectricityAttr);
 
     /**
      * 修改服务区用电属性
@@ -41,7 +41,7 @@ public interface AreaElectricityAttrMapper {
      * @param areaElectricityAttr 服务区用电属性
      * @return 结果
      */
-    int updateAreaElectricityAttr(AreaElectricityAttr areaElectricityAttr);
+    int updateElecAttr(ElecAttr areaElectricityAttr);
 
     /**
      * 删除服务区用电属性
@@ -49,7 +49,7 @@ public interface AreaElectricityAttrMapper {
      * @param id 服务区用电属性主键
      * @return 结果
      */
-    int deleteAreaElectricityAttrById(Long id);
+    int deleteElecAttrById(Long id);
 
     /**
      * 批量删除服务区用电属性
@@ -57,5 +57,5 @@ public interface AreaElectricityAttrMapper {
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    int deleteAreaElectricityAttrByIds(Long[] ids);
+    int deleteElecAttrByIds(Long[] ids);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/ElecValencyConfigMapper.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/ElecGwPriceConfigMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.ems.mapper;
 
-import com.ruoyi.ems.domain.ElecValencyConfig;
+import com.ruoyi.ems.domain.ElecGwPriceConfig;
 
 import java.util.List;
 
@@ -10,38 +10,38 @@ import java.util.List;
  * @author ruoyi
  * @date 2024-07-23
  */
-public interface ElecValencyConfigMapper {
+public interface ElecGwPriceConfigMapper {
     /**
      * 查询电价配置
      *
      * @param id 电价配置主键
      * @return 电价配置
      */
-    ElecValencyConfig selectElecValencyConfigById(Long id);
+    ElecGwPriceConfig selectElecPriceConfigById(Long id);
 
     /**
      * 查询电价配置列表
      *
-     * @param elecValencyConfig 电价配置
+     * @param elecPriceConfig 电价配置
      * @return 电价配置集合
      */
-    List<ElecValencyConfig> selectElecValencyConfigList(ElecValencyConfig elecValencyConfig);
+    List<ElecGwPriceConfig> selectElecPriceConfigList(ElecGwPriceConfig elecPriceConfig);
 
     /**
      * 新增电价配置
      *
-     * @param elecValencyConfig 电价配置
+     * @param elecPriceConfig 电价配置
      * @return 结果
      */
-    int insertElecValencyConfig(ElecValencyConfig elecValencyConfig);
+    int insertElecPriceConfig(ElecGwPriceConfig elecPriceConfig);
 
     /**
      * 修改电价配置
      *
-     * @param elecValencyConfig 电价配置
+     * @param elecPriceConfig 电价配置
      * @return 结果
      */
-    int updateElecValencyConfig(ElecValencyConfig elecValencyConfig);
+    int updateElecPriceConfig(ElecGwPriceConfig elecPriceConfig);
 
     /**
      * 删除电价配置
@@ -49,7 +49,7 @@ public interface ElecValencyConfigMapper {
      * @param id 电价配置主键
      * @return 结果
      */
-    int deleteElecValencyConfigById(Long id);
+    int deleteElecPriceConfigById(Long id);
 
     /**
      * 批量删除电价配置
@@ -57,5 +57,5 @@ public interface ElecValencyConfigMapper {
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    int deleteElecValencyConfigByIds(Long[] ids);
+    int deleteElecPriceConfigByIds(Long[] ids);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/ElecValencyTypeMapper.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/ElecPriceTypeMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.ems.mapper;
 
-import com.ruoyi.ems.domain.ElecValencyType;
+import com.ruoyi.ems.domain.ElecPriceType;
 
 import java.util.List;
 
@@ -11,7 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2024-07-29
  */
-public interface ElecValencyTypeMapper
+public interface ElecPriceTypeMapper
 {
     /**
      * 查询电价计量分类
@@ -19,31 +19,31 @@ public interface ElecValencyTypeMapper
      * @param id 电价计量分类主键
      * @return 电价计量分类
      */
-     ElecValencyType selectElecValencyTypeById(Long id);
+     ElecPriceType selectElecPriceTypeById(Long id);
 
     /**
      * 查询电价计量分类列表
      * 
-     * @param elecValencyType 电价计量分类
+     * @param elecPriceType 电价计量分类
      * @return 电价计量分类集合
      */
-     List<ElecValencyType> selectElecValencyTypeList(ElecValencyType elecValencyType);
+     List<ElecPriceType> selectElecPriceTypeList(ElecPriceType elecPriceType);
 
     /**
      * 新增电价计量分类
      * 
-     * @param elecValencyType 电价计量分类
+     * @param elecPriceType 电价计量分类
      * @return 结果
      */
-     int insertElecValencyType(ElecValencyType elecValencyType);
+     int insertElecPriceType(ElecPriceType elecPriceType);
 
     /**
      * 修改电价计量分类
      * 
-     * @param elecValencyType 电价计量分类
+     * @param elecPriceType 电价计量分类
      * @return 结果
      */
-     int updateElecValencyType(ElecValencyType elecValencyType);
+     int updateElecPriceType(ElecPriceType elecPriceType);
 
     /**
      * 删除电价计量分类
@@ -51,7 +51,7 @@ public interface ElecValencyTypeMapper
      * @param id 电价计量分类主键
      * @return 结果
      */
-     int deleteElecValencyTypeById(Long id);
+     int deleteElecPriceTypeById(Long id);
 
     /**
      * 批量删除电价计量分类
@@ -59,5 +59,5 @@ public interface ElecValencyTypeMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-     int deleteElecValencyTypeByIds(Long[] ids);
+     int deleteElecPriceTypeByIds(Long[] ids);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/PvPriceConfigMapper.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/ElecPvPriceConfigMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2024-08-19
  */
-public interface PvPriceConfigMapper {
+public interface ElecPvPriceConfigMapper {
     /**
      * 查询光伏电价配置
      *

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

@@ -1,77 +0,0 @@
-package com.ruoyi.ems.mapper;
-
-import java.util.List;
-
-import com.ruoyi.ems.domain.ElecValencyHourStrategy;
-
-/**
- * 电价策略小时Mapper接口
- *
- * @author ruoyi
- * @date 2024-07-23
- */
-public interface ElecValencyHourStrategyMapper {
-    /**
-     * 查询电价策略小时
-     *
-     * @param id 电价策略小时主键
-     * @return 电价策略小时
-     */
-    ElecValencyHourStrategy selectElecValencyStrategyHourById(Long id);
-
-    /**
-     * 查询电价策略小时列表
-     *
-     * @param elecValencyStrategyHour 电价策略小时
-     * @return 电价策略小时集合
-     */
-    List<ElecValencyHourStrategy> selectElecValencyStrategyHourList(ElecValencyHourStrategy elecValencyStrategyHour);
-
-    /**
-     * 新增电价策略小时
-     *
-     * @param elecValencyStrategyHour 电价策略小时
-     * @return 结果
-     */
-    int insertElecValencyStrategyHour(ElecValencyHourStrategy elecValencyStrategyHour);
-
-    /**
-     * 批量新增电价策略小时
-     *
-     * @param elecValencyStrategyHours 电价策略小时列表
-     * @return 结果
-     */
-    int insertElecValencyStrategyHourBatch(List<ElecValencyHourStrategy> elecValencyStrategyHours);
-
-    /**
-     * 修改电价策略小时
-     *
-     * @param elecValencyStrategyHour 电价策略小时
-     * @return 结果
-     */
-    int updateElecValencyStrategyHour(ElecValencyHourStrategy elecValencyStrategyHour);
-
-    /**
-     * 删除电价策略小时
-     *
-     * @param id 电价策略小时主键
-     * @return 结果
-     */
-    int deleteElecValencyStrategyHourById(Long id);
-
-    /**
-     * 删除电价策略小时
-     *
-     * @param strategyCode 策略编码
-     * @return 结果
-     */
-    int deleteElecValencyStrategyHourByStrategy(String strategyCode);
-
-    /**
-     * 批量删除电价策略小时
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    int deleteElecValencyStrategyHourByIds(Long[] ids);
-}

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

@@ -1,61 +0,0 @@
-package com.ruoyi.ems.mapper;
-
-import com.ruoyi.ems.domain.ElecValencyStrategy;
-
-import java.util.List;
-
-/**
- * 电价策略Mapper接口
- *
- * @author ruoyi
- * @date 2024-07-23
- */
-public interface ElecValencyStrategyMapper {
-    /**
-     * 查询电价策略
-     *
-     * @param id 电价策略主键
-     * @return 电价策略
-     */
-    ElecValencyStrategy selectElecValencyStrategyById(Long id);
-
-    /**
-     * 查询电价策略列表
-     *
-     * @param sysElectrovalencyStrategy 电价策略
-     * @return 电价策略集合
-     */
-    List<ElecValencyStrategy> selectElecValencyStrategyList(ElecValencyStrategy sysElectrovalencyStrategy);
-
-    /**
-     * 新增电价策略
-     *
-     * @param sysElectrovalencyStrategy 电价策略
-     * @return 结果
-     */
-    int insertElecValencyStrategy(ElecValencyStrategy sysElectrovalencyStrategy);
-
-    /**
-     * 修改电价策略
-     *
-     * @param sysElectrovalencyStrategy 电价策略
-     * @return 结果
-     */
-    int updateElecValencyStrategy(ElecValencyStrategy sysElectrovalencyStrategy);
-
-    /**
-     * 删除电价策略
-     *
-     * @param id 电价策略主键
-     * @return 结果
-     */
-    int deleteElecValencyStrategyById(Long id);
-
-    /**
-     * 批量删除电价策略
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    int deleteElecValencyStrategyByIds(Long[] ids);
-}

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

@@ -0,0 +1,77 @@
+package com.ruoyi.ems.mapper;
+
+import java.util.List;
+import com.ruoyi.ems.domain.EmsFacsAbility;
+
+/**
+ * 能源设施能力Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-08-22
+ */
+public interface EmsFacsAbilityMapper
+{
+    /**
+     * 查询能源设施能力
+     * 
+     * @param id 能源设施能力主键
+     * @return 能源设施能力
+     */
+     EmsFacsAbility selectEmsFacsAbilityById(Long id);
+
+    /**
+     * 查询能源设施能力列表
+     * 
+     * @param emsFacsAbility 能源设施能力
+     * @return 能源设施能力集合
+     */
+     List<EmsFacsAbility> selectEmsFacsAbilityList(EmsFacsAbility emsFacsAbility);
+
+    /**
+     * 新增能源设施能力
+     * 
+     * @param emsFacsAbility 能源设施能力
+     * @return 结果
+     */
+     int insertEmsFacsAbility(EmsFacsAbility emsFacsAbility);
+
+    /**
+     * 新增能源设施能力
+     *
+     * @param list 能源设施能力list
+     * @return 结果
+     */
+    int insertEmsFacsAbilityBatch(List<EmsFacsAbility> list);
+
+    /**
+     * 修改能源设施能力
+     * 
+     * @param emsFacsAbility 能源设施能力
+     * @return 结果
+     */
+     int updateEmsFacsAbility(EmsFacsAbility emsFacsAbility);
+
+    /**
+     * 删除能源设施能力
+     * 
+     * @param id 能源设施能力主键
+     * @return 结果
+     */
+     int deleteEmsFacsAbilityById(Long id);
+
+    /**
+     * 批量删除能源设施能力
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+     int deleteEmsFacsAbilityByIds(Long[] ids);
+
+    /**
+     * 根据设施code删除
+     *
+     * @param facsCode 设施编码
+     * @return 结果
+     */
+    int deleteEmsFacsAbilityFacsCode(String facsCode);
+}

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

@@ -69,8 +69,8 @@ public interface EmsFacsAttrMapper {
     /**
      * 批量删除能源设施/系统属性
      *
-     * @param factCode 设施编码
+     * @param facsCode 设施编码
      * @return 结果
      */
-    int deleteEmsFacsAttrByFactCode(String factCode);
+    int deleteEmsFacsAttrByFacsCode(String facsCode);
 }

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

@@ -0,0 +1,77 @@
+package com.ruoyi.ems.mapper;
+
+import java.util.List;
+import com.ruoyi.ems.domain.EmsFacsEvent;
+
+/**
+ * 能源设施事件Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-08-22
+ */
+public interface EmsFacsEventMapper
+{
+    /**
+     * 查询能源设施事件
+     * 
+     * @param id 能源设施事件主键
+     * @return 能源设施事件
+     */
+     EmsFacsEvent selectEmsFacsEventById(Long id);
+
+    /**
+     * 查询能源设施事件列表
+     * 
+     * @param emsFacsEvent 能源设施事件
+     * @return 能源设施事件集合
+     */
+     List<EmsFacsEvent> selectEmsFacsEventList(EmsFacsEvent emsFacsEvent);
+
+    /**
+     * 新增能源设施事件
+     * 
+     * @param emsFacsEvent 能源设施事件
+     * @return 结果
+     */
+     int insertEmsFacsEvent(EmsFacsEvent emsFacsEvent);
+
+    /**
+     * 批量新增能源设施事件
+     *
+     * @param list 能源设施事件
+     * @return 结果
+     */
+    int insertEmsFacsEventBatch(List<EmsFacsEvent> list);
+
+    /**
+     * 修改能源设施事件
+     * 
+     * @param emsFacsEvent 能源设施事件
+     * @return 结果
+     */
+     int updateEmsFacsEvent(EmsFacsEvent emsFacsEvent);
+
+    /**
+     * 删除能源设施事件
+     * 
+     * @param id 能源设施事件主键
+     * @return 结果
+     */
+     int deleteEmsFacsEventById(Long id);
+
+    /**
+     * 批量删除能源设施事件
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+     int deleteEmsFacsEventByIds(Long[] ids);
+
+    /**
+     * 根据设施code删除
+     *
+     * @param facsCode 设施编码
+     * @return 结果
+     */
+    int deleteEmsFacsEventByFacsCode(String facsCode);
+}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IAreaElectricityAttrService.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IElecAttrService.java

@@ -2,7 +2,7 @@ package com.ruoyi.ems.service;
 
 import java.util.List;
 
-import com.ruoyi.ems.domain.AreaElectricityAttr;
+import com.ruoyi.ems.domain.ElecAttr;
 
 /**
  * 服务区用电属性Service接口
@@ -10,7 +10,7 @@ import com.ruoyi.ems.domain.AreaElectricityAttr;
  * @author ruoyi
  * @date 2024-07-23
  */
-public interface IAreaElectricityAttrService
+public interface IElecAttrService
 {
     /**
      * 查询服务区用电属性
@@ -18,7 +18,7 @@ public interface IAreaElectricityAttrService
      * @param id 服务区用电属性主键
      * @return 服务区用电属性
      */
-     AreaElectricityAttr selectAreaElectricityAttrById(Long id);
+     ElecAttr selectElecAttrById(Long id);
 
     /**
      * 查询服务区用电属性列表
@@ -26,7 +26,7 @@ public interface IAreaElectricityAttrService
      * @param areaElectricityAttr 服务区用电属性
      * @return 服务区用电属性集合
      */
-     List<AreaElectricityAttr> selectAreaElectricityAttrList(AreaElectricityAttr areaElectricityAttr);
+     List<ElecAttr> selectElecAttrList(ElecAttr areaElectricityAttr);
 
     /**
      * 新增服务区用电属性
@@ -34,7 +34,7 @@ public interface IAreaElectricityAttrService
      * @param areaElectricityAttr 服务区用电属性
      * @return 结果
      */
-     int insertAreaElectricityAttr(AreaElectricityAttr areaElectricityAttr);
+     int insertElecAttr(ElecAttr areaElectricityAttr);
 
     /**
      * 修改服务区用电属性
@@ -42,7 +42,7 @@ public interface IAreaElectricityAttrService
      * @param areaElectricityAttr 服务区用电属性
      * @return 结果
      */
-     int updateAreaElectricityAttr(AreaElectricityAttr areaElectricityAttr);
+     int updateElecAttr(ElecAttr areaElectricityAttr);
 
     /**
      * 批量删除服务区用电属性
@@ -50,7 +50,7 @@ public interface IAreaElectricityAttrService
      * @param ids 需要删除的服务区用电属性主键集合
      * @return 结果
      */
-     int deleteAreaElectricityAttrByIds(Long[] ids);
+     int deleteElecAttrByIds(Long[] ids);
 
     /**
      * 删除服务区用电属性信息
@@ -58,5 +58,5 @@ public interface IAreaElectricityAttrService
      * @param id 服务区用电属性主键
      * @return 结果
      */
-     int deleteAreaElectricityAttrById(Long id);
+     int deleteElecAttrById(Long id);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IPvPriceConfigService.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IElecPriceConfigService.java

@@ -1,16 +1,66 @@
 package com.ruoyi.ems.service;
 
-import com.ruoyi.ems.domain.ElecPvPriceConfig;
-
 import java.util.List;
 
+import com.ruoyi.ems.domain.ElecGwPriceConfig;
+import com.ruoyi.ems.domain.ElecPvPriceConfig;
+
 /**
- * 光伏电价配置Service接口
- *
+ * 电价配置Service接口
+ * 
  * @author ruoyi
- * @date 2024-08-19
+ * @date 2024-07-23
  */
-public interface IPvPriceConfigService {
+public interface IElecPriceConfigService
+{
+    /**
+     * 查询电价配置
+     * 
+     * @param id 电价配置主键
+     * @return 电价配置
+     */
+     ElecGwPriceConfig selectGwElecPriceConfigById(Long id);
+
+    /**
+     * 查询电价配置列表
+     * 
+     * @param elecPriceConfig 电价配置
+     * @return 电价配置集合
+     */
+     List<ElecGwPriceConfig> selectGwElecPriceConfigList(ElecGwPriceConfig elecPriceConfig);
+
+    /**
+     * 新增电价配置
+     * 
+     * @param elecPriceConfig 电价配置
+     * @return 结果
+     */
+     int insertGwElecPriceConfig(ElecGwPriceConfig elecPriceConfig);
+
+    /**
+     * 修改电价配置
+     * 
+     * @param elecPriceConfig 电价配置
+     * @return 结果
+     */
+     int updateGwElecPriceConfig(ElecGwPriceConfig elecPriceConfig);
+
+    /**
+     * 批量删除电价配置
+     * 
+     * @param ids 需要删除的电价配置主键集合
+     * @return 结果
+     */
+     int deleteGwElecPriceConfigByIds(Long[] ids);
+
+    /**
+     * 删除电价配置信息
+     * 
+     * @param id 电价配置主键
+     * @return 结果
+     */
+     int deleteGwElecPriceConfigById(Long id);
+
     /**
      * 查询光伏电价配置
      *

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IElecValencyTypeService.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IElecPriceTypeService.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.service;
 
 import java.util.List;
-import com.ruoyi.ems.domain.ElecValencyType;
+import com.ruoyi.ems.domain.ElecPriceType;
 
 /**
  * 电价计量分类Service接口
@@ -9,38 +9,38 @@ import com.ruoyi.ems.domain.ElecValencyType;
  * @author ruoyi
  * @date 2024-07-29
  */
-public interface IElecValencyTypeService {
+public interface IElecPriceTypeService {
     /**
      * 查询电价计量分类
      *
      * @param id 电价计量分类主键
      * @return 电价计量分类
      */
-    ElecValencyType selectElecValencyTypeById(Long id);
+    ElecPriceType selectElecPriceTypeById(Long id);
 
     /**
      * 查询电价计量分类列表
      *
-     * @param elecValencyType 电价计量分类
+     * @param elecPriceType 电价计量分类
      * @return 电价计量分类集合
      */
-    List<ElecValencyType> selectElecValencyTypeList(ElecValencyType elecValencyType);
+    List<ElecPriceType> selectElecPriceTypeList(ElecPriceType elecPriceType);
 
     /**
      * 新增电价计量分类
      *
-     * @param elecValencyType 电价计量分类
+     * @param elecPriceType 电价计量分类
      * @return 结果
      */
-    int insertElecValencyType(ElecValencyType elecValencyType);
+    int insertElecPriceType(ElecPriceType elecPriceType);
 
     /**
      * 修改电价计量分类
      *
-     * @param elecValencyType 电价计量分类
+     * @param elecPriceType 电价计量分类
      * @return 结果
      */
-    int updateElecValencyType(ElecValencyType elecValencyType);
+    int updateElecPriceType(ElecPriceType elecPriceType);
 
     /**
      * 批量删除电价计量分类
@@ -48,7 +48,7 @@ public interface IElecValencyTypeService {
      * @param ids 需要删除的电价计量分类主键集合
      * @return 结果
      */
-    int deleteElecValencyTypeByIds(Long[] ids);
+    int deleteElecPriceTypeByIds(Long[] ids);
 
     /**
      * 删除电价计量分类信息
@@ -56,5 +56,5 @@ public interface IElecValencyTypeService {
      * @param id 电价计量分类主键
      * @return 结果
      */
-    int deleteElecValencyTypeById(Long id);
+    int deleteElecPriceTypeById(Long id);
 }

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

@@ -1,62 +0,0 @@
-package com.ruoyi.ems.service;
-
-import java.util.List;
-
-import com.ruoyi.ems.domain.ElecValencyConfig;
-
-/**
- * 电价配置Service接口
- * 
- * @author ruoyi
- * @date 2024-07-23
- */
-public interface IElecValencyConfigService
-{
-    /**
-     * 查询电价配置
-     * 
-     * @param id 电价配置主键
-     * @return 电价配置
-     */
-     ElecValencyConfig selectElecValencyConfigById(Long id);
-
-    /**
-     * 查询电价配置列表
-     * 
-     * @param elecValencyConfig 电价配置
-     * @return 电价配置集合
-     */
-     List<ElecValencyConfig> selectElecValencyConfigList(ElecValencyConfig elecValencyConfig);
-
-    /**
-     * 新增电价配置
-     * 
-     * @param elecValencyConfig 电价配置
-     * @return 结果
-     */
-     int insertElecValencyConfig(ElecValencyConfig elecValencyConfig);
-
-    /**
-     * 修改电价配置
-     * 
-     * @param elecValencyConfig 电价配置
-     * @return 结果
-     */
-     int updateElecValencyConfig(ElecValencyConfig elecValencyConfig);
-
-    /**
-     * 批量删除电价配置
-     * 
-     * @param ids 需要删除的电价配置主键集合
-     * @return 结果
-     */
-     int deleteElecValencyConfigByIds(Long[] ids);
-
-    /**
-     * 删除电价配置信息
-     * 
-     * @param id 电价配置主键
-     * @return 结果
-     */
-     int deleteElecValencyConfigById(Long id);
-}

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

@@ -1,78 +0,0 @@
-package com.ruoyi.ems.service;
-
-import com.ruoyi.ems.domain.ElecValencyHourStrategy;
-
-import java.util.List;
-
-/**
- * 电价策略小时Service接口
- * 
- * @author ruoyi
- * @date 2024-07-23
- */
-public interface IElecValencyHourStrategyService
-{
-    /**
-     * 查询电价策略小时
-     * 
-     * @param id 电价策略小时主键
-     * @return 电价策略小时
-     */
-     ElecValencyHourStrategy selectHourStrategyById(Long id);
-
-    /**
-     * 查询电价策略小时列表
-     * 
-     * @param HourStrategy 电价策略小时
-     * @return 电价策略小时集合
-     */
-     List<ElecValencyHourStrategy> selectHourStrategyList(ElecValencyHourStrategy HourStrategy);
-
-    /**
-     * 新增电价策略小时
-     * 
-     * @param HourStrategy 电价策略小时
-     * @return 结果
-     */
-     int insertHourStrategy(ElecValencyHourStrategy HourStrategy);
-
-    /**
-     * 批量新增电价策略小时
-     *
-     * @param hourStrategys 电价策略小时列表
-     * @return 结果
-     */
-     int insertHourStrategyList(List<ElecValencyHourStrategy> hourStrategys);
-
-    /**
-     * 修改电价策略小时
-     * 
-     * @param hourStrategy 电价策略小时
-     * @return 结果
-     */
-     int updateHourStrategy(ElecValencyHourStrategy hourStrategy);
-
-    /**
-     * 批量删除电价策略小时
-     * 
-     * @param ids 需要删除的电价策略小时主键集合
-     * @return 结果
-     */
-     int deleteHourStrategyByIds(Long[] ids);
-
-    /**
-     * 删除电价策略小时信息
-     * 
-     * @param id 电价策略小时主键
-     * @return 结果
-     */
-     int deleteHourStrategyById(Long id);
-
-    /**
-     * 删除电价策略小时信息
-     *
-     * @param strategyCode 策略编码
-     * @return 结果
-     */
-    int deleteHourStrategyByStrategy(String strategyCode);
-}

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

@@ -1,62 +0,0 @@
-package com.ruoyi.ems.service;
-
-import java.util.List;
-
-import com.ruoyi.ems.domain.ElecValencyStrategy;
-
-/**
- * 电价策略Service接口
- * 
- * @author ruoyi
- * @date 2024-07-23
- */
-public interface IElecValencyStrategyService
-{
-    /**
-     * 查询电价策略
-     * 
-     * @param id 电价策略主键
-     * @return 电价策略
-     */
-     ElecValencyStrategy selectStrategyById(Long id);
-
-    /**
-     * 查询电价策略列表
-     * 
-     * @param strategy 电价策略
-     * @return 电价策略集合
-     */
-     List<ElecValencyStrategy> selectStrategyList(ElecValencyStrategy strategy);
-
-    /**
-     * 新增电价策略
-     * 
-     * @param elecValencyStrategy 电价策略
-     * @return 结果
-     */
-     int insertStrategy(ElecValencyStrategy strategy);
-
-    /**
-     * 修改电价策略
-     * 
-     * @param strategy 电价策略
-     * @return 结果
-     */
-     int updateStrategy(ElecValencyStrategy strategy);
-
-    /**
-     * 批量删除电价策略
-     * 
-     * @param ids 需要删除的电价策略主键集合
-     * @return 结果
-     */
-     int deleteStrategyByIds(Long[] ids);
-
-    /**
-     * 删除电价策略信息
-     * 
-     * @param id 电价策略主键
-     * @return 结果
-     */
-     int deleteStrategyById(Long id);
-}

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

@@ -0,0 +1,77 @@
+package com.ruoyi.ems.service;
+
+import java.util.List;
+import com.ruoyi.ems.domain.EmsFacsAbility;
+
+/**
+ * 能源设施能力Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-08-22
+ */
+public interface IEmsFacsAbilityService
+{
+    /**
+     * 查询能源设施能力
+     * 
+     * @param id 能源设施能力主键
+     * @return 能源设施能力
+     */
+     EmsFacsAbility selectEmsFacsAbilityById(Long id);
+
+    /**
+     * 查询能源设施能力列表
+     * 
+     * @param emsFacsAbility 能源设施能力
+     * @return 能源设施能力集合
+     */
+     List<EmsFacsAbility> selectEmsFacsAbilityList(EmsFacsAbility emsFacsAbility);
+
+    /**
+     * 新增能源设施能力
+     * 
+     * @param emsFacsAbility 能源设施能力
+     * @return 结果
+     */
+     int insertEmsFacsAbility(EmsFacsAbility emsFacsAbility);
+
+    /**
+     * 批量新增能源设施能力
+     *
+     * @param emsFacsAbilitys 能源设施能力列表
+     * @return 结果
+     */
+    int insertEmsFacsAbilityBatch(List<EmsFacsAbility> emsFacsAbilitys);
+
+    /**
+     * 修改能源设施能力
+     * 
+     * @param emsFacsAbility 能源设施能力
+     * @return 结果
+     */
+     int updateEmsFacsAbility(EmsFacsAbility emsFacsAbility);
+
+    /**
+     * 批量删除能源设施能力
+     * 
+     * @param ids 需要删除的能源设施能力主键集合
+     * @return 结果
+     */
+     int deleteEmsFacsAbilityByIds(Long[] ids);
+
+    /**
+     * 删除能源设施能力信息
+     * 
+     * @param id 能源设施能力主键
+     * @return 结果
+     */
+     int deleteEmsFacsAbilityById(Long id);
+
+    /**
+     * 删除能源设施能力信息
+     *
+     * @param facsCode 设施编码
+     * @return 结果
+     */
+    int deleteAbilityByFacsCode(String facsCode);
+}

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

@@ -72,5 +72,5 @@ public interface IEmsFacsAttrService {
      * @param facsCode 设施编码
      * @return 结果
      */
-    int deleteEmsFacsAttrByFacsCode(String facsCode);
+    int deleteAttrByFacsCode(String facsCode);
 }

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

@@ -0,0 +1,76 @@
+package com.ruoyi.ems.service;
+
+import java.util.List;
+import com.ruoyi.ems.domain.EmsFacsEvent;
+
+/**
+ * 能源设施事件Service接口
+ *
+ * @author ruoyi
+ * @date 2024-08-22
+ */
+public interface IEmsFacsEventService {
+    /**
+     * 查询能源设施事件
+     *
+     * @param id 能源设施事件主键
+     * @return 能源设施事件
+     */
+    EmsFacsEvent selectEmsFacsEventById(Long id);
+
+    /**
+     * 查询能源设施事件列表
+     *
+     * @param emsFacsEvent 能源设施事件
+     * @return 能源设施事件集合
+     */
+    List<EmsFacsEvent> selectEmsFacsEventList(EmsFacsEvent emsFacsEvent);
+
+    /**
+     * 新增能源设施事件
+     *
+     * @param emsFacsEvent 能源设施事件
+     * @return 结果
+     */
+    int insertEmsFacsEvent(EmsFacsEvent emsFacsEvent);
+
+    /**
+     * 批量新增能源设施事件
+     *
+     * @param emsFacsEvents 能源设施事件列表
+     * @return 结果
+     */
+    int insertEmsFacsEventBatch(List<EmsFacsEvent> emsFacsEvents);
+
+    /**
+     * 修改能源设施事件
+     *
+     * @param emsFacsEvent 能源设施事件
+     * @return 结果
+     */
+    int updateEmsFacsEvent(EmsFacsEvent emsFacsEvent);
+
+    /**
+     * 批量删除能源设施事件
+     *
+     * @param ids 需要删除的能源设施事件主键集合
+     * @return 结果
+     */
+    int deleteEmsFacsEventByIds(Long[] ids);
+
+    /**
+     * 删除能源设施事件信息
+     *
+     * @param id 能源设施事件主键
+     * @return 结果
+     */
+    int deleteEmsFacsEventById(Long id);
+
+    /**
+     * 删除能源设施事件信息
+     *
+     * @param facsCode 设施编码
+     * @return 结果
+     */
+    int deleteEventByFacsCode(String facsCode);
+}

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

@@ -3,9 +3,9 @@ package com.ruoyi.ems.service.impl;
 import java.util.List;
 
 import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.ems.domain.AreaElectricityAttr;
-import com.ruoyi.ems.mapper.AreaElectricityAttrMapper;
-import com.ruoyi.ems.service.IAreaElectricityAttrService;
+import com.ruoyi.ems.domain.ElecAttr;
+import com.ruoyi.ems.mapper.ElecAttrMapper;
+import com.ruoyi.ems.service.IElecAttrService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -16,9 +16,9 @@ import org.springframework.stereotype.Service;
  * @date 2024-07-23
  */
 @Service
-public class AreaElectricityAttrServiceImpl implements IAreaElectricityAttrService {
+public class AreaElectricityAttrServiceImpl implements IElecAttrService {
     @Autowired
-    private AreaElectricityAttrMapper areaElectricityAttrMapper;
+    private ElecAttrMapper areaElectricityAttrMapper;
 
     /**
      * 查询服务区用电属性
@@ -27,8 +27,8 @@ public class AreaElectricityAttrServiceImpl implements IAreaElectricityAttrServi
      * @return 服务区用电属性
      */
     @Override
-    public AreaElectricityAttr selectAreaElectricityAttrById(Long id) {
-        return areaElectricityAttrMapper.selectAreaElectricityAttrById(id);
+    public ElecAttr selectElecAttrById(Long id) {
+        return areaElectricityAttrMapper.selectElecAttrById(id);
     }
 
     /**
@@ -38,8 +38,8 @@ public class AreaElectricityAttrServiceImpl implements IAreaElectricityAttrServi
      * @return 服务区用电属性
      */
     @Override
-    public List<AreaElectricityAttr> selectAreaElectricityAttrList(AreaElectricityAttr areaElectricityAttr) {
-        return areaElectricityAttrMapper.selectAreaElectricityAttrList(areaElectricityAttr);
+    public List<ElecAttr> selectElecAttrList(ElecAttr areaElectricityAttr) {
+        return areaElectricityAttrMapper.selectElecAttrList(areaElectricityAttr);
     }
 
     /**
@@ -49,9 +49,9 @@ public class AreaElectricityAttrServiceImpl implements IAreaElectricityAttrServi
      * @return 结果
      */
     @Override
-    public int insertAreaElectricityAttr(AreaElectricityAttr areaElectricityAttr) {
+    public int insertElecAttr(ElecAttr areaElectricityAttr) {
         areaElectricityAttr.setCreateTime(DateUtils.getNowDate());
-        return areaElectricityAttrMapper.insertAreaElectricityAttr(areaElectricityAttr);
+        return areaElectricityAttrMapper.insertElecAttr(areaElectricityAttr);
     }
 
     /**
@@ -61,9 +61,9 @@ public class AreaElectricityAttrServiceImpl implements IAreaElectricityAttrServi
      * @return 结果
      */
     @Override
-    public int updateAreaElectricityAttr(AreaElectricityAttr areaElectricityAttr) {
+    public int updateElecAttr(ElecAttr areaElectricityAttr) {
         areaElectricityAttr.setUpdateTime(DateUtils.getNowDate());
-        return areaElectricityAttrMapper.updateAreaElectricityAttr(areaElectricityAttr);
+        return areaElectricityAttrMapper.updateElecAttr(areaElectricityAttr);
     }
 
     /**
@@ -73,8 +73,8 @@ public class AreaElectricityAttrServiceImpl implements IAreaElectricityAttrServi
      * @return 结果
      */
     @Override
-    public int deleteAreaElectricityAttrByIds(Long[] ids) {
-        return areaElectricityAttrMapper.deleteAreaElectricityAttrByIds(ids);
+    public int deleteElecAttrByIds(Long[] ids) {
+        return areaElectricityAttrMapper.deleteElecAttrByIds(ids);
     }
 
     /**
@@ -84,7 +84,7 @@ public class AreaElectricityAttrServiceImpl implements IAreaElectricityAttrServi
      * @return 结果
      */
     @Override
-    public int deleteAreaElectricityAttrById(Long id) {
-        return areaElectricityAttrMapper.deleteAreaElectricityAttrById(id);
+    public int deleteElecAttrById(Long id) {
+        return areaElectricityAttrMapper.deleteElecAttrById(id);
     }
 }

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

@@ -0,0 +1,172 @@
+package com.ruoyi.ems.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.ems.domain.ElecGwPriceConfig;
+import com.ruoyi.ems.domain.ElecPvPriceConfig;
+import com.ruoyi.ems.mapper.ElecGwPriceConfigMapper;
+import com.ruoyi.ems.mapper.ElecPvPriceConfigMapper;
+import com.ruoyi.ems.service.IElecPriceConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电价配置Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+@Service
+public class ElecPriceConfigServiceImpl implements IElecPriceConfigService
+{
+    @Autowired
+    private ElecGwPriceConfigMapper gwPriceConfigMapper;
+
+
+    @Autowired
+    private ElecPvPriceConfigMapper pvPriceConfigMapper;
+
+    /**
+     * 查询电价配置
+     * 
+     * @param id 电价配置主键
+     * @return 电价配置
+     */
+    @Override
+    public ElecGwPriceConfig selectGwElecPriceConfigById(Long id)
+    {
+        return gwPriceConfigMapper.selectElecPriceConfigById(id);
+    }
+
+    /**
+     * 查询电价配置列表
+     * 
+     * @param elecPriceConfig 电价配置
+     * @return 电价配置
+     */
+    @Override
+    public List<ElecGwPriceConfig> selectGwElecPriceConfigList(ElecGwPriceConfig elecPriceConfig)
+    {
+        return gwPriceConfigMapper.selectElecPriceConfigList(elecPriceConfig);
+    }
+
+    /**
+     * 新增电价配置
+     * 
+     * @param elecPriceConfig 电价配置
+     * @return 结果
+     */
+    @Override
+    public int insertGwElecPriceConfig(ElecGwPriceConfig elecPriceConfig)
+    {
+        return gwPriceConfigMapper.insertElecPriceConfig(elecPriceConfig);
+    }
+
+    /**
+     * 修改电价配置
+     * 
+     * @param elecPriceConfig 电价配置
+     * @return 结果
+     */
+    @Override
+    public int updateGwElecPriceConfig(ElecGwPriceConfig elecPriceConfig)
+    {
+        return gwPriceConfigMapper.updateElecPriceConfig(elecPriceConfig);
+    }
+
+    /**
+     * 批量删除电价配置
+     * 
+     * @param ids 需要删除的电价配置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteGwElecPriceConfigByIds(Long[] ids)
+    {
+        return gwPriceConfigMapper.deleteElecPriceConfigByIds(ids);
+    }
+
+    /**
+     * 删除电价配置信息
+     * 
+     * @param id 电价配置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteGwElecPriceConfigById(Long id)
+    {
+        return gwPriceConfigMapper.deleteElecPriceConfigById(id);
+    }
+
+    /**
+     * 查询光伏电价配置
+     *
+     * @param id 光伏电价配置主键
+     * @return 光伏电价配置
+     */
+    @Override
+    public ElecPvPriceConfig selectPvPriceConfigById(Long id)
+    {
+        return pvPriceConfigMapper.selectPvPriceConfigById(id);
+    }
+
+    /**
+     * 查询光伏电价配置列表
+     *
+     * @param elecPvPriceConfig 光伏电价配置
+     * @return 光伏电价配置
+     */
+    @Override
+    public List<ElecPvPriceConfig> selectPvPriceConfigList(ElecPvPriceConfig elecPvPriceConfig)
+    {
+        return pvPriceConfigMapper.selectPvPriceConfigList(elecPvPriceConfig);
+    }
+
+    /**
+     * 新增光伏电价配置
+     *
+     * @param elecPvPriceConfig 光伏电价配置
+     * @return 结果
+     */
+    @Override
+    public int insertPvPriceConfig(ElecPvPriceConfig elecPvPriceConfig)
+    {
+        return pvPriceConfigMapper.insertPvPriceConfig(elecPvPriceConfig);
+    }
+
+    /**
+     * 修改光伏电价配置
+     *
+     * @param elecPvPriceConfig 光伏电价配置
+     * @return 结果
+     */
+    @Override
+    public int updatePvPriceConfig(ElecPvPriceConfig elecPvPriceConfig)
+    {
+        return pvPriceConfigMapper.updatePvPriceConfig(elecPvPriceConfig);
+    }
+
+    /**
+     * 批量删除光伏电价配置
+     *
+     * @param ids 需要删除的光伏电价配置主键
+     * @return 结果
+     */
+    @Override
+    public int deletePvPriceConfigByIds(Long[] ids)
+    {
+        return pvPriceConfigMapper.deletePvPriceConfigByIds(ids);
+    }
+
+    /**
+     * 删除光伏电价配置信息
+     *
+     * @param id 光伏电价配置主键
+     * @return 结果
+     */
+    @Override
+    public int deletePvPriceConfigById(Long id)
+    {
+        return pvPriceConfigMapper.deletePvPriceConfigById(id);
+    }
+}

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

@@ -0,0 +1,94 @@
+package com.ruoyi.ems.service.impl;
+
+import com.ruoyi.ems.domain.ElecPriceType;
+import com.ruoyi.ems.mapper.ElecPriceTypeMapper;
+import com.ruoyi.ems.service.IElecPriceTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 电价计量分类Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-07-29
+ */
+@Service
+public class ElecPriceTypeServiceImpl implements IElecPriceTypeService
+{
+    @Autowired
+    private ElecPriceTypeMapper elecPriceTypeMapper;
+
+    /**
+     * 查询电价计量分类
+     * 
+     * @param id 电价计量分类主键
+     * @return 电价计量分类
+     */
+    @Override
+    public ElecPriceType selectElecPriceTypeById(Long id)
+    {
+        return elecPriceTypeMapper.selectElecPriceTypeById(id);
+    }
+
+    /**
+     * 查询电价计量分类列表
+     * 
+     * @param elecPriceType 电价计量分类
+     * @return 电价计量分类
+     */
+    @Override
+    public List<ElecPriceType> selectElecPriceTypeList(ElecPriceType elecPriceType)
+    {
+        return elecPriceTypeMapper.selectElecPriceTypeList(elecPriceType);
+    }
+
+    /**
+     * 新增电价计量分类
+     * 
+     * @param elecPriceType 电价计量分类
+     * @return 结果
+     */
+    @Override
+    public int insertElecPriceType(ElecPriceType elecPriceType)
+    {
+        return elecPriceTypeMapper.insertElecPriceType(elecPriceType);
+    }
+
+    /**
+     * 修改电价计量分类
+     * 
+     * @param elecPriceType 电价计量分类
+     * @return 结果
+     */
+    @Override
+    public int updateElecPriceType(ElecPriceType elecPriceType)
+    {
+        return elecPriceTypeMapper.updateElecPriceType(elecPriceType);
+    }
+
+    /**
+     * 批量删除电价计量分类
+     * 
+     * @param ids 需要删除的电价计量分类主键
+     * @return 结果
+     */
+    @Override
+    public int deleteElecPriceTypeByIds(Long[] ids)
+    {
+        return elecPriceTypeMapper.deleteElecPriceTypeByIds(ids);
+    }
+
+    /**
+     * 删除电价计量分类信息
+     * 
+     * @param id 电价计量分类主键
+     * @return 结果
+     */
+    @Override
+    public int deleteElecPriceTypeById(Long id)
+    {
+        return elecPriceTypeMapper.deleteElecPriceTypeById(id);
+    }
+}

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

@@ -1,94 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import java.util.List;
-
-import com.ruoyi.ems.domain.ElecValencyConfig;
-import com.ruoyi.ems.mapper.ElecValencyConfigMapper;
-import com.ruoyi.ems.service.IElecValencyConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 电价配置Service业务层处理
- * 
- * @author ruoyi
- * @date 2024-07-23
- */
-@Service
-public class ElecValencyConfigServiceImpl implements IElecValencyConfigService
-{
-    @Autowired
-    private ElecValencyConfigMapper elecValencyConfigMapper;
-
-    /**
-     * 查询电价配置
-     * 
-     * @param id 电价配置主键
-     * @return 电价配置
-     */
-    @Override
-    public ElecValencyConfig selectElecValencyConfigById(Long id)
-    {
-        return elecValencyConfigMapper.selectElecValencyConfigById(id);
-    }
-
-    /**
-     * 查询电价配置列表
-     * 
-     * @param elecValencyConfig 电价配置
-     * @return 电价配置
-     */
-    @Override
-    public List<ElecValencyConfig> selectElecValencyConfigList(ElecValencyConfig elecValencyConfig)
-    {
-        return elecValencyConfigMapper.selectElecValencyConfigList(elecValencyConfig);
-    }
-
-    /**
-     * 新增电价配置
-     * 
-     * @param elecValencyConfig 电价配置
-     * @return 结果
-     */
-    @Override
-    public int insertElecValencyConfig(ElecValencyConfig elecValencyConfig)
-    {
-        return elecValencyConfigMapper.insertElecValencyConfig(elecValencyConfig);
-    }
-
-    /**
-     * 修改电价配置
-     * 
-     * @param elecValencyConfig 电价配置
-     * @return 结果
-     */
-    @Override
-    public int updateElecValencyConfig(ElecValencyConfig elecValencyConfig)
-    {
-        return elecValencyConfigMapper.updateElecValencyConfig(elecValencyConfig);
-    }
-
-    /**
-     * 批量删除电价配置
-     * 
-     * @param ids 需要删除的电价配置主键
-     * @return 结果
-     */
-    @Override
-    public int deleteElecValencyConfigByIds(Long[] ids)
-    {
-        return elecValencyConfigMapper.deleteElecValencyConfigByIds(ids);
-    }
-
-    /**
-     * 删除电价配置信息
-     * 
-     * @param id 电价配置主键
-     * @return 结果
-     */
-    @Override
-    public int deleteElecValencyConfigById(Long id)
-    {
-        return elecValencyConfigMapper.deleteElecValencyConfigById(id);
-    }
-}

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

@@ -1,110 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import java.util.List;
-
-import com.ruoyi.ems.domain.ElecValencyHourStrategy;
-import com.ruoyi.ems.mapper.ElecValencyHourStrategyMapper;
-import com.ruoyi.ems.service.IElecValencyHourStrategyService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 电价策略小时Service业务层处理
- *
- * @author ruoyi
- * @date 2024-07-23
- */
-@Service
-public class ElecValencyHourStrategyServiceImpl implements IElecValencyHourStrategyService {
-    @Autowired
-    private ElecValencyHourStrategyMapper hourStrategyMapper;
-
-    /**
-     * 查询电价策略小时
-     *
-     * @param id 电价策略小时主键
-     * @return 电价策略小时
-     */
-    @Override
-    public ElecValencyHourStrategy selectHourStrategyById(Long id) {
-        return hourStrategyMapper.selectElecValencyStrategyHourById(id);
-    }
-
-    /**
-     * 查询电价策略小时列表
-     *
-     * @param hourStrategy 电价策略小时
-     * @return 电价策略小时
-     */
-    @Override
-    public List<ElecValencyHourStrategy> selectHourStrategyList(
-        ElecValencyHourStrategy hourStrategy) {
-        return hourStrategyMapper.selectElecValencyStrategyHourList(hourStrategy);
-    }
-
-    /**
-     * 新增电价策略小时
-     *
-     * @param hourStrategy 电价策略小时
-     * @return 结果
-     */
-    @Override
-    public int insertHourStrategy(ElecValencyHourStrategy hourStrategy) {
-        return hourStrategyMapper.insertElecValencyStrategyHour(hourStrategy);
-    }
-
-    /**
-     * 批量插入小时电价策略列表
-     *
-     * @param hourStrategys 小时电价策略列表
-     * @return 插入成功的小时电价策略数量
-     */
-    @Override
-    public int insertHourStrategyList(List<ElecValencyHourStrategy> hourStrategys) {
-        return hourStrategyMapper.insertElecValencyStrategyHourBatch(hourStrategys);
-    }
-
-    /**
-     * 修改电价策略小时
-     *
-     * @param hourStrategys 电价策略小时
-     * @return 结果
-     */
-    @Override
-    public int updateHourStrategy(ElecValencyHourStrategy hourStrategys) {
-        return hourStrategyMapper.updateElecValencyStrategyHour(hourStrategys);
-    }
-
-    /**
-     * 批量删除电价策略小时
-     *
-     * @param ids 需要删除的电价策略小时主键
-     * @return 结果
-     */
-    @Override
-    public int deleteHourStrategyByIds(Long[] ids) {
-        return hourStrategyMapper.deleteElecValencyStrategyHourByIds(ids);
-    }
-
-    /**
-     * 删除电价策略小时信息
-     *
-     * @param id 电价策略小时主键
-     * @return 结果
-     */
-    @Override
-    public int deleteHourStrategyById(Long id) {
-        return hourStrategyMapper.deleteElecValencyStrategyHourById(id);
-    }
-
-    /**
-     * 根据策略代码删除小时策略
-     *
-     * @param strategyCode 策略代码
-     * @return 删除的小时策略数量
-     */
-    @Override
-    public int deleteHourStrategyByStrategy(String strategyCode) {
-        return hourStrategyMapper.deleteElecValencyStrategyHourByStrategy(strategyCode);
-    }
-}

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

@@ -1,147 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import java.util.List;
-import java.util.UUID;
-
-import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.ems.domain.ElecValencyHourStrategy;
-import com.ruoyi.ems.domain.ElecValencyStrategy;
-import com.ruoyi.ems.mapper.ElecValencyStrategyMapper;
-import com.ruoyi.ems.service.IElecValencyHourStrategyService;
-import com.ruoyi.ems.service.IElecValencyStrategyService;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 电价策略Service业务层处理
- *
- * @author ruoyi
- * @date 2024-07-23
- */
-@Service
-public class ElecValencyStrategyServiceImpl implements IElecValencyStrategyService {
-    @Autowired
-    private ElecValencyStrategyMapper strategyMapper;
-
-    @Autowired
-    private IElecValencyHourStrategyService strategyHourService;
-
-    /**
-     * 查询电价策略
-     *
-     * @param id 电价策略主键
-     * @return 电价策略
-     */
-    @Override
-    public ElecValencyStrategy selectStrategyById(Long id) {
-        ElecValencyStrategy strategy = strategyMapper.selectElecValencyStrategyById(id);
-
-        if (null != strategy) {
-            strategy.setHourStrategys(strategyHourService.selectHourStrategyList(new ElecValencyHourStrategy(strategy.getStrategyCode())));
-        }
-
-        return strategy;
-    }
-
-    /**
-     * 查询电价策略列表
-     *
-     * @param strategy 电价策略
-     * @return 电价策略
-     */
-    @Override
-    public List<ElecValencyStrategy> selectStrategyList(ElecValencyStrategy strategy) {
-        List<ElecValencyStrategy> strategies = strategyMapper.selectElecValencyStrategyList(strategy);
-
-        if (CollectionUtils.isNotEmpty(strategies)) {
-            for (ElecValencyStrategy strategyItem : strategies) {
-                strategyItem.setHourStrategys(strategyHourService.selectHourStrategyList(new ElecValencyHourStrategy(strategyItem.getStrategyCode())));
-            }
-        }
-
-        return strategies;
-    }
-
-    /**
-     * 新增电价策略
-     *
-     * @param strategy 电价策略
-     * @return 结果
-     */
-    @Override
-    public int insertStrategy(ElecValencyStrategy strategy) {
-        strategy.setStrategyCode(UUID.randomUUID().toString());
-        strategy.setCreateTime(DateUtils.getNowDate());
-        int rows = strategyMapper.insertElecValencyStrategy(strategy);
-
-        for (ElecValencyHourStrategy hourStrategy : strategy.getHourStrategys()) {
-            hourStrategy.setStrategyCode(strategy.getStrategyCode());
-        }
-
-        strategyHourService.insertHourStrategyList(strategy.getHourStrategys());
-
-        return rows;
-    }
-
-    /**
-     * 修改电价策略
-     *
-     * @param strategy 电价策略
-     * @return 结果
-     */
-    @Override
-    public int updateStrategy(ElecValencyStrategy strategy) {
-        strategy.setUpdateTime(DateUtils.getNowDate());
-        int rows = strategyMapper.updateElecValencyStrategy(strategy);
-
-        if (CollectionUtils.isNotEmpty(strategy.getHourStrategys())) {
-            for (ElecValencyHourStrategy hourStrategy : strategy.getHourStrategys()) {
-                hourStrategy.setStrategyCode(strategy.getStrategyCode());
-            }
-
-            strategyHourService.deleteHourStrategyByStrategy(strategy.getStrategyCode());
-            strategyHourService.insertHourStrategyList(strategy.getHourStrategys());
-        } else {
-            strategyHourService.deleteHourStrategyByStrategy(strategy.getStrategyCode());
-        }
-
-        return rows;
-    }
-
-    /**
-     * 批量删除电价策略
-     *
-     * @param ids 需要删除的电价策略主键
-     * @return 结果
-     */
-    @Override
-    public int deleteStrategyByIds(Long[] ids) {
-        for (Long id : ids) {
-            ElecValencyStrategy strategy = strategyMapper.selectElecValencyStrategyById(id);
-
-            if (null != strategy) {
-                strategyHourService.deleteHourStrategyByStrategy(strategy.getStrategyCode());
-            }
-        }
-
-        return strategyMapper.deleteElecValencyStrategyByIds(ids);
-    }
-
-    /**
-     * 删除电价策略信息
-     *
-     * @param id 电价策略主键
-     * @return 结果
-     */
-    @Override
-    public int deleteStrategyById(Long id) {
-        ElecValencyStrategy strategy = strategyMapper.selectElecValencyStrategyById(id);
-
-        if (null != strategy) {
-            strategyHourService.deleteHourStrategyByStrategy(strategy.getStrategyCode());
-        }
-
-        return strategyMapper.deleteElecValencyStrategyById(id);
-    }
-}

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

@@ -1,94 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import com.ruoyi.ems.domain.ElecValencyType;
-import com.ruoyi.ems.mapper.ElecValencyTypeMapper;
-import com.ruoyi.ems.service.IElecValencyTypeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 电价计量分类Service业务层处理
- * 
- * @author ruoyi
- * @date 2024-07-29
- */
-@Service
-public class ElecValencyTypeServiceImpl implements IElecValencyTypeService
-{
-    @Autowired
-    private ElecValencyTypeMapper elecValencyTypeMapper;
-
-    /**
-     * 查询电价计量分类
-     * 
-     * @param id 电价计量分类主键
-     * @return 电价计量分类
-     */
-    @Override
-    public ElecValencyType selectElecValencyTypeById(Long id)
-    {
-        return elecValencyTypeMapper.selectElecValencyTypeById(id);
-    }
-
-    /**
-     * 查询电价计量分类列表
-     * 
-     * @param elecValencyType 电价计量分类
-     * @return 电价计量分类
-     */
-    @Override
-    public List<ElecValencyType> selectElecValencyTypeList(ElecValencyType elecValencyType)
-    {
-        return elecValencyTypeMapper.selectElecValencyTypeList(elecValencyType);
-    }
-
-    /**
-     * 新增电价计量分类
-     * 
-     * @param elecValencyType 电价计量分类
-     * @return 结果
-     */
-    @Override
-    public int insertElecValencyType(ElecValencyType elecValencyType)
-    {
-        return elecValencyTypeMapper.insertElecValencyType(elecValencyType);
-    }
-
-    /**
-     * 修改电价计量分类
-     * 
-     * @param elecValencyType 电价计量分类
-     * @return 结果
-     */
-    @Override
-    public int updateElecValencyType(ElecValencyType elecValencyType)
-    {
-        return elecValencyTypeMapper.updateElecValencyType(elecValencyType);
-    }
-
-    /**
-     * 批量删除电价计量分类
-     * 
-     * @param ids 需要删除的电价计量分类主键
-     * @return 结果
-     */
-    @Override
-    public int deleteElecValencyTypeByIds(Long[] ids)
-    {
-        return elecValencyTypeMapper.deleteElecValencyTypeByIds(ids);
-    }
-
-    /**
-     * 删除电价计量分类信息
-     * 
-     * @param id 电价计量分类主键
-     * @return 结果
-     */
-    @Override
-    public int deleteElecValencyTypeById(Long id)
-    {
-        return elecValencyTypeMapper.deleteElecValencyTypeById(id);
-    }
-}

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

@@ -0,0 +1,103 @@
+package com.ruoyi.ems.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.ems.domain.EmsFacsAbility;
+import com.ruoyi.ems.service.IEmsFacsAbilityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ems.mapper.EmsFacsAbilityMapper;
+
+/**
+ * 能源设施能力Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-08-22
+ */
+@Service
+public class EmsFacsAbilityServiceImpl implements IEmsFacsAbilityService {
+    @Autowired
+    private EmsFacsAbilityMapper emsFacsAbilityMapper;
+
+    /**
+     * 查询能源设施能力
+     *
+     * @param id 能源设施能力主键
+     * @return 能源设施能力
+     */
+    @Override
+    public EmsFacsAbility selectEmsFacsAbilityById(Long id) {
+        return emsFacsAbilityMapper.selectEmsFacsAbilityById(id);
+    }
+
+    /**
+     * 查询能源设施能力列表
+     *
+     * @param emsFacsAbility 能源设施能力
+     * @return 能源设施能力
+     */
+    @Override
+    public List<EmsFacsAbility> selectEmsFacsAbilityList(EmsFacsAbility emsFacsAbility) {
+        return emsFacsAbilityMapper.selectEmsFacsAbilityList(emsFacsAbility);
+    }
+
+    /**
+     * 新增能源设施能力
+     *
+     * @param emsFacsAbility 能源设施能力
+     * @return 结果
+     */
+    @Override
+    public int insertEmsFacsAbility(EmsFacsAbility emsFacsAbility) {
+        return emsFacsAbilityMapper.insertEmsFacsAbility(emsFacsAbility);
+    }
+
+    /**
+     * 批量-新增能源设施能力
+     *
+     * @param emsFacsAbilitys 能源设施能力list
+     * @return 结果
+     */
+    @Override
+    public int insertEmsFacsAbilityBatch(List<EmsFacsAbility> emsFacsAbilitys) {
+        return emsFacsAbilityMapper.insertEmsFacsAbilityBatch(emsFacsAbilitys);
+    }
+
+    /**
+     * 修改能源设施能力
+     *
+     * @param emsFacsAbility 能源设施能力
+     * @return 结果
+     */
+    @Override
+    public int updateEmsFacsAbility(EmsFacsAbility emsFacsAbility) {
+        return emsFacsAbilityMapper.updateEmsFacsAbility(emsFacsAbility);
+    }
+
+    /**
+     * 批量删除能源设施能力
+     *
+     * @param ids 需要删除的能源设施能力主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmsFacsAbilityByIds(Long[] ids) {
+        return emsFacsAbilityMapper.deleteEmsFacsAbilityByIds(ids);
+    }
+
+    /**
+     * 删除能源设施能力信息
+     *
+     * @param id 能源设施能力主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmsFacsAbilityById(Long id) {
+        return emsFacsAbilityMapper.deleteEmsFacsAbilityById(id);
+    }
+
+    @Override
+    public int deleteAbilityByFacsCode(String facsCode) {
+        return emsFacsAbilityMapper.deleteEmsFacsAbilityFacsCode(facsCode);
+    }
+}

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

@@ -51,7 +51,6 @@ public class EmsFacsAttrServiceImpl implements IEmsFacsAttrService {
      */
     @Override
     public int insertEmsFacsAttr(EmsFacsAttr emsFacsAttr) {
-        emsFacsAttr.setCreateTime(DateUtils.getNowDate());
         return emsFacsAttrMapper.insertEmsFacsAttr(emsFacsAttr);
     }
 
@@ -106,7 +105,7 @@ public class EmsFacsAttrServiceImpl implements IEmsFacsAttrService {
      * @return 结果
      */
     @Override
-    public int deleteEmsFacsAttrByFacsCode(String facsCode) {
-        return emsFacsAttrMapper.deleteEmsFacsAttrByFactCode(facsCode);
+    public int deleteAttrByFacsCode(String facsCode) {
+        return emsFacsAttrMapper.deleteEmsFacsAttrByFacsCode(facsCode);
     }
 }

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

@@ -0,0 +1,105 @@
+package com.ruoyi.ems.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.ems.domain.EmsFacsEvent;
+import com.ruoyi.ems.service.IEmsFacsEventService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ems.mapper.EmsFacsEventMapper;
+
+
+/**
+ * 能源设施事件Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-08-22
+ */
+@Service
+public class EmsFacsEventServiceImpl implements IEmsFacsEventService
+{
+    @Autowired
+    private EmsFacsEventMapper emsFacsEventMapper;
+
+    /**
+     * 查询能源设施事件
+     * 
+     * @param id 能源设施事件主键
+     * @return 能源设施事件
+     */
+    @Override
+    public EmsFacsEvent selectEmsFacsEventById(Long id)
+    {
+        return emsFacsEventMapper.selectEmsFacsEventById(id);
+    }
+
+    /**
+     * 查询能源设施事件列表
+     * 
+     * @param emsFacsEvent 能源设施事件
+     * @return 能源设施事件
+     */
+    @Override
+    public List<EmsFacsEvent> selectEmsFacsEventList(EmsFacsEvent emsFacsEvent)
+    {
+        return emsFacsEventMapper.selectEmsFacsEventList(emsFacsEvent);
+    }
+
+    /**
+     * 新增能源设施事件
+     * 
+     * @param emsFacsEvent 能源设施事件
+     * @return 结果
+     */
+    @Override
+    public int insertEmsFacsEvent(EmsFacsEvent emsFacsEvent)
+    {
+        return emsFacsEventMapper.insertEmsFacsEvent(emsFacsEvent);
+    }
+
+    @Override
+    public int insertEmsFacsEventBatch(List<EmsFacsEvent> emsFacsEvents) {
+        return emsFacsEventMapper.insertEmsFacsEventBatch(emsFacsEvents);
+    }
+
+    /**
+     * 修改能源设施事件
+     * 
+     * @param emsFacsEvent 能源设施事件
+     * @return 结果
+     */
+    @Override
+    public int updateEmsFacsEvent(EmsFacsEvent emsFacsEvent)
+    {
+        return emsFacsEventMapper.updateEmsFacsEvent(emsFacsEvent);
+    }
+
+    /**
+     * 批量删除能源设施事件
+     * 
+     * @param ids 需要删除的能源设施事件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmsFacsEventByIds(Long[] ids)
+    {
+        return emsFacsEventMapper.deleteEmsFacsEventByIds(ids);
+    }
+
+    /**
+     * 删除能源设施事件信息
+     * 
+     * @param id 能源设施事件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmsFacsEventById(Long id)
+    {
+        return emsFacsEventMapper.deleteEmsFacsEventById(id);
+    }
+
+    @Override
+    public int deleteEventByFacsCode(String facsCode) {
+        return emsFacsEventMapper.deleteEmsFacsEventByFacsCode(facsCode);
+    }
+}

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

@@ -1,17 +1,21 @@
 package com.ruoyi.ems.service.impl;
 
-import java.util.List;
-
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.ems.domain.EmsFacs;
+import com.ruoyi.ems.domain.EmsFacsAbility;
 import com.ruoyi.ems.domain.EmsFacsAttr;
+import com.ruoyi.ems.domain.EmsFacsEvent;
 import com.ruoyi.ems.mapper.EmsFacsMapper;
+import com.ruoyi.ems.service.IEmsFacsAbilityService;
 import com.ruoyi.ems.service.IEmsFacsAttrService;
+import com.ruoyi.ems.service.IEmsFacsEventService;
 import com.ruoyi.ems.service.IEmsFacsService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 能源设施/系统Service业务层处理
  *
@@ -26,11 +30,17 @@ public class EmsFacsServiceImpl implements IEmsFacsService {
     @Autowired
     private IEmsFacsAttrService facsAttrService;
 
+    @Autowired
+    private IEmsFacsAbilityService facsAbilityService;
+
+    @Autowired
+    private IEmsFacsEventService facsEventService;
+
     /**
-     * 查询能源设施/系统
+     * 查询能源设施
      *
-     * @param id 能源设施/系统主键
-     * @return 能源设施/系统
+     * @param id 能源设施主键
+     * @return 能源设施
      */
     @Override
     public EmsFacs selectEmsFacsById(Long id) {
@@ -40,6 +50,8 @@ public class EmsFacsServiceImpl implements IEmsFacsService {
         // 查询扩展属性
         if (null != emsFacs) {
             emsFacs.setFacsAttrs(getFacsAttrs(emsFacs));
+            emsFacs.setFacsAbilities(getFacsAbilitys(emsFacs));
+            emsFacs.setFacsEvents(getFacsEvents(emsFacs));
         }
 
         return emsFacs;
@@ -53,6 +65,8 @@ public class EmsFacsServiceImpl implements IEmsFacsService {
         // 查询扩展属性
         if (null != emsFacs) {
             emsFacs.setFacsAttrs(getFacsAttrs(emsFacs));
+            emsFacs.setFacsAbilities(getFacsAbilitys(emsFacs));
+            emsFacs.setFacsEvents(getFacsEvents(emsFacs));
         }
 
         return emsFacs;
@@ -70,6 +84,8 @@ public class EmsFacsServiceImpl implements IEmsFacsService {
         if (CollectionUtils.isNotEmpty(list)) {
             list.forEach(facsObj -> {
                 facsObj.setFacsAttrs(getFacsAttrs(facsObj));
+                facsObj.setFacsAbilities(getFacsAbilitys(facsObj));
+                facsObj.setFacsEvents(getFacsEvents(facsObj));
             });
         }
 
@@ -77,10 +93,10 @@ public class EmsFacsServiceImpl implements IEmsFacsService {
     }
 
     /**
-     * 查询能源设施/系统列表
+     * 查询能源设施列表
      *
-     * @param emsFacs 能源设施/系统
-     * @return 能源设施/系统
+     * @param emsFacs 能源设施
+     * @return 能源设施
      */
     @Override
     public List<EmsFacs> selectEmsFacsList(EmsFacs emsFacs) {
@@ -91,6 +107,8 @@ public class EmsFacsServiceImpl implements IEmsFacsService {
         if (CollectionUtils.isNotEmpty(list)) {
             list.forEach(facsObj -> {
                 facsObj.setFacsAttrs(getFacsAttrs(facsObj));
+                facsObj.setFacsAbilities(getFacsAbilitys(facsObj));
+                facsObj.setFacsEvents(getFacsEvents(facsObj));
             });
         }
 
@@ -106,17 +124,7 @@ public class EmsFacsServiceImpl implements IEmsFacsService {
     @Override
     public int insertEmsFacs(EmsFacs emsFacs) {
         emsFacs.setCreateTime(DateUtils.getNowDate());
-        int count = emsFacsMapper.insertEmsFacs(emsFacs);
-
-        if (CollectionUtils.isNotEmpty(emsFacs.getFacsAttrs())) {
-            facsAttrService.deleteEmsFacsAttrByFacsCode(emsFacs.getFacsCode());
-            facsAttrService.insertEmsFacsAttrBatch(emsFacs.getFacsAttrs());
-        }
-        else {
-            facsAttrService.deleteEmsFacsAttrByFacsCode(emsFacs.getFacsCode());
-        }
-
-        return count;
+        return emsFacsMapper.insertEmsFacs(emsFacs);
     }
 
     /**
@@ -128,23 +136,13 @@ public class EmsFacsServiceImpl implements IEmsFacsService {
     @Override
     public int updateEmsFacs(EmsFacs emsFacs) {
         emsFacs.setUpdateTime(DateUtils.getNowDate());
-        int count = emsFacsMapper.updateEmsFacs(emsFacs);
-
-        if (CollectionUtils.isNotEmpty(emsFacs.getFacsAttrs())) {
-            facsAttrService.deleteEmsFacsAttrByFacsCode(emsFacs.getFacsCode());
-            facsAttrService.insertEmsFacsAttrBatch(emsFacs.getFacsAttrs());
-        }
-        else {
-            facsAttrService.deleteEmsFacsAttrByFacsCode(emsFacs.getFacsCode());
-        }
-
-        return count;
+        return emsFacsMapper.updateEmsFacs(emsFacs);
     }
 
     /**
-     * 批量删除能源设施/系统
+     * 批量删除能源设施
      *
-     * @param ids 需要删除的能源设施/系统主键
+     * @param ids 需要删除的能源设施主键
      * @return 结果
      */
     @Override
@@ -154,7 +152,9 @@ public class EmsFacsServiceImpl implements IEmsFacsService {
 
             // 查询扩展属性
             if (null != emsFacs) {
-                facsAttrService.deleteEmsFacsAttrByFacsCode(emsFacs.getFacsCode());
+                facsAttrService.deleteAttrByFacsCode(emsFacs.getFacsCode());
+                facsAbilityService.deleteAbilityByFacsCode(emsFacs.getFacsCode());
+                facsEventService.deleteEventByFacsCode(emsFacs.getFacsCode());
             }
         }
 
@@ -173,7 +173,9 @@ public class EmsFacsServiceImpl implements IEmsFacsService {
 
         // 查询扩展属性
         if (null != emsFacs) {
-            facsAttrService.deleteEmsFacsAttrByFacsCode(emsFacs.getFacsCode());
+            facsAttrService.deleteAttrByFacsCode(emsFacs.getFacsCode());
+            facsAbilityService.deleteAbilityByFacsCode(emsFacs.getFacsCode());
+            facsEventService.deleteEventByFacsCode(emsFacs.getFacsCode());
         }
 
         return emsFacsMapper.deleteEmsFacsById(id);
@@ -183,4 +185,14 @@ public class EmsFacsServiceImpl implements IEmsFacsService {
         EmsFacsAttr param = new EmsFacsAttr(emsFacs.getFacsCode());
         return facsAttrService.selectEmsFacsAttrList(param);
     }
+
+    private List<EmsFacsAbility> getFacsAbilitys(EmsFacs emsFacs) {
+        EmsFacsAbility param = new EmsFacsAbility(emsFacs.getFacsCode());
+        return facsAbilityService.selectEmsFacsAbilityList(param);
+    }
+
+    private List<EmsFacsEvent> getFacsEvents(EmsFacs emsFacs) {
+        EmsFacsEvent param = new EmsFacsEvent(emsFacs.getFacsCode());
+        return facsEventService.selectEmsFacsEventList(param);
+    }
 }

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

@@ -1,94 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import java.util.List;
-
-import com.ruoyi.ems.domain.ElecPvPriceConfig;
-import com.ruoyi.ems.mapper.PvPriceConfigMapper;
-import com.ruoyi.ems.service.IPvPriceConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 光伏电价配置Service业务层处理
- * 
- * @author ruoyi
- * @date 2024-08-19
- */
-@Service
-public class PvPriceConfigServiceImpl implements IPvPriceConfigService
-{
-    @Autowired
-    private PvPriceConfigMapper pvPriceConfigMapper;
-
-    /**
-     * 查询光伏电价配置
-     * 
-     * @param id 光伏电价配置主键
-     * @return 光伏电价配置
-     */
-    @Override
-    public ElecPvPriceConfig selectPvPriceConfigById(Long id)
-    {
-        return pvPriceConfigMapper.selectPvPriceConfigById(id);
-    }
-
-    /**
-     * 查询光伏电价配置列表
-     * 
-     * @param elecPvPriceConfig 光伏电价配置
-     * @return 光伏电价配置
-     */
-    @Override
-    public List<ElecPvPriceConfig> selectPvPriceConfigList(ElecPvPriceConfig elecPvPriceConfig)
-    {
-        return pvPriceConfigMapper.selectPvPriceConfigList(elecPvPriceConfig);
-    }
-
-    /**
-     * 新增光伏电价配置
-     * 
-     * @param elecPvPriceConfig 光伏电价配置
-     * @return 结果
-     */
-    @Override
-    public int insertPvPriceConfig(ElecPvPriceConfig elecPvPriceConfig)
-    {
-        return pvPriceConfigMapper.insertPvPriceConfig(elecPvPriceConfig);
-    }
-
-    /**
-     * 修改光伏电价配置
-     * 
-     * @param elecPvPriceConfig 光伏电价配置
-     * @return 结果
-     */
-    @Override
-    public int updatePvPriceConfig(ElecPvPriceConfig elecPvPriceConfig)
-    {
-        return pvPriceConfigMapper.updatePvPriceConfig(elecPvPriceConfig);
-    }
-
-    /**
-     * 批量删除光伏电价配置
-     * 
-     * @param ids 需要删除的光伏电价配置主键
-     * @return 结果
-     */
-    @Override
-    public int deletePvPriceConfigByIds(Long[] ids)
-    {
-        return pvPriceConfigMapper.deletePvPriceConfigByIds(ids);
-    }
-
-    /**
-     * 删除光伏电价配置信息
-     * 
-     * @param id 光伏电价配置主键
-     * @return 结果
-     */
-    @Override
-    public int deletePvPriceConfigById(Long id)
-    {
-        return pvPriceConfigMapper.deletePvPriceConfigById(id);
-    }
-}

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/AreaElectricityAttrMapper.xml → ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/ElecAttrMapper.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.AreaElectricityAttrMapper">
+<mapper namespace="com.ruoyi.ems.mapper.ElecAttrMapper">
     
-    <resultMap type="com.ruoyi.ems.domain.AreaElectricityAttr" id="areaElectricityAttrResult">
+    <resultMap type="com.ruoyi.ems.domain.ElecAttr" id="ElecAttrResult">
         <result property="id"    column="id"    />
         <result property="areaCode"    column="area_code"    />
         <result property="areaName"    column="area_name"    />
@@ -19,16 +19,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
-    <sql id="selectAreaElectricityAttrVo">
+    <sql id="selectElecAttrVo">
         SELECT attr.id, attr.area_code, area.area_name, price.elec_type, attr.price_code, t.`name` as elec_type_name, price.voltage_level, attr.req_capacity_flag, attr.trans_capacity, attr.req_quantity, attr.create_time, attr.update_time
-          FROM sys_area_electricity_attr attr
+          FROM adm_area_elec_attr attr
             LEFT JOIN adm_service_area area ON attr.area_code = area.area_code
             LEFT JOIN sys_electrovalency_config price ON attr.price_code = price.cfg_code
-            LEFT JOIN dim_ems_electrovalency_type t ON t.`code` = price.elec_type
+            LEFT JOIN dim_ems_elecprice_type t ON t.`code` = price.elec_type
     </sql>
 
-    <select id="selectAreaElectricityAttrList" parameterType="com.ruoyi.ems.domain.AreaElectricityAttr" resultMap="areaElectricityAttrResult">
-        <include refid="selectAreaElectricityAttrVo"/>
+    <select id="selectElecAttrList" parameterType="com.ruoyi.ems.domain.ElecAttr" resultMap="ElecAttrResult">
+        <include refid="selectElecAttrVo"/>
         <where>  
             <if test="areaCode != null  and areaCode != ''"> and attr.area_code = #{areaCode}</if>
             <if test="priceCode != null  and priceCode != ''"> and attr.price_code = #{priceCode}</if>
@@ -38,13 +38,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectAreaElectricityAttrById" parameterType="Long" resultMap="areaElectricityAttrResult">
-        <include refid="selectAreaElectricityAttrVo"/>
+    <select id="selectElecAttrById" parameterType="Long" resultMap="ElecAttrResult">
+        <include refid="selectElecAttrVo"/>
         where attr.id = #{id}
     </select>
         
-    <insert id="insertAreaElectricityAttr" parameterType="com.ruoyi.ems.domain.AreaElectricityAttr" useGeneratedKeys="true" keyProperty="id">
-        insert into sys_area_electricity_attr
+    <insert id="insertElecAttr" parameterType="com.ruoyi.ems.domain.ElecAttr" useGeneratedKeys="true" keyProperty="id">
+        insert into adm_area_elec_attr
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code,</if>
             <if test="priceCode != null and priceCode != ''">price_code,</if>
@@ -65,8 +65,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateAreaElectricityAttr" parameterType="com.ruoyi.ems.domain.AreaElectricityAttr">
-        update sys_area_electricity_attr
+    <update id="updateElecAttr" parameterType="com.ruoyi.ems.domain.ElecAttr">
+        update adm_area_elec_attr
         <trim prefix="SET" suffixOverrides=",">
             area_code = #{areaCode},
             price_code = #{priceCode},
@@ -79,12 +79,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteAreaElectricityAttrById" parameterType="Long">
-        delete from sys_area_electricity_attr where id = #{id}
+    <delete id="deleteElecAttrById" parameterType="Long">
+        delete from adm_area_elec_attr where id = #{id}
     </delete>
 
-    <delete id="deleteAreaElectricityAttrByIds" parameterType="String">
-        delete from sys_area_electricity_attr where id in 
+    <delete id="deleteElecAttrByIds" parameterType="String">
+        delete from adm_area_elec_attr where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/ElecValencyConfigMapper.xml → ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/ElecGwPriceConfigMapper.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.ElecValencyConfigMapper">
+<mapper namespace="com.ruoyi.ems.mapper.ElecGwPriceConfigMapper">
     
-    <resultMap type="com.ruoyi.ems.domain.ElecValencyConfig" id="elecValencyConfigResult">
+    <resultMap type="com.ruoyi.ems.domain.ElecGwPriceConfig" id="elecPriceConfigResult">
         <result property="id"    column="id"    />
         <result property="cfgCode"    column="cfg_code"    />
         <result property="elecType"    column="elec_type"    />
@@ -19,13 +19,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="transCapacityPrice"    column="trans_capacity_price"    />
     </resultMap>
 
-    <sql id="selectElecValencyConfigVo">
-        select v.id, v.cfg_code, v.elec_type, t.`name` as elec_type_name, v.voltage_level, v.degree_price, v.fs_peak_degree_price, v.fs_high_degree_price, v.fs_flat_degree_price, v.fs_low_degree_price, v.max_req_price, v.trans_capacity_price from sys_electrovalency_config v
-            LEFT JOIN dim_ems_electrovalency_type t ON v.elec_type = t.`code`
+    <sql id="selectElecPriceConfigVo">
+        select
+            v.id, v.cfg_code, v.elec_type, t.`name` as elec_type_name, v.voltage_level, v.degree_price, v.fs_peak_degree_price, v.fs_high_degree_price, v.fs_flat_degree_price, v.fs_low_degree_price, v.max_req_price, v.trans_capacity_price
+        from adm_gw_elecprice_config v
+            LEFT JOIN dim_ems_elecprice_type t ON v.elec_type = t.`code`
     </sql>
 
-    <select id="selectElecValencyConfigList" parameterType="com.ruoyi.ems.domain.ElecValencyConfig" resultMap="elecValencyConfigResult">
-        <include refid="selectElecValencyConfigVo"/>
+    <select id="selectElecPriceConfigList" parameterType="com.ruoyi.ems.domain.ElecGwPriceConfig" resultMap="elecPriceConfigResult">
+        <include refid="selectElecPriceConfigVo"/>
         <where>  
             <if test="cfgCode != null  and cfgCode != ''"> and v.cfg_code = #{cfgCode}</if>
             <if test="elecType != null "> and v.elec_type = #{elecType}</if>
@@ -40,13 +42,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectElecValencyConfigById" parameterType="Long" resultMap="elecValencyConfigResult">
-        <include refid="selectElecValencyConfigVo"/>
+    <select id="selectElecPriceConfigById" parameterType="Long" resultMap="elecPriceConfigResult">
+        <include refid="selectElecPriceConfigVo"/>
         where v.id = #{id}
     </select>
         
-    <insert id="insertElecValencyConfig" parameterType="com.ruoyi.ems.domain.ElecValencyConfig" useGeneratedKeys="true" keyProperty="id">
-        insert into sys_electrovalency_config
+    <insert id="insertElecPriceConfig" parameterType="com.ruoyi.ems.domain.ElecGwPriceConfig" useGeneratedKeys="true" keyProperty="id">
+        insert into adm_gw_elecprice_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="cfgCode != null and cfgCode != ''">cfg_code,</if>
             <if test="elecType != null">elec_type,</if>
@@ -73,8 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateElecValencyConfig" parameterType="com.ruoyi.ems.domain.ElecValencyConfig">
-        update sys_electrovalency_config
+    <update id="updateElecPriceConfig" parameterType="com.ruoyi.ems.domain.ElecGwPriceConfig">
+        update adm_gw_elecprice_config
         <trim prefix="SET" suffixOverrides=",">
             <if test="cfgCode != null and cfgCode != ''">cfg_code = #{cfgCode},</if>
             <if test="elecType != null">elec_type = #{elecType},</if>
@@ -90,12 +92,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteElecValencyConfigById" parameterType="Long">
-        delete from sys_electrovalency_config where id = #{id}
+    <delete id="deleteElecPriceConfigById" parameterType="Long">
+        delete from adm_gw_elecprice_config where id = #{id}
     </delete>
 
-    <delete id="deleteElecValencyConfigByIds" parameterType="String">
-        delete from sys_electrovalency_config where id in 
+    <delete id="deleteElecPriceConfigByIds" parameterType="String">
+        delete from adm_gw_elecprice_config where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/ElecValencyTypeMapper.xml → ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/ElecPriceTypeMapper.xml

@@ -2,33 +2,33 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ems.mapper.ElecValencyTypeMapper">
+<mapper namespace="com.ruoyi.ems.mapper.ElecPriceTypeMapper">
     
-    <resultMap type="com.ruoyi.ems.domain.ElecValencyType" id="ElecValencyTypeResult">
+    <resultMap type="com.ruoyi.ems.domain.ElecPriceType" id="ElecPriceTypeResult">
         <result property="id"    column="id"    />
         <result property="code"    column="code"    />
         <result property="name"    column="name"    />
     </resultMap>
 
-    <sql id="selectElecValencyTypeVo">
-        select id, code, name from dim_ems_electrovalency_type
+    <sql id="selectElecPriceTypeVo">
+        select id, code, name from dim_ems_elecprice_type
     </sql>
 
-    <select id="selectElecValencyTypeList" parameterType="com.ruoyi.ems.domain.ElecValencyType" resultMap="ElecValencyTypeResult">
-        <include refid="selectElecValencyTypeVo"/>
+    <select id="selectElecPriceTypeList" parameterType="com.ruoyi.ems.domain.ElecPriceType" resultMap="ElecPriceTypeResult">
+        <include refid="selectElecPriceTypeVo"/>
         <where>  
             <if test="code != null "> and code = #{code}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
         </where>
     </select>
     
-    <select id="selectElecValencyTypeById" parameterType="Long" resultMap="ElecValencyTypeResult">
-        <include refid="selectElecValencyTypeVo"/>
+    <select id="selectElecPriceTypeById" parameterType="Long" resultMap="ElecPriceTypeResult">
+        <include refid="selectElecPriceTypeVo"/>
         where id = #{id}
     </select>
         
-    <insert id="insertElecValencyType" parameterType="com.ruoyi.ems.domain.ElecValencyType" useGeneratedKeys="true" keyProperty="id">
-        insert into dim_ems_electrovalency_type
+    <insert id="insertElecPriceType" parameterType="com.ruoyi.ems.domain.ElecPriceType" useGeneratedKeys="true" keyProperty="id">
+        insert into dim_ems_elecprice_type
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="code != null">code,</if>
             <if test="name != null and name != ''">name,</if>
@@ -39,8 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateElecValencyType" parameterType="com.ruoyi.ems.domain.ElecValencyType">
-        update dim_ems_electrovalency_type
+    <update id="updateElecPriceType" parameterType="com.ruoyi.ems.domain.ElecPriceType">
+        update dim_ems_elecprice_type
         <trim prefix="SET" suffixOverrides=",">
             <if test="code != null">code = #{code},</if>
             <if test="name != null and name != ''">name = #{name},</if>
@@ -48,12 +48,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteElecValencyTypeById" parameterType="Long">
-        delete from dim_ems_electrovalency_type where id = #{id}
+    <delete id="deleteElecPriceTypeById" parameterType="Long">
+        delete from dim_ems_elecprice_type where id = #{id}
     </delete>
 
-    <delete id="deleteElecValencyTypeByIds" parameterType="String">
-        delete from dim_ems_electrovalency_type where id in 
+    <delete id="deleteElecPriceTypeByIds" parameterType="String">
+        delete from dim_ems_elecprice_type where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/PvPriceConfigMapper.xml → ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/ElecPvPriceConfigMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ems.mapper.PvPriceConfigMapper">
+<mapper namespace="com.ruoyi.ems.mapper.ElecPvPriceConfigMapper">
     
     <resultMap type="com.ruoyi.ems.domain.ElecPvPriceConfig" id="pvPriceConfigResult">
         <result property="id"    column="id"    />
@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectPvPriceConfigVo">
-        select id, cfg_code, price_name, obj_price, state_subsidy, local_subsidy from sys_pv_price_config
+        select id, cfg_code, price_name, obj_price, state_subsidy, local_subsidy from adm_pv_elecprice_config
     </sql>
 
     <select id="selectPvPriceConfigList" parameterType="com.ruoyi.ems.domain.ElecPvPriceConfig" resultMap="pvPriceConfigResult">
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertPvPriceConfig" parameterType="com.ruoyi.ems.domain.ElecPvPriceConfig" useGeneratedKeys="true" keyProperty="id">
-        insert into sys_pv_price_config
+        insert into adm_pv_elecprice_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="cfgCode != null and cfgCode != ''">cfg_code,</if>
             <if test="priceName != null and priceName != ''">price_name,</if>
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updatePvPriceConfig" parameterType="com.ruoyi.ems.domain.ElecPvPriceConfig">
-        update sys_pv_price_config
+        update adm_pv_elecprice_config
         <trim prefix="SET" suffixOverrides=",">
             <if test="cfgCode != null and cfgCode != ''">cfg_code = #{cfgCode},</if>
             <if test="priceName != null and priceName != ''">price_name = #{priceName},</if>
@@ -64,11 +64,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deletePvPriceConfigById" parameterType="Long">
-        delete from sys_pv_price_config where id = #{id}
+        delete from adm_pv_elecprice_config where id = #{id}
     </delete>
 
     <delete id="deletePvPriceConfigByIds" parameterType="String">
-        delete from sys_pv_price_config where id in 
+        delete from adm_pv_elecprice_config where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

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

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-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.ElecValencyHourStrategyMapper">
-    
-    <resultMap type="com.ruoyi.ems.domain.ElecValencyHourStrategy" id="elecValencyStrategyHourResult">
-        <result property="id"    column="id"    />
-        <result property="strategyCode"    column="strategy_code"    />
-        <result property="startTime"    column="start_time"    />
-        <result property="endTime"    column="end_time"    />
-        <result property="type"    column="type"    />
-    </resultMap>
-
-    <sql id="selectElecValencyStrategyHourVo">
-        select id, strategy_code, start_time, end_time, type from sys_electrovalency_strategy_hour
-    </sql>
-
-    <select id="selectElecValencyStrategyHourList" parameterType="com.ruoyi.ems.domain.ElecValencyHourStrategy" resultMap="elecValencyStrategyHourResult">
-        <include refid="selectElecValencyStrategyHourVo"/>
-        <where>  
-            <if test="strategyCode != null  and strategyCode != ''"> and strategy_code = #{strategyCode}</if>
-            <if test="startTime != null "> and start_time = #{startTime}</if>
-            <if test="endTime != null "> and end_time = #{endTime}</if>
-            <if test="type != null "> and type = #{type}</if>
-        </where>
-    </select>
-    
-    <select id="selectElecValencyStrategyHourById" parameterType="Long" resultMap="elecValencyStrategyHourResult">
-        <include refid="selectElecValencyStrategyHourVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertElecValencyStrategyHour" parameterType="com.ruoyi.ems.domain.ElecValencyHourStrategy" useGeneratedKeys="true" keyProperty="id">
-        insert into sys_electrovalency_strategy_hour
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="strategyCode != null and strategyCode != ''">strategy_code,</if>
-            <if test="startTime != null">start_time,</if>
-            <if test="endTime != null">end_time,</if>
-            <if test="type != null">type,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="strategyCode != null and strategyCode != ''">#{strategyCode},</if>
-            <if test="startTime != null">#{startTime},</if>
-            <if test="endTime != null">#{endTime},</if>
-            <if test="type != null">#{type},</if>
-         </trim>
-    </insert>
-
-    <insert id="insertElecValencyStrategyHourBatch" parameterType="java.util.List">
-        insert into sys_electrovalency_strategy_hour (strategy_code, start_time, end_time, type) values
-        <foreach collection="elecValencyStrategyHours" item="elecValencyStrategyHour" index="index" separator=",">
-            (#{elecValencyStrategyHour.strategyCode},
-             #{elecValencyStrategyHour.startTime},
-             #{elecValencyStrategyHour.endTime},
-             #{elecValencyStrategyHour.type})
-        </foreach>
-    </insert>
-
-    <update id="updateElecValencyStrategyHour" parameterType="com.ruoyi.ems.domain.ElecValencyHourStrategy">
-        update sys_electrovalency_strategy_hour
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="strategyCode != null and strategyCode != ''">strategy_code = #{strategyCode},</if>
-            <if test="startTime != null">start_time = #{startTime},</if>
-            <if test="endTime != null">end_time = #{endTime},</if>
-            <if test="type != null">type = #{type},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteElecValencyStrategyHourById" parameterType="Long">
-        delete from sys_electrovalency_strategy_hour where id = #{id}
-    </delete>
-
-    <delete id="deleteElecValencyStrategyHourByStrategy" parameterType="String">
-        delete from sys_electrovalency_strategy_hour where strategy_code = #{strategyCode}
-    </delete>
-
-    <delete id="deleteElecValencyStrategyHourByIds" parameterType="String">
-        delete from sys_electrovalency_strategy_hour where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

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

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-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.ElecValencyStrategyMapper">
-    
-    <resultMap type="com.ruoyi.ems.domain.ElecValencyStrategy" id="elecValencyStrategyResult">
-        <result property="id"    column="id"    />
-        <result property="strategyCode"    column="strategy_code"    />
-        <result property="strategyName"    column="strategy_name"    />
-        <result property="date"    column="date"    />
-        <result property="priority"    column="priority"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectElecValencyStrategyVo">
-        select id, strategy_code, strategy_name, date, priority, create_time, update_time from sys_electrovalency_strategy
-    </sql>
-
-    <select id="selectElecValencyStrategyList" parameterType="com.ruoyi.ems.domain.ElecValencyStrategy" resultMap="elecValencyStrategyResult">
-        <include refid="selectElecValencyStrategyVo"/>
-        <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>
-            <if test="date != null "> and date = #{date}</if>
-            <if test="priority != null "> and priority = #{priority}</if>
-        </where>
-    </select>
-    
-    <select id="selectElecValencyStrategyById" parameterType="Long" resultMap="elecValencyStrategyResult">
-        <include refid="selectElecValencyStrategyVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertElecValencyStrategy" parameterType="com.ruoyi.ems.domain.ElecValencyStrategy" useGeneratedKeys="true" keyProperty="id">
-        insert into sys_electrovalency_strategy
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="strategyCode != null and strategyCode != ''">strategy_code,</if>
-            <if test="strategyName != null and strategyName != ''">strategy_name,</if>
-            <if test="date != null">date,</if>
-            <if test="priority != null">priority,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="strategyCode != null and strategyCode != ''">#{strategyCode},</if>
-            <if test="strategyName != null and strategyName != ''">#{strategyName},</if>
-            <if test="date != null">#{date},</if>
-            <if test="priority != null">#{priority},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updateElecValencyStrategy" parameterType="com.ruoyi.ems.domain.ElecValencyStrategy">
-        update sys_electrovalency_strategy
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="strategyCode != null and strategyCode != ''">strategy_code = #{strategyCode},</if>
-            <if test="strategyName != null and strategyName != ''">strategy_name = #{strategyName},</if>
-            <if test="date != null">date = #{date},</if>
-            <if test="priority != null">priority = #{priority},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteElecValencyStrategyById" parameterType="Long">
-        delete from sys_electrovalency_strategy where id = #{id}
-    </delete>
-
-    <delete id="deleteElecValencyStrategyByIds" parameterType="String">
-        delete from sys_electrovalency_strategy where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

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

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-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.EmsFacsAbilityMapper">
+    
+    <resultMap type="com.ruoyi.ems.domain.EmsFacsAbility" id="AbilityResult">
+        <result property="id"    column="id"    />
+        <result property="facsCode"    column="facs_code"    />
+        <result property="abilityName"    column="ability_name"    />
+        <result property="abilityDesc"    column="ability_desc"    />
+        <result property="abilityParam"    column="ability_param"    />
+    </resultMap>
+
+    <sql id="selectEmsFacsAbilityVo">
+        select id, facs_code, ability_name, ability_desc, ability_param from adm_ems_facs_ability
+    </sql>
+
+    <select id="selectEmsFacsAbilityList" parameterType="com.ruoyi.ems.domain.EmsFacsAbility" resultMap="AbilityResult">
+        <include refid="selectEmsFacsAbilityVo"/>
+        <where>  
+            <if test="facsCode != null  and facsCode != ''"> and facs_code = #{facsCode}</if>
+            <if test="abilityName != null  and abilityName != ''"> and ability_name like concat('%', #{abilityName}, '%')</if>
+            <if test="abilityDesc != null  and abilityDesc != ''"> and ability_desc = #{abilityDesc}</if>
+            <if test="abilityParam != null  and abilityParam != ''"> and ability_param = #{abilityParam}</if>
+        </where>
+    </select>
+    
+    <select id="selectEmsFacsAbilityById" parameterType="Long" resultMap="AbilityResult">
+        <include refid="selectEmsFacsAbilityVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertEmsFacsAbility" parameterType="com.ruoyi.ems.domain.EmsFacsAbility" useGeneratedKeys="true" keyProperty="id">
+        insert into adm_ems_facs_ability
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="facsCode != null and facsCode != ''">facs_code,</if>
+            <if test="abilityName != null and abilityName != ''">ability_name,</if>
+            <if test="abilityDesc != null">ability_desc,</if>
+            <if test="abilityParam != null">ability_param,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="facsCode != null and facsCode != ''">#{facsCode},</if>
+            <if test="abilityName != null and abilityName != ''">#{abilityName},</if>
+            <if test="abilityDesc != null">#{abilityDesc},</if>
+            <if test="abilityParam != null">#{abilityParam},</if>
+         </trim>
+    </insert>
+
+    <insert id="insertEmsFacsAbilityBatch" parameterType="java.util.List">
+        insert into adm_ems_facs_ability (facs_code, ability_name, ability_desc, ability_param) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.facsCode},#{item.abilityName},#{item.abilityDesc},#{item.abilityParam})
+        </foreach>
+    </insert>
+
+    <update id="updateEmsFacsAbility" parameterType="com.ruoyi.ems.domain.EmsFacsAbility">
+        update adm_ems_facs_ability
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="facsCode != null and facsCode != ''">facs_code = #{facsCode},</if>
+            <if test="abilityName != null and abilityName != ''">ability_name = #{abilityName},</if>
+            <if test="abilityDesc != null">ability_desc = #{abilityDesc},</if>
+            <if test="abilityParam != null">ability_param = #{abilityParam},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteEmsFacsAbilityById" parameterType="Long">
+        delete from adm_ems_facs_ability where id = #{id}
+    </delete>
+
+    <delete id="deleteEmsFacsAbilityByIds" parameterType="String">
+        delete from adm_ems_facs_ability where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteEmsFacsAbilityFacsCode" parameterType="String">
+        delete from adm_ems_facs_ability where facs_code = #{facsCode}
+    </delete>
+</mapper>

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

@@ -11,12 +11,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="attrDesc"    column="attr_desc"    />
         <result property="attrValue"    column="attr_value"    />
         <result property="attrUnit"    column="attr_unit"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectEmsFacsAttrVo">
-        select id, facs_code, attr_name, attr_desc, attr_value, attr_unit, create_time, update_time from adm_ems_facs_attr
+        select id, facs_code, attr_name, attr_desc, attr_value, attr_unit from adm_ems_facs_attr
     </sql>
 
     <select id="selectEmsFacsAttrList" parameterType="com.ruoyi.ems.domain.EmsFacsAttr" resultMap="EmsFacsAttrResult">
@@ -43,8 +41,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="attrDesc != null">attr_desc,</if>
             <if test="attrValue != null">attr_value,</if>
             <if test="attrUnit != null">attr_unit,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="facsCode != null and facsCode != ''">#{facsCode},</if>
@@ -52,15 +48,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="attrDesc != null">#{attrDesc},</if>
             <if test="attrValue != null">#{attrValue},</if>
             <if test="attrUnit != null">#{attrUnit},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
          </trim>
     </insert>
 
     <insert id="insertEmsFacsAttrBatch" parameterType="java.util.List">
-        insert into adm_ems_facs_attr (facs_code, attr_name, attr_desc, attr_value, attr_unit, create_time, update_time) values
+        insert into adm_ems_facs_attr (facs_code, attr_name, attr_desc, attr_value, attr_unit) values
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.facsCode},#{item.attrName},#{item.attrDesc},#{item.attrValue},#{item.attrUnit},#{item.createTime},#{item.updateTime})
+            (#{item.facsCode},#{item.attrName},#{item.attrDesc},#{item.attrValue},#{item.attrUnit})
         </foreach>
     </insert>
 
@@ -72,8 +66,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="attrDesc != null">attr_desc = #{attrDesc},</if>
             <if test="attrValue != null">attr_value = #{attrValue},</if>
             <if test="attrUnit != null">attr_unit = #{attrUnit},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
         where id = #{id}
     </update>
@@ -89,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-    <delete id="deleteEmsFacsAttrByFactCode" parameterType="String">
+    <delete id="deleteEmsFacsAttrByFacsCode" parameterType="String">
         delete from adm_ems_facs_attr where facs_code = #{facsCode}
     </delete>
 </mapper>

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

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-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.EmsFacsEventMapper">
+    
+    <resultMap type="com.ruoyi.ems.domain.EmsFacsEvent" id="EventResult">
+        <result property="id"    column="id"    />
+        <result property="facsCode"    column="facs_code"    />
+        <result property="eventName"    column="event_name"    />
+        <result property="eventType"    column="event_type"    />
+        <result property="eventDesc"    column="event_desc"    />
+        <result property="eventCode"    column="event_code"    />
+        <result property="extEventCode"    column="ext_event_code"    />
+    </resultMap>
+
+    <sql id="selectEmsFacsEventVo">
+        select id, facs_code, event_name, event_type, event_desc, event_code, ext_event_code from adm_ems_facs_event
+    </sql>
+
+    <select id="selectEmsFacsEventList" parameterType="com.ruoyi.ems.domain.EmsFacsEvent" resultMap="EventResult">
+        <include refid="selectEmsFacsEventVo"/>
+        <where>  
+            <if test="facsCode != null  and facsCode != ''"> and facs_code = #{facsCode}</if>
+            <if test="eventName != null  and eventName != ''"> and event_name like concat('%', #{eventName}, '%')</if>
+            <if test="eventType != null "> and event_type = #{eventType}</if>
+            <if test="eventDesc != null  and eventDesc != ''"> and event_desc = #{eventDesc}</if>
+            <if test="eventCode != null  and eventCode != ''"> and event_code = #{eventCode}</if>
+            <if test="extEventCode != null  and extEventCode != ''"> and ext_event_code = #{extEventCode}</if>
+        </where>
+    </select>
+    
+    <select id="selectEmsFacsEventById" parameterType="Long" resultMap="EventResult">
+        <include refid="selectEmsFacsEventVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertEmsFacsEvent" parameterType="com.ruoyi.ems.domain.EmsFacsEvent" useGeneratedKeys="true" keyProperty="id">
+        insert into adm_ems_facs_event
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="facsCode != null and facsCode != ''">facs_code,</if>
+            <if test="eventName != null and eventName != ''">event_name,</if>
+            <if test="eventType != null">event_type,</if>
+            <if test="eventDesc != null">event_desc,</if>
+            <if test="eventCode != null">event_code,</if>
+            <if test="extEventCode != null">ext_event_code,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="facsCode != null and facsCode != ''">#{facsCode},</if>
+            <if test="eventName != null and eventName != ''">#{eventName},</if>
+            <if test="eventType != null">#{eventType},</if>
+            <if test="eventDesc != null">#{eventDesc},</if>
+            <if test="eventCode != null">#{eventCode},</if>
+            <if test="extEventCode != null">#{extEventCode},</if>
+         </trim>
+    </insert>
+
+    <insert id="insertEmsFacsEventBatch" parameterType="java.util.List">
+        insert into adm_ems_facs_event (facs_code, event_name, event_type, event_desc, event_code, ext_event_code) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.facsCode},#{item.eventName},#{item.eventType},#{item.eventDesc},#{item.eventCode},#{item.extEventCode})
+        </foreach>
+    </insert>
+
+    <update id="updateEmsFacsEvent" parameterType="com.ruoyi.ems.domain.EmsFacsEvent">
+        update adm_ems_facs_event
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="facsCode != null and facsCode != ''">facs_code = #{facsCode},</if>
+            <if test="eventName != null and eventName != ''">event_name = #{eventName},</if>
+            <if test="eventType != null">event_type = #{eventType},</if>
+            <if test="eventDesc != null">event_desc = #{eventDesc},</if>
+            <if test="eventCode != null">event_code = #{eventCode},</if>
+            <if test="extEventCode != null">ext_event_code = #{extEventCode},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteEmsFacsEventById" parameterType="Long">
+        delete from adm_ems_facs_event where id = #{id}
+    </delete>
+
+    <delete id="deleteEmsFacsEventByIds" parameterType="String">
+        delete from adm_ems_facs_event where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteEmsFacsEventByFacsCode" parameterType="String">
+        delete from adm_ems_facs_event where facs_code = #{facsCode}
+    </delete>
+</mapper>

ems-cloud/sql/ems_server.sql

@@ -300,19 +300,19 @@ INSERT INTO `dim_box_eleceqpt_type` (`type_code`, `type_name`) VALUES ('K', '继
 -- ----------------------------
 -- 电价计量分类
 -- ----------------------------
-drop table if exists dim_ems_electrovalency_type;
-create table dim_ems_electrovalency_type (
+drop table if exists dim_ems_elecprice_type;
+create table dim_ems_elecprice_type (
   `id`            bigint(20)      not null auto_increment    comment '序号',
   `code`          int             not null                   comment '分类类型',
   `name`          varchar(16)     not null                   comment '分类名称',
    primary key (`id`),
-   unique key ux_electrovalency_type_code(`code`)
+   unique key ux_elecprice_type_code(`code`)
 ) engine=innodb auto_increment=1 comment = '电价计量分类';
 
-INSERT INTO `dim_ems_electrovalency_type` (`code`, `name`) VALUES ('1', '居民生活用电');
-INSERT INTO `dim_ems_electrovalency_type` (`code`, `name`) VALUES ('2', '农业用电');
-INSERT INTO `dim_ems_electrovalency_type` (`code`, `name`) VALUES ('3', '单一制');
-INSERT INTO `dim_ems_electrovalency_type` (`code`, `name`) VALUES ('4', '两部制');
+INSERT INTO `dim_ems_elecprice_type` (`code`, `name`) VALUES ('1', '居民生活用电');
+INSERT INTO `dim_ems_elecprice_type` (`code`, `name`) VALUES ('2', '农业用电');
+INSERT INTO `dim_ems_elecprice_type` (`code`, `name`) VALUES ('3', '单一制');
+INSERT INTO `dim_ems_elecprice_type` (`code`, `name`) VALUES ('4', '两部制');
 
 -- ----------------------------
 -- 排放因子维表
@@ -523,7 +523,7 @@ INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype
 
 
 -- ----------------------------
--- 能源设施/系统属性表
+-- 能源设施属性表
 -- ----------------------------
 drop table if exists adm_ems_facs_attr;
 create table adm_ems_facs_attr  (
@@ -533,8 +533,6 @@ create table adm_ems_facs_attr  (
   `attr_desc`       varchar(64)     default null                 comment '属性描述',
   `attr_value`      varchar(64)     default null                 comment '属性值',
   `attr_unit`       varchar(32)     default null                 comment '属性单位',
-  `create_time`     datetime        default CURRENT_TIMESTAMP    comment '创建时间',
-  `update_time`     datetime        default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP comment '更新时间',
    primary key (`id`),
    key ux_ems_facs_code(`facs_code`)
 ) engine=innodb auto_increment=1 comment = '能源设施属性表';
@@ -545,6 +543,44 @@ INSERT INTO `adm_ems_facs_attr` (`facs_code`, `attr_name`, `attr_desc`, `attr_va
 
 
 -- ----------------------------
+-- 能源设施能力表
+-- ----------------------------
+drop table if exists adm_ems_facs_ability;
+create table adm_ems_facs_ability  (
+  `id`              bigint(20)      not null auto_increment      comment '序号',
+  `facs_code`       varchar(16)     not null                     comment '设施代码',
+  `ability_name`    varchar(32)     not null                     comment '能力名称',
+  `ability_desc`    varchar(64)     default null                 comment '能力描述',
+  `ability_param`   varchar(64)     default null                 comment '属性值',
+  primary key (`id`),
+  key ux_ems_facs_ability(`facs_code`)
+) engine=innodb auto_increment=1 comment = '能源设施能力表';
+
+-- 设施属性DEMO数据
+INSERT INTO `adm_ems_facs_ability` (`facs_code`, `ability_name`, `ability_desc`, `ability_param`) VALUES ('Z020', '开启', '开启空调', '{\"enable\":1}');
+INSERT INTO `adm_ems_facs_ability` (`facs_code`, `ability_name`, `ability_desc`, `ability_param`) VALUES ('Z020', '关闭', '关闭空调', '{\"enable\":0}');
+
+
+-- ----------------------------
+-- 能源设施事件表
+-- ----------------------------
+drop table if exists adm_ems_facs_event;
+create table adm_ems_facs_event  (
+  `id`              bigint(20)      not null auto_increment      comment '序号',
+  `facs_code`       varchar(16)     not null                     comment '设施代码',
+  `event_name`      varchar(32)     not null                     comment '事件名称',
+  `event_type`      int             not null                     comment '事件类型',
+  `event_desc`      varchar(64)     default null                 comment '事件描述',
+  `event_code`      varchar(32)     default null                 comment '事件代码',
+  `ext_event_code`  varchar(64)     default null                 comment '外系统事件代码',
+  primary key (`id`),
+  key ux_ems_facs_event(`facs_code`)
+) engine=innodb auto_increment=1 comment = '能源设施事件表';
+
+INSERT INTO `adm_ems_facs_event` (`facs_code`, `event_name`, `event_type`, `event_desc`, `event_code`, `ext_event_code`) VALUES ('Z101', '电压告警', '2', '电压过低告警', 'LOW_V',  '10001001');
+
+
+-- ----------------------------
 -- 能源子系统表
 -- ----------------------------
 drop table if exists adm_ems_subsystem;
@@ -832,8 +868,8 @@ create table adm_op_inspection_report (
 -- ----------------------------
 -- 服务区用电属性表
 -- ----------------------------
-drop table if exists sys_area_electricity_attr;
-create table sys_area_electricity_attr (
+drop table if exists adm_area_elec_attr;
+create table adm_area_elec_attr (
   `id`                   bigint(20)      not null auto_increment       comment '序号',
   `area_code`            varchar(32)     not null                      comment '园区代码',
   `price_code`           varchar(16)     not null                      comment '价格编码',
@@ -843,17 +879,17 @@ create table sys_area_electricity_attr (
   `create_time`         datetime         default CURRENT_TIMESTAMP     comment '创建时间',
   `update_time`         datetime         default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP comment '更新时间',
   primary key (`id`),
-  unique key ux_area_electricity_attr(`area_code`)
+  unique key ux_area_elec_attr(`area_code`)
 ) engine=innodb auto_increment=1 comment = '服务区用电属性表';
 
-INSERT INTO sys_area_electricity_attr (`area_code`, `price_code`, `req_capacity_flag`, `trans_capacity`, `req_quantity`) VALUES ('321283124S3001', '4001', 1, 630, NULL);
-INSERT INTO sys_area_electricity_attr (`area_code`, `price_code`, `req_capacity_flag`, `trans_capacity`, `req_quantity`) VALUES ('321283124S3002', '4001', 1, 630, NULL);
+INSERT INTO adm_area_elec_attr (`area_code`, `price_code`, `req_capacity_flag`, `trans_capacity`, `req_quantity`) VALUES ('321283124S3001', '4001', 1, 630, NULL);
+INSERT INTO adm_area_elec_attr (`area_code`, `price_code`, `req_capacity_flag`, `trans_capacity`, `req_quantity`) VALUES ('321283124S3002', '4001', 1, 630, NULL);
 
 -- ----------------------------
--- 电价配置表
+-- 国网电价配置表
 -- ----------------------------
-drop table if exists sys_electrovalency_config;
-create table sys_electrovalency_config (
+drop table if exists adm_gw_elecprice_config;
+create table adm_gw_elecprice_config (
   `id`                    bigint(20)      not null auto_increment      comment '序号',
   `cfg_code`              varchar(4)      not null                     comment '配置代码',
   `elec_type`             int             not null                     comment '用电分类 1-居民 2-农业 3-工业单一制 4-工业两部制',
@@ -866,41 +902,41 @@ create table sys_electrovalency_config (
   `max_req_price`         double          default null                 comment '最大需量用电价格',
   `trans_capacity_price`  double          default null                 comment '变压器容量用电价格',
   primary key (`id`),
-  unique key ux_electrovalency_config(`cfg_code`)
+  unique key ux_gw_elecprice_config(`cfg_code`)
 ) engine=innodb auto_increment=1 comment = '电价配置表';
 
 -- 单一制初始电价数据
-INSERT INTO sys_electrovalency_config (`cfg_code`, `elec_type`, `voltage_level`, `degree_price`, `fs_peak_degree_price`, `fs_high_degree_price`, `fs_flat_degree_price`, `fs_low_degree_price`, `max_req_price`, `trans_capacity_price`) VALUES ('3001', 3, '不满1千伏', 0.7624, 1.5296, 1.2747, 0.7624, 0.3445, NULL, NULL);
-INSERT INTO sys_electrovalency_config (`cfg_code`, `elec_type`, `voltage_level`, `degree_price`, `fs_peak_degree_price`, `fs_high_degree_price`, `fs_flat_degree_price`, `fs_low_degree_price`, `max_req_price`, `trans_capacity_price`) VALUES ('3002', 3, '1-10(20)千伏', 0.7364, 1.4774, 1.2312, 0.7364, 0.3327, NULL, NULL);
-INSERT INTO sys_electrovalency_config (`cfg_code`, `elec_type`, `voltage_level`, `degree_price`, `fs_peak_degree_price`, `fs_high_degree_price`, `fs_flat_degree_price`, `fs_low_degree_price`, `max_req_price`, `trans_capacity_price`) VALUES ('3003', 3, '35千伏', 0.7114, 1.4273, 1.1894, 0.7114, 0.3214, NULL, NULL);
+INSERT INTO adm_gw_elecprice_config (`cfg_code`, `elec_type`, `voltage_level`, `degree_price`, `fs_peak_degree_price`, `fs_high_degree_price`, `fs_flat_degree_price`, `fs_low_degree_price`, `max_req_price`, `trans_capacity_price`) VALUES ('3001', 3, '不满1千伏', 0.7624, 1.5296, 1.2747, 0.7624, 0.3445, NULL, NULL);
+INSERT INTO adm_gw_elecprice_config (`cfg_code`, `elec_type`, `voltage_level`, `degree_price`, `fs_peak_degree_price`, `fs_high_degree_price`, `fs_flat_degree_price`, `fs_low_degree_price`, `max_req_price`, `trans_capacity_price`) VALUES ('3002', 3, '1-10(20)千伏', 0.7364, 1.4774, 1.2312, 0.7364, 0.3327, NULL, NULL);
+INSERT INTO adm_gw_elecprice_config (`cfg_code`, `elec_type`, `voltage_level`, `degree_price`, `fs_peak_degree_price`, `fs_high_degree_price`, `fs_flat_degree_price`, `fs_low_degree_price`, `max_req_price`, `trans_capacity_price`) VALUES ('3003', 3, '35千伏', 0.7114, 1.4273, 1.1894, 0.7114, 0.3214, NULL, NULL);
 
 -- 两部制初始电价数据
-INSERT INTO sys_electrovalency_config (`cfg_code`, `elec_type`, `voltage_level`, `degree_price`, `fs_peak_degree_price`, `fs_high_degree_price`, `fs_flat_degree_price`, `fs_low_degree_price`, `max_req_price`, `trans_capacity_price`) VALUES ('4001', 4, '1-10(20)千伏', 0.6587, 1.3592, 1.1327, 0.6587, 0.2757, 51.2, 32);
-INSERT INTO sys_electrovalency_config (`cfg_code`, `elec_type`, `voltage_level`, `degree_price`, `fs_peak_degree_price`, `fs_high_degree_price`, `fs_flat_degree_price`, `fs_low_degree_price`, `max_req_price`, `trans_capacity_price`) VALUES ('4002', 4, '35千伏', 0.6337, 1.3076, 1.0897, 0.6337, 0.2652, 48, 30);
-INSERT INTO sys_electrovalency_config (`cfg_code`, `elec_type`, `voltage_level`, `degree_price`, `fs_peak_degree_price`, `fs_high_degree_price`, `fs_flat_degree_price`, `fs_low_degree_price`, `max_req_price`, `trans_capacity_price`) VALUES ('4003', 4, '110千伏', 0.6087, 1.256, 1.0467, 0.6087, 0.2547, 44.8, 28);
-INSERT INTO sys_electrovalency_config (`cfg_code`, `elec_type`, `voltage_level`, `degree_price`, `fs_peak_degree_price`, `fs_high_degree_price`, `fs_flat_degree_price`, `fs_low_degree_price`, `max_req_price`, `trans_capacity_price`) VALUES ('4004', 4, '220千伏及以上', 0.5827, 1.2024, 1.002, 0.5827, 0.2439, 41.6, 26);
+INSERT INTO adm_gw_elecprice_config (`cfg_code`, `elec_type`, `voltage_level`, `degree_price`, `fs_peak_degree_price`, `fs_high_degree_price`, `fs_flat_degree_price`, `fs_low_degree_price`, `max_req_price`, `trans_capacity_price`) VALUES ('4001', 4, '1-10(20)千伏', 0.6587, 1.3592, 1.1327, 0.6587, 0.2757, 51.2, 32);
+INSERT INTO adm_gw_elecprice_config (`cfg_code`, `elec_type`, `voltage_level`, `degree_price`, `fs_peak_degree_price`, `fs_high_degree_price`, `fs_flat_degree_price`, `fs_low_degree_price`, `max_req_price`, `trans_capacity_price`) VALUES ('4002', 4, '35千伏', 0.6337, 1.3076, 1.0897, 0.6337, 0.2652, 48, 30);
+INSERT INTO adm_gw_elecprice_config (`cfg_code`, `elec_type`, `voltage_level`, `degree_price`, `fs_peak_degree_price`, `fs_high_degree_price`, `fs_flat_degree_price`, `fs_low_degree_price`, `max_req_price`, `trans_capacity_price`) VALUES ('4003', 4, '110千伏', 0.6087, 1.256, 1.0467, 0.6087, 0.2547, 44.8, 28);
+INSERT INTO adm_gw_elecprice_config (`cfg_code`, `elec_type`, `voltage_level`, `degree_price`, `fs_peak_degree_price`, `fs_high_degree_price`, `fs_flat_degree_price`, `fs_low_degree_price`, `max_req_price`, `trans_capacity_price`) VALUES ('4004', 4, '220千伏及以上', 0.5827, 1.2024, 1.002, 0.5827, 0.2439, 41.6, 26);
 
 -- ----------------------------
 -- 光伏电价配置表
 -- ----------------------------
-drop table if exists sys_pv_price_config;
-create table sys_pv_price_config (
+drop table if exists adm_pv_elecprice_config;
+create table adm_pv_elecprice_config (
   `id`                    bigint(20)      not null auto_increment      comment '序号',
-  `cfg_code`              varchar(4)      not null                     comment '配置代码',
+  `cfg_code`              varchar(16)      not null                     comment '配置代码',
   `price_name`            varchar(32)     not null                     comment '价格名称',
   `obj_price`             double          default null                 comment '对象价格',
   `state_subsidy`         double          default null                 comment '国家补贴',
   `local_subsidy`         double          default null                 comment '地方补贴',
   primary key (`id`),
-  unique key ux_electrovalency_config(`price_name`)
+  unique key ux_pv_elecprice_config(`cfg_code`)
 ) engine=innodb auto_increment=1 comment = '光伏电价配置表';
 
 
 -- ----------------------------
 -- 电价策略表
 -- ----------------------------
-drop table if exists sys_electrovalency_strategy;
-create table sys_electrovalency_strategy (
+drop table if exists adm_elecprice_strategy;
+create table adm_elecprice_strategy (
   `id`                   bigint(20)      not null auto_increment      comment '序号',
   `strategy_code`        varchar(32)     not null                     comment '策略代码',
   `strategy_name`        varchar(16)     not null                     comment '策略名称',
@@ -909,17 +945,17 @@ create table sys_electrovalency_strategy (
   `create_time`          datetime        default CURRENT_TIMESTAMP    comment '创建时间',
   `update_time`          datetime        default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP comment '更新时间',
   primary key (`id`),
-  unique key ux_electrovalency_strategy(`strategy_code`)
+  unique key ux_elecprice_strategy(`strategy_code`)
 ) engine=innodb auto_increment=1 comment = '电价策略表';
 
 -- 默认策略
-INSERT INTO sys_electrovalency_strategy (`strategy_code`, `strategy_name`, `date`, `priority`) VALUES ('-1', '默认策略', NULL, 0);
+INSERT INTO adm_elecprice_strategy (`strategy_code`, `strategy_name`, `date`, `priority`) VALUES ('-1', '默认策略', NULL, 0);
 
 -- ----------------------------
 -- 电价策略小时表
 -- ----------------------------
-drop table if exists sys_electrovalency_strategy_hour;
-create table sys_electrovalency_strategy_hour (
+drop table if exists adm_elecprice_strategy_hour;
+create table adm_elecprice_strategy_hour (
   `id`                   bigint(20)      not null auto_increment      comment '序号',
   `strategy_code`        varchar(16)     not null                     comment '策略代码',
   `start_time`           time            not null                     comment '开始时间',
@@ -928,7 +964,7 @@ create table sys_electrovalency_strategy_hour (
   primary key (`id`)
 ) engine=innodb auto_increment=1 comment = '电价策略小时表';
 
-INSERT INTO sys_electrovalency_strategy_hour (`strategy_code`, `start_time`, `end_time`, `type`) VALUES ('-1', '00:00:00', '23:59:59', 0);
+INSERT INTO adm_elecprice_strategy_hour (`strategy_code`, `start_time`, `end_time`, `type`) VALUES ('-1', '00:00:00', '23:59:59', 0);
 
 -- ----------------------------
 -- 电网供应计量表