Merge branch 'master' of http://git.xt.wenhq.top:8083/hs/zhny_bg

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

@@ -1,99 +0,0 @@
-package com.ruoyi.ems.controller;
-
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-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.AdmBoxElecEqpt;
-import com.ruoyi.ems.service.IAdmBoxElecEqptService;
-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-09-03
- */
-@RestController
-@RequestMapping("/eqpt")
-public class AdmBoxElecEqptController extends BaseController
-{
-    @Autowired
-    private IAdmBoxElecEqptService admBoxElecEqptService;
-
-    /**
-     * 查询动力箱柜电气设备列表
-     */
-    @GetMapping("/list")
-    public TableDataInfo list(AdmBoxElecEqpt admBoxElecEqpt)
-    {
-        startPage();
-        List<AdmBoxElecEqpt> list = admBoxElecEqptService.selectAdmBoxElecEqptList(admBoxElecEqpt);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出动力箱柜电气设备列表
-     */
-    @Log(title = "动力箱柜电气设备", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, AdmBoxElecEqpt admBoxElecEqpt)
-    {
-        List<AdmBoxElecEqpt> list = admBoxElecEqptService.selectAdmBoxElecEqptList(admBoxElecEqpt);
-        ExcelUtil<AdmBoxElecEqpt> util = new ExcelUtil<AdmBoxElecEqpt>(AdmBoxElecEqpt.class);
-        util.exportExcel(response, list, "动力箱柜电气设备数据");
-    }
-
-    /**
-     * 获取动力箱柜电气设备详细信息
-     */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return success(admBoxElecEqptService.selectAdmBoxElecEqptById(id));
-    }
-
-    /**
-     * 新增动力箱柜电气设备
-     */
-    @Log(title = "动力箱柜电气设备", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody AdmBoxElecEqpt admBoxElecEqpt)
-    {
-        return toAjax(admBoxElecEqptService.insertAdmBoxElecEqpt(admBoxElecEqpt));
-    }
-
-    /**
-     * 修改动力箱柜电气设备
-     */
-    @Log(title = "动力箱柜电气设备", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody AdmBoxElecEqpt admBoxElecEqpt)
-    {
-        return toAjax(admBoxElecEqptService.updateAdmBoxElecEqpt(admBoxElecEqpt));
-    }
-
-    /**
-     * 删除动力箱柜电气设备
-     */
-    @Log(title = "动力箱柜电气设备", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(admBoxElecEqptService.deleteAdmBoxElecEqptByIds(ids));
-    }
-}

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

@@ -1,102 +0,0 @@
-package com.ruoyi.ems.controller;
-
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-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.AdmEmsElecBoxEqptIndex;
-import com.ruoyi.ems.service.IAdmEmsElecBoxEqptIndexService;
-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-09-03
- */
-@RestController
-@RequestMapping("/elecBoxEqptIndex")
-public class AdmEmsElecBoxEqptIndexController extends BaseController {
-    @Autowired
-    private IAdmEmsElecBoxEqptIndexService admEmsElecBoxEqptIndexService;
-
-    /**
-     * 查询动力箱元器件指标列表
-     */
-    @GetMapping("/list")
-    public TableDataInfo list(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex) {
-        startPage();
-        List<AdmEmsElecBoxEqptIndex> list = admEmsElecBoxEqptIndexService
-            .selectAdmEmsElecBoxEqptIndexList(admEmsElecBoxEqptIndex);
-        return getDataTable(list);
-    }
-
-    @GetMapping("/latest/list")
-    public TableDataInfo latestIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex) {
-        startPage();
-        List<AdmEmsElecBoxEqptIndex> list = admEmsElecBoxEqptIndexService
-            .selectAdmEmsElecBoxEqptLatestIndex(admEmsElecBoxEqptIndex);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出动力箱元器件指标列表
-     */
-    @Log(title = "动力箱元器件指标", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex) {
-        List<AdmEmsElecBoxEqptIndex> list = admEmsElecBoxEqptIndexService
-            .selectAdmEmsElecBoxEqptIndexList(admEmsElecBoxEqptIndex);
-        ExcelUtil<AdmEmsElecBoxEqptIndex> util = new ExcelUtil<AdmEmsElecBoxEqptIndex>(AdmEmsElecBoxEqptIndex.class);
-        util.exportExcel(response, list, "动力箱元器件指标数据");
-    }
-
-    /**
-     * 获取动力箱元器件指标详细信息
-     */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(admEmsElecBoxEqptIndexService.selectAdmEmsElecBoxEqptIndexById(id));
-    }
-
-    /**
-     * 新增动力箱元器件指标
-     */
-    @Log(title = "动力箱元器件指标", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex) {
-        return toAjax(admEmsElecBoxEqptIndexService.insertAdmEmsElecBoxEqptIndex(admEmsElecBoxEqptIndex));
-    }
-
-    /**
-     * 修改动力箱元器件指标
-     */
-    @Log(title = "动力箱元器件指标", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex) {
-        return toAjax(admEmsElecBoxEqptIndexService.updateAdmEmsElecBoxEqptIndex(admEmsElecBoxEqptIndex));
-    }
-
-    /**
-     * 删除动力箱元器件指标
-     */
-    @Log(title = "动力箱元器件指标", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(admEmsElecBoxEqptIndexService.deleteAdmEmsElecBoxEqptIndexByIds(ids));
-    }
-}

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

@@ -1,100 +0,0 @@
-package com.ruoyi.ems.controller;
-
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-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.AdmEmsElecBoxIndex;
-import com.ruoyi.ems.service.IAdmEmsElecBoxIndexService;
-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-09-03
- */
-@RestController
-@RequestMapping("/powerBoxIndex")
-public class AdmEmsElecBoxIndexController extends BaseController {
-    @Autowired
-    private IAdmEmsElecBoxIndexService admEmsElecBoxIndexService;
-
-    /**
-     * 查询动力箱指标列表
-     */
-    @GetMapping("/list")
-    public TableDataInfo list(AdmEmsElecBoxIndex admEmsElecBoxIndex) {
-        startPage();
-        List<AdmEmsElecBoxIndex> list = admEmsElecBoxIndexService.selectAdmEmsElecBoxIndexList(admEmsElecBoxIndex);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出动力箱指标列表
-     */
-    @Log(title = "动力箱指标", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, AdmEmsElecBoxIndex admEmsElecBoxIndex) {
-        List<AdmEmsElecBoxIndex> list = admEmsElecBoxIndexService.selectAdmEmsElecBoxIndexList(admEmsElecBoxIndex);
-        ExcelUtil<AdmEmsElecBoxIndex> util = new ExcelUtil<AdmEmsElecBoxIndex>(AdmEmsElecBoxIndex.class);
-        util.exportExcel(response, list, "动力箱指标数据");
-    }
-
-    /**
-     * 获取动力箱指标详细信息
-     */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(admEmsElecBoxIndexService.selectAdmEmsElecBoxIndexById(id));
-    }
-
-    /**
-     * 获取动力箱指标详细信息
-     */
-    @GetMapping(value = "/latest/{boxCode}")
-    public AjaxResult getLatestIndexByBoxCode(@PathVariable("boxCode") String boxCode) {
-        return success(admEmsElecBoxIndexService.selectAdmEmsElecBoxIndexByBoxCode(boxCode));
-    }
-
-    /**
-     * 新增动力箱指标
-     */
-    @Log(title = "动力箱指标", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody AdmEmsElecBoxIndex admEmsElecBoxIndex) {
-        return toAjax(admEmsElecBoxIndexService.insertAdmEmsElecBoxIndex(admEmsElecBoxIndex));
-    }
-
-    /**
-     * 修改动力箱指标
-     */
-    @Log(title = "动力箱指标", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody AdmEmsElecBoxIndex admEmsElecBoxIndex) {
-        return toAjax(admEmsElecBoxIndexService.updateAdmEmsElecBoxIndex(admEmsElecBoxIndex));
-    }
-
-    /**
-     * 删除动力箱指标
-     */
-    @Log(title = "动力箱指标", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(admEmsElecBoxIndexService.deleteAdmEmsElecBoxIndexByIds(ids));
-    }
-}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/ElecEqptTypeController.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.ElecEqptType;
-import com.ruoyi.ems.service.IElecEqptTypeService;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-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-20
- */
-@RestController
-@RequestMapping("/elecEqpt/type")
-@Api(value = "ElecEqptTypeController", description = "维表-动力柜电气设备类型")
-public class ElecEqptTypeController extends BaseController
-{
-    @Autowired
-    private IElecEqptTypeService elecEqptTypeService;
-
-    /**
-     * 查询动力柜电器设备类型列表
-     */
-    @RequiresPermissions("ems:eqptType:list")
-    @GetMapping("/list")
-    public TableDataInfo list(ElecEqptType eleceqptType)
-    {
-        startPage();
-        List<ElecEqptType> list = elecEqptTypeService.selectElecEqptTypeList(eleceqptType);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出动力柜电器设备类型列表
-     */
-    @RequiresPermissions("ems:eqptType:export")
-    @Log(title = "动力柜电器设备类型", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, ElecEqptType eleceqptType)
-    {
-        List<ElecEqptType> list = elecEqptTypeService.selectElecEqptTypeList(eleceqptType);
-        ExcelUtil<ElecEqptType> util = new ExcelUtil<ElecEqptType>(ElecEqptType.class);
-        util.exportExcel(response, list, "动力柜电器设备类型数据");
-    }
-
-    /**
-     * 获取动力柜电器设备类型详细信息
-     */
-    @RequiresPermissions("ems:eqptType:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return success(elecEqptTypeService.selectElecEqptTypeById(id));
-    }
-
-    /**
-     * 新增动力柜电器设备类型
-     */
-    @RequiresPermissions("ems:eqptType:add")
-    @Log(title = "动力柜电器设备类型", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody ElecEqptType eleceqptType)
-    {
-        return toAjax(elecEqptTypeService.insertElecEqptType(eleceqptType));
-    }
-
-    /**
-     * 修改动力柜电器设备类型
-     */
-    @RequiresPermissions("ems:eqptType:edit")
-    @Log(title = "动力柜电器设备类型", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody ElecEqptType eleceqptType)
-    {
-        return toAjax(elecEqptTypeService.updateElecEqptType(eleceqptType));
-    }
-
-    /**
-     * 删除动力柜电器设备类型
-     */
-    @RequiresPermissions("ems:eqptType:remove")
-    @Log(title = "动力柜电器设备类型", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(elecEqptTypeService.deleteElecEqptTypeByIds(ids));
-    }
-}

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

@@ -1,107 +0,0 @@
-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/EmsObjAbilityController.java

@@ -0,0 +1,87 @@
+package com.ruoyi.ems.controller;
+
+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.ems.domain.EmsObjAbility;
+import com.ruoyi.ems.service.IEmsObjAbilityService;
+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 java.util.List;
+
+/**
+ * 能源设施能力Controller
+ * 
+ * @author ruoyi
+ * @date 2024-08-22
+ */
+@RestController
+@RequestMapping("/basecfg/ems/ability")
+@Api(value = "EmsObjAbilityController", description = "能源对象能力特性管理")
+public class EmsObjAbilityController extends BaseController
+{
+    @Autowired
+    private IEmsObjAbilityService abilityService;
+
+    /**
+     * 查询能源设施能力列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(EmsObjAbility ability)
+    {
+        startPage();
+        List<EmsObjAbility> list = abilityService.selectAbilityList(ability);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取能源设施能力详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(abilityService.selectAbilityById(id));
+    }
+
+    /**
+     * 新增能源设施能力
+     */
+    @Log(title = "能源设施能力", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody EmsObjAbility ability)
+    {
+        return toAjax(abilityService.insertAbility(ability));
+    }
+
+    /**
+     * 修改能源设施能力
+     */
+    @Log(title = "能源设施能力", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody EmsObjAbility ability)
+    {
+        return toAjax(abilityService.updateAbility(ability));
+    }
+
+    /**
+     * 删除能源设施能力
+     */
+    @Log(title = "能源设施能力", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(abilityService.deleteAbilityByIds(ids));
+    }
+}

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

@@ -1,14 +1,12 @@
 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 com.ruoyi.ems.domain.EmsObjAttr;
+import com.ruoyi.ems.service.IEmsObjAttrService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -20,7 +18,6 @@ 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;
 
 /**
@@ -30,89 +27,71 @@ import java.util.List;
  * @date 2024-08-22
  */
 @RestController
-@RequestMapping("/basecfg/emsfacs/attr")
-@Api(value = "EmsFacsAttrController", description = "能源设施属性管理")
-public class EmsFacsAttrController extends BaseController
+@RequestMapping("/basecfg/ems/attr")
+@Api(value = "EmsObjAttrController", description = "能源对象属性管理")
+public class EmsObjAttrController extends BaseController
 {
     @Autowired
-    private IEmsFacsAttrService facsAttrService;
+    private IEmsObjAttrService objAttrService;
 
     /**
      * 查询能源设施属性列表
      */
-    @RequiresPermissions("basecfg:emsfacs:list")
     @GetMapping("/list")
-    public TableDataInfo list(EmsFacsAttr emsFacsAttr)
+    public TableDataInfo list(EmsObjAttr objAttr)
     {
         startPage();
-        List<EmsFacsAttr> list = facsAttrService.selectEmsFacsAttrList(emsFacsAttr);
+        List<EmsObjAttr> list = objAttrService.selectAttrList(objAttr);
         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));
+        return success(objAttrService.selectAttrById(id));
     }
 
     /**
      * 新增能源设施属性
      */
-    @RequiresPermissions("basecfg:emsfacs:add")
     @Log(title = "能源设施属性", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody EmsFacsAttr emsFacsAttr)
+    public AjaxResult add(@RequestBody EmsObjAttr objAttr)
     {
-        return toAjax(facsAttrService.insertEmsFacsAttr(emsFacsAttr));
+        return toAjax(objAttrService.insertAttr(objAttr));
     }
 
     /**
      * 新增能源设施属性
      */
-    @RequiresPermissions("basecfg:emsfacs:add")
     @Log(title = "能源设施属性", businessType = BusinessType.INSERT)
     @PostMapping("/batch")
-    public AjaxResult addBatch(@RequestBody List<EmsFacsAttr> emsFacsAttrs)
+    public AjaxResult addBatch(@RequestBody List<EmsObjAttr> objAttrs)
     {
-        return toAjax(facsAttrService.insertEmsFacsAttrBatch(emsFacsAttrs));
+        return toAjax(objAttrService.insertAttrBatch(objAttrs));
     }
 
     /**
      * 修改能源设施属性
      */
-    @RequiresPermissions("basecfg:emsfacs:edit")
     @Log(title = "能源设施属性", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody EmsFacsAttr emsFacsAttr)
+    public AjaxResult edit(@RequestBody EmsObjAttr objAttr)
     {
-        return toAjax(facsAttrService.updateEmsFacsAttr(emsFacsAttr));
+        return toAjax(objAttrService.updateAttr(objAttr));
     }
 
     /**
      * 删除能源设施属性
      */
-    @RequiresPermissions("basecfg:emsfacs:remove")
     @Log(title = "能源设施属性", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(facsAttrService.deleteEmsFacsAttrByIds(ids));
+        return toAjax(objAttrService.deleteAttrByIds(ids));
     }
 }

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

@@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.ems.domain.EmsFacsEvent;
-import com.ruoyi.ems.service.IEmsFacsEventService;
+import com.ruoyi.ems.domain.EmsObjEvent;
+import com.ruoyi.ems.service.IEmsObjEventService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -30,89 +30,70 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
  * @date 2024-08-22
  */
 @RestController
-@RequestMapping("/basecfg/emsfacs/event")
-@Api(value = "EmsFacsEventController", description = "能源设施事件特性管理")
-public class EmsFacsEventController extends BaseController
+@RequestMapping("/basecfg/ems/event")
+@Api(value = "EmsObjEventController", description = "能源对象事件特性管理")
+public class EmsObjEventController extends BaseController
 {
     @Autowired
-    private IEmsFacsEventService emsFacsEventService;
+    private IEmsObjEventService eventService;
 
     /**
      * 查询能源设施事件列表
      */
-    @RequiresPermissions("ems:event:list")
     @GetMapping("/list")
-    public TableDataInfo list(EmsFacsEvent admEmsFacsEvent)
+    public TableDataInfo list(EmsObjEvent event)
     {
         startPage();
-        List<EmsFacsEvent> list = emsFacsEventService.selectEmsFacsEventList(admEmsFacsEvent);
+        List<EmsObjEvent> list = eventService.selectEventList(event);
         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));
+        return success(eventService.selectEventById(id));
     }
 
     /**
      * 新增能源设施事件
      */
-    @RequiresPermissions("ems:event:add")
     @Log(title = "能源设施事件", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody EmsFacsEvent admEmsFacsEvent)
+    public AjaxResult add(@RequestBody EmsObjEvent event)
     {
-        return toAjax(emsFacsEventService.insertEmsFacsEvent(admEmsFacsEvent));
+        return toAjax(eventService.insertEvent(event));
     }
 
     /**
      * 新增能源设施事件
      */
-    @RequiresPermissions("ems:event:add")
     @Log(title = "能源设施事件", businessType = BusinessType.INSERT)
     @PostMapping(value = "/batch")
-    public AjaxResult addBatch(@RequestBody List<EmsFacsEvent> emsFacsEvents)
+    public AjaxResult addBatch(@RequestBody List<EmsObjEvent> events)
     {
-        return toAjax(emsFacsEventService.insertEmsFacsEventBatch(emsFacsEvents));
+        return toAjax(eventService.insertEventBatch(events));
     }
 
     /**
      * 修改能源设施事件
      */
-    @RequiresPermissions("ems:event:edit")
     @Log(title = "能源设施事件", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody EmsFacsEvent admEmsFacsEvent)
+    public AjaxResult edit(@RequestBody EmsObjEvent event)
     {
-        return toAjax(emsFacsEventService.updateEmsFacsEvent(admEmsFacsEvent));
+        return toAjax(eventService.updateEvent(event));
     }
 
     /**
      * 删除能源设施事件
      */
-    @RequiresPermissions("ems:event:remove")
     @Log(title = "能源设施事件", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(emsFacsEventService.deleteEmsFacsEventByIds(ids));
+        return toAjax(eventService.deleteEventByIds(ids));
     }
 }

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

@@ -1,106 +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.PowerBox;
-import com.ruoyi.ems.service.IPowerBoxService;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-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-20
- */
-@RestController
-@RequestMapping("/powerBox")
-@Api(value = "PowerBoxController", description = "动力箱/配电箱管理")
-public class PowerBoxController extends BaseController
-{
-    @Autowired
-    private IPowerBoxService admPowerBoxService;
-
-    /**
-     * 查询动力箱柜列表
-     */
-    @GetMapping("/list")
-    public TableDataInfo list(PowerBox powerBox)
-    {
-        startPage();
-        List<PowerBox> list = admPowerBoxService.selectPowerBoxList(powerBox);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出动力箱柜列表
-     */
-    @RequiresPermissions("ems:powerBox:export")
-    @Log(title = "动力箱柜", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, PowerBox admPowerBox)
-    {
-        List<PowerBox> list = admPowerBoxService.selectPowerBoxList(admPowerBox);
-        ExcelUtil<PowerBox> util = new ExcelUtil<PowerBox>(PowerBox.class);
-        util.exportExcel(response, list, "动力箱柜数据");
-    }
-
-    /**
-     * 获取动力箱柜详细信息
-     */
-    @RequiresPermissions("ems:powerBox:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return success(admPowerBoxService.selectPowerBoxById(id));
-    }
-
-    /**
-     * 新增动力箱柜
-     */
-    @RequiresPermissions("ems:powerBox:add")
-    @Log(title = "动力箱柜", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody PowerBox admPowerBox)
-    {
-        return toAjax(admPowerBoxService.insertPowerBox(admPowerBox));
-    }
-
-    /**
-     * 修改动力箱柜
-     */
-    @RequiresPermissions("ems:powerBox:edit")
-    @Log(title = "动力箱柜", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody PowerBox admPowerBox)
-    {
-        return toAjax(admPowerBoxService.updatePowerBox(admPowerBox));
-    }
-
-    /**
-     * 删除动力箱柜
-     */
-    @RequiresPermissions("ems:powerBox:remove")
-    @Log(title = "动力箱柜", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(admPowerBoxService.deletePowerBoxByIds(ids));
-    }
-}

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

@@ -1,118 +0,0 @@
-package com.ruoyi.ems.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.ems.domain.PowerBoxElecEqpt;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-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.service.IPowerBoxElecEqptService;
-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-20
- */
-@RestController
-@RequestMapping("/powerBox/elecEqpt")
-@Api(value = "PowerBoxElecEqptController", description = "动力箱配电元器件管理")
-public class PowerBoxElecEqptController extends BaseController
-{
-    @Autowired
-    private IPowerBoxElecEqptService boxElecEqptService;
-
-    /**
-     * 查询动力箱柜电气设备列表
-     */
-    @RequiresPermissions("ems:powerBox:list")
-    @GetMapping("/list")
-    public TableDataInfo list(PowerBoxElecEqpt boxElecEqpt)
-    {
-        startPage();
-        List<PowerBoxElecEqpt> list = boxElecEqptService.selectBoxElecEqptList(boxElecEqpt);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出动力箱柜电气设备列表
-     */
-    @RequiresPermissions("ems:powerBox:export")
-    @Log(title = "动力箱柜电气设备", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, PowerBoxElecEqpt boxElecEqpt)
-    {
-        List<PowerBoxElecEqpt> list = boxElecEqptService.selectBoxElecEqptList(boxElecEqpt);
-        ExcelUtil<PowerBoxElecEqpt> util = new ExcelUtil<PowerBoxElecEqpt>(PowerBoxElecEqpt.class);
-        util.exportExcel(response, list, "动力箱柜电气设备数据");
-    }
-
-    /**
-     * 获取动力箱柜电气设备详细信息
-     */
-    @RequiresPermissions("ems:powerBox:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return success(boxElecEqptService.selectBoxElecEqptById(id));
-    }
-
-    /**
-     * 新增动力箱柜电气设备
-     */
-    @RequiresPermissions("ems:powerBox:add")
-    @Log(title = "动力箱柜电气设备", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody PowerBoxElecEqpt boxElecEqpt)
-    {
-        return toAjax(boxElecEqptService.insertBoxElecEqpt(boxElecEqpt));
-    }
-
-    /**
-     * 新增动力箱柜电气设备
-     */
-    @RequiresPermissions("ems:powerBox:add")
-    @Log(title = "动力箱柜电气设备", businessType = BusinessType.INSERT)
-    @PostMapping("/batch")
-    public AjaxResult addBatch(@RequestBody List<PowerBoxElecEqpt> boxElecEqpts)
-    {
-        return toAjax(boxElecEqptService.insertBatch(boxElecEqpts));
-    }
-
-    /**
-     * 修改动力箱柜电气设备
-     */
-    @RequiresPermissions("ems:powerBox:edit")
-    @Log(title = "动力箱柜电气设备", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody PowerBoxElecEqpt boxElecEqpt)
-    {
-        return toAjax(boxElecEqptService.updateBoxElecEqpt(boxElecEqpt));
-    }
-
-    /**
-     * 删除动力箱柜电气设备
-     */
-    @RequiresPermissions("ems:powerBox:remove")
-    @Log(title = "动力箱柜电气设备", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(boxElecEqptService.deleteBoxElecEqptByIds(ids));
-    }
-}

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

@@ -1,177 +0,0 @@
-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_box_elec_eqpt
- * 
- * @author ruoyi
- * @date 2024-09-03
- */
-public class AdmBoxElecEqpt extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 序号 */
-    private Long id;
-
-    /** 箱柜代码 */
-    @Excel(name = "箱柜代码")
-    private String boxCode;
-
-    /** 电气编码 */
-    @Excel(name = "电气编码")
-    private String eqptCode;
-
-    /** 外部系统编码 */
-    @Excel(name = "外部系统编码")
-    private String extEqptCode;
-
-    /** 电气符号代码 */
-    @Excel(name = "电气符号代码")
-    private String eqptType;
-
-    /** 电气型号 */
-    @Excel(name = "电气型号")
-    private String eqptSpec;
-
-    /** 额定电压 */
-    @Excel(name = "额定电压")
-    private Integer ratedVoltage;
-
-    /** 额定电流 */
-    @Excel(name = "额定电流")
-    private Integer ratedCurrent;
-
-    /** 祖籍列表 */
-    @Excel(name = "祖籍列表")
-    private String ancestors;
-
-    /** 上级电气件 */
-    @Excel(name = "上级电气件")
-    private String parentEqpt;
-
-    /** 下级支路 */
-    @Excel(name = "下级支路")
-    private String subCircuit;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setBoxCode(String boxCode) 
-    {
-        this.boxCode = boxCode;
-    }
-
-    public String getBoxCode() 
-    {
-        return boxCode;
-    }
-    public void setEqptCode(String eqptCode) 
-    {
-        this.eqptCode = eqptCode;
-    }
-
-    public String getEqptCode() 
-    {
-        return eqptCode;
-    }
-    public void setExtEqptCode(String extEqptCode) 
-    {
-        this.extEqptCode = extEqptCode;
-    }
-
-    public String getExtEqptCode() 
-    {
-        return extEqptCode;
-    }
-    public void setEqptType(String eqptType) 
-    {
-        this.eqptType = eqptType;
-    }
-
-    public String getEqptType() 
-    {
-        return eqptType;
-    }
-    public void setEqptSpec(String eqptSpec) 
-    {
-        this.eqptSpec = eqptSpec;
-    }
-
-    public String getEqptSpec() 
-    {
-        return eqptSpec;
-    }
-    public void setRatedVoltage(Integer ratedVoltage) 
-    {
-        this.ratedVoltage = ratedVoltage;
-    }
-
-    public Integer getRatedVoltage() 
-    {
-        return ratedVoltage;
-    }
-    public void setRatedCurrent(Integer ratedCurrent) 
-    {
-        this.ratedCurrent = ratedCurrent;
-    }
-
-    public Integer getRatedCurrent() 
-    {
-        return ratedCurrent;
-    }
-    public void setAncestors(String ancestors) 
-    {
-        this.ancestors = ancestors;
-    }
-
-    public String getAncestors() 
-    {
-        return ancestors;
-    }
-    public void setParentEqpt(String parentEqpt) 
-    {
-        this.parentEqpt = parentEqpt;
-    }
-
-    public String getParentEqpt() 
-    {
-        return parentEqpt;
-    }
-    public void setSubCircuit(String subCircuit) 
-    {
-        this.subCircuit = subCircuit;
-    }
-
-    public String getSubCircuit() 
-    {
-        return subCircuit;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("boxCode", getBoxCode())
-            .append("eqptCode", getEqptCode())
-            .append("extEqptCode", getExtEqptCode())
-            .append("eqptType", getEqptType())
-            .append("eqptSpec", getEqptSpec())
-            .append("ratedVoltage", getRatedVoltage())
-            .append("ratedCurrent", getRatedCurrent())
-            .append("ancestors", getAncestors())
-            .append("parentEqpt", getParentEqpt())
-            .append("subCircuit", getSubCircuit())
-            .toString();
-    }
-}

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

@@ -1,173 +0,0 @@
-package com.ruoyi.ems.domain;
-
-import java.util.Date;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-
-/**
- * 动力箱元器件指标对象 adm_ems_elec_box_eqpt_index
- *
- * @author ruoyi
- * @date 2024-09-03
- */
-public class AdmEmsElecBoxEqptIndex extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 序号
-     */
-    private Long id;
-
-    /**
-     * 箱体代码
-     */
-    @Excel(name = "箱体代码")
-    private String boxCode;
-
-    /**
-     * 元件代码
-     */
-    @Excel(name = "元件代码")
-    private String eqptCode;
-
-    /**
-     * 服务区代码
-     */
-    @Excel(name = "服务区代码")
-    private String areaCode;
-
-    /**
-     * 日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date date;
-
-    /**
-     * 时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date time;
-
-    /**
-     * 电压（伏）
-     */
-    @Excel(name = "电压", readConverterExp = "伏=")
-    private Double voltage;
-
-    /**
-     * 电流（安培）
-     */
-    @Excel(name = "电流", readConverterExp = "安=培")
-    private Double current;
-
-    /**
-     * 功率（千瓦）
-     */
-    @Excel(name = "功率", readConverterExp = "千=瓦")
-    private Double power;
-
-    private String eqptSpec;
-
-    private String ratedCurrent;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setBoxCode(String boxCode) {
-        this.boxCode = boxCode;
-    }
-
-    public String getBoxCode() {
-        return boxCode;
-    }
-
-    public void setEqptCode(String eqptCode) {
-        this.eqptCode = eqptCode;
-    }
-
-    public String getEqptCode() {
-        return eqptCode;
-    }
-
-    public void setAreaCode(String areaCode) {
-        this.areaCode = areaCode;
-    }
-
-    public String getAreaCode() {
-        return areaCode;
-    }
-
-    public void setDate(Date date) {
-        this.date = date;
-    }
-
-    public Date getDate() {
-        return date;
-    }
-
-    public void setTime(Date time) {
-        this.time = time;
-    }
-
-    public Date getTime() {
-        return time;
-    }
-
-    public void setVoltage(Double voltage) {
-        this.voltage = voltage;
-    }
-
-    public Double getVoltage() {
-        return voltage;
-    }
-
-    public void setCurrent(Double current) {
-        this.current = current;
-    }
-
-    public Double getCurrent() {
-        return current;
-    }
-
-    public void setPower(Double power) {
-        this.power = power;
-    }
-
-    public Double getPower() {
-        return power;
-    }
-
-    public String getEqptSpec() {
-        return eqptSpec;
-    }
-
-    public void setEqptSpec(String eqptSpec) {
-        this.eqptSpec = eqptSpec;
-    }
-
-
-    public String getRatedCurrent() {
-        return ratedCurrent;
-    }
-
-    public void setRatedCurrent(String ratedCurrent) {
-        this.ratedCurrent = ratedCurrent;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("boxCode", getBoxCode()).append("eqptCode", getEqptCode()).append("areaCode", getAreaCode()).append("date", getDate()).append("time", getTime()).append("voltage", getVoltage()).append("current", getCurrent()).append("power", getPower()).toString();
-    }
-}

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

@@ -1,209 +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;
-
-/**
- * 动力箱指标对象 adm_ems_elec_box_index
- * 
- * @author ruoyi
- * @date 2024-09-03
- */
-public class AdmEmsElecBoxIndex extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 序号 */
-    private Long id;
-
-    /** 箱体代码 */
-    @Excel(name = "箱体代码")
-    private String boxCode;
-
-    /** 箱体类型 */
-    @Excel(name = "箱体类型")
-    private Integer boxType;
-
-    /** 服务区代码 */
-    @Excel(name = "服务区代码")
-    private String areaCode;
-
-    /** 日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date date;
-
-    /** 时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date time;
-
-    /** 电压(A相，伏） */
-    @Excel(name = "电压(A相，伏）")
-    private Double voltageA;
-
-    /** 电压(B相，伏） */
-    @Excel(name = "电压(B相，伏）")
-    private Double voltageB;
-
-    /** 电压(C相，伏） */
-    @Excel(name = "电压(C相，伏）")
-    private Double voltageC;
-
-    /** 电流(A相，安培） */
-    @Excel(name = "电流(A相，安培）")
-    private Double electricityA;
-
-    /** 电流(B相，安培） */
-    @Excel(name = "电流(B相，安培）")
-    private Double electricityB;
-
-    /** 电流(C相，安培） */
-    @Excel(name = "电流(C相，安培）")
-    private Double electricityC;
-
-    /** 功率（千瓦） */
-    @Excel(name = "功率", readConverterExp = "千=瓦")
-    private Double power;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setBoxCode(String boxCode) 
-    {
-        this.boxCode = boxCode;
-    }
-
-    public String getBoxCode() 
-    {
-        return boxCode;
-    }
-    public void setBoxType(Integer boxType) 
-    {
-        this.boxType = boxType;
-    }
-
-    public Integer getBoxType() 
-    {
-        return boxType;
-    }
-    public void setAreaCode(String areaCode) 
-    {
-        this.areaCode = areaCode;
-    }
-
-    public String getAreaCode() 
-    {
-        return areaCode;
-    }
-    public void setDate(Date date) 
-    {
-        this.date = date;
-    }
-
-    public Date getDate() 
-    {
-        return date;
-    }
-    public void setTime(Date time) 
-    {
-        this.time = time;
-    }
-
-    public Date getTime() 
-    {
-        return time;
-    }
-    public void setVoltageA(Double voltageA) 
-    {
-        this.voltageA = voltageA;
-    }
-
-    public Double getVoltageA() 
-    {
-        return voltageA;
-    }
-    public void setVoltageB(Double voltageB) 
-    {
-        this.voltageB = voltageB;
-    }
-
-    public Double getVoltageB() 
-    {
-        return voltageB;
-    }
-    public void setVoltageC(Double voltageC) 
-    {
-        this.voltageC = voltageC;
-    }
-
-    public Double getVoltageC() 
-    {
-        return voltageC;
-    }
-    public void setElectricityA(Double electricityA) 
-    {
-        this.electricityA = electricityA;
-    }
-
-    public Double getElectricityA() 
-    {
-        return electricityA;
-    }
-    public void setElectricityB(Double electricityB) 
-    {
-        this.electricityB = electricityB;
-    }
-
-    public Double getElectricityB() 
-    {
-        return electricityB;
-    }
-    public void setElectricityC(Double electricityC) 
-    {
-        this.electricityC = electricityC;
-    }
-
-    public Double getElectricityC() 
-    {
-        return electricityC;
-    }
-    public void setPower(Double power) 
-    {
-        this.power = power;
-    }
-
-    public Double getPower() 
-    {
-        return power;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("boxCode", getBoxCode())
-            .append("boxType", getBoxType())
-            .append("areaCode", getAreaCode())
-            .append("date", getDate())
-            .append("time", getTime())
-            .append("voltageA", getVoltageA())
-            .append("voltageB", getVoltageB())
-            .append("voltageC", getVoltageC())
-            .append("electricityA", getElectricityA())
-            .append("electricityB", getElectricityB())
-            .append("electricityC", getElectricityC())
-            .append("power", getPower())
-            .toString();
-    }
-}

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

@@ -1,65 +0,0 @@
-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;
-
-/**
- * 动力柜电器设备类型对象 dim_box_eleceqpt_type
- * 
- * @author ruoyi
- * @date 2024-08-20
- */
-public class ElecEqptType extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 序号 */
-    private Long id;
-
-    /** 类型代码 */
-    @Excel(name = "类型代码")
-    private String typeCode;
-
-    /** 类型名称 */
-    @Excel(name = "类型名称")
-    private String typeName;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setTypeCode(String typeCode) 
-    {
-        this.typeCode = typeCode;
-    }
-
-    public String getTypeCode() 
-    {
-        return typeCode;
-    }
-    public void setTypeName(String typeName) 
-    {
-        this.typeName = typeName;
-    }
-
-    public String getTypeName() 
-    {
-        return typeName;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("typeCode", getTypeCode())
-            .append("typeName", getTypeName())
-            .toString();
-    }
-}

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

@@ -52,14 +52,23 @@ public class EmsFacs extends BaseEntity
     @Excel(name = "归属区域")
     private String refAreaName;
 
+    /** 属性分组代码 */
+    private String attrGroup;
+
+    /** 能力分组代码 */
+    private String abilityGroup;
+
+    /** 事件分组代码 */
+    private String eventGroup;
+
     /** 设施属性 */
-    private List<EmsFacsAttr> facsAttrs;
+    private List<EmsObjAttr> facsAttrs;
 
     /** 设施能力 */
-    private List<EmsFacsAbility> facsAbilities;
+    private List<EmsObjAbility> facsAbilities;
 
     /** 设施事件 */
-    private List<EmsFacsEvent> facsEvents;
+    private List<EmsObjEvent> facsEvents;
 
     public Long getId() {
         return id;
@@ -141,27 +150,51 @@ public class EmsFacs extends BaseEntity
         this.refAreaName = refAreaName;
     }
 
-    public List<EmsFacsAttr> getFacsAttrs() {
+    public String getAttrGroup() {
+        return attrGroup;
+    }
+
+    public void setAttrGroup(String attrGroup) {
+        this.attrGroup = attrGroup;
+    }
+
+    public String getAbilityGroup() {
+        return abilityGroup;
+    }
+
+    public void setAbilityGroup(String abilityGroup) {
+        this.abilityGroup = abilityGroup;
+    }
+
+    public String getEventGroup() {
+        return eventGroup;
+    }
+
+    public void setEventGroup(String eventGroup) {
+        this.eventGroup = eventGroup;
+    }
+
+    public List<EmsObjAttr> getFacsAttrs() {
         return facsAttrs;
     }
 
-    public void setFacsAttrs(List<EmsFacsAttr> facsAttrs) {
+    public void setFacsAttrs(List<EmsObjAttr> facsAttrs) {
         this.facsAttrs = facsAttrs;
     }
 
-    public List<EmsFacsAbility> getFacsAbilities() {
+    public List<EmsObjAbility> getFacsAbilities() {
         return facsAbilities;
     }
 
-    public void setFacsAbilities(List<EmsFacsAbility> facsAbilities) {
+    public void setFacsAbilities(List<EmsObjAbility> facsAbilities) {
         this.facsAbilities = facsAbilities;
     }
 
-    public List<EmsFacsEvent> getFacsEvents() {
+    public List<EmsObjEvent> getFacsEvents() {
         return facsEvents;
     }
 
-    public void setFacsEvents(List<EmsFacsEvent> facsEvents) {
+    public void setFacsEvents(List<EmsObjEvent> facsEvents) {
         this.facsEvents = facsEvents;
     }
 
@@ -175,6 +208,9 @@ public class EmsFacs extends BaseEntity
             .append("facsSubCategory", getFacsSubCategory())
             .append("enable", getEnable())
             .append("refArea", getRefArea())
+            .append("attrGroup", getAttrGroup())
+            .append("abilityGroup", getAbilityGroup())
+            .append("eventGroup", getEventGroup())
             .append("createTime", getCreateTime())
             .append("updateTime", getUpdateTime())
             .toString();

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

@@ -1,102 +0,0 @@
-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/EmsObjAbility.java

@@ -0,0 +1,117 @@
+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_obj_ability
+ * 
+ * @author ruoyi
+ * @date 2024-08-22
+ */
+public class EmsObjAbility extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 序号 */
+    private Long id;
+
+    /** 能力分组代码 */
+    private String groupCode;
+
+    /** 能力分组名称 */
+    private String groupName;
+
+    /** 对象类型 */
+    private Integer objType;
+
+    /** 能力名称 */
+    private String abilityName;
+
+    /** 能力描述 */
+    private String abilityDesc;
+
+    /** 属性值 */
+    private String abilityParam;
+
+    public EmsObjAbility() {
+        super();
+    }
+
+    public EmsObjAbility(String groupCode, int objType){
+        super();
+        this.groupCode = groupCode;
+        this.objType = objType;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getGroupCode() {
+        return groupCode;
+    }
+
+    public void setGroupCode(String groupCode) {
+        this.groupCode = groupCode;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public Integer getObjType() {
+        return objType;
+    }
+
+    public void setObjType(Integer objType) {
+        this.objType = objType;
+    }
+
+    public String getAbilityName() {
+        return abilityName;
+    }
+
+    public void setAbilityName(String abilityName) {
+        this.abilityName = abilityName;
+    }
+
+    public String getAbilityDesc() {
+        return abilityDesc;
+    }
+
+    public void setAbilityDesc(String abilityDesc) {
+        this.abilityDesc = abilityDesc;
+    }
+
+    public String getAbilityParam() {
+        return abilityParam;
+    }
+
+    public void setAbilityParam(String abilityParam) {
+        this.abilityParam = abilityParam;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("groupCode", getGroupCode())
+            .append("groupName", getGroupName())
+            .append("objType", getObjType())
+            .append("abilityName", getAbilityName())
+            .append("abilityDesc", getAbilityDesc())
+            .append("abilityParam", getAbilityParam())
+            .toString();
+    }
+}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/EmsFacsAttr.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/EmsObjAttr.java

@@ -6,107 +6,120 @@ import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 
 /**
- * 能源设施/系统属性对象 adm_ems_facs_attr
+ * 能源设施/系统属性对象 adm_ems_obj_attr
  * 
  * @author ruoyi
  * @date 2024-07-10
  */
-public class EmsFacsAttr extends BaseEntity
+public class EmsObjAttr extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    public EmsFacsAttr(){
+    public EmsObjAttr(){
         super();
     }
 
-    public EmsFacsAttr(String facsCode){
+    public EmsObjAttr(String groupCode, int objType){
         super();
-        this.facsCode = facsCode;
+        this.groupCode = groupCode;
+        this.objType = objType;
     }
 
     /** 序号 */
     private Long id;
 
-    /** 设施代码 */
-    @Excel(name = "设施代码")
-    private String facsCode;
+    /** 分组code */
+    private String groupCode;
+
+    /** 分组名称 */
+    private String groupName;
+
+    /** 对象类型 */
+    private Integer objType;
 
     /** 属性名称 */
-    @Excel(name = "属性名称")
     private String attrName;
 
     /** 属性描述 */
-    @Excel(name = "属性描述")
     private String attrDesc;
 
     /** 属性值 */
-    @Excel(name = "属性值")
     private String attrValue;
 
     /** 属性单位 */
-    @Excel(name = "属性单位")
     private String attrUnit;
 
-    public void setId(Long id) 
-    {
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() 
-    {
-        return id;
+    public String getGroupCode() {
+        return groupCode;
     }
-    public void setFacsCode(String facsCode) 
-    {
-        this.facsCode = facsCode;
+
+    public void setGroupCode(String groupCode) {
+        this.groupCode = groupCode;
     }
 
-    public String getFacsCode() 
-    {
-        return facsCode;
+    public String getGroupName() {
+        return groupName;
     }
-    public void setAttrName(String attrName) 
-    {
-        this.attrName = attrName;
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public Integer getObjType() {
+        return objType;
+    }
+
+    public void setObjType(Integer objType) {
+        this.objType = objType;
     }
 
-    public String getAttrName() 
-    {
+    public String getAttrName() {
         return attrName;
     }
-    public void setAttrDesc(String attrDesc) 
-    {
-        this.attrDesc = attrDesc;
+
+    public void setAttrName(String attrName) {
+        this.attrName = attrName;
     }
 
-    public String getAttrDesc() 
-    {
+    public String getAttrDesc() {
         return attrDesc;
     }
-    public void setAttrValue(String attrValue) 
-    {
-        this.attrValue = attrValue;
+
+    public void setAttrDesc(String attrDesc) {
+        this.attrDesc = attrDesc;
     }
 
-    public String getAttrValue() 
-    {
+    public String getAttrValue() {
         return attrValue;
     }
-    public void setAttrUnit(String attrUnit) 
-    {
-        this.attrUnit = attrUnit;
+
+    public void setAttrValue(String attrValue) {
+        this.attrValue = attrValue;
     }
 
-    public String getAttrUnit() 
-    {
+    public String getAttrUnit() {
         return attrUnit;
     }
 
+    public void setAttrUnit(String attrUnit) {
+        this.attrUnit = attrUnit;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("facsCode", getFacsCode())
+            .append("groupCode", getGroupCode())
+            .append("groupName", getGroupName())
+            .append("objType", getObjType())
             .append("attrName", getAttrName())
             .append("attrDesc", getAttrDesc())
             .append("attrValue", getAttrValue())

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

@@ -11,7 +11,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-08-22
  */
-public class EmsFacsEvent extends BaseEntity {
+public class EmsObjEvent extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -20,111 +20,132 @@ public class EmsFacsEvent extends BaseEntity {
     private Long id;
 
     /**
-     * 设施代码
+     * 分组代码
      */
-    @Excel(name = "设施代码")
-    private String facsCode;
+    private String groupCode;
+
+    /**
+     * 分组名称
+     */
+    private String groupName;
+
+    /**
+     * 对象类型
+     */
+    private Integer objType;
 
     /**
      * 事件名称
      */
-    @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() {
+    public EmsObjEvent() {
         super();
     }
 
-    public EmsFacsEvent(String facsCode) {
+    public EmsObjEvent(String groupCode, int objType) {
         super();
-        this.facsCode = facsCode;
+        this.groupCode = groupCode;
+        this.objType = objType;
+    }
+
+    public Long getId() {
+        return id;
     }
 
     public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() {
-        return id;
+    public String getGroupCode() {
+        return groupCode;
     }
 
-    public void setFacsCode(String facsCode) {
-        this.facsCode = facsCode;
+    public void setGroupCode(String groupCode) {
+        this.groupCode = groupCode;
     }
 
-    public String getFacsCode() {
-        return facsCode;
+    public String getGroupName() {
+        return groupName;
     }
 
-    public void setEventName(String eventName) {
-        this.eventName = eventName;
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public Integer getObjType() {
+        return objType;
+    }
+
+    public void setObjType(Integer objType) {
+        this.objType = objType;
     }
 
     public String getEventName() {
         return eventName;
     }
 
-    public void setEventType(Long eventType) {
-        this.eventType = eventType;
+    public void setEventName(String eventName) {
+        this.eventName = eventName;
     }
 
     public Long getEventType() {
         return eventType;
     }
 
-    public void setEventDesc(String eventDesc) {
-        this.eventDesc = eventDesc;
+    public void setEventType(Long eventType) {
+        this.eventType = eventType;
     }
 
     public String getEventDesc() {
         return eventDesc;
     }
 
-    public void setEventCode(String eventCode) {
-        this.eventCode = eventCode;
+    public void setEventDesc(String eventDesc) {
+        this.eventDesc = eventDesc;
     }
 
     public String getEventCode() {
         return eventCode;
     }
 
-    public void setExtEventCode(String extEventCode) {
-        this.extEventCode = extEventCode;
+    public void setEventCode(String eventCode) {
+        this.eventCode = eventCode;
     }
 
     public String getExtEventCode() {
         return extEventCode;
     }
 
+    public void setExtEventCode(String extEventCode) {
+        this.extEventCode = 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();
+            .append("groupCode", getGroupCode()).append("groupName", getGroupName()).append("objType", getObjType())
+            .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/domain/PowerBox.java

@@ -1,171 +0,0 @@
-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;
-
-import java.util.List;
-
-/**
- * 动力箱柜对象 adm_power_box
- * 
- * @author ruoyi
- * @date 2024-08-20
- */
-public class PowerBox extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 序号 */
-    private Long id;
-
-    /** 箱柜代码 */
-    @Excel(name = "箱柜代码")
-    private String boxCode;
-
-    /** 箱体类型 */
-    @Excel(name = "箱体类型")
-    private Long boxType;
-
-    /** 服务区代码 */
-    private String areaCode;
-
-    /** 服务区名称 */
-    @Excel(name = "服务区名称")
-    private String areaName;
-
-    /** 服务区简称 */
-    private String areaShortName;
-
-    /** 安装位置 */
-    @Excel(name = "安装位置")
-    private String location;
-
-    /** 箱体尺寸 */
-    @Excel(name = "箱体尺寸")
-    private String boxSize;
-
-    /** 网关地址 */
-    @Excel(name = "网关地址")
-    private String gatewayAddr;
-
-    /** 网关端口 */
-    @Excel(name = "网关端口")
-    private Long gatewayPort;
-
-    /** 电气件信息 */
-    private List<PowerBoxElecEqpt> elecEqptList;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setBoxCode(String boxCode) 
-    {
-        this.boxCode = boxCode;
-    }
-
-    public String getBoxCode() 
-    {
-        return boxCode;
-    }
-    public void setBoxType(Long boxType) 
-    {
-        this.boxType = boxType;
-    }
-
-    public Long getBoxType() 
-    {
-        return boxType;
-    }
-    public void setAreaCode(String areaCode) 
-    {
-        this.areaCode = areaCode;
-    }
-
-    public String getAreaCode() 
-    {
-        return areaCode;
-    }
-
-    public String getAreaName() {
-        return areaName;
-    }
-
-    public void setAreaName(String areaName) {
-        this.areaName = areaName;
-    }
-
-    public String getAreaShortName() {
-        return areaShortName;
-    }
-
-    public void setAreaShortName(String areaShortName) {
-        this.areaShortName = areaShortName;
-    }
-
-    public void setLocation(String location)
-    {
-        this.location = location;
-    }
-
-    public String getLocation() 
-    {
-        return location;
-    }
-    public void setBoxSize(String boxSize) 
-    {
-        this.boxSize = boxSize;
-    }
-
-    public String getBoxSize() 
-    {
-        return boxSize;
-    }
-    public void setGatewayAddr(String gatewayAddr) 
-    {
-        this.gatewayAddr = gatewayAddr;
-    }
-
-    public String getGatewayAddr() 
-    {
-        return gatewayAddr;
-    }
-    public void setGatewayPort(Long gatewayPort) 
-    {
-        this.gatewayPort = gatewayPort;
-    }
-
-    public Long getGatewayPort() 
-    {
-        return gatewayPort;
-    }
-
-    public List<PowerBoxElecEqpt> getElecEqptList() {
-        return elecEqptList;
-    }
-
-    public void setElecEqptList(List<PowerBoxElecEqpt> elecEqptList) {
-        this.elecEqptList = elecEqptList;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("boxCode", getBoxCode())
-            .append("boxType", getBoxType())
-            .append("areaCode", getAreaCode())
-            .append("location", getLocation())
-            .append("boxSize", getBoxSize())
-            .append("gatewayAddr", getGatewayAddr())
-            .append("gatewayPort", getGatewayPort())
-            .toString();
-    }
-}

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

@@ -1,173 +0,0 @@
-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_box_elec_eqpt
- * 
- * @author ruoyi
- * @date 2024-08-20
- */
-public class PowerBoxElecEqpt extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 序号 */
-    private Long id;
-
-    /** 箱柜代码 */
-    @Excel(name = "箱柜代码")
-    private String boxCode;
-
-    /** 电气编码 */
-    @Excel(name = "电气编码")
-    private String eqptCode;
-
-    /** 外部系统编码 */
-    @Excel(name = "外部系统编码")
-    private String extEqptCode;
-
-    private String eqptType;
-
-    @Excel(name = "电气件名称")
-    private String eqptName;
-
-    /** 电气型号 */
-    @Excel(name = "电气型号")
-    private String eqptSpec;
-
-    /** 额定电压 */
-    @Excel(name = "额定电压")
-    private Long ratedVoltage;
-
-    /** 额定电流 */
-    @Excel(name = "额定电流")
-    private Long ratedCurrent;
-
-    /** 祖籍列表 */
-    private String ancestors;
-
-    /** 上级电气件 */
-    @Excel(name = "上级电气件")
-    private String parentEqpt;
-
-    /** 下级支路 */
-    @Excel(name = "下级支路")
-    private String subCircuit;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getBoxCode() {
-        return boxCode;
-    }
-
-    public void setBoxCode(String boxCode) {
-        this.boxCode = boxCode;
-    }
-
-    public String getEqptCode() {
-        return eqptCode;
-    }
-
-    public void setEqptCode(String eqptCode) {
-        this.eqptCode = eqptCode;
-    }
-
-    public String getExtEqptCode() {
-        return extEqptCode;
-    }
-
-    public void setExtEqptCode(String extEqptCode) {
-        this.extEqptCode = extEqptCode;
-    }
-
-    public String getEqptType() {
-        return eqptType;
-    }
-
-    public void setEqptType(String eqptType) {
-        this.eqptType = eqptType;
-    }
-
-    public String getEqptName() {
-        return eqptName;
-    }
-
-    public void setEqptName(String eqptName) {
-        this.eqptName = eqptName;
-    }
-
-    public String getEqptSpec() {
-        return eqptSpec;
-    }
-
-    public void setEqptSpec(String eqptSpec) {
-        this.eqptSpec = eqptSpec;
-    }
-
-    public Long getRatedVoltage() {
-        return ratedVoltage;
-    }
-
-    public void setRatedVoltage(Long ratedVoltage) {
-        this.ratedVoltage = ratedVoltage;
-    }
-
-    public Long getRatedCurrent() {
-        return ratedCurrent;
-    }
-
-    public void setRatedCurrent(Long ratedCurrent) {
-        this.ratedCurrent = ratedCurrent;
-    }
-
-    public String getParentEqpt() {
-        return parentEqpt;
-    }
-
-    public void setParentEqpt(String parentEqpt) {
-        this.parentEqpt = parentEqpt;
-    }
-
-    public String getAncestors() {
-        return ancestors;
-    }
-
-    public void setAncestors(String ancestors) {
-        this.ancestors = ancestors;
-    }
-
-    public String getSubCircuit() {
-        return subCircuit;
-    }
-
-    public void setSubCircuit(String subCircuit) {
-        this.subCircuit = subCircuit;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("boxCode", getBoxCode())
-            .append("eqptCode", getEqptCode())
-            .append("extEqptCode", getExtEqptCode())
-            .append("eqptType", getEqptType())
-            .append("eqptSpec", getEqptSpec())
-            .append("ratedVoltage", getRatedVoltage())
-            .append("ratedCurrent", getRatedCurrent())
-            .append("parentEqpt", getParentEqpt())
-            .append("ancestors", getAncestors())
-            .append("subCircuit", getSubCircuit())
-            .toString();
-    }
-}

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

@@ -0,0 +1,36 @@
+/*
+ * 文 件 名:  ObjType
+ * 版    权:  浩鲸云计算科技股份有限公司
+ * 描    述:  <描述>
+ * 修 改 人:  lvwenbin
+ * 修改时间:  2024/9/20
+ * 跟踪单号:  <跟踪单号>
+ * 修改单号:  <修改单号>
+ * 修改内容:  <修改内容>
+ */
+package com.ruoyi.ems.domain.common;
+
+/**
+ * 对象类型
+ * <功能详细描述>
+ *
+ * @author lvwenbin
+ * @version [版本号, 2024/9/20]
+ * @see [相关类/方法]
+ * @since [产品/模块版本]
+ */
+public enum ObjType {
+    FACS(1),
+    DEVC(2),
+    COMPONENT(3);
+
+    ObjType(int code) {
+        this.code = code;
+    }
+
+    private int code;
+
+    public int getCode() {
+        return code;
+    }
+}

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

@@ -1,61 +0,0 @@
-package com.ruoyi.ems.mapper;
-
-import java.util.List;
-import com.ruoyi.ems.domain.AdmBoxElecEqpt;
-
-/**
- * 动力箱柜电气设备Mapper接口
- * 
- * @author ruoyi
- * @date 2024-09-03
- */
-public interface AdmBoxElecEqptMapper 
-{
-    /**
-     * 查询动力箱柜电气设备
-     * 
-     * @param id 动力箱柜电气设备主键
-     * @return 动力箱柜电气设备
-     */
-    public AdmBoxElecEqpt selectAdmBoxElecEqptById(Long id);
-
-    /**
-     * 查询动力箱柜电气设备列表
-     * 
-     * @param admBoxElecEqpt 动力箱柜电气设备
-     * @return 动力箱柜电气设备集合
-     */
-    public List<AdmBoxElecEqpt> selectAdmBoxElecEqptList(AdmBoxElecEqpt admBoxElecEqpt);
-
-    /**
-     * 新增动力箱柜电气设备
-     * 
-     * @param admBoxElecEqpt 动力箱柜电气设备
-     * @return 结果
-     */
-    public int insertAdmBoxElecEqpt(AdmBoxElecEqpt admBoxElecEqpt);
-
-    /**
-     * 修改动力箱柜电气设备
-     * 
-     * @param admBoxElecEqpt 动力箱柜电气设备
-     * @return 结果
-     */
-    public int updateAdmBoxElecEqpt(AdmBoxElecEqpt admBoxElecEqpt);
-
-    /**
-     * 删除动力箱柜电气设备
-     * 
-     * @param id 动力箱柜电气设备主键
-     * @return 结果
-     */
-    public int deleteAdmBoxElecEqptById(Long id);
-
-    /**
-     * 批量删除动力箱柜电气设备
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteAdmBoxElecEqptByIds(Long[] ids);
-}

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

@@ -1,64 +0,0 @@
-package com.ruoyi.ems.mapper;
-
-import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsElecBoxEqptIndex;
-
-/**
- * 动力箱元器件指标Mapper接口
- *
- * @author ruoyi
- * @date 2024-09-03
- */
-public interface AdmEmsElecBoxEqptIndexMapper
-{
-    /**
-     * 查询动力箱元器件指标
-     *
-     * @param id 动力箱元器件指标主键
-     * @return 动力箱元器件指标
-     */
-    public AdmEmsElecBoxEqptIndex selectAdmEmsElecBoxEqptIndexById(Long id);
-
-    /**
-     * 查询动力箱元器件指标列表
-     *
-     * @param admEmsElecBoxEqptIndex 动力箱元器件指标
-     * @return 动力箱元器件指标集合
-     */
-    public List<AdmEmsElecBoxEqptIndex> selectAdmEmsElecBoxEqptIndexList(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex);
-
-
-    List<AdmEmsElecBoxEqptIndex> selectAdmEmsElecBoxEqptLatestIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex);
-
-    /**
-     * 新增动力箱元器件指标
-     *
-     * @param admEmsElecBoxEqptIndex 动力箱元器件指标
-     * @return 结果
-     */
-    public int insertAdmEmsElecBoxEqptIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex);
-
-    /**
-     * 修改动力箱元器件指标
-     *
-     * @param admEmsElecBoxEqptIndex 动力箱元器件指标
-     * @return 结果
-     */
-    public int updateAdmEmsElecBoxEqptIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex);
-
-    /**
-     * 删除动力箱元器件指标
-     *
-     * @param id 动力箱元器件指标主键
-     * @return 结果
-     */
-    public int deleteAdmEmsElecBoxEqptIndexById(Long id);
-
-    /**
-     * 批量删除动力箱元器件指标
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteAdmEmsElecBoxEqptIndexByIds(Long[] ids);
-}

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

@@ -1,63 +0,0 @@
-package com.ruoyi.ems.mapper;
-
-import java.util.List;
-
-import com.ruoyi.ems.domain.AdmEmsElecBoxIndex;
-
-/**
- * 动力箱指标Mapper接口
- *
- * @author ruoyi
- * @date 2024-09-03
- */
-public interface AdmEmsElecBoxIndexMapper {
-    /**
-     * 查询动力箱指标
-     *
-     * @param id 动力箱指标主键
-     * @return 动力箱指标
-     */
-    public AdmEmsElecBoxIndex selectAdmEmsElecBoxIndexById(Long id);
-
-    AdmEmsElecBoxIndex selectElecBoxLatestIndexByBoxCode(String boxCode);
-
-    /**
-     * 查询动力箱指标列表
-     *
-     * @param admEmsElecBoxIndex 动力箱指标
-     * @return 动力箱指标集合
-     */
-    public List<AdmEmsElecBoxIndex> selectAdmEmsElecBoxIndexList(AdmEmsElecBoxIndex admEmsElecBoxIndex);
-
-    /**
-     * 新增动力箱指标
-     *
-     * @param admEmsElecBoxIndex 动力箱指标
-     * @return 结果
-     */
-    public int insertAdmEmsElecBoxIndex(AdmEmsElecBoxIndex admEmsElecBoxIndex);
-
-    /**
-     * 修改动力箱指标
-     *
-     * @param admEmsElecBoxIndex 动力箱指标
-     * @return 结果
-     */
-    public int updateAdmEmsElecBoxIndex(AdmEmsElecBoxIndex admEmsElecBoxIndex);
-
-    /**
-     * 删除动力箱指标
-     *
-     * @param id 动力箱指标主键
-     * @return 结果
-     */
-    public int deleteAdmEmsElecBoxIndexById(Long id);
-
-    /**
-     * 批量删除动力箱指标
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteAdmEmsElecBoxIndexByIds(Long[] ids);
-}

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

@@ -1,61 +0,0 @@
-package com.ruoyi.ems.mapper;
-
-import java.util.List;
-import com.ruoyi.ems.domain.ElecEqptType;
-
-/**
- * 动力柜电器设备类型Mapper接口
- * 
- * @author ruoyi
- * @date 2024-08-20
- */
-public interface EleceqptTypeMapper
-{
-    /**
-     * 查询动力柜电器设备类型
-     * 
-     * @param id 动力柜电器设备类型主键
-     * @return 动力柜电器设备类型
-     */
-     ElecEqptType selectElecEqptTypeById(Long id);
-
-    /**
-     * 查询动力柜电器设备类型列表
-     * 
-     * @param boxEleceqptType 动力柜电器设备类型
-     * @return 动力柜电器设备类型集合
-     */
-     List<ElecEqptType> selectElecEqptTypeList(ElecEqptType boxEleceqptType);
-
-    /**
-     * 新增动力柜电器设备类型
-     * 
-     * @param boxEleceqptType 动力柜电器设备类型
-     * @return 结果
-     */
-     int insertElecEqptType(ElecEqptType boxEleceqptType);
-
-    /**
-     * 修改动力柜电器设备类型
-     * 
-     * @param boxEleceqptType 动力柜电器设备类型
-     * @return 结果
-     */
-     int updateElecEqptType(ElecEqptType boxEleceqptType);
-
-    /**
-     * 删除动力柜电器设备类型
-     * 
-     * @param id 动力柜电器设备类型主键
-     * @return 结果
-     */
-     int deleteElecEqptTypeById(Long id);
-
-    /**
-     * 批量删除动力柜电器设备类型
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-     int deleteElecEqptTypeByIds(Long[] ids);
-}

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

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.mapper;
 
 import java.util.List;
-import com.ruoyi.ems.domain.EmsFacsAbility;
+import com.ruoyi.ems.domain.EmsObjAbility;
 
 /**
  * 能源设施能力Mapper接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.EmsFacsAbility;
  * @author ruoyi
  * @date 2024-08-22
  */
-public interface EmsFacsAbilityMapper
+public interface EmsObjAbilityMapper
 {
     /**
      * 查询能源设施能力
@@ -17,23 +17,23 @@ public interface EmsFacsAbilityMapper
      * @param id 能源设施能力主键
      * @return 能源设施能力
      */
-     EmsFacsAbility selectEmsFacsAbilityById(Long id);
+     EmsObjAbility selectAbilityById(Long id);
 
     /**
      * 查询能源设施能力列表
      * 
-     * @param emsFacsAbility 能源设施能力
+     * @param ability 能源设施能力
      * @return 能源设施能力集合
      */
-     List<EmsFacsAbility> selectEmsFacsAbilityList(EmsFacsAbility emsFacsAbility);
+     List<EmsObjAbility> selectAbilityList(EmsObjAbility ability);
 
     /**
      * 新增能源设施能力
      * 
-     * @param emsFacsAbility 能源设施能力
+     * @param ability 能源设施能力
      * @return 结果
      */
-     int insertEmsFacsAbility(EmsFacsAbility emsFacsAbility);
+     int insertAbility(EmsObjAbility ability);
 
     /**
      * 新增能源设施能力
@@ -41,15 +41,15 @@ public interface EmsFacsAbilityMapper
      * @param list 能源设施能力list
      * @return 结果
      */
-    int insertEmsFacsAbilityBatch(List<EmsFacsAbility> list);
+    int insertAbilityBatch(List<EmsObjAbility> list);
 
     /**
      * 修改能源设施能力
      * 
-     * @param emsFacsAbility 能源设施能力
+     * @param ability 能源设施能力
      * @return 结果
      */
-     int updateEmsFacsAbility(EmsFacsAbility emsFacsAbility);
+     int updateAbility(EmsObjAbility ability);
 
     /**
      * 删除能源设施能力
@@ -57,7 +57,7 @@ public interface EmsFacsAbilityMapper
      * @param id 能源设施能力主键
      * @return 结果
      */
-     int deleteEmsFacsAbilityById(Long id);
+     int deleteAbilityById(Long id);
 
     /**
      * 批量删除能源设施能力
@@ -65,13 +65,13 @@ public interface EmsFacsAbilityMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-     int deleteEmsFacsAbilityByIds(Long[] ids);
+     int deleteAbilityByIds(Long[] ids);
 
     /**
      * 根据设施code删除
      *
-     * @param facsCode 设施编码
+     * @param groupCode 设施编码
      * @return 结果
      */
-    int deleteEmsFacsAbilityFacsCode(String facsCode);
+    int deleteAbilityGroupCode(String groupCode);
 }

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

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.mapper;
 
 import java.util.List;
-import com.ruoyi.ems.domain.EmsFacsAttr;
+import com.ruoyi.ems.domain.EmsObjAttr;
 
 /**
  * 能源设施/系统属性Mapper接口
@@ -9,30 +9,30 @@ import com.ruoyi.ems.domain.EmsFacsAttr;
  * @author ruoyi
  * @date 2024-07-10
  */
-public interface EmsFacsAttrMapper {
+public interface EmsObjAttrMapper {
     /**
      * 查询能源设施/系统属性
      *
      * @param id 能源设施/系统属性主键
      * @return 能源设施/系统属性
      */
-    EmsFacsAttr selectEmsFacsAttrById(Long id);
+    EmsObjAttr selectAttrById(Long id);
 
     /**
      * 查询能源设施/系统属性列表
      *
-     * @param emsFacsAttr 能源设施/系统属性
+     * @param Attr 能源设施/系统属性
      * @return 能源设施/系统属性集合
      */
-    List<EmsFacsAttr> selectEmsFacsAttrList(EmsFacsAttr emsFacsAttr);
+    List<EmsObjAttr> selectAttrList(EmsObjAttr Attr);
 
     /**
      * 新增能源设施/系统属性
      *
-     * @param emsFacsAttr 能源设施/系统属性
+     * @param Attr 能源设施/系统属性
      * @return 结果
      */
-    int insertEmsFacsAttr(EmsFacsAttr emsFacsAttr);
+    int insertAttr(EmsObjAttr Attr);
 
     /**
      * 批量新增能源设施/系统属性
@@ -40,15 +40,15 @@ public interface EmsFacsAttrMapper {
      * @param list 能源设施/系统属性
      * @return 结果
      */
-    int insertEmsFacsAttrBatch(List<EmsFacsAttr> list);
+    int insertAttrBatch(List<EmsObjAttr> list);
 
     /**
      * 修改能源设施/系统属性
      *
-     * @param emsFacsAttr 能源设施/系统属性
+     * @param Attr 能源设施/系统属性
      * @return 结果
      */
-    int updateEmsFacsAttr(EmsFacsAttr emsFacsAttr);
+    int updateAttr(EmsObjAttr Attr);
 
     /**
      * 删除能源设施/系统属性
@@ -56,7 +56,7 @@ public interface EmsFacsAttrMapper {
      * @param id 能源设施/系统属性主键
      * @return 结果
      */
-    int deleteEmsFacsAttrById(Long id);
+    int deleteAttrById(Long id);
 
     /**
      * 批量删除能源设施/系统属性
@@ -64,13 +64,13 @@ public interface EmsFacsAttrMapper {
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    int deleteEmsFacsAttrByIds(Long[] ids);
+    int deleteAttrByIds(Long[] ids);
 
     /**
      * 批量删除能源设施/系统属性
      *
-     * @param facsCode 设施编码
+     * @param groupCode 分组编码
      * @return 结果
      */
-    int deleteEmsFacsAttrByFacsCode(String facsCode);
+    int deleteAttrByGroupCode(String groupCode);
 }

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

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.mapper;
 
 import java.util.List;
-import com.ruoyi.ems.domain.EmsFacsEvent;
+import com.ruoyi.ems.domain.EmsObjEvent;
 
 /**
  * 能源设施事件Mapper接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.EmsFacsEvent;
  * @author ruoyi
  * @date 2024-08-22
  */
-public interface EmsFacsEventMapper
+public interface EmsObjEventMapper
 {
     /**
      * 查询能源设施事件
@@ -17,23 +17,23 @@ public interface EmsFacsEventMapper
      * @param id 能源设施事件主键
      * @return 能源设施事件
      */
-     EmsFacsEvent selectEmsFacsEventById(Long id);
+     EmsObjEvent selectEventById(Long id);
 
     /**
      * 查询能源设施事件列表
      * 
-     * @param emsFacsEvent 能源设施事件
+     * @param event 能源设施事件
      * @return 能源设施事件集合
      */
-     List<EmsFacsEvent> selectEmsFacsEventList(EmsFacsEvent emsFacsEvent);
+     List<EmsObjEvent> selectEventList(EmsObjEvent event);
 
     /**
      * 新增能源设施事件
      * 
-     * @param emsFacsEvent 能源设施事件
+     * @param event 能源设施事件
      * @return 结果
      */
-     int insertEmsFacsEvent(EmsFacsEvent emsFacsEvent);
+     int insertEvent(EmsObjEvent event);
 
     /**
      * 批量新增能源设施事件
@@ -41,15 +41,15 @@ public interface EmsFacsEventMapper
      * @param list 能源设施事件
      * @return 结果
      */
-    int insertEmsFacsEventBatch(List<EmsFacsEvent> list);
+    int insertEventBatch(List<EmsObjEvent> list);
 
     /**
      * 修改能源设施事件
      * 
-     * @param emsFacsEvent 能源设施事件
+     * @param event 能源设施事件
      * @return 结果
      */
-     int updateEmsFacsEvent(EmsFacsEvent emsFacsEvent);
+     int updateEvent(EmsObjEvent event);
 
     /**
      * 删除能源设施事件
@@ -57,7 +57,7 @@ public interface EmsFacsEventMapper
      * @param id 能源设施事件主键
      * @return 结果
      */
-     int deleteEmsFacsEventById(Long id);
+     int deleteEventById(Long id);
 
     /**
      * 批量删除能源设施事件
@@ -65,13 +65,13 @@ public interface EmsFacsEventMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-     int deleteEmsFacsEventByIds(Long[] ids);
+     int deleteEventByIds(Long[] ids);
 
     /**
      * 根据设施code删除
      *
-     * @param facsCode 设施编码
+     * @param groupCode 设施编码
      * @return 结果
      */
-    int deleteEmsFacsEventByFacsCode(String facsCode);
+    int deleteEventByGroupCode(String groupCode);
 }

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

@@ -1,79 +0,0 @@
-package com.ruoyi.ems.mapper;
-
-import com.ruoyi.ems.domain.PowerBoxElecEqpt;
-
-import java.util.List;
-
-/**
- * 动力箱柜电气设备Mapper接口
- *
- * @author ruoyi
- * @date 2024-08-20
- */
-public interface PowerBoxElecEqptMapper {
-    /**
-     * 查询动力箱柜电气设备
-     *
-     * @param id 动力箱柜电气设备主键
-     * @return 动力箱柜电气设备
-     */
-    PowerBoxElecEqpt selectBoxElecEqptById(Long id);
-
-    /**
-     * 查询动力箱柜电气设备列表
-     *
-     * @param boxElecEqpt 动力箱柜电气设备
-     * @return 动力箱柜电气设备集合
-     */
-    List<PowerBoxElecEqpt> selectBoxElecEqptList(PowerBoxElecEqpt boxElecEqpt);
-
-    /**
-     * 查询动力箱柜电气设备列表
-     *
-     * @param boxCode 动力箱柜编码
-     * @return 动力箱柜电气设备集合
-     */
-    List<PowerBoxElecEqpt> selectByBoxCode(String boxCode);
-
-    /**
-     * 新增动力箱柜电气设备
-     *
-     * @param boxElecEqpt 动力箱柜电气设备
-     * @return 结果
-     */
-    int insertBoxElecEqpt(PowerBoxElecEqpt boxElecEqpt);
-
-    /**
-     * 批量-新增动力箱柜电气设备
-     *
-     * @param list 动力箱柜电气设备列表
-     * @return 结果
-     */
-    int insertBatch(List<PowerBoxElecEqpt> list);
-
-    /**
-     * 修改动力箱柜电气设备
-     *
-     * @param boxElecEqpt 动力箱柜电气设备
-     * @return 结果
-     */
-    int updateBoxElecEqpt(PowerBoxElecEqpt boxElecEqpt);
-
-    /**
-     * 删除动力箱柜电气设备
-     *
-     * @param id 动力箱柜电气设备主键
-     * @return 结果
-     */
-    int deleteBoxElecEqptById(Long id);
-
-    int deleteByBoxCode(String boxCode);
-
-    /**
-     * 批量删除动力箱柜电气设备
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    int deleteBoxElecEqptByIds(Long[] ids);
-}

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

@@ -1,70 +0,0 @@
-package com.ruoyi.ems.mapper;
-
-import java.util.List;
-import com.ruoyi.ems.domain.PowerBox;
-
-/**
- * 动力箱柜Mapper接口
- *
- * @author ruoyi
- * @date 2024-08-20
- */
-public interface PowerBoxMapper
-{
-    /**
-     * 查询动力箱柜
-     *
-     * @param id 动力箱柜主键
-     * @return 动力箱柜
-     */
-     PowerBox selectPowerBoxById(Long id);
-
-    /**
-     * 查询动力箱柜列表
-     *
-     * @param powerBox 动力箱柜
-     * @return 动力箱柜集合
-     */
-     List<PowerBox> selectPowerBoxList(PowerBox powerBox);
-
-    /**
-     * Select power box by code power box.
-     *
-     * @param boxCode the box code
-     * @return the power box
-     * @author chen.cheng
-     */
-    PowerBox selectPowerBoxByCode(String boxCode);
-
-    /**
-     * 新增动力箱柜
-     *
-     * @param powerBox 动力箱柜
-     * @return 结果
-     */
-     int insertPowerBox(PowerBox powerBox);
-
-    /**
-     * 修改动力箱柜
-     *
-     * @param powerBox 动力箱柜
-     * @return 结果
-     */
-     int updatePowerBox(PowerBox powerBox);
-
-    /**
-     * 删除动力箱柜
-     *
-     * @param id 动力箱柜主键
-     * @return 结果
-     */
-     int deletePowerBoxById(Long id);
-
-    /**
-     * 批量删除动力箱柜
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-     int deletePowerBoxByIds(Long[] ids);
-}

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

@@ -1,61 +0,0 @@
-package com.ruoyi.ems.service;
-
-import java.util.List;
-import com.ruoyi.ems.domain.AdmBoxElecEqpt;
-
-/**
- * 动力箱柜电气设备Service接口
- * 
- * @author ruoyi
- * @date 2024-09-03
- */
-public interface IAdmBoxElecEqptService 
-{
-    /**
-     * 查询动力箱柜电气设备
-     * 
-     * @param id 动力箱柜电气设备主键
-     * @return 动力箱柜电气设备
-     */
-    public AdmBoxElecEqpt selectAdmBoxElecEqptById(Long id);
-
-    /**
-     * 查询动力箱柜电气设备列表
-     * 
-     * @param admBoxElecEqpt 动力箱柜电气设备
-     * @return 动力箱柜电气设备集合
-     */
-    public List<AdmBoxElecEqpt> selectAdmBoxElecEqptList(AdmBoxElecEqpt admBoxElecEqpt);
-
-    /**
-     * 新增动力箱柜电气设备
-     * 
-     * @param admBoxElecEqpt 动力箱柜电气设备
-     * @return 结果
-     */
-    public int insertAdmBoxElecEqpt(AdmBoxElecEqpt admBoxElecEqpt);
-
-    /**
-     * 修改动力箱柜电气设备
-     * 
-     * @param admBoxElecEqpt 动力箱柜电气设备
-     * @return 结果
-     */
-    public int updateAdmBoxElecEqpt(AdmBoxElecEqpt admBoxElecEqpt);
-
-    /**
-     * 批量删除动力箱柜电气设备
-     * 
-     * @param ids 需要删除的动力箱柜电气设备主键集合
-     * @return 结果
-     */
-    public int deleteAdmBoxElecEqptByIds(Long[] ids);
-
-    /**
-     * 删除动力箱柜电气设备信息
-     * 
-     * @param id 动力箱柜电气设备主键
-     * @return 结果
-     */
-    public int deleteAdmBoxElecEqptById(Long id);
-}

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

@@ -1,65 +0,0 @@
-package com.ruoyi.ems.service;
-
-import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsElecBoxEqptIndex;
-
-/**
- * 动力箱元器件指标Service接口
- *
- * @author ruoyi
- * @date 2024-09-03
- */
-public interface IAdmEmsElecBoxEqptIndexService
-{
-    /**
-     * 查询动力箱元器件指标
-     *
-     * @param id 动力箱元器件指标主键
-     * @return 动力箱元器件指标
-     */
-    public AdmEmsElecBoxEqptIndex selectAdmEmsElecBoxEqptIndexById(Long id);
-
-    /**
-     * 查询动力箱元器件指标列表
-     *
-     * @param admEmsElecBoxEqptIndex 动力箱元器件指标
-     * @return 动力箱元器件指标集合
-     */
-    public List<AdmEmsElecBoxEqptIndex> selectAdmEmsElecBoxEqptIndexList(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex);
-
-    List<AdmEmsElecBoxEqptIndex> selectAdmEmsElecBoxEqptLatestIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex);
-
-    /**
-     * 新增动力箱元器件指标
-     *
-     * @param admEmsElecBoxEqptIndex 动力箱元器件指标
-     * @return 结果
-     */
-    public int insertAdmEmsElecBoxEqptIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex);
-
-    /**
-     * 修改动力箱元器件指标
-     *
-     * @param admEmsElecBoxEqptIndex 动力箱元器件指标
-     * @return 结果
-     */
-    public int updateAdmEmsElecBoxEqptIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex);
-
-    /**
-     * 批量删除动力箱元器件指标
-     *
-     * @param ids 需要删除的动力箱元器件指标主键集合
-     * @return 结果
-     */
-    public int deleteAdmEmsElecBoxEqptIndexByIds(Long[] ids);
-
-    /**
-     * 删除动力箱元器件指标信息
-     *
-     * @param id 动力箱元器件指标主键
-     * @return 结果
-     */
-    public int deleteAdmEmsElecBoxEqptIndexById(Long id);
-
-
-}

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

@@ -1,65 +0,0 @@
-package com.ruoyi.ems.service;
-
-import java.util.List;
-
-import com.ruoyi.ems.domain.AdmEmsElecBoxIndex;
-
-/**
- * 动力箱指标Service接口
- *
- * @author ruoyi
- * @date 2024-09-03
- */
-public interface IAdmEmsElecBoxIndexService {
-    /**
-     * 查询动力箱指标
-     *
-     * @param id 动力箱指标主键
-     * @return 动力箱指标
-     */
-    public AdmEmsElecBoxIndex selectAdmEmsElecBoxIndexById(Long id);
-
-    public AdmEmsElecBoxIndex selectAdmEmsElecBoxIndexByBoxCode(String boxCode);
-
-    /**
-     * 查询动力箱指标列表
-     *
-     * @param admEmsElecBoxIndex 动力箱指标
-     * @return 动力箱指标集合
-     */
-    public List<AdmEmsElecBoxIndex> selectAdmEmsElecBoxIndexList(AdmEmsElecBoxIndex admEmsElecBoxIndex);
-
-    /**
-     * 新增动力箱指标
-     *
-     * @param admEmsElecBoxIndex 动力箱指标
-     * @return 结果
-     */
-    public int insertAdmEmsElecBoxIndex(AdmEmsElecBoxIndex admEmsElecBoxIndex);
-
-    /**
-     * 修改动力箱指标
-     *
-     * @param admEmsElecBoxIndex 动力箱指标
-     * @return 结果
-     */
-    public int updateAdmEmsElecBoxIndex(AdmEmsElecBoxIndex admEmsElecBoxIndex);
-
-    /**
-     * 批量删除动力箱指标
-     *
-     * @param ids 需要删除的动力箱指标主键集合
-     * @return 结果
-     */
-    public int deleteAdmEmsElecBoxIndexByIds(Long[] ids);
-
-    /**
-     * 删除动力箱指标信息
-     *
-     * @param id 动力箱指标主键
-     * @return 结果
-     */
-    public int deleteAdmEmsElecBoxIndexById(Long id);
-
-
-}

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

@@ -1,61 +0,0 @@
-package com.ruoyi.ems.service;
-
-import java.util.List;
-import com.ruoyi.ems.domain.ElecEqptType;
-
-/**
- * 动力柜电器设备类型Service接口
- * 
- * @author ruoyi
- * @date 2024-08-20
- */
-public interface IElecEqptTypeService
-{
-    /**
-     * 查询动力柜电器设备类型
-     * 
-     * @param id 动力柜电器设备类型主键
-     * @return 动力柜电器设备类型
-     */
-     ElecEqptType selectElecEqptTypeById(Long id);
-
-    /**
-     * 查询动力柜电器设备类型列表
-     * 
-     * @param eleceqptType 动力柜电器设备类型
-     * @return 动力柜电器设备类型集合
-     */
-     List<ElecEqptType> selectElecEqptTypeList(ElecEqptType eleceqptType);
-
-    /**
-     * 新增动力柜电器设备类型
-     * 
-     * @param eleceqptType 动力柜电器设备类型
-     * @return 结果
-     */
-     int insertElecEqptType(ElecEqptType eleceqptType);
-
-    /**
-     * 修改动力柜电器设备类型
-     * 
-     * @param eleceqptType 动力柜电器设备类型
-     * @return 结果
-     */
-     int updateElecEqptType(ElecEqptType eleceqptType);
-
-    /**
-     * 批量删除动力柜电器设备类型
-     * 
-     * @param ids 需要删除的动力柜电器设备类型主键集合
-     * @return 结果
-     */
-     int deleteElecEqptTypeByIds(Long[] ids);
-
-    /**
-     * 删除动力柜电器设备类型信息
-     * 
-     * @param id 动力柜电器设备类型主键
-     * @return 结果
-     */
-     int deleteElecEqptTypeById(Long id);
-}

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

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.service;
 
 import java.util.List;
-import com.ruoyi.ems.domain.EmsFacsAbility;
+import com.ruoyi.ems.domain.EmsObjAbility;
 
 /**
  * 能源设施能力Service接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.EmsFacsAbility;
  * @author ruoyi
  * @date 2024-08-22
  */
-public interface IEmsFacsAbilityService
+public interface IEmsObjAbilityService
 {
     /**
      * 查询能源设施能力
@@ -17,39 +17,39 @@ public interface IEmsFacsAbilityService
      * @param id 能源设施能力主键
      * @return 能源设施能力
      */
-     EmsFacsAbility selectEmsFacsAbilityById(Long id);
+     EmsObjAbility selectAbilityById(Long id);
 
     /**
      * 查询能源设施能力列表
      * 
-     * @param emsFacsAbility 能源设施能力
+     * @param ability 能源设施能力
      * @return 能源设施能力集合
      */
-     List<EmsFacsAbility> selectEmsFacsAbilityList(EmsFacsAbility emsFacsAbility);
+     List<EmsObjAbility> selectAbilityList(EmsObjAbility ability);
 
     /**
      * 新增能源设施能力
      * 
-     * @param emsFacsAbility 能源设施能力
+     * @param ability 能源设施能力
      * @return 结果
      */
-     int insertEmsFacsAbility(EmsFacsAbility emsFacsAbility);
+     int insertAbility(EmsObjAbility ability);
 
     /**
      * 批量新增能源设施能力
      *
-     * @param emsFacsAbilitys 能源设施能力列表
+     * @param abilitys 能源设施能力列表
      * @return 结果
      */
-    int insertEmsFacsAbilityBatch(List<EmsFacsAbility> emsFacsAbilitys);
+    int insertAbilityBatch(List<EmsObjAbility> abilitys);
 
     /**
      * 修改能源设施能力
      * 
-     * @param emsFacsAbility 能源设施能力
+     * @param ability 能源设施能力
      * @return 结果
      */
-     int updateEmsFacsAbility(EmsFacsAbility emsFacsAbility);
+     int updateAbility(EmsObjAbility ability);
 
     /**
      * 批量删除能源设施能力
@@ -57,7 +57,7 @@ public interface IEmsFacsAbilityService
      * @param ids 需要删除的能源设施能力主键集合
      * @return 结果
      */
-     int deleteEmsFacsAbilityByIds(Long[] ids);
+     int deleteAbilityByIds(Long[] ids);
 
     /**
      * 删除能源设施能力信息
@@ -65,13 +65,13 @@ public interface IEmsFacsAbilityService
      * @param id 能源设施能力主键
      * @return 结果
      */
-     int deleteEmsFacsAbilityById(Long id);
+     int deleteAbilityById(Long id);
 
     /**
      * 删除能源设施能力信息
      *
-     * @param facsCode 设施编码
+     * @param groupCode 设施编码
      * @return 结果
      */
-    int deleteAbilityByFacsCode(String facsCode);
+    int deleteAbilityByGroupCode(String groupCode);
 }

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

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.service;
 
 import java.util.List;
-import com.ruoyi.ems.domain.EmsFacsAttr;
+import com.ruoyi.ems.domain.EmsObjAttr;
 
 /**
  * 能源设施/系统属性Service接口
@@ -9,46 +9,46 @@ import com.ruoyi.ems.domain.EmsFacsAttr;
  * @author ruoyi
  * @date 2024-07-10
  */
-public interface IEmsFacsAttrService {
+public interface IEmsObjAttrService {
     /**
      * 查询能源设施/系统属性
      *
      * @param id 能源设施/系统属性主键
      * @return 能源设施/系统属性
      */
-    EmsFacsAttr selectEmsFacsAttrById(Long id);
+    EmsObjAttr selectAttrById(Long id);
 
     /**
      * 查询能源设施/系统属性列表
      *
-     * @param emsFacsAttr 能源设施/系统属性
+     * @param attr 能源设施/系统属性
      * @return 能源设施/系统属性集合
      */
-    List<EmsFacsAttr> selectEmsFacsAttrList(EmsFacsAttr emsFacsAttr);
+    List<EmsObjAttr> selectAttrList(EmsObjAttr attr);
 
     /**
      * 新增能源设施/系统属性
      *
-     * @param emsFacsAttr 能源设施/系统属性
+     * @param attr 能源设施/系统属性
      * @return 结果
      */
-    int insertEmsFacsAttr(EmsFacsAttr emsFacsAttr);
+    int insertAttr(EmsObjAttr attr);
 
     /**
      * 批量新增能源设施/系统属性
      *
-     * @param emsFacsAttrs 能源设施/系统属性
+     * @param attrs 能源设施/系统属性
      * @return 结果
      */
-    int insertEmsFacsAttrBatch(List<EmsFacsAttr> emsFacsAttrs);
+    int insertAttrBatch(List<EmsObjAttr> attrs);
 
     /**
      * 修改能源设施/系统属性
      *
-     * @param emsFacsAttr 能源设施/系统属性
+     * @param attr 能源设施/系统属性
      * @return 结果
      */
-    int updateEmsFacsAttr(EmsFacsAttr emsFacsAttr);
+    int updateAttr(EmsObjAttr attr);
 
     /**
      * 批量删除能源设施/系统属性
@@ -56,7 +56,7 @@ public interface IEmsFacsAttrService {
      * @param ids 需要删除的能源设施/系统属性主键集合
      * @return 结果
      */
-    int deleteEmsFacsAttrByIds(Long[] ids);
+    int deleteAttrByIds(Long[] ids);
 
     /**
      * 删除能源设施/系统属性信息
@@ -64,13 +64,13 @@ public interface IEmsFacsAttrService {
      * @param id 能源设施/系统属性主键
      * @return 结果
      */
-    int deleteEmsFacsAttrById(Long id);
+    int deleteAttrById(Long id);
 
     /**
      * 删除能源设施/系统属性信息
      *
-     * @param facsCode 设施编码
+     * @param groupCode 设施编码
      * @return 结果
      */
-    int deleteAttrByFacsCode(String facsCode);
+    int deleteAttrByGroupCode(String groupCode);
 }

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

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

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

@@ -1,79 +0,0 @@
-package com.ruoyi.ems.service;
-
-import java.util.List;
-
-import com.ruoyi.ems.domain.PowerBoxElecEqpt;
-
-/**
- * 动力箱柜电气设备Service接口
- *
- * @author ruoyi
- * @date 2024-08-20
- */
-public interface IPowerBoxElecEqptService {
-    /**
-     * 查询动力箱柜电气设备
-     *
-     * @param id 动力箱柜电气设备主键
-     * @return 动力箱柜电气设备
-     */
-    PowerBoxElecEqpt selectBoxElecEqptById(Long id);
-
-    /**
-     * 查询动力箱柜电气设备列表
-     *
-     * @param boxCode 动力箱编码
-     * @return 动力箱柜电气设备集合
-     */
-    List<PowerBoxElecEqpt> selectByBoxCode(String boxCode);
-
-    /**
-     * 查询动力箱柜电气设备列表
-     *
-     * @param boxElecEqpt 动力箱柜电气设备
-     * @return 动力箱柜电气设备集合
-     */
-    List<PowerBoxElecEqpt> selectBoxElecEqptList(PowerBoxElecEqpt boxElecEqpt);
-
-    /**
-     * 新增动力箱柜电气设备
-     *
-     * @param boxElecEqpt 动力箱柜电气设备
-     * @return 结果
-     */
-    int insertBoxElecEqpt(PowerBoxElecEqpt boxElecEqpt);
-
-    /**
-     * 批量-新增动力箱柜电气设备
-     *
-     * @param boxElecEqpts 动力箱柜电气设备列表
-     * @return 结果
-     */
-    int insertBatch(List<PowerBoxElecEqpt> boxElecEqpts);
-
-    /**
-     * 修改动力箱柜电气设备
-     *
-     * @param boxElecEqpt 动力箱柜电气设备
-     * @return 结果
-     */
-    int updateBoxElecEqpt(PowerBoxElecEqpt boxElecEqpt);
-
-    /**
-     * 批量删除动力箱柜电气设备
-     *
-     * @param ids 需要删除的动力箱柜电气设备主键集合
-     * @return 结果
-     */
-    int deleteBoxElecEqptByIds(Long[] ids);
-
-    /**
-     * 删除动力箱柜电气设备信息
-     *
-     * @param id 动力箱柜电气设备主键
-     * @return 结果
-     */
-    int deleteBoxElecEqptById(Long id);
-
-    int deleteByBoxCode(String boxCode);
-}

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

@@ -1,62 +0,0 @@
-package com.ruoyi.ems.service;
-
-import java.util.List;
-
-import com.ruoyi.ems.domain.PowerBox;
-
-/**
- * 动力箱柜Service接口
- * 
- * @author ruoyi
- * @date 2024-08-20
- */
-public interface IPowerBoxService
-{
-    /**
-     * 查询动力箱柜
-     * 
-     * @param id 动力箱柜主键
-     * @return 动力箱柜
-     */
-     PowerBox selectPowerBoxById(Long id);
-
-    /**
-     * 查询动力箱柜列表
-     * 
-     * @param powerBox 动力箱柜
-     * @return 动力箱柜集合
-     */
-     List<PowerBox> selectPowerBoxList(PowerBox powerBox);
-
-    /**
-     * 新增动力箱柜
-     * 
-     * @param powerBox 动力箱柜
-     * @return 结果
-     */
-     int insertPowerBox(PowerBox powerBox);
-
-    /**
-     * 修改动力箱柜
-     * 
-     * @param powerBox 动力箱柜
-     * @return 结果
-     */
-     int updatePowerBox(PowerBox powerBox);
-
-    /**
-     * 批量删除动力箱柜
-     * 
-     * @param ids 需要删除的动力箱柜主键集合
-     * @return 结果
-     */
-     int deletePowerBoxByIds(Long[] ids);
-
-    /**
-     * 删除动力箱柜信息
-     * 
-     * @param id 动力箱柜主键
-     * @return 结果
-     */
-     int deletePowerBoxById(Long id);
-}

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

@@ -1,93 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.ems.mapper.AdmBoxElecEqptMapper;
-import com.ruoyi.ems.domain.AdmBoxElecEqpt;
-import com.ruoyi.ems.service.IAdmBoxElecEqptService;
-
-/**
- * 动力箱柜电气设备Service业务层处理
- * 
- * @author ruoyi
- * @date 2024-09-03
- */
-@Service
-public class AdmBoxElecEqptServiceImpl implements IAdmBoxElecEqptService 
-{
-    @Autowired
-    private AdmBoxElecEqptMapper admBoxElecEqptMapper;
-
-    /**
-     * 查询动力箱柜电气设备
-     * 
-     * @param id 动力箱柜电气设备主键
-     * @return 动力箱柜电气设备
-     */
-    @Override
-    public AdmBoxElecEqpt selectAdmBoxElecEqptById(Long id)
-    {
-        return admBoxElecEqptMapper.selectAdmBoxElecEqptById(id);
-    }
-
-    /**
-     * 查询动力箱柜电气设备列表
-     * 
-     * @param admBoxElecEqpt 动力箱柜电气设备
-     * @return 动力箱柜电气设备
-     */
-    @Override
-    public List<AdmBoxElecEqpt> selectAdmBoxElecEqptList(AdmBoxElecEqpt admBoxElecEqpt)
-    {
-        return admBoxElecEqptMapper.selectAdmBoxElecEqptList(admBoxElecEqpt);
-    }
-
-    /**
-     * 新增动力箱柜电气设备
-     * 
-     * @param admBoxElecEqpt 动力箱柜电气设备
-     * @return 结果
-     */
-    @Override
-    public int insertAdmBoxElecEqpt(AdmBoxElecEqpt admBoxElecEqpt)
-    {
-        return admBoxElecEqptMapper.insertAdmBoxElecEqpt(admBoxElecEqpt);
-    }
-
-    /**
-     * 修改动力箱柜电气设备
-     * 
-     * @param admBoxElecEqpt 动力箱柜电气设备
-     * @return 结果
-     */
-    @Override
-    public int updateAdmBoxElecEqpt(AdmBoxElecEqpt admBoxElecEqpt)
-    {
-        return admBoxElecEqptMapper.updateAdmBoxElecEqpt(admBoxElecEqpt);
-    }
-
-    /**
-     * 批量删除动力箱柜电气设备
-     * 
-     * @param ids 需要删除的动力箱柜电气设备主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmBoxElecEqptByIds(Long[] ids)
-    {
-        return admBoxElecEqptMapper.deleteAdmBoxElecEqptByIds(ids);
-    }
-
-    /**
-     * 删除动力箱柜电气设备信息
-     * 
-     * @param id 动力箱柜电气设备主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmBoxElecEqptById(Long id)
-    {
-        return admBoxElecEqptMapper.deleteAdmBoxElecEqptById(id);
-    }
-}

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

@@ -1,94 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.ruoyi.ems.domain.AdmEmsElecBoxEqptIndex;
-import com.ruoyi.ems.mapper.AdmEmsElecBoxEqptIndexMapper;
-import com.ruoyi.ems.service.IAdmEmsElecBoxEqptIndexService;
-
-/**
- * 动力箱元器件指标Service业务层处理
- *
- * @author ruoyi
- * @date 2024-09-03
- */
-@Service
-public class AdmEmsElecBoxEqptIndexServiceImpl implements IAdmEmsElecBoxEqptIndexService {
-    @Autowired
-    private AdmEmsElecBoxEqptIndexMapper admEmsElecBoxEqptIndexMapper;
-
-    /**
-     * 查询动力箱元器件指标
-     *
-     * @param id 动力箱元器件指标主键
-     * @return 动力箱元器件指标
-     */
-    @Override
-    public AdmEmsElecBoxEqptIndex selectAdmEmsElecBoxEqptIndexById(Long id) {
-        return admEmsElecBoxEqptIndexMapper.selectAdmEmsElecBoxEqptIndexById(id);
-    }
-
-    /**
-     * 查询动力箱元器件指标列表
-     *
-     * @param admEmsElecBoxEqptIndex 动力箱元器件指标
-     * @return 动力箱元器件指标
-     */
-    @Override
-    public List<AdmEmsElecBoxEqptIndex> selectAdmEmsElecBoxEqptIndexList(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex) {
-        return admEmsElecBoxEqptIndexMapper.selectAdmEmsElecBoxEqptIndexList(admEmsElecBoxEqptIndex);
-    }
-
-
-    @Override
-    public List<AdmEmsElecBoxEqptIndex> selectAdmEmsElecBoxEqptLatestIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex) {
-        return admEmsElecBoxEqptIndexMapper.selectAdmEmsElecBoxEqptLatestIndex(admEmsElecBoxEqptIndex);
-    }
-
-    /**
-     * 新增动力箱元器件指标
-     *
-     * @param admEmsElecBoxEqptIndex 动力箱元器件指标
-     * @return 结果
-     */
-    @Override
-    public int insertAdmEmsElecBoxEqptIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex) {
-        return admEmsElecBoxEqptIndexMapper.insertAdmEmsElecBoxEqptIndex(admEmsElecBoxEqptIndex);
-    }
-
-    /**
-     * 修改动力箱元器件指标
-     *
-     * @param admEmsElecBoxEqptIndex 动力箱元器件指标
-     * @return 结果
-     */
-    @Override
-    public int updateAdmEmsElecBoxEqptIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex) {
-        return admEmsElecBoxEqptIndexMapper.updateAdmEmsElecBoxEqptIndex(admEmsElecBoxEqptIndex);
-    }
-
-    /**
-     * 批量删除动力箱元器件指标
-     *
-     * @param ids 需要删除的动力箱元器件指标主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmEmsElecBoxEqptIndexByIds(Long[] ids) {
-        return admEmsElecBoxEqptIndexMapper.deleteAdmEmsElecBoxEqptIndexByIds(ids);
-    }
-
-    /**
-     * 删除动力箱元器件指标信息
-     *
-     * @param id 动力箱元器件指标主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmEmsElecBoxEqptIndexById(Long id) {
-        return admEmsElecBoxEqptIndexMapper.deleteAdmEmsElecBoxEqptIndexById(id);
-    }
-}

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

@@ -1,93 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.ruoyi.ems.domain.AdmEmsElecBoxIndex;
-import com.ruoyi.ems.mapper.AdmEmsElecBoxIndexMapper;
-import com.ruoyi.ems.service.IAdmEmsElecBoxIndexService;
-
-/**
- * 动力箱指标Service业务层处理
- *
- * @author ruoyi
- * @date 2024-09-03
- */
-@Service
-public class AdmEmsElecBoxIndexServiceImpl implements IAdmEmsElecBoxIndexService {
-    @Autowired
-    private AdmEmsElecBoxIndexMapper admEmsElecBoxIndexMapper;
-
-    /**
-     * 查询动力箱指标
-     *
-     * @param id 动力箱指标主键
-     * @return 动力箱指标
-     */
-    @Override
-    public AdmEmsElecBoxIndex selectAdmEmsElecBoxIndexById(Long id) {
-        return admEmsElecBoxIndexMapper.selectAdmEmsElecBoxIndexById(id);
-    }
-
-    @Override
-    public AdmEmsElecBoxIndex selectAdmEmsElecBoxIndexByBoxCode(String boxCode) {
-        return admEmsElecBoxIndexMapper.selectElecBoxLatestIndexByBoxCode(boxCode);
-    }
-
-    /**
-     * 查询动力箱指标列表
-     *
-     * @param admEmsElecBoxIndex 动力箱指标
-     * @return 动力箱指标
-     */
-    @Override
-    public List<AdmEmsElecBoxIndex> selectAdmEmsElecBoxIndexList(AdmEmsElecBoxIndex admEmsElecBoxIndex) {
-        return admEmsElecBoxIndexMapper.selectAdmEmsElecBoxIndexList(admEmsElecBoxIndex);
-    }
-
-    /**
-     * 新增动力箱指标
-     *
-     * @param admEmsElecBoxIndex 动力箱指标
-     * @return 结果
-     */
-    @Override
-    public int insertAdmEmsElecBoxIndex(AdmEmsElecBoxIndex admEmsElecBoxIndex) {
-        return admEmsElecBoxIndexMapper.insertAdmEmsElecBoxIndex(admEmsElecBoxIndex);
-    }
-
-    /**
-     * 修改动力箱指标
-     *
-     * @param admEmsElecBoxIndex 动力箱指标
-     * @return 结果
-     */
-    @Override
-    public int updateAdmEmsElecBoxIndex(AdmEmsElecBoxIndex admEmsElecBoxIndex) {
-        return admEmsElecBoxIndexMapper.updateAdmEmsElecBoxIndex(admEmsElecBoxIndex);
-    }
-
-    /**
-     * 批量删除动力箱指标
-     *
-     * @param ids 需要删除的动力箱指标主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmEmsElecBoxIndexByIds(Long[] ids) {
-        return admEmsElecBoxIndexMapper.deleteAdmEmsElecBoxIndexByIds(ids);
-    }
-
-    /**
-     * 删除动力箱指标信息
-     *
-     * @param id 动力箱指标主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmEmsElecBoxIndexById(Long id) {
-        return admEmsElecBoxIndexMapper.deleteAdmEmsElecBoxIndexById(id);
-    }
-}

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

@@ -1,13 +1,5 @@
 package com.ruoyi.ems.service.impl;
 
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.ruoyi.common.core.enums.ObjType;
 import com.ruoyi.common.core.utils.DateTimeUtil;
 import com.ruoyi.ems.domain.AdmOpAlarm;
@@ -15,14 +7,19 @@ import com.ruoyi.ems.domain.Area;
 import com.ruoyi.ems.domain.AreaBuildingZoning;
 import com.ruoyi.ems.domain.EmsDevice;
 import com.ruoyi.ems.domain.EmsFacs;
-import com.ruoyi.ems.domain.PowerBox;
 import com.ruoyi.ems.mapper.AdmOpAlarmMapper;
 import com.ruoyi.ems.mapper.AreaBuildingZoningMapper;
 import com.ruoyi.ems.mapper.AreaMapper;
 import com.ruoyi.ems.mapper.EmsDeviceMapper;
 import com.ruoyi.ems.mapper.EmsFacsMapper;
-import com.ruoyi.ems.mapper.PowerBoxMapper;
 import com.ruoyi.ems.service.IAdmOpAlarmService;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 能源设施告警Service业务层处理
@@ -47,9 +44,6 @@ public class AdmOpAlarmServiceImpl implements IAdmOpAlarmService {
     @Autowired
     private EmsDeviceMapper emsDeviceMapper;
 
-    @Autowired
-    private PowerBoxMapper powerBoxMapper;
-
     /**
      * 查询能源设施告警
      *
@@ -188,13 +182,7 @@ public class AdmOpAlarmServiceImpl implements IAdmOpAlarmService {
             }
             return emsDevice.getDeviceName();
         }
-        if (ObjType.POWER_BOX.getCode().equals(objType)) {
-            PowerBox powerBox = powerBoxMapper.selectPowerBoxByCode(objCode);
-            if (ObjectUtils.isEmpty(powerBox)) {
-                return StringUtils.EMPTY;
-            }
-            return String.format("%s(%s)", powerBox.getLocation(), powerBox.getAreaName());
-        }
+
         return StringUtils.EMPTY;
     }
 }

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

@@ -1,94 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import java.util.List;
-
-import com.ruoyi.ems.domain.ElecEqptType;
-import com.ruoyi.ems.mapper.EleceqptTypeMapper;
-import com.ruoyi.ems.service.IElecEqptTypeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 动力柜电器设备类型Service业务层处理
- * 
- * @author ruoyi
- * @date 2024-08-20
- */
-@Service
-public class ElecEqptTypeServiceImpl implements IElecEqptTypeService
-{
-    @Autowired
-    private EleceqptTypeMapper elecEqptTypeMapper;
-
-    /**
-     * 查询动力柜电器设备类型
-     * 
-     * @param id 动力柜电器设备类型主键
-     * @return 动力柜电器设备类型
-     */
-    @Override
-    public ElecEqptType selectElecEqptTypeById(Long id)
-    {
-        return elecEqptTypeMapper.selectElecEqptTypeById(id);
-    }
-
-    /**
-     * 查询动力柜电器设备类型列表
-     * 
-     * @param eleceqptType 动力柜电器设备类型
-     * @return 动力柜电器设备类型
-     */
-    @Override
-    public List<ElecEqptType> selectElecEqptTypeList(ElecEqptType eleceqptType)
-    {
-        return elecEqptTypeMapper.selectElecEqptTypeList(eleceqptType);
-    }
-
-    /**
-     * 新增动力柜电器设备类型
-     * 
-     * @param eleceqptType 动力柜电器设备类型
-     * @return 结果
-     */
-    @Override
-    public int insertElecEqptType(ElecEqptType eleceqptType)
-    {
-        return elecEqptTypeMapper.insertElecEqptType(eleceqptType);
-    }
-
-    /**
-     * 修改动力柜电器设备类型
-     * 
-     * @param eleceqptType 动力柜电器设备类型
-     * @return 结果
-     */
-    @Override
-    public int updateElecEqptType(ElecEqptType eleceqptType)
-    {
-        return elecEqptTypeMapper.updateElecEqptType(eleceqptType);
-    }
-
-    /**
-     * 批量删除动力柜电器设备类型
-     * 
-     * @param ids 需要删除的动力柜电器设备类型主键
-     * @return 结果
-     */
-    @Override
-    public int deleteElecEqptTypeByIds(Long[] ids)
-    {
-        return elecEqptTypeMapper.deleteElecEqptTypeByIds(ids);
-    }
-
-    /**
-     * 删除动力柜电器设备类型信息
-     * 
-     * @param id 动力柜电器设备类型主键
-     * @return 结果
-     */
-    @Override
-    public int deleteElecEqptTypeById(Long id)
-    {
-        return elecEqptTypeMapper.deleteElecEqptTypeById(id);
-    }
-}

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

@@ -1,103 +0,0 @@
-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

@@ -1,111 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import java.util.Date;
-import java.util.List;
-
-import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.ems.domain.EmsFacsAttr;
-import com.ruoyi.ems.mapper.EmsFacsAttrMapper;
-import com.ruoyi.ems.service.IEmsFacsAttrService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 能源设施/系统属性Service业务层处理
- *
- * @author ruoyi
- * @date 2024-07-10
- */
-@Service
-public class EmsFacsAttrServiceImpl implements IEmsFacsAttrService {
-    @Autowired
-    private EmsFacsAttrMapper emsFacsAttrMapper;
-
-    /**
-     * 查询能源设施/系统属性
-     *
-     * @param id 能源设施/系统属性主键
-     * @return 能源设施/系统属性
-     */
-    @Override
-    public EmsFacsAttr selectEmsFacsAttrById(Long id) {
-        return emsFacsAttrMapper.selectEmsFacsAttrById(id);
-    }
-
-    /**
-     * 查询能源设施/系统属性列表
-     *
-     * @param emsFacsAttr 能源设施/系统属性
-     * @return 能源设施/系统属性
-     */
-    @Override
-    public List<EmsFacsAttr> selectEmsFacsAttrList(EmsFacsAttr emsFacsAttr) {
-        return emsFacsAttrMapper.selectEmsFacsAttrList(emsFacsAttr);
-    }
-
-    /**
-     * 新增能源设施/系统属性
-     *
-     * @param emsFacsAttr 能源设施/系统属性
-     * @return 结果
-     */
-    @Override
-    public int insertEmsFacsAttr(EmsFacsAttr emsFacsAttr) {
-        return emsFacsAttrMapper.insertEmsFacsAttr(emsFacsAttr);
-    }
-
-    /**
-     * 批量新增能源设施/系统属性
-     *
-     * @param emsFacsAttrs 能源设施/系统属性
-     * @return 结果
-     */
-    @Override
-    public int insertEmsFacsAttrBatch(List<EmsFacsAttr> emsFacsAttrs) {
-        return emsFacsAttrMapper.insertEmsFacsAttrBatch(emsFacsAttrs);
-    }
-
-    /**
-     * 修改能源设施/系统属性
-     *
-     * @param emsFacsAttr 能源设施/系统属性
-     * @return 结果
-     */
-    @Override
-    public int updateEmsFacsAttr(EmsFacsAttr emsFacsAttr) {
-        return emsFacsAttrMapper.updateEmsFacsAttr(emsFacsAttr);
-    }
-
-    /**
-     * 批量删除能源设施/系统属性
-     *
-     * @param ids 需要删除的能源设施/系统属性主键
-     * @return 结果
-     */
-    @Override
-    public int deleteEmsFacsAttrByIds(Long[] ids) {
-        return emsFacsAttrMapper.deleteEmsFacsAttrByIds(ids);
-    }
-
-    /**
-     * 删除能源设施/系统属性信息
-     *
-     * @param id 能源设施/系统属性主键
-     * @return 结果
-     */
-    @Override
-    public int deleteEmsFacsAttrById(Long id) {
-        return emsFacsAttrMapper.deleteEmsFacsAttrById(id);
-    }
-
-    /**
-     * 批量删除能源设施/系统属性
-     *
-     * @param facsCode 设施编码
-     * @return 结果
-     */
-    @Override
-    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

@@ -1,105 +0,0 @@
-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,39 +1,38 @@
 package com.ruoyi.ems.service.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.BiFunction;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
 import com.ruoyi.common.core.enums.FacTypes;
+
 import com.ruoyi.common.core.utils.DateTimeUtil;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.ExpressUtil;
 import com.ruoyi.common.core.utils.StreamUtils;
 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.domain.EmsObjAbility;
+import com.ruoyi.ems.domain.EmsObjAttr;
+import com.ruoyi.ems.domain.EmsObjEvent;
+import com.ruoyi.ems.domain.common.ObjType;
 import com.ruoyi.ems.mapper.AdmEmsElecPgIndexMapper;
 import com.ruoyi.ems.mapper.AdmEmsIndexRangeMapper;
 import com.ruoyi.ems.mapper.EmsFacsMapper;
-import com.ruoyi.ems.service.IAdmEmsIndexRangeService;
-import com.ruoyi.ems.service.IEmsFacsAbilityService;
-import com.ruoyi.ems.service.IEmsFacsAttrService;
-import com.ruoyi.ems.service.IEmsFacsEventService;
+import com.ruoyi.ems.service.IEmsObjEventService;
 import com.ruoyi.ems.service.IEmsFacsService;
+import com.ruoyi.ems.service.IEmsObjAbilityService;
+import com.ruoyi.ems.service.IEmsObjAttrService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
-import cn.hutool.core.date.DateUnit;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.map.MapUtil;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.BiFunction;
 
 /**
  * 能源设施/系统Service业务层处理
@@ -53,16 +52,13 @@ public class EmsFacsServiceImpl implements IEmsFacsService {
     private AdmEmsElecPgIndexMapper admEmsElecPgIndexMapper;
 
     @Autowired
-    private IEmsFacsAttrService facsAttrService;
+    private IEmsObjAttrService objAttrService;
 
     @Autowired
-    private IEmsFacsAbilityService facsAbilityService;
+    private IEmsObjAbilityService objAbilityService;
 
     @Autowired
-    private IEmsFacsEventService facsEventService;
-
-    @Autowired
-    private IAdmEmsIndexRangeService admEmsIndexRangeService;
+    private IEmsObjEventService objEventService;
 
     /**
      * 查询能源设施
@@ -180,9 +176,9 @@ public class EmsFacsServiceImpl implements IEmsFacsService {
 
             // 查询扩展属性
             if (null != emsFacs) {
-                facsAttrService.deleteAttrByFacsCode(emsFacs.getFacsCode());
-                facsAbilityService.deleteAbilityByFacsCode(emsFacs.getFacsCode());
-                facsEventService.deleteEventByFacsCode(emsFacs.getFacsCode());
+                objAttrService.deleteAttrByGroupCode(emsFacs.getAttrGroup());
+                objAbilityService.deleteAbilityByGroupCode(emsFacs.getAbilityGroup());
+                objEventService.deleteEventByGroupCode(emsFacs.getEventGroup());
             }
         }
 
@@ -201,9 +197,9 @@ public class EmsFacsServiceImpl implements IEmsFacsService {
 
         // 查询扩展属性
         if (null != emsFacs) {
-            facsAttrService.deleteAttrByFacsCode(emsFacs.getFacsCode());
-            facsAbilityService.deleteAbilityByFacsCode(emsFacs.getFacsCode());
-            facsEventService.deleteEventByFacsCode(emsFacs.getFacsCode());
+            objAttrService.deleteAttrByGroupCode(emsFacs.getAttrGroup());
+            objAbilityService.deleteAbilityByGroupCode(emsFacs.getAbilityGroup());
+            objEventService.deleteEventByGroupCode(emsFacs.getEventGroup());
         }
 
         return emsFacsMapper.deleteEmsFacsById(id);
@@ -238,6 +234,7 @@ public class EmsFacsServiceImpl implements IEmsFacsService {
         String firstDayOfRecentMonth = DateTimeUtil.getFirstDayOfRecentMonth();
         return admEmsElecPgIndexMapper.qryAreaDayPowerIndex(areaCode, firstDayOfRecentMonth);
     }
+
     private void pgIndexInspection(List<String> errorReport,
         Map.Entry<String, List<Map<String, Object>>> facTypeRange) {
         Map<String, List<Map<String, Object>>> objCodeRangeMap = StreamUtils.groupByKey(facTypeRange.getValue(),
@@ -271,19 +268,18 @@ public class EmsFacsServiceImpl implements IEmsFacsService {
         }
     }
 
-
-    private List<EmsFacsAttr> getFacsAttrs(EmsFacs emsFacs) {
-        EmsFacsAttr param = new EmsFacsAttr(emsFacs.getFacsCode());
-        return facsAttrService.selectEmsFacsAttrList(param);
+    private List<EmsObjAttr> getFacsAttrs(EmsFacs emsFacs) {
+        EmsObjAttr param = new EmsObjAttr(emsFacs.getAttrGroup(), ObjType.FACS.getCode());
+        return objAttrService.selectAttrList(param);
     }
 
-    private List<EmsFacsAbility> getFacsAbilitys(EmsFacs emsFacs) {
-        EmsFacsAbility param = new EmsFacsAbility(emsFacs.getFacsCode());
-        return facsAbilityService.selectEmsFacsAbilityList(param);
+    private List<EmsObjAbility> getFacsAbilitys(EmsFacs emsFacs) {
+        EmsObjAbility param = new EmsObjAbility(emsFacs.getAbilityGroup(), ObjType.FACS.getCode());
+        return objAbilityService.selectAbilityList(param);
     }
 
-    private List<EmsFacsEvent> getFacsEvents(EmsFacs emsFacs) {
-        EmsFacsEvent param = new EmsFacsEvent(emsFacs.getFacsCode());
-        return facsEventService.selectEmsFacsEventList(param);
+    private List<EmsObjEvent> getFacsEvents(EmsFacs emsFacs) {
+        EmsObjEvent param = new EmsObjEvent(emsFacs.getEventGroup(), ObjType.FACS.getCode());
+        return objEventService.selectEventList(param);
     }
 }

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

@@ -0,0 +1,106 @@
+package com.ruoyi.ems.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.ems.domain.EmsObjAbility;
+import com.ruoyi.ems.service.IEmsObjAbilityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ems.mapper.EmsObjAbilityMapper;
+
+/**
+ * 能源设施能力Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-08-22
+ */
+@Service
+public class EmsObjAbilityServiceImpl implements IEmsObjAbilityService {
+    @Autowired
+    private EmsObjAbilityMapper abilityMapper;
+
+    /**
+     * 查询能源设施能力
+     *
+     * @param id 能源设施能力主键
+     * @return 能源设施能力
+     */
+    @Override
+    public EmsObjAbility selectAbilityById(Long id) {
+        return abilityMapper.selectAbilityById(id);
+    }
+
+    /**
+     * 查询能源设施能力列表
+     *
+     * @param Ability 能源设施能力
+     * @return 能源设施能力
+     */
+    @Override
+    public List<EmsObjAbility> selectAbilityList(EmsObjAbility Ability) {
+        return abilityMapper.selectAbilityList(Ability);
+    }
+
+    /**
+     * 新增能源设施能力
+     *
+     * @param Ability 能源设施能力
+     * @return 结果
+     */
+    @Override
+    public int insertAbility(EmsObjAbility Ability) {
+        return abilityMapper.insertAbility(Ability);
+    }
+
+    /**
+     * 批量-新增能源设施能力
+     *
+     * @param Abilitys 能源设施能力list
+     * @return 结果
+     */
+    @Override
+    public int insertAbilityBatch(List<EmsObjAbility> Abilitys) {
+        return abilityMapper.insertAbilityBatch(Abilitys);
+    }
+
+    /**
+     * 修改能源设施能力
+     *
+     * @param Ability 能源设施能力
+     * @return 结果
+     */
+    @Override
+    public int updateAbility(EmsObjAbility Ability) {
+        return abilityMapper.updateAbility(Ability);
+    }
+
+    /**
+     * 批量删除能源设施能力
+     *
+     * @param ids 需要删除的能源设施能力主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAbilityByIds(Long[] ids) {
+        return abilityMapper.deleteAbilityByIds(ids);
+    }
+
+    /**
+     * 删除能源设施能力信息
+     *
+     * @param id 能源设施能力主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAbilityById(Long id) {
+        return abilityMapper.deleteAbilityById(id);
+    }
+
+    @Override
+    public int deleteAbilityByGroupCode(String groupCode) {
+        if (groupCode == null) {
+            return 0;
+        }
+        return abilityMapper.deleteAbilityGroupCode(groupCode);
+    }
+}

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

@@ -0,0 +1,112 @@
+package com.ruoyi.ems.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.ems.domain.EmsObjAttr;
+import com.ruoyi.ems.mapper.EmsObjAttrMapper;
+import com.ruoyi.ems.service.IEmsObjAttrService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 能源设施/系统属性Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-07-10
+ */
+@Service
+public class EmsObjAttrServiceImpl implements IEmsObjAttrService {
+    @Autowired
+    private EmsObjAttrMapper emsObjAttrMapper;
+
+    /**
+     * 查询能源设施/系统属性
+     *
+     * @param id 能源设施/系统属性主键
+     * @return 能源设施/系统属性
+     */
+    @Override
+    public EmsObjAttr selectAttrById(Long id) {
+        return emsObjAttrMapper.selectAttrById(id);
+    }
+
+    /**
+     * 查询能源设施/系统属性列表
+     *
+     * @param attr 能源设施/系统属性
+     * @return 能源设施/系统属性
+     */
+    @Override
+    public List<EmsObjAttr> selectAttrList(EmsObjAttr attr) {
+        return emsObjAttrMapper.selectAttrList(attr);
+    }
+
+    /**
+     * 新增能源设施/系统属性
+     *
+     * @param attr 能源设施/系统属性
+     * @return 结果
+     */
+    @Override
+    public int insertAttr(EmsObjAttr attr) {
+        return emsObjAttrMapper.insertAttr(attr);
+    }
+
+    /**
+     * 批量新增能源设施/系统属性
+     *
+     * @param attrs 能源设施/系统属性
+     * @return 结果
+     */
+    @Override
+    public int insertAttrBatch(List<EmsObjAttr> attrs) {
+        return emsObjAttrMapper.insertAttrBatch(attrs);
+    }
+
+    /**
+     * 修改能源设施/系统属性
+     *
+     * @param attr 能源设施/系统属性
+     * @return 结果
+     */
+    @Override
+    public int updateAttr(EmsObjAttr attr) {
+        return emsObjAttrMapper.updateAttr(attr);
+    }
+
+    /**
+     * 批量删除能源设施/系统属性
+     *
+     * @param ids 需要删除的能源设施/系统属性主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAttrByIds(Long[] ids) {
+        return emsObjAttrMapper.deleteAttrByIds(ids);
+    }
+
+    /**
+     * 删除能源设施/系统属性信息
+     *
+     * @param id 能源设施/系统属性主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAttrById(Long id) {
+        return emsObjAttrMapper.deleteAttrById(id);
+    }
+
+    /**
+     * 批量删除能源设施/系统属性
+     *
+     * @param groupCode 设施编码
+     * @return 结果
+     */
+    @Override
+    public int deleteAttrByGroupCode(String groupCode) {
+        if (groupCode == null) {
+            return 0;
+        }
+        return emsObjAttrMapper.deleteAttrByGroupCode(groupCode);
+    }
+}

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

@@ -0,0 +1,100 @@
+package com.ruoyi.ems.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.ems.domain.EmsObjEvent;
+import com.ruoyi.ems.service.IEmsObjEventService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ems.mapper.EmsObjEventMapper;
+
+/**
+ * 能源设施事件Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-08-22
+ */
+@Service
+public class EmsObjEventServiceImpl implements IEmsObjEventService {
+    @Autowired
+    private EmsObjEventMapper eventMapper;
+
+    /**
+     * 查询能源设施事件
+     *
+     * @param id 能源设施事件主键
+     * @return 能源设施事件
+     */
+    @Override
+    public EmsObjEvent selectEventById(Long id) {
+        return eventMapper.selectEventById(id);
+    }
+
+    /**
+     * 查询能源设施事件列表
+     *
+     * @param event 能源设施事件
+     * @return 能源设施事件
+     */
+    @Override
+    public List<EmsObjEvent> selectEventList(EmsObjEvent event) {
+        return eventMapper.selectEventList(event);
+    }
+
+    /**
+     * 新增能源设施事件
+     *
+     * @param event 能源设施事件
+     * @return 结果
+     */
+    @Override
+    public int insertEvent(EmsObjEvent event) {
+        return eventMapper.insertEvent(event);
+    }
+
+    @Override
+    public int insertEventBatch(List<EmsObjEvent> events) {
+        return eventMapper.insertEventBatch(events);
+    }
+
+    /**
+     * 修改能源设施事件
+     *
+     * @param Event 能源设施事件
+     * @return 结果
+     */
+    @Override
+    public int updateEvent(EmsObjEvent Event) {
+        return eventMapper.updateEvent(Event);
+    }
+
+    /**
+     * 批量删除能源设施事件
+     *
+     * @param ids 需要删除的能源设施事件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEventByIds(Long[] ids) {
+        return eventMapper.deleteEventByIds(ids);
+    }
+
+    /**
+     * 删除能源设施事件信息
+     *
+     * @param id 能源设施事件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEventById(Long id) {
+        return eventMapper.deleteEventById(id);
+    }
+
+    @Override
+    public int deleteEventByGroupCode(String groupCode) {
+        if (groupCode == null) {
+            return 0;
+        }
+        return eventMapper.deleteEventByGroupCode(groupCode);
+    }
+}

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

@@ -1,116 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import java.util.List;
-
-import com.ruoyi.ems.domain.PowerBoxElecEqpt;
-import com.ruoyi.ems.mapper.PowerBoxElecEqptMapper;
-import com.ruoyi.ems.service.IPowerBoxElecEqptService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 动力箱柜电气设备Service业务层处理
- * 
- * @author ruoyi
- * @date 2024-08-20
- */
-@Service
-public class PowerBoxElecEqptServiceImpl implements IPowerBoxElecEqptService
-{
-    @Autowired
-    private PowerBoxElecEqptMapper boxElecEqptMapper;
-
-    /**
-     * 查询动力箱柜电气设备
-     * 
-     * @param id 动力箱柜电气设备主键
-     * @return 动力箱柜电气设备
-     */
-    @Override
-    public PowerBoxElecEqpt selectBoxElecEqptById(Long id)
-    {
-        return boxElecEqptMapper.selectBoxElecEqptById(id);
-    }
-
-    @Override
-    public List<PowerBoxElecEqpt> selectByBoxCode(String boxCode) {
-        return boxElecEqptMapper.selectByBoxCode(boxCode);
-    }
-
-    /**
-     * 查询动力箱柜电气设备列表
-     * 
-     * @param boxElecEqpt 动力箱柜电气设备
-     * @return 动力箱柜电气设备
-     */
-    @Override
-    public List<PowerBoxElecEqpt> selectBoxElecEqptList(PowerBoxElecEqpt boxElecEqpt)
-    {
-        return boxElecEqptMapper.selectBoxElecEqptList(boxElecEqpt);
-    }
-
-    /**
-     * 新增动力箱柜电气设备
-     * 
-     * @param boxElecEqpt 动力箱柜电气设备
-     * @return 结果
-     */
-    @Override
-    public int insertBoxElecEqpt(PowerBoxElecEqpt boxElecEqpt)
-    {
-        return boxElecEqptMapper.insertBoxElecEqpt(boxElecEqpt);
-    }
-
-    /**
-     * 批量-新增动力箱柜电气设备
-     *
-     * @param boxElecEqpts 动力箱柜电气设备列表
-     * @return 结果
-     */
-    @Override
-    public int insertBatch(List<PowerBoxElecEqpt> boxElecEqpts) {
-        return boxElecEqptMapper.insertBatch(boxElecEqpts);
-    }
-
-    /**
-     * 修改动力箱柜电气设备
-     * 
-     * @param boxElecEqpt 动力箱柜电气设备
-     * @return 结果
-     */
-    @Override
-    public int updateBoxElecEqpt(PowerBoxElecEqpt boxElecEqpt)
-    {
-        return boxElecEqptMapper.updateBoxElecEqpt(boxElecEqpt);
-    }
-
-    /**
-     * 批量删除动力箱柜电气设备
-     * 
-     * @param ids 需要删除的动力箱柜电气设备主键
-     * @return 结果
-     */
-    @Override
-    public int deleteBoxElecEqptByIds(Long[] ids)
-    {
-        return boxElecEqptMapper.deleteBoxElecEqptByIds(ids);
-    }
-
-    /**
-     * 删除动力箱柜电气设备信息
-     * 
-     * @param id 动力箱柜电气设备主键
-     * @return 结果
-     */
-    @Override
-    public int deleteBoxElecEqptById(Long id)
-    {
-        return boxElecEqptMapper.deleteBoxElecEqptById(id);
-    }
-
-    @Override
-    public int deleteByBoxCode(String boxCode)
-    {
-        return boxElecEqptMapper.deleteByBoxCode(boxCode);
-    }
-}

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

@@ -1,149 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import com.ruoyi.ems.domain.EmsCls;
-import com.ruoyi.ems.domain.PowerBox;
-import com.ruoyi.ems.domain.PowerBoxElecEqpt;
-import com.ruoyi.ems.mapper.PowerBoxMapper;
-import com.ruoyi.ems.service.IPowerBoxElecEqptService;
-import com.ruoyi.ems.service.IPowerBoxService;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 动力箱柜Service业务层处理
- *
- * @author ruoyi
- * @date 2024-08-20
- */
-@Service
-public class PowerBoxServiceImpl implements IPowerBoxService {
-    @Autowired
-    private PowerBoxMapper powerBoxMapper;
-
-    @Autowired
-    private IPowerBoxElecEqptService elecEqptService;
-
-    /**
-     * 查询动力箱柜
-     *
-     * @param id 动力箱柜主键
-     * @return 动力箱柜
-     */
-    @Override
-    public PowerBox selectPowerBoxById(Long id) {
-        PowerBox powerBox = powerBoxMapper.selectPowerBoxById(id);
-
-        // 查询箱体内部电气设备
-        if (null != powerBox) {
-            List<PowerBoxElecEqpt> eqptList = elecEqptService.selectByBoxCode(powerBox.getBoxCode());
-            powerBox.setElecEqptList(eqptList);
-        }
-
-        return powerBox;
-    }
-
-    /**
-     * 查询动力箱柜列表
-     *
-     * @param powerBox 动力箱柜
-     * @return 动力箱柜
-     */
-    @Override
-    public List<PowerBox> selectPowerBoxList(PowerBox param) {
-        List<PowerBox> retList = powerBoxMapper.selectPowerBoxList(param);
-
-        if (CollectionUtils.isNotEmpty(retList)) {
-            List<PowerBoxElecEqpt> eqptList = elecEqptService.selectBoxElecEqptList(new PowerBoxElecEqpt());
-            Map<String, List<PowerBoxElecEqpt>> groupedByParent = eqptList.stream()
-                .collect(Collectors.groupingBy(PowerBoxElecEqpt::getBoxCode));
-
-            for (PowerBox powerBox : retList) {
-                if (groupedByParent.containsKey(powerBox.getBoxCode())) {
-                    powerBox.setElecEqptList(groupedByParent.get(powerBox.getBoxCode()));
-                }
-                else {
-                    powerBox.setElecEqptList(new ArrayList<>());
-                }
-            }
-        }
-
-        return retList;
-    }
-
-    /**
-     * 新增动力箱柜
-     *
-     * @param powerBox 动力箱柜
-     * @return 结果
-     */
-    @Override
-    public int insertPowerBox(PowerBox powerBox) {
-        elecEqptService.deleteByBoxCode(powerBox.getBoxCode());
-        elecEqptService.insertBatch(powerBox.getElecEqptList());
-        return powerBoxMapper.insertPowerBox(powerBox);
-    }
-
-    /**
-     * 修改动力箱柜
-     *
-     * @param powerBox 动力箱柜
-     * @return 结果
-     */
-    @Override
-    public int updatePowerBox(PowerBox powerBox) {
-        List<PowerBoxElecEqpt> eqptList = powerBox.getElecEqptList();
-
-        if (CollectionUtils.isNotEmpty(eqptList)) {
-            elecEqptService.deleteByBoxCode(powerBox.getBoxCode());
-            elecEqptService.insertBatch(eqptList);
-        }
-        else {
-            elecEqptService.deleteByBoxCode(powerBox.getBoxCode());
-        }
-
-        return powerBoxMapper.updatePowerBox(powerBox);
-    }
-
-    /**
-     * 批量删除动力箱柜
-     *
-     * @param ids 需要删除的动力箱柜主键
-     * @return 结果
-     */
-    @Override
-    public int deletePowerBoxByIds(Long[] ids) {
-        for (Long id : ids) {
-            PowerBox powerBox = powerBoxMapper.selectPowerBoxById(id);
-
-            if (null != powerBox) {
-                elecEqptService.deleteByBoxCode(powerBox.getBoxCode());
-            }
-        }
-
-        return powerBoxMapper.deletePowerBoxByIds(ids);
-    }
-
-    /**
-     * 删除动力箱柜信息
-     *
-     * @param id 动力箱柜主键
-     * @return 结果
-     */
-    @Override
-    public int deletePowerBoxById(Long id) {
-        PowerBox powerBox = powerBoxMapper.selectPowerBoxById(id);
-
-        if (null != powerBox) {
-            elecEqptService.deleteByBoxCode(powerBox.getBoxCode());
-        }
-
-        return powerBoxMapper.deletePowerBoxById(id);
-    }
-}

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

@@ -1,94 +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.AdmBoxElecEqptMapper">
-
-    <resultMap type="com.ruoyi.ems.domain.AdmBoxElecEqpt" id="AdmBoxElecEqptResult">
-        <result property="id"    column="id"    />
-        <result property="boxCode"    column="box_code"    />
-        <result property="eqptCode"    column="eqpt_code"    />
-        <result property="extEqptCode"    column="ext_eqpt_code"    />
-        <result property="eqptType"    column="eqpt_type"    />
-        <result property="eqptSpec"    column="eqpt_spec"    />
-        <result property="ratedVoltage"    column="rated_voltage"    />
-        <result property="ratedCurrent"    column="rated_current"    />
-        <result property="ancestors"    column="ancestors"    />
-        <result property="parentEqpt"    column="parent_eqpt"    />
-        <result property="subCircuit"    column="sub_circuit"    />
-    </resultMap>
-
-    <sql id="selectAdmBoxElecEqptVo">
-        select id, box_code, eqpt_code, ext_eqpt_code, eqpt_type, eqpt_spec, rated_voltage, rated_current, ancestors, parent_eqpt, sub_circuit from adm_box_elec_eqpt
-    </sql>
-
-    <select id="selectAdmBoxElecEqptList" parameterType="com.ruoyi.ems.domain.AdmBoxElecEqpt" resultMap="AdmBoxElecEqptResult">
-        <include refid="selectAdmBoxElecEqptVo"/>
-        <where>
-            <if test="boxCode != null  and boxCode != ''"> and box_code = #{boxCode}</if>
-            <if test="eqptCode != null  and eqptCode != ''"> and eqpt_code = #{eqptCode}</if>
-        </where>
-    </select>
-
-
-    <select id="selectAdmBoxElecEqptById" parameterType="Long" resultMap="AdmBoxElecEqptResult">
-        <include refid="selectAdmBoxElecEqptVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertAdmBoxElecEqpt" parameterType="com.ruoyi.ems.domain.AdmBoxElecEqpt" useGeneratedKeys="true" keyProperty="id">
-        insert into adm_box_elec_eqpt
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="boxCode != null and boxCode != ''">box_code,</if>
-            <if test="eqptCode != null and eqptCode != ''">eqpt_code,</if>
-            <if test="extEqptCode != null">ext_eqpt_code,</if>
-            <if test="eqptType != null">eqpt_type,</if>
-            <if test="eqptSpec != null">eqpt_spec,</if>
-            <if test="ratedVoltage != null">rated_voltage,</if>
-            <if test="ratedCurrent != null">rated_current,</if>
-            <if test="ancestors != null">ancestors,</if>
-            <if test="parentEqpt != null">parent_eqpt,</if>
-            <if test="subCircuit != null">sub_circuit,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="boxCode != null and boxCode != ''">#{boxCode},</if>
-            <if test="eqptCode != null and eqptCode != ''">#{eqptCode},</if>
-            <if test="extEqptCode != null">#{extEqptCode},</if>
-            <if test="eqptType != null">#{eqptType},</if>
-            <if test="eqptSpec != null">#{eqptSpec},</if>
-            <if test="ratedVoltage != null">#{ratedVoltage},</if>
-            <if test="ratedCurrent != null">#{ratedCurrent},</if>
-            <if test="ancestors != null">#{ancestors},</if>
-            <if test="parentEqpt != null">#{parentEqpt},</if>
-            <if test="subCircuit != null">#{subCircuit},</if>
-         </trim>
-    </insert>
-
-    <update id="updateAdmBoxElecEqpt" parameterType="com.ruoyi.ems.domain.AdmBoxElecEqpt">
-        update adm_box_elec_eqpt
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="boxCode != null and boxCode != ''">box_code = #{boxCode},</if>
-            <if test="eqptCode != null and eqptCode != ''">eqpt_code = #{eqptCode},</if>
-            <if test="extEqptCode != null">ext_eqpt_code = #{extEqptCode},</if>
-            <if test="eqptType != null">eqpt_type = #{eqptType},</if>
-            <if test="eqptSpec != null">eqpt_spec = #{eqptSpec},</if>
-            <if test="ratedVoltage != null">rated_voltage = #{ratedVoltage},</if>
-            <if test="ratedCurrent != null">rated_current = #{ratedCurrent},</if>
-            <if test="ancestors != null">ancestors = #{ancestors},</if>
-            <if test="parentEqpt != null">parent_eqpt = #{parentEqpt},</if>
-            <if test="subCircuit != null">sub_circuit = #{subCircuit},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteAdmBoxElecEqptById" parameterType="Long">
-        delete from adm_box_elec_eqpt where id = #{id}
-    </delete>
-
-    <delete id="deleteAdmBoxElecEqptByIds" parameterType="String">
-        delete from adm_box_elec_eqpt 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/AdmEmsElecBoxEqptIndexMapper.xml

@@ -1,125 +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.AdmEmsElecBoxEqptIndexMapper">
-
-    <resultMap type="com.ruoyi.ems.domain.AdmEmsElecBoxEqptIndex" id="AdmEmsElecBoxEqptIndexResult">
-        <result property="id" column="id"/>
-        <result property="boxCode" column="box_code"/>
-        <result property="eqptCode" column="eqpt_code"/>
-        <result property="areaCode" column="area_code"/>
-        <result property="date" column="date"/>
-        <result property="time" column="time"/>
-        <result property="voltage" column="voltage"/>
-        <result property="current" column="current"/>
-        <result property="power" column="power"/>
-        <result property="eqptSpec" column="eqpt_spec"/>
-    </resultMap>
-
-    <select id="selectAdmEmsElecBoxEqptLatestIndex" parameterType="com.ruoyi.ems.domain.AdmEmsElecBoxEqptIndex"
-            resultMap="AdmEmsElecBoxEqptIndexResult">
-        SELECT
-            latestIndex.*,
-            elecEqpt.eqpt_spec,
-            elecEqpt.rated_current
-        FROM
-            (SELECT
-                 a.*
-             FROM
-                 `adm_ems_elec_box_eqpt_index` a
-                     JOIN
-                 (SELECT
-                      eqpt_code,
-                      MAX(id) AS id
-                  FROM
-                      `adm_ems_elec_box_eqpt_index`
-                  WHERE
-                      box_code = #{boxCode}
-                  GROUP BY
-                      eqpt_code) latestTime
-                 ON
-                     a.eqpt_code = latestTime.eqpt_code AND a.id = latestTime.id
-             WHERE
-                 a.box_code = #{boxCode}
-            ) latestIndex
-                JOIN
-            adm_box_elec_eqpt elecEqpt
-            ON
-                latestIndex.eqpt_code = elecEqpt.eqpt_code
-    </select>
-
-
-    <select id="selectAdmEmsElecBoxEqptIndexList" parameterType="com.ruoyi.ems.domain.AdmEmsElecBoxEqptIndex"
-            resultMap="AdmEmsElecBoxEqptIndexResult">
-        <include refid="selectAdmEmsElecBoxEqptIndexVo"/>
-        <where>
-            <if test="boxCode != null  and boxCode != ''">and box_code = #{boxCode}</if>
-            <if test="eqptCode != null  and eqptCode != ''">and eqpt_code = #{eqptCode}</if>
-            <if test="areaCode != null  and areaCode != ''">and area_code = #{areaCode}</if>
-        </where>
-    </select>
-
-    <sql id="selectAdmEmsElecBoxEqptIndexVo">
-        select id, box_code, eqpt_code, area_code, date, time, voltage, current, power
-        from adm_ems_elec_box_eqpt_index
-    </sql>
-
-    <select id="selectAdmEmsElecBoxEqptIndexById" parameterType="Long" resultMap="AdmEmsElecBoxEqptIndexResult">
-        <include refid="selectAdmEmsElecBoxEqptIndexVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertAdmEmsElecBoxEqptIndex" parameterType="com.ruoyi.ems.domain.AdmEmsElecBoxEqptIndex"
-            useGeneratedKeys="true" keyProperty="id">
-        insert into adm_ems_elec_box_eqpt_index
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="boxCode != null and boxCode != ''">box_code,</if>
-            <if test="eqptCode != null and eqptCode != ''">eqpt_code,</if>
-            <if test="areaCode != null and areaCode != ''">area_code,</if>
-            <if test="date != null">date,</if>
-            <if test="time != null">time,</if>
-            <if test="voltage != null">voltage,</if>
-            <if test="current != null">current,</if>
-            <if test="power != null">power,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="boxCode != null and boxCode != ''">#{boxCode},</if>
-            <if test="eqptCode != null and eqptCode != ''">#{eqptCode},</if>
-            <if test="areaCode != null and areaCode != ''">#{areaCode},</if>
-            <if test="date != null">#{date},</if>
-            <if test="time != null">#{time},</if>
-            <if test="voltage != null">#{voltage},</if>
-            <if test="current != null">#{current},</if>
-            <if test="power != null">#{power},</if>
-        </trim>
-    </insert>
-
-    <update id="updateAdmEmsElecBoxEqptIndex" parameterType="com.ruoyi.ems.domain.AdmEmsElecBoxEqptIndex">
-        update adm_ems_elec_box_eqpt_index
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="boxCode != null and boxCode != ''">box_code = #{boxCode},</if>
-            <if test="eqptCode != null and eqptCode != ''">eqpt_code = #{eqptCode},</if>
-            <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
-            <if test="date != null">date = #{date},</if>
-            <if test="time != null">time = #{time},</if>
-            <if test="voltage != null">voltage = #{voltage},</if>
-            <if test="current != null">current = #{current},</if>
-            <if test="power != null">power = #{power},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteAdmEmsElecBoxEqptIndexById" parameterType="Long">
-        delete
-        from adm_ems_elec_box_eqpt_index
-        where id = #{id}
-    </delete>
-
-    <delete id="deleteAdmEmsElecBoxEqptIndexByIds" parameterType="String">
-        delete from adm_ems_elec_box_eqpt_index 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/AdmEmsElecBoxIndexMapper.xml

@@ -1,124 +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.AdmEmsElecBoxIndexMapper">
-
-    <resultMap type="com.ruoyi.ems.domain.AdmEmsElecBoxIndex" id="AdmEmsElecBoxIndexResult">
-        <result property="id" column="id"/>
-        <result property="boxCode" column="box_code"/>
-        <result property="boxType" column="box_type"/>
-        <result property="areaCode" column="area_code"/>
-        <result property="date" column="date"/>
-        <result property="time" column="time"/>
-        <result property="voltageA" column="voltage_a"/>
-        <result property="voltageB" column="voltage_b"/>
-        <result property="voltageC" column="voltage_c"/>
-        <result property="electricityA" column="electricity_a"/>
-        <result property="electricityB" column="electricity_b"/>
-        <result property="electricityC" column="electricity_c"/>
-        <result property="power" column="power"/>
-    </resultMap>
-
-    <sql id="selectAdmEmsElecBoxIndexVo">
-        select id,
-               box_code,
-               box_type,
-               area_code, date, time, voltage_a, voltage_b, voltage_c, electricity_a, electricity_b, electricity_c, power
-        from adm_ems_elec_box_index
-    </sql>
-
-    <select id="selectAdmEmsElecBoxIndexList" parameterType="com.ruoyi.ems.domain.AdmEmsElecBoxIndex"
-            resultMap="AdmEmsElecBoxIndexResult">
-        <include refid="selectAdmEmsElecBoxIndexVo"/>
-        <where>
-            <if test="boxCode != null  and boxCode != ''">and box_code = #{boxCode}</if>
-            <if test="boxType != null ">and box_type = #{boxType}</if>
-            <if test="areaCode != null  and areaCode != ''">and area_code = #{areaCode}</if>
-        </where>
-    </select>
-
-    <select id="selectAdmEmsElecBoxIndexById" parameterType="Long" resultMap="AdmEmsElecBoxIndexResult">
-        <include refid="selectAdmEmsElecBoxIndexVo"/>
-        where id = #{id}
-    </select>
-    <select id="selectElecBoxLatestIndexByBoxCode" parameterType="String"
-            resultType="com.ruoyi.ems.domain.AdmEmsElecBoxIndex">
-        SELECT *
-        FROM (SELECT a.*
-              FROM adm_ems_elec_box_index a
-                       JOIN (SELECT box_code,
-                                    MAX(id) AS max_id
-                             FROM adm_ems_elec_box_index
-                             WHERE box_code = #{boxCode}
-                             GROUP BY box_code) latestId
-                            ON
-                                a.box_code = latestId.box_code AND a.id = latestId.max_id
-              WHERE a.box_code = #{boxCode}) latestIndex;
-    </select>
-
-    <insert id="insertAdmEmsElecBoxIndex" parameterType="com.ruoyi.ems.domain.AdmEmsElecBoxIndex"
-            useGeneratedKeys="true" keyProperty="id">
-        insert into adm_ems_elec_box_index
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="boxCode != null and boxCode != ''">box_code,</if>
-            <if test="boxType != null">box_type,</if>
-            <if test="areaCode != null and areaCode != ''">area_code,</if>
-            <if test="date != null">date,</if>
-            <if test="time != null">time,</if>
-            <if test="voltageA != null">voltage_a,</if>
-            <if test="voltageB != null">voltage_b,</if>
-            <if test="voltageC != null">voltage_c,</if>
-            <if test="electricityA != null">electricity_a,</if>
-            <if test="electricityB != null">electricity_b,</if>
-            <if test="electricityC != null">electricity_c,</if>
-            <if test="power != null">power,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="boxCode != null and boxCode != ''">#{boxCode},</if>
-            <if test="boxType != null">#{boxType},</if>
-            <if test="areaCode != null and areaCode != ''">#{areaCode},</if>
-            <if test="date != null">#{date},</if>
-            <if test="time != null">#{time},</if>
-            <if test="voltageA != null">#{voltageA},</if>
-            <if test="voltageB != null">#{voltageB},</if>
-            <if test="voltageC != null">#{voltageC},</if>
-            <if test="electricityA != null">#{electricityA},</if>
-            <if test="electricityB != null">#{electricityB},</if>
-            <if test="electricityC != null">#{electricityC},</if>
-            <if test="power != null">#{power},</if>
-        </trim>
-    </insert>
-
-    <update id="updateAdmEmsElecBoxIndex" parameterType="com.ruoyi.ems.domain.AdmEmsElecBoxIndex">
-        update adm_ems_elec_box_index
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="boxCode != null and boxCode != ''">box_code = #{boxCode},</if>
-            <if test="boxType != null">box_type = #{boxType},</if>
-            <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
-            <if test="date != null">date = #{date},</if>
-            <if test="time != null">time = #{time},</if>
-            <if test="voltageA != null">voltage_a = #{voltageA},</if>
-            <if test="voltageB != null">voltage_b = #{voltageB},</if>
-            <if test="voltageC != null">voltage_c = #{voltageC},</if>
-            <if test="electricityA != null">electricity_a = #{electricityA},</if>
-            <if test="electricityB != null">electricity_b = #{electricityB},</if>
-            <if test="electricityC != null">electricity_c = #{electricityC},</if>
-            <if test="power != null">power = #{power},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteAdmEmsElecBoxIndexById" parameterType="Long">
-        delete
-        from adm_ems_elec_box_index
-        where id = #{id}
-    </delete>
-
-    <delete id="deleteAdmEmsElecBoxIndexByIds" parameterType="String">
-        delete from adm_ems_elec_box_index 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/EleceqptTypeMapper.xml

@@ -1,61 +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.EleceqptTypeMapper">
-    
-    <resultMap type="com.ruoyi.ems.domain.ElecEqptType" id="elecEqptTypeResult">
-        <result property="id"    column="id"    />
-        <result property="typeCode"    column="type_code"    />
-        <result property="typeName"    column="type_name"    />
-    </resultMap>
-
-    <sql id="selectBoxEleceqptTypeVo">
-        select id, type_code, type_name from dim_box_eleceqpt_type
-    </sql>
-
-    <select id="selectElecEqptTypeList" parameterType="com.ruoyi.ems.domain.ElecEqptType" resultMap="elecEqptTypeResult">
-        <include refid="selectBoxEleceqptTypeVo"/>
-        <where>  
-            <if test="typeCode != null  and typeCode != ''"> and type_code = #{typeCode}</if>
-            <if test="typeName != null  and typeName != ''"> and type_name like concat('%', #{typeName}, '%')</if>
-        </where>
-    </select>
-    
-    <select id="selectElecEqptTypeById" parameterType="Long" resultMap="elecEqptTypeResult">
-        <include refid="selectBoxEleceqptTypeVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertElecEqptType" parameterType="com.ruoyi.ems.domain.ElecEqptType" useGeneratedKeys="true" keyProperty="id">
-        insert into dim_box_eleceqpt_type
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="typeCode != null and typeCode != ''">type_code,</if>
-            <if test="typeName != null and typeName != ''">type_name,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="typeCode != null and typeCode != ''">#{typeCode},</if>
-            <if test="typeName != null and typeName != ''">#{typeName},</if>
-         </trim>
-    </insert>
-
-    <update id="updateElecEqptType" parameterType="com.ruoyi.ems.domain.ElecEqptType">
-        update dim_box_eleceqpt_type
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="typeCode != null and typeCode != ''">type_code = #{typeCode},</if>
-            <if test="typeName != null and typeName != ''">type_name = #{typeName},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteElecEqptTypeById" parameterType="Long">
-        delete from dim_box_eleceqpt_type where id = #{id}
-    </delete>
-
-    <delete id="deleteElecEqptTypeByIds" parameterType="String">
-        delete from dim_box_eleceqpt_type 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

@@ -1,82 +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.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

@@ -1,87 +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.EmsFacsAttrMapper">
-    
-    <resultMap type="com.ruoyi.ems.domain.EmsFacsAttr" id="EmsFacsAttrResult">
-        <result property="id"    column="id"    />
-        <result property="facsCode"    column="facs_code"    />
-        <result property="attrName"    column="attr_name"    />
-        <result property="attrDesc"    column="attr_desc"    />
-        <result property="attrValue"    column="attr_value"    />
-        <result property="attrUnit"    column="attr_unit"    />
-    </resultMap>
-
-    <sql id="selectEmsFacsAttrVo">
-        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">
-        <include refid="selectEmsFacsAttrVo"/>
-        <where>  
-            <if test="facsCode != null  and facsCode != ''"> and facs_code = #{facsCode}</if>
-            <if test="attrName != null  and attrName != ''"> and attr_name like concat('%', #{attrName}, '%')</if>
-            <if test="attrDesc != null  and attrDesc != ''"> and attr_desc = #{attrDesc}</if>
-            <if test="attrValue != null  and attrValue != ''"> and attr_value = #{attrValue}</if>
-            <if test="attrUnit != null  and attrUnit != ''"> and attr_unit = #{attrUnit}</if>
-        </where>
-    </select>
-    
-    <select id="selectEmsFacsAttrById" parameterType="Long" resultMap="EmsFacsAttrResult">
-        <include refid="selectEmsFacsAttrVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertEmsFacsAttr" parameterType="com.ruoyi.ems.domain.EmsFacsAttr" useGeneratedKeys="true" keyProperty="id">
-        insert into adm_ems_facs_attr
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="facsCode != null and facsCode != ''">facs_code,</if>
-            <if test="attrName != null and attrName != ''">attr_name,</if>
-            <if test="attrDesc != null">attr_desc,</if>
-            <if test="attrValue != null">attr_value,</if>
-            <if test="attrUnit != null">attr_unit,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="facsCode != null and facsCode != ''">#{facsCode},</if>
-            <if test="attrName != null and attrName != ''">#{attrName},</if>
-            <if test="attrDesc != null">#{attrDesc},</if>
-            <if test="attrValue != null">#{attrValue},</if>
-            <if test="attrUnit != null">#{attrUnit},</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) values
-        <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.facsCode},#{item.attrName},#{item.attrDesc},#{item.attrValue},#{item.attrUnit})
-        </foreach>
-    </insert>
-
-    <update id="updateEmsFacsAttr" parameterType="com.ruoyi.ems.domain.EmsFacsAttr">
-        update adm_ems_facs_attr
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="facsCode != null and facsCode != ''">facs_code = #{facsCode},</if>
-            <if test="attrName != null and attrName != ''">attr_name = #{attrName},</if>
-            <if test="attrDesc != null">attr_desc = #{attrDesc},</if>
-            <if test="attrValue != null">attr_value = #{attrValue},</if>
-            <if test="attrUnit != null">attr_unit = #{attrUnit},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteEmsFacsAttrById" parameterType="Long">
-        delete from adm_ems_facs_attr where id = #{id}
-    </delete>
-
-    <delete id="deleteEmsFacsAttrByIds" parameterType="String">
-        delete from adm_ems_facs_attr where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <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

@@ -1,92 +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.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/ems-modules/ems-server/src/main/resources/mapper/ems/EmsFacsMapper.xml

@@ -15,13 +15,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="enable"    column="enable"    />
         <result property="refArea"    column="ref_area"    />
         <result property="refAreaName"    column="ref_area_name"    />
+        <result property="attrGroup"    column="attr_group"    />
+        <result property="abilityGroup"    column="ability_group"    />
+        <result property="eventGroup"    column="event_group"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectEmsFacsVo">
         SELECT
-            f.`id`, f.`facs_code`, f.`facs_name`, f.`facs_category`, f.`facs_subcategory`, f.`enable`, f.`ref_area`, f.`create_time`, f.`update_time`,
+            f.`id`, f.`facs_code`, f.`facs_name`, f.`facs_category`, f.`facs_subcategory`, f.`enable`, f.`ref_area`, f.`attr_group`, f.`ability_group`, f.`event_group`, f.`create_time`, f.`update_time`,
             t.`name` as facs_category_name,
             s.`name` as facs_subcategory_name,
             a.`area_name` as ref_area_name
@@ -62,8 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facsSubCategory != null and facsSubCategory != ''">facs_subcategory,</if>
             <if test="enable != null">enable,</if>
             <if test="refArea != null and refArea != ''">ref_area,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
+            <if test="attrGroup != null and attrGroup != ''">attr_group,</if>
+            <if test="abilityGroup != null and abilityGroup != ''">ability_group,</if>
+            <if test="eventGroup != null and eventGroup != ''">event_group,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="facsCode != null and facsCode != ''">#{facsCode},</if>
@@ -72,8 +76,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facsSubCategory != null and facsSubCategory != ''">#{facsSubCategory},</if>
             <if test="enable != null">#{enable},</if>
             <if test="refArea != null and refArea != ''">#{refArea},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
+            <if test="attrGroup != null and attrGroup != ''">#{attrGroup},</if>
+            <if test="abilityGroup != null and abilityGroup != ''">#{abilityGroup},</if>
+            <if test="eventGroup != null and eventGroup != ''">#{eventGroup},</if>
          </trim>
     </insert>
 
@@ -86,8 +91,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facsSubCategory != null and facsSubCategory != ''">facs_subcategory = #{facsSubCategory},</if>
             <if test="enable != null">enable = #{enable},</if>
             <if test="refArea != null and refArea != ''">ref_area = #{refArea},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="attrGroup != null and attrGroup != ''">attr_group=#{attrGroup},</if>
+            <if test="abilityGroup != null and abilityGroup != ''">ability_group=#{abilityGroup},</if>
+            <if test="eventGroup != null and eventGroup != ''">event_group=#{eventGroup},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -0,0 +1,88 @@
+<?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.EmsObjAbilityMapper">
+    
+    <resultMap type="com.ruoyi.ems.domain.EmsObjAbility" id="AbilityResult">
+        <result property="id"    column="id"    />
+        <result property="groupCode"    column="group_code"    />
+        <result property="groupName"    column="group_name"    />
+        <result property="objType"      column="obj_type"    />
+        <result property="abilityName"    column="ability_name"    />
+        <result property="abilityDesc"    column="ability_desc"    />
+        <result property="abilityParam"    column="ability_param"    />
+    </resultMap>
+
+    <sql id="selectAbilityVo">
+        select id, group_code, group_name, obj_type, ability_name, ability_desc, ability_param from adm_ems_obj_ability
+    </sql>
+
+    <select id="selectAbilityList" parameterType="com.ruoyi.ems.domain.EmsObjAbility" resultMap="AbilityResult">
+        <include refid="selectAbilityVo"/>
+        <where>  
+            <if test="groupCode != null  and groupCode != ''"> and group_code = #{groupCode}</if>
+            <if test="objType != null"> and obj_type = #{objType}</if>
+        </where>
+    </select>
+    
+    <select id="selectAbilityById" parameterType="Long" resultMap="AbilityResult">
+        <include refid="selectAbilityVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertAbility" parameterType="com.ruoyi.ems.domain.EmsObjAbility" useGeneratedKeys="true" keyProperty="id">
+        insert into adm_ems_obj_ability
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="groupCode != null and groupCode != ''">group_code,</if>
+            <if test="groupName != null and groupName != ''">group_name,</if>
+            <if test="objType != null">obj_type,</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="groupCode != null and groupCode != ''">#{groupCode},</if>
+            <if test="groupName != null and groupName != ''">#{groupName},</if>
+            <if test="objType != null">#{objType},</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="insertAbilityBatch" parameterType="java.util.List">
+        insert into adm_ems_obj_ability (group_code, group_name, obj_type, ability_name, ability_desc, ability_param) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.groupCode},#{item.groupName},#{item.objType},#{item.abilityName},#{item.abilityDesc},#{item.abilityParam})
+        </foreach>
+    </insert>
+
+    <update id="updateAbility" parameterType="com.ruoyi.ems.domain.EmsObjAbility">
+        update adm_ems_obj_ability
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="groupCode != null and groupCode != ''">group_code = #{groupCode},</if>
+            <if test="groupName != null and groupName != ''">group_name = #{groupName},</if>
+            <if test="objType != null">obj_type = #{objType},</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="deleteAbilityById" parameterType="Long">
+        delete from adm_ems_obj_ability where id = #{id}
+    </delete>
+
+    <delete id="deleteAbilityByIds" parameterType="String">
+        delete from adm_ems_obj_ability where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteAbilityGroupCode" parameterType="String">
+        delete from adm_ems_obj_ability where group_code = #{groupCode}
+    </delete>
+</mapper>

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/EmsObjAttrMapper.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.EmsObjAttrMapper">
+    
+    <resultMap type="com.ruoyi.ems.domain.EmsObjAttr" id="EmsAttrResult">
+        <result property="id"    column="id"    />
+        <result property="groupCode"    column="group_code"    />
+        <result property="groupName"    column="group_name"    />
+        <result property="objType"      column="obj_type"    />
+        <result property="attrName"     column="attr_name"    />
+        <result property="attrDesc"     column="attr_desc"    />
+        <result property="attrValue"    column="attr_value"    />
+        <result property="attrUnit"     column="attr_unit"    />
+    </resultMap>
+
+    <sql id="selectAttrVo">
+        select id, group_code, group_name, obj_type, attr_name, attr_desc, attr_value, attr_unit from adm_ems_obj_attr
+    </sql>
+
+    <select id="selectAttrList" parameterType="com.ruoyi.ems.domain.EmsObjAttr" resultMap="EmsAttrResult">
+        <include refid="selectAttrVo"/>
+        <where>  
+            <if test="groupCode != null  and groupCode != ''"> and group_code = #{groupCode}</if>
+            <if test="objType != null"> and obj_type = #{objType}</if>
+        </where>
+    </select>
+    
+    <select id="selectAttrById" parameterType="Long" resultMap="EmsAttrResult">
+        <include refid="selectAttrVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertAttr" parameterType="com.ruoyi.ems.domain.EmsObjAttr" useGeneratedKeys="true" keyProperty="id">
+        insert into adm_ems_obj_attr
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="groupCode != null and groupCode != ''">group_code,</if>
+            <if test="groupName != null and groupName != ''">group_name,</if>
+            <if test="objType != null">obj_type,</if>
+            <if test="attrName != null and attrName != ''">attr_name,</if>
+            <if test="attrDesc != null">attr_desc,</if>
+            <if test="attrValue != null">attr_value,</if>
+            <if test="attrUnit != null">attr_unit,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="groupCode != null and groupCode != ''">#{groupCode},</if>
+            <if test="groupName != null and groupName != ''">#{groupName},</if>
+            <if test="objType != null">#{objType},</if>
+            <if test="attrName != null and attrName != ''">#{attrName},</if>
+            <if test="attrDesc != null">#{attrDesc},</if>
+            <if test="attrValue != null">#{attrValue},</if>
+            <if test="attrUnit != null">#{attrUnit},</if>
+         </trim>
+    </insert>
+
+    <insert id="insertAttrBatch" parameterType="java.util.List">
+        insert into adm_ems_obj_attr (group_code, group_name, obj_type, attr_name, attr_desc, attr_value, attr_unit) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.groupCode},#{item.groupName},#{item.objType},#{item.attrName},#{item.attrDesc},#{item.attrValue},#{item.attrUnit})
+        </foreach>
+    </insert>
+
+    <update id="updateAttr" parameterType="com.ruoyi.ems.domain.EmsObjAttr">
+        update adm_ems_obj_attr
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="groupCode != null and groupCode != ''">group_code = #{groupCode},</if>
+            <if test="groupName != null and groupName != ''">group_name = #{groupName},</if>
+            <if test="objType != null">obj_type = #{objType},</if>
+            <if test="attrName != null and attrName != ''">attr_name = #{attrName},</if>
+            <if test="attrDesc != null">attr_desc = #{attrDesc},</if>
+            <if test="attrValue != null">attr_value = #{attrValue},</if>
+            <if test="attrUnit != null">attr_unit = #{attrUnit},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteAttrById" parameterType="Long">
+        delete from adm_ems_obj_attr where id = #{id}
+    </delete>
+
+    <delete id="deleteAttrByIds" parameterType="String">
+        delete from adm_ems_obj_attr where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteAttrByGroupCode" parameterType="String">
+        delete from adm_ems_obj_attr where group_code = #{groupCode}
+    </delete>
+</mapper>

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

@@ -0,0 +1,96 @@
+<?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.EmsObjEventMapper">
+    
+    <resultMap type="com.ruoyi.ems.domain.EmsObjEvent" id="EventResult">
+        <result property="id"    column="id"    />
+        <result property="groupCode"    column="group_code"    />
+        <result property="groupName"    column="group_name"    />
+        <result property="objType"      column="obj_type"    />
+        <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="selectEventVo">
+        select id, group_code, group_name, obj_type, event_name, event_type, event_desc, event_code, ext_event_code from adm_ems_obj_event
+    </sql>
+
+    <select id="selectEventList" parameterType="com.ruoyi.ems.domain.EmsObjEvent" resultMap="EventResult">
+        <include refid="selectEventVo"/>
+        <where>  
+            <if test="groupCode != null  and groupCode != ''"> and group_code = #{groupCode}</if>
+            <if test="objType != null"> and obj_type = #{objType}</if>
+        </where>
+    </select>
+    
+    <select id="selectEventById" parameterType="Long" resultMap="EventResult">
+        <include refid="selectEventVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertEvent" parameterType="com.ruoyi.ems.domain.EmsObjEvent" useGeneratedKeys="true" keyProperty="id">
+        insert into adm_ems_obj_event
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="groupCode != null and groupCode != ''">group_code,</if>
+            <if test="groupName != null and groupName != ''">group_name,</if>
+            <if test="objType != null">obj_type,</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="groupCode != null and groupCode != ''">#{groupCode},</if>
+            <if test="groupName != null and groupName != ''">#{groupName},</if>
+            <if test="objType != null">#{objType},</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="insertEventBatch" parameterType="java.util.List">
+        insert into adm_ems_obj_event (group_code, group_name, obj_type, event_name, event_type, event_desc, event_code, ext_event_code) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.groupCode},#{item.groupName},#{item.objType},#{item.eventName},#{item.eventType},#{item.eventDesc},#{item.eventCode},#{item.extEventCode})
+        </foreach>
+    </insert>
+
+    <update id="updateEvent" parameterType="com.ruoyi.ems.domain.EmsObjEvent">
+        update adm_ems_obj_event
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="groupCode != null and groupCode != ''">group_code = #{groupCode},</if>
+            <if test="groupnName != null and groupnName != ''">group_name = #{groupnName},</if>
+            <if test="objType != null">obj_type = #{objType},</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="deleteEventById" parameterType="Long">
+        delete from adm_ems_obj_event where id = #{id}
+    </delete>
+
+    <delete id="deleteEventByIds" parameterType="String">
+        delete from adm_ems_obj_event where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteEventByGroupCode" parameterType="String">
+        delete from adm_ems_obj_event where group_code = #{groupCode}
+    </delete>
+</mapper>

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

@@ -1,123 +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.PowerBoxElecEqptMapper">
-    
-    <resultMap type="com.ruoyi.ems.domain.PowerBoxElecEqpt" id="boxElecEqptResult">
-        <result property="id"           column="id"    />
-        <result property="boxCode"      column="box_code"    />
-        <result property="eqptCode"     column="eqpt_code"    />
-        <result property="eqptName"     column="eqpt_name"    />
-        <result property="extEqptCode"  column="ext_eqpt_code"    />
-        <result property="eqptType"     column="eqpt_type"    />
-        <result property="eqptName"     column="eqpt_name"    />
-        <result property="eqptSpec"     column="eqpt_spec"    />
-        <result property="ratedVoltage" column="rated_voltage"    />
-        <result property="ratedCurrent" column="rated_current"    />
-        <result property="ancestors"     column="ancestors"    />
-        <result property="parentEqpt"   column="parent_eqpt"    />
-        <result property="subCircuit"  column="sub_circuit"    />
-    </resultMap>
-
-    <sql id="selectBoxElecEqptVo">
-        select
-            bee.id, bee.box_code, bee.eqpt_code, bee.ext_eqpt_code, bee.eqpt_type, bet.type_name as eqpt_name, bee.eqpt_spec, bee.rated_voltage, bee.rated_current, bee.ancestors, bee.parent_eqpt, bee.sub_circuit
-        from adm_box_elec_eqpt bee
-            LEFT JOIN dim_box_eleceqpt_type bet ON bee.eqpt_type = bet.type_code
-    </sql>
-
-    <select id="selectBoxElecEqptList" parameterType="com.ruoyi.ems.domain.PowerBoxElecEqpt" resultMap="boxElecEqptResult">
-        <include refid="selectBoxElecEqptVo"/>
-        <where>  
-            <if test="boxCode != null  and boxCode != ''"> and bee.box_code = #{boxCode}</if>
-            <if test="eqptCode != null  and eqptCode != ''"> and bee.eqpt_code = #{eqptCode}</if>
-            <if test="extEqptCode != null  and extEqptCode != ''"> and bee.ext_eqpt_code = #{extEqptCode}</if>
-            <if test="eqptType != null  and eqptType != ''"> and bee.eqpt_type = #{eqptType}</if>
-            <if test="eqptSpec != null  and eqptSpec != ''"> and bee.eqpt_spec = #{eqptSpec}</if>
-            <if test="ratedVoltage != null "> and bee.rated_voltage = #{ratedVoltage}</if>
-            <if test="ratedCurrent != null "> and bee.rated_current = #{ratedCurrent}</if>
-            <if test="ancestors != null and ancestors != ''"> and bee.ancestors = #{ancestors}</if>
-            <if test="parentEqpt != null  and parentEqpt != ''"> and bee.parent_eqpt = #{parentEqpt}</if>
-            <if test="subCircuit != null  and subCircuit != ''"> and bee.sub_circuit = #{subCircuit}</if>
-        </where>
-    </select>
-
-    <select id="selectByBoxCode" parameterType="java.lang.String" resultMap="boxElecEqptResult">
-        <include refid="selectBoxElecEqptVo"/>
-        where bee.box_code = #{code}
-    </select>
-    
-    <select id="selectBoxElecEqptById" parameterType="Long" resultMap="boxElecEqptResult">
-        <include refid="selectBoxElecEqptVo"/>
-        where bee.id = #{id}
-    </select>
-        
-    <insert id="insertBoxElecEqpt" parameterType="com.ruoyi.ems.domain.PowerBoxElecEqpt" useGeneratedKeys="true" keyProperty="id">
-        insert into adm_box_elec_eqpt
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="boxCode != null and boxCode != ''">box_code,</if>
-            <if test="eqptCode != null and eqptCode != ''">eqpt_code,</if>
-            <if test="extEqptCode != null">ext_eqpt_code,</if>
-            <if test="eqptType != null and eqptType != ''">eqpt_type,</if>
-            <if test="eqptSpec != null">eqpt_spec,</if>
-            <if test="ratedVoltage != null">rated_voltage,</if>
-            <if test="ratedCurrent != null">rated_current,</if>
-            <if test="ancestors != null ">ancestors</if>
-            <if test="parentEqpt != null">parent_eqpt,</if>
-            <if test="subCircuit != null">sub_circuit,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="boxCode != null and boxCode != ''">#{boxCode},</if>
-            <if test="eqptCode != null and eqptCode != ''">#{eqptCode},</if>
-            <if test="extEqptCode != null">#{extEqptCode},</if>
-            <if test="eqptType != null and eqptType != ''">#{eqptType},</if>
-            <if test="eqptSpec != null">#{eqptSpec},</if>
-            <if test="ratedVoltage != null">#{ratedVoltage},</if>
-            <if test="ratedCurrent != null">#{ratedCurrent},</if>
-            <if test="ancestors != null ">#{ancestors},</if>
-            <if test="parentEqpt != null">#{parentEqpt},</if>
-            <if test="subCircuit != null">#{subCircuit},</if>
-         </trim>
-    </insert>
-
-    <insert id="insertBatch" parameterType="java.util.List" >
-        insert into adm_box_elec_eqpt (box_code, eqpt_code, ext_eqpt_code, eqpt_type, eqpt_spec, rated_voltage, rated_current, ancestors, parent_eqpt, sub_circuit)
-        values
-        <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.boxCode}, #{item.eqptCode}, #{item.extEqptCode}, #{item.eqptType}, #{item.eqptSpec}, #{item.ratedVoltage}, #{item.ratedCurrent}, #{item.ancestors}, #{item.parentEqpt}, #{item.subCircuit})
-        </foreach>
-    </insert>
-
-    <update id="updateBoxElecEqpt" parameterType="com.ruoyi.ems.domain.PowerBoxElecEqpt">
-        update adm_box_elec_eqpt
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="boxCode != null and boxCode != ''">box_code = #{boxCode},</if>
-            <if test="eqptCode != null and eqptCode != ''">eqpt_code = #{eqptCode},</if>
-            <if test="extEqptCode != null">ext_eqpt_code = #{extEqptCode},</if>
-            <if test="eqptType != null and eqptType != ''">eqpt_type = #{eqptType},</if>
-            <if test="eqptSpec != null">eqpt_spec = #{eqptSpec},</if>
-            <if test="ratedVoltage != null">rated_voltage = #{ratedVoltage},</if>
-            <if test="ratedCurrent != null">rated_current = #{ratedCurrent},</if>
-            <if test="ancestors != null ">ancestors = #{ancestors}</if>
-            <if test="parentEqpt != null">parent_eqpt = #{parentEqpt},</if>
-            <if test="subCircuit != null">sub_circuit = #{subCircuit},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteBoxElecEqptById" parameterType="Long">
-        delete from adm_box_elec_eqpt where id = #{id}
-    </delete>
-
-    <delete id="deleteByBoxCode" parameterType="String">
-        delete from adm_box_elec_eqpt where box_code = #{code}
-    </delete>
-
-    <delete id="deleteBoxElecEqptByIds" parameterType="String">
-        delete from adm_box_elec_eqpt 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/PowerBoxMapper.xml

@@ -1,96 +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.PowerBoxMapper">
-
-    <resultMap type="com.ruoyi.ems.domain.PowerBox" id="powerBoxResult">
-        <result property="id"    column="id"    />
-        <result property="boxCode"    column="box_code"    />
-        <result property="boxType"    column="box_type"    />
-        <result property="areaCode"    column="area_code"    />
-        <result property="areaName"    column="area_name"    />
-        <result property="areaShortName"    column="area_short_name"    />
-        <result property="location"    column="location"    />
-        <result property="boxSize"    column="box_size"    />
-        <result property="gatewayAddr"    column="gateway_addr"    />
-        <result property="gatewayPort"    column="gateway_port"    />
-    </resultMap>
-
-    <sql id="selectPowerBoxVo">
-        select
-            pb.id, pb.box_code, pb.box_type, pb.area_code, sa.area_name, sa.short_name as area_short_name, pb.location, pb.box_size, pb.gateway_addr, pb.gateway_port
-        from adm_power_box pb
-          LEFT JOIN adm_service_area sa on pb.area_code = sa.area_code
-    </sql>
-
-    <select id="selectPowerBoxList" parameterType="com.ruoyi.ems.domain.PowerBox" resultMap="powerBoxResult">
-        <include refid="selectPowerBoxVo"/>
-        <where>
-            <if test="boxCode != null  and boxCode != ''"> and pb.box_code = #{boxCode}</if>
-            <if test="boxType != null "> and pb.box_type = #{boxType}</if>
-            <if test="areaCode != null  and areaCode != ''"> and pb.area_code = #{areaCode}</if>
-            <if test="location != null  and location != ''"> and pb.location = #{location}</if>
-            <if test="boxSize != null  and boxSize != ''"> and pb.box_size = #{boxSize}</if>
-            <if test="gatewayAddr != null  and gatewayAddr != ''"> and pb.gateway_addr = #{gatewayAddr}</if>
-            <if test="gatewayPort != null "> and pb.gateway_port = #{gatewayPort}</if>
-        </where>
-    </select>
-
-    <select id="selectPowerBoxById" parameterType="Long" resultMap="powerBoxResult">
-        <include refid="selectPowerBoxVo"/>
-        where pb.id = #{id}
-    </select>
-
-    <select id="selectPowerBoxByCode" parameterType="String" resultMap="powerBoxResult">
-        <include refid="selectPowerBoxVo"/>
-        where pb.box_code = #{boxCode}
-    </select>
-
-    <insert id="insertPowerBox" parameterType="com.ruoyi.ems.domain.PowerBox" useGeneratedKeys="true" keyProperty="id">
-        insert into adm_power_box
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="boxCode != null and boxCode != ''">box_code,</if>
-            <if test="boxType != null">box_type,</if>
-            <if test="areaCode != null">area_code,</if>
-            <if test="location != null">location,</if>
-            <if test="boxSize != null">box_size,</if>
-            <if test="gatewayAddr != null">gateway_addr,</if>
-            <if test="gatewayPort != null">gateway_port,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="boxCode != null and boxCode != ''">#{boxCode},</if>
-            <if test="boxType != null">#{boxType},</if>
-            <if test="areaCode != null">#{areaCode},</if>
-            <if test="location != null">#{location},</if>
-            <if test="boxSize != null">#{boxSize},</if>
-            <if test="gatewayAddr != null">#{gatewayAddr},</if>
-            <if test="gatewayPort != null">#{gatewayPort},</if>
-         </trim>
-    </insert>
-
-    <update id="updatePowerBox" parameterType="com.ruoyi.ems.domain.PowerBox">
-        update adm_power_box
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="boxCode != null and boxCode != ''">box_code = #{boxCode},</if>
-            <if test="boxType != null">box_type = #{boxType},</if>
-            <if test="areaCode != null">area_code = #{areaCode},</if>
-            <if test="location != null">location = #{location},</if>
-            <if test="boxSize != null">box_size = #{boxSize},</if>
-            <if test="gatewayAddr != null">gateway_addr = #{gatewayAddr},</if>
-            <if test="gatewayPort != null">gateway_port = #{gatewayPort},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deletePowerBoxById" parameterType="Long">
-        delete from adm_power_box where id = #{id}
-    </delete>
-
-    <delete id="deletePowerBoxByIds" parameterType="String">
-        delete from adm_power_box where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ems-cloud/sql/ems_init_data.sql

@@ -103,32 +103,38 @@ INSERT INTO adm_area_building_zoning (`bldg_code`, `zoning_code`, `zoning_name`,
 INSERT INTO adm_area_building_zoning (`bldg_code`, `zoning_code`, `zoning_name`, `floor`, `room_no`, `bldg_ld_area`, `usage_detail`) VALUES ('321283124S300206', '321283124S3002_CW-WXP','危险品车位', 1, 'CW-XK', 100, '使用中');
 
 -- 能源设施初始数据
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('W201', '北区-供电网', 'W', 'W2', 1, '321283124S3001');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('W202', '南区-供电网', 'W', 'W2', 1, '321283124S3002');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('E501', '北区-光伏', 'E', 'E5', 1, '321283124S3001');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('E502', '南区-光伏', 'E', 'E5', 1, '321283124S3002');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('C101', '北区-储能', 'C', 'C1', 1, '321283124S3001');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('C102', '南区-储能', 'C', 'C1', 1, '321283124S3002');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('Z101', '北区-室内照明', 'Z', 'Z001', 1, '321283124S3001');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('Z102', '北区-室外照明', 'Z', 'Z002', 1, '321283124S3001');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('Z110', '北区-公共设施', 'Z', 'Z010', 1, '321283124S3001');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('Z120', '北区-空调设施', 'Z', 'Z020', 1, '321283124S3001');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('Z201', '南区-室内照明', 'Z', 'Z001', 1, '321283124S3002');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('Z202', '南区-室外照明', 'Z', 'Z002', 1, '321283124S3002');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('Z210', '南区-公共设施', 'Z', 'Z010', 1, '321283124S3002');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('Z220', '南区-空调设施', 'Z', 'Z020', 1, '321283124S3002');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('E503', '主路-光伏', 'E', 'E5', 1, '321283124S3003');
-
--- 设施属性DEMO数据
-INSERT INTO `adm_ems_facs_attr` (`facs_code`, `attr_name`, `attr_desc`, `attr_value`, `attr_unit`) VALUES ('W201', 'input_load', '进线负荷', '293.55', 'kw/h');
-INSERT INTO `adm_ems_facs_attr` (`facs_code`, `attr_name`, `attr_desc`, `attr_value`, `attr_unit`) VALUES ('E501', 'installed_capacity', '装机容量', '2000', 'MW');
-
--- 设施属性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}');
-
--- 设施事件DEMO数据
-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');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `attr_group`, `ability_group`, `event_group`) VALUES ('W201', '北区-供电网', 'W', 'W2', 1, '321283124S3001', 'AT_W2', 'AB_W2', 'E_W2');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `attr_group`, `ability_group`, `event_group`) VALUES ('W202', '南区-供电网', 'W', 'W2', 1, '321283124S3002', 'AT_W2', 'AB_W2', 'E_W2');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `attr_group`, `ability_group`, `event_group`) VALUES ('E501', '北区-光伏', 'E', 'E5', 1, '321283124S3001', 'AT_E501', null, null);
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `attr_group`, `ability_group`, `event_group`) VALUES ('E502', '南区-光伏', 'E', 'E5', 1, '321283124S3002', 'AT_E502', null, null);
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `attr_group`, `ability_group`, `event_group`) VALUES ('E503', '主路-光伏', 'E', 'E5', 1, '321283124S3003', 'AT_E503', null, null);
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `attr_group`, `ability_group`, `event_group`) VALUES ('C101', '北区-储能', 'C', 'C1', 1, '321283124S3001', 'AT_C101', null, null);
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `attr_group`, `ability_group`, `event_group`) VALUES ('C102', '南区-储能', 'C', 'C1', 1, '321283124S3002', 'AT_C102', null, null);
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `attr_group`, `ability_group`, `event_group`) VALUES ('Z101', '北区-室内照明', 'Z', 'Z001', 1, '321283124S3001', null, null, null);
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `attr_group`, `ability_group`, `event_group`) VALUES ('Z102', '北区-室外照明', 'Z', 'Z002', 1, '321283124S3001', null, null, null);
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `attr_group`, `ability_group`, `event_group`) VALUES ('Z110', '北区-公共设施', 'Z', 'Z010', 1, '321283124S3001', null, null, null);
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `attr_group`, `ability_group`, `event_group`) VALUES ('Z120', '北区-空调设施', 'Z', 'Z020', 1, '321283124S3001', null, null, null);
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `attr_group`, `ability_group`, `event_group`) VALUES ('Z201', '南区-室内照明', 'Z', 'Z001', 1, '321283124S3002', null, null, null);
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `attr_group`, `ability_group`, `event_group`) VALUES ('Z202', '南区-室外照明', 'Z', 'Z002', 1, '321283124S3002', null, null, null);
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `attr_group`, `ability_group`, `event_group`) VALUES ('Z210', '南区-公共设施', 'Z', 'Z010', 1, '321283124S3002', null, null, null);
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `attr_group`, `ability_group`, `event_group`) VALUES ('Z220', '南区-空调设施', 'Z', 'Z020', 1, '321283124S3002', null, null, null);
+
+
+-- 对象属性DEMO数据
+INSERT INTO `adm_ems_obj_attr` (`group_code`, `group_name`, `obj_type`, `attr_name`, `attr_desc`, `attr_value`, `attr_unit`) VALUES ('AT_W2', '电网属性', 1, 'voltageLevel', '电压等级', '10', 'kV');
+INSERT INTO `adm_ems_obj_attr` (`group_code`, `group_name`, `obj_type`, `attr_name`, `attr_desc`, `attr_value`, `attr_unit`) VALUES ('AT_E501', '北区光伏属性', 1, 'installedCapacity', '装机容量', '150', 'kw');
+INSERT INTO `adm_ems_obj_attr` (`group_code`, `group_name`, `obj_type`, `attr_name`, `attr_desc`, `attr_value`, `attr_unit`) VALUES ('AT_E502', '南区光伏属性', 1, 'installedCapacity', '装机容量', '150', 'kw');
+INSERT INTO `adm_ems_obj_attr` (`group_code`, `group_name`, `obj_type`, `attr_name`, `attr_desc`, `attr_value`, `attr_unit`) VALUES ('AT_E503', '主路光伏属性', 1, 'installedCapacity', '装机容量', '150', 'kw');
+INSERT INTO `adm_ems_obj_attr` (`group_code`, `group_name`, `obj_type`, `attr_name`, `attr_desc`, `attr_value`, `attr_unit`) VALUES ('AT_C101', '北区储能属性', 1, 'storageCapacity', '储能容量', '100', 'kW-h');
+INSERT INTO `adm_ems_obj_attr` (`group_code`, `group_name`, `obj_type`, `attr_name`, `attr_desc`, `attr_value`, `attr_unit`) VALUES ('AT_C102', '南区储能属性', 1, 'storageCapacity', '储能容量', '100', 'kW-h');
+
+-- 对象能力DEMO数据
+INSERT INTO `adm_ems_obj_ability` (`group_code`, `group_name`, `obj_type`, `ability_name`, `ability_desc`, `ability_param`) VALUES ('AB_W2', '电网能力', 1, '通断检测', '链路测试', '{\"enable\":\"1\"}');
+
+
+-- 对象事件DEMO数据
+INSERT INTO `adm_ems_obj_event` (`group_code`, `group_name`, `obj_type`, `event_name`, `event_type`, `event_desc`, `event_code`, `ext_event_code`) VALUES ('E_W2', '电网事件', 1, 'overload', 2, '过载', 'e-gy-0001', '0x0001');
+INSERT INTO `adm_ems_obj_event` (`group_code`, `group_name`, `obj_type`, `event_name`, `event_type`, `event_desc`, `event_code`, `ext_event_code`) VALUES ('E_W2', '电网事件', 1, 'undervoltage', 2, '欠压', 'e-gy-0002', '0x0002');
 
 
 -- 能源设施能流关系DEMO数据
@@ -137,107 +143,107 @@ INSERT INTO `adm_ems_facs_flow_rel` (`code`, `export_facs_code`, `input_facs_cod
 INSERT INTO `adm_ems_facs_flow_rel` (`code`, `export_facs_code`, `input_facs_code`, `ems_cls`, `state`, `action_type`) VALUES ('E501_Z101', 'E501', 'Z101', '45', 1, '4505');
 
 -- 能源设备
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R101-001', '开水炉',       '1', '2', 'Zoning', 'B-101', '321283124S3001,321283124S300101,B-101', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R102-002', '超市照明灯',       '1', '2', 'Zoning', 'B-102', '321283124S3001,321283124S300101,B-102', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R102-003', '超市监控和防盗设备', '1', '2', 'Zoning', 'B-102', '321283124S3001,321283124S300101,B-102', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R103-001', '空调',             '2', '1', 'Zoning', 'B-103', '321283124S3001,321283124S300101,B-103', 'Z120', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R103-002', '烤箱', '2', '2', 'Zoning', 'B-103', '321283124S3001,321283124S300101,B-103', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R103-003', '搅拌机', '2','2' , 'Zoning', 'B-103', '321283124S3001,321283124S300101,B-103', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R104-001', 'LED节能灯', '2', '1', 'Zoning', 'B-104', '321283124S3001,321283124S300101,B-104', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R104-002', '智能电表', '2', '1', 'Zoning', 'B-104', '321283124S3001,321283124S300101,B-104', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R104-003', '智慧路灯', '2', '1', 'Zoning', 'B-104', '321283124S3001,321283124S300101,B-104', 'Z102', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R105-001', '电源管理器', '2', '1', 'Zoning', 'B-105', '321283124S3001,321283124S300101,B-105', 'W201', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R105-002', '充电站', '1', '1', 'Zoning', 'B-105', '321283124S3001,321283124S300101,B-105', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R105-003', '调光系统', '1', '1', 'Zoning', 'B-105', '321283124S3001,321283124S300101,B-105', 'Z101', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R106-001', '吊灯', '2', '1', 'Zoning', 'B-106', '321283124S3001,321283124S300101,B-106', 'Z101', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R107-001', '橱窗照明','2', '1', 'Zoning', 'B-107', '321283124S3001,321283124S300101,B-107', 'Z101', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R107-002', 'UPS（不间断电源）系统', '1', '1', 'Zoning', 'B-107', '321283124S3001,321283124S300101,B-107', 'Z101', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R108-001', '吊灯', '2', '1', 'Zoning', 'B-108', '321283124S3001,321283124S300101,B-108', 'Z101', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R109-001', '指示灯', '2', '1', 'Zoning', 'B-109', '321283124S3001,321283124S300101,B-109', 'Z101', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R110-001', '应急照明', '2', '1', 'Zoning', 'B-110', '321283124S3001,321283124S300101,B-110', 'Z101', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R112-001', '自动感应灯', '2', '2', 'Zoning', 'B-112', '321283124S3001,321283124S300101,B-112', 'Z101', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R112-002', '电路保护装置', '1', '2', 'Zoning', 'B-112', '321283124S3001,321283124S300101,B-112', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R114-001', '自动感应灯', '2', '2', 'Zoning', 'B-114', '321283124S3001,321283124S300101,B-114', 'Z101', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R114-002', '电路保护装置', '1', '2', 'Zoning', 'B-114', '321283124S3001,321283124S300101,B-114', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R115-001', '工作灯', '1', '2', 'Zoning', 'B-115', '321283124S3001,321283124S300101,B-115', 'Z101', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R16-001',  '防水灯具', '1', '2', 'Zoning', 'B-116', '321283124S3001,321283124S300101,B-116', 'Z102', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R117-001', '防水灯具', '1', '2', 'Zoning', 'B-117', '321283124S3001,321283124S300101,B-117', 'Z102', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R118-001', '灯具', '1', '2', 'Zoning', 'B-118', '321283124S3001,321283124S300101,B-118', 'Z102', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R119-001', '防水灯具', '1', '2', 'Zoning', 'B-119', '321283124S3001,321283124S300101,B-119', 'Z102', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R120-001', '控制面板', '1', '1', 'Zoning', 'B-120', '321283124S3001,321283124S300102,B-120', 'W201', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R121-001', '配电柜', '2', '1', 'Zoning', 'B-121', '321283124S3001,321283124S300102,B-121', 'W201', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R122-001', '断路器', '1', '1', 'Zoning', 'B-122', '321283124S3001,321283124S300102,B-122', 'W201', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R123-001', '电源插座', '1', '1', 'Zoning', 'B-123', '321283124S3001,321283124S300103,B-123', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R124-001', '加热器', '1', '1', 'Zoning', 'B-124', '321283124S3001,321283124S300103,B-124', 'Z102', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R125-001', '空调', '1', '1', 'Zoning', 'B-125', '321283124S3001,321283124S300104,B-125', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R126-001', '空调', '1', '1', 'Zoning', 'B-126', '321283124S3001,321283124S300104,B-126', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R127-001', '空调', '1', '1', 'Zoning', 'B-127', '321283124S3001,321283124S300104,B-127', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R128-001', '空调', '1', '1', 'Zoning', 'B-128', '321283124S3001,321283124S300104,B-128', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R129-001', '空调', '1', '1', 'Zoning', 'B-129', '321283124S3001,321283124S300105,B-129', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R130-001', '空调', '1', '1', 'Zoning', 'B-130', '321283124S3001,321283124S300105,B-130', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R131-001', '空调', '1', '1', 'Zoning', 'B-131', '321283124S3001,321283124S300105,B-131', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R132-001', '空调', '1', '1', 'Zoning', 'B-132', '321283124S3001,321283124S300105,B-132', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Car-001', '照明灯', '1', '1', 'Zoning', '321283124S3001_CW-XK', '321283124S3001,321283124S300106,321283124S3001_CW-XK', 'Z102','SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Car-002', '智能监控系统', '1', NULL, 'Zoning', '321283124S3001_CW-CD', '321283124S3001,321283124S300106,321283124S3001_CW-CD', 'Z110','SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Car-003', '照明灯', '1', NULL, 'Zoning', '321283124S3001_CW-WZA', '321283124S3001,321283124S300106,321283124S3001_CW-WZA', 'Z102','SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Car-004', '照明灯', '1', NULL, 'Zoning', '321283124S3001_CW-DKC', '321283124S3001,321283124S300106,321283124S3001_CW-DKC', 'Z102','SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Car-005', '照明灯', '1', NULL, 'Zoning', '321283124S3001_CW-HC', '321283124S3001,321283124S300106,321283124S3001_CW-HC', 'Z102','SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Car-006', '停车场照明灯', '1', NULL, 'Zoning', '321283124S3001_CW-WXP', '321283124S3001,321283124S300106,321283124S3001_CW-WXP', 'Z102','SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Car-007', '智能监控系统', '1', NULL, 'Zoning', '321283124S3001_CW-WXP', '321283124S3001,321283124S300106,321283124S3001_CW-WXP', 'Z110','SYS_BA');
-
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R101-101', '开水炉', '1', '2', 'Zoning', 'N-101', '321283124S3002,321283124S300201,N-101', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R102-101', '超市区空调', '2', '1', 'Zoning', 'N-102', '321283124S3002,321283124S300201,N-102', 'Z120', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R102-102', '超市照明灯', '1', '2', 'Zoning', 'N-102', '321283124S3002,321283124S300201,N-102', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R102-103', '超市监控和防盗设备', '1', '2', 'Zoning', 'N-102', '321283124S3002,321283124S300201,N-102', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R103-101', '空调', '2', NULL, 'Zoning', 'N-103', '321283124S3002,321283124S300201,N-103', 'Z120', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R103-102', '烤箱', '2', '2', 'Zoning', 'N-103', '321283124S3002,321283124S300201,N-103', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R103-103', '搅拌机', '2','2' , 'Zoning', 'N-103', '321283124S3002,321283124S300201,N-103', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R104-101', 'LED节能灯', '2', '1', 'Zoning', 'N-104', '321283124S3002,321283124S300201,N-104', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R104-102', '智能电表', '2', '1', 'Zoning', 'N-104', '321283124S3002,321283124S300201,N-104', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R104-103', '智慧路灯', '2', '1', 'Zoning', 'N-104', '321283124S3002,321283124S300201,N-104', 'Z102', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R105-101', '电源管理器', '2', '1', 'Zoning', 'N-105', '321283124S3002,321283124S300201,N-105', 'W201', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R105-102', '充电站', '1', '1', 'Zoning', 'N-105', '321283124S3002,321283124S300201,N-105', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R105-103', '调光系统', '1', '1', 'Zoning', 'N-105', '321283124S3002,321283124S300201,N-105', 'Z101', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R106-101', '吊灯', '2', '1', 'Zoning', 'N-106', '321283124S3002,321283124S300201,N-106', 'Z101', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R107-101', '橱窗照明','2', '1', 'Zoning', 'N-107', '321283124S3002,321283124S300201,N-107', 'Z101', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R107-102', 'UPS（不间断电源）系统', '1', '1', 'Zoning', 'N-107', '321283124S3002,321283124S300201,N-107', 'Z101', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R108-101', '吊灯', '2', '1', 'Zoning', 'N-108', '321283124S3002,321283124S300201,N-108', 'Z101', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R109-101', '指示灯', '2', '1', 'Zoning', 'N-109', '321283124S3002,321283124S300201,N-109', 'Z101', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R110-101', '应急照明', '2', '1', 'Zoning', 'N-110', '321283124S3002,321283124S300201,N-110', 'Z101', 'SYS_BA');
-
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R112-101', '自动感应灯', '2', '2', 'Zoning', 'N-112', '321283124S3002,321283124S300201,N-112', 'Z101', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R112-102', '电路保护装置', '1', '2', 'Zoning', 'N-112', '321283124S3002,321283124S300201,N-112', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R114-101', '自动感应灯', '2', '2', 'Zoning', 'N-114', '321283124S3002,321283124S300201,N-114', 'Z101', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R114-102', '电路保护装置', '1', '2', 'Zoning', 'N-114', '321283124S3002,321283124S300201,N-114', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R115-101', '工作灯', '1', '2', 'Zoning', 'N-115', '321283124S3002,321283124S300201,N-115', 'Z101', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R16-101', '防水灯具', '1', '2', 'Zoning', 'N-116', '321283124S3002,321283124S300201,N-115', 'Z102', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R117-101', '防水灯具', '1', '2', 'Zoning', 'N-117', '321283124S3002,321283124S300201,N-117', 'Z102', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R118-101', '防水灯具', '1', '1', 'Zoning', 'N-118', '321283124S3002,321283124S300201,N-118', 'Z102', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R119-101', '防水灯具', '1', '1', 'Zoning', 'N-119', '321283124S3002,321283124S300201,N-119', 'Z102', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R120-101', '控制面板', '1', '1', 'Zoning', 'N-120', '321283124S3002,321283124S300202,N-120', 'W201', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R121-101', '配电柜', '2', '1', 'Zoning', 'N-121', '321283124S3002,321283124S300202,N-121', 'W201', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R122-101', '断路器', '1', '1', 'Zoning', 'N-122', '321283124S3002,321283124S300202,N-122', 'W201', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R123-101', '电源插座', '1', '1', 'Zoning', 'N-123', '321283124S3002,321283124S300203,N-123', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R124-101', '加热器', '1', '1', 'Zoning', 'N-124', '321283124S3002,321283124S300203,N-124', 'Z102', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R125-101', '空调', '1', '1', 'Zoning', 'N-125', '321283124S3002,321283124S300204,N-125', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R126-101', '空调', '1', '1', 'Zoning', 'N-126', '321283124S3002,321283124S300204,N-126', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R127-101', '空调', '1', '1', 'Zoning', 'N-127', '321283124S3002,321283124S300204,N-127', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R128-101', '空调', '1', '1', 'Zoning', 'N-128', '321283124S3002,321283124S300204,N-128', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R129-101', '空调', '1', '1', 'Zoning', 'N-129', '321283124S3002,321283124S300205,N-129', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R130-101', '空调', '1', '1', 'Zoning', 'N-130', '321283124S3002,321283124S300205,N-130', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R131-101', '空调', '1', '1', 'Zoning', 'N-131', '321283124S3002,321283124S300205,N-131', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Z010-R132-101', '空调', '1', '1', 'Zoning', 'N-132', '321283124S3002,321283124S300205,N-132', 'Z110', 'SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Car-101', '照明灯', '1', '1', 'Zoning', '321283124S3002_CW-XK', '321283124S3002,321283124S300206,321283124S3002_CW-XK', 'Z102','SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Car-102', '智能监控系统', '1', NULL, 'Zoning', '321283124S3002_CW-CD', '321283124S3002,321283124S300206,321283124S3002_CW-CD', 'Z110','SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Car-103', '照明灯', '1', NULL, 'Zoning', '321283124S3002_CW-WZA', '321283124S3002,321283124S300206,321283124S3002_CW-WZA', 'Z102','SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Car-104', '照明灯', '1', NULL, 'Zoning', '321283124S3002_CW-DKC', '321283124S3002,321283124S300206,321283124S3002_CW-DKC', 'Z102','SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Car-105', '照明灯', '1', NULL, 'Zoning', '321283124S3002_CW-HC', '321283124S3002,321283124S300206,321283124S3002_CW-HC', 'Z102','SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Car-106', '停车场照明灯', '1', NULL, 'Zoning', '321283124S3002_CW-WXP', '321283124S3002,321283124S300206,321283124S3002_CW-WXP', 'Z102','SYS_BA');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'Car-107', '智能监控系统', '1', NULL, 'Zoning', '321283124S3002_CW-WXP', '321283124S3002,321283124S300206,321283124S3002_CW-WXP', 'Z110','SYS_BA');
-
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'E503-K140-K150-001', '光伏板1', '2', '1', 'Building', 'S30K140-S30K150', '321283124S3003,S30K140-S30K150', 'E503', 'SYS_GF');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'E503-K140-K150-002', '光伏板2', '2', '1', 'Building', 'S30K140-S30K150', '321283124S3003,S30K140-S30K150', 'E503', 'SYS_GF');
-INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `subsystem_code`) VALUES ( 'E503-K140-K150-003', '光伏板3', '2', '1', 'Building', 'S30K150-S30K180', '321283124S3003,S30K150-S30K180', 'E503', 'SYS_GF');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R101-001', '开水炉',       '1', '2', 'Zoning', 'B-101', '321283124S3001,321283124S300101,B-101', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R102-002', '超市照明灯',       '1', '2', 'Zoning', 'B-102', '321283124S3001,321283124S300101,B-102', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R102-003', '超市监控和防盗设备', '1', '2', 'Zoning', 'B-102', '321283124S3001,321283124S300101,B-102', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R103-001', '空调',             '2', '1', 'Zoning', 'B-103', '321283124S3001,321283124S300101,B-103', 'Z120', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R103-002', '烤箱', '2', '2', 'Zoning', 'B-103', '321283124S3001,321283124S300101,B-103', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R103-003', '搅拌机', '2','2' , 'Zoning', 'B-103', '321283124S3001,321283124S300101,B-103', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R104-001', 'LED节能灯', '2', '1', 'Zoning', 'B-104', '321283124S3001,321283124S300101,B-104', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R104-002', '智能电表', '2', '1', 'Zoning', 'B-104', '321283124S3001,321283124S300101,B-104', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R104-003', '智慧路灯', '2', '1', 'Zoning', 'B-104', '321283124S3001,321283124S300101,B-104', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R105-001', '电源管理器', '2', '1', 'Zoning', 'B-105', '321283124S3001,321283124S300101,B-105', 'W201', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R105-002', '充电站', '1', '1', 'Zoning', 'B-105', '321283124S3001,321283124S300101,B-105', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R105-003', '调光系统', '1', '1', 'Zoning', 'B-105', '321283124S3001,321283124S300101,B-105', 'Z101', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R106-001', '吊灯', '2', '1', 'Zoning', 'B-106', '321283124S3001,321283124S300101,B-106', 'Z101', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R107-001', '橱窗照明','2', '1', 'Zoning', 'B-107', '321283124S3001,321283124S300101,B-107', 'Z101', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R107-002', 'UPS（不间断电源）系统', '1', '1', 'Zoning', 'B-107', '321283124S3001,321283124S300101,B-107', 'Z101', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R108-001', '吊灯', '2', '1', 'Zoning', 'B-108', '321283124S3001,321283124S300101,B-108', 'Z101', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R109-001', '指示灯', '2', '1', 'Zoning', 'B-109', '321283124S3001,321283124S300101,B-109', 'Z101', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R110-001', '应急照明', '2', '1', 'Zoning', 'B-110', '321283124S3001,321283124S300101,B-110', 'Z101', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R112-001', '自动感应灯', '2', '2', 'Zoning', 'B-112', '321283124S3001,321283124S300101,B-112', 'Z101', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R112-002', '电路保护装置', '1', '2', 'Zoning', 'B-112', '321283124S3001,321283124S300101,B-112', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R114-001', '自动感应灯', '2', '2', 'Zoning', 'B-114', '321283124S3001,321283124S300101,B-114', 'Z101', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R114-002', '电路保护装置', '1', '2', 'Zoning', 'B-114', '321283124S3001,321283124S300101,B-114', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R115-001', '工作灯', '1', '2', 'Zoning', 'B-115', '321283124S3001,321283124S300101,B-115', 'Z101', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R16-001',  '防水灯具', '1', '2', 'Zoning', 'B-116', '321283124S3001,321283124S300101,B-116', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R117-001', '防水灯具', '1', '2', 'Zoning', 'B-117', '321283124S3001,321283124S300101,B-117', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R118-001', '灯具', '1', '2', 'Zoning', 'B-118', '321283124S3001,321283124S300101,B-118', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R119-001', '防水灯具', '1', '2', 'Zoning', 'B-119', '321283124S3001,321283124S300101,B-119', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R120-001', '控制面板', '1', '1', 'Zoning', 'B-120', '321283124S3001,321283124S300102,B-120', 'W201', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R121-001', '配电柜', '2', '1', 'Zoning', 'B-121', '321283124S3001,321283124S300102,B-121', 'W201', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R122-001', '断路器', '1', '1', 'Zoning', 'B-122', '321283124S3001,321283124S300102,B-122', 'W201', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R123-001', '电源插座', '1', '1', 'Zoning', 'B-123', '321283124S3001,321283124S300103,B-123', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R124-001', '加热器', '1', '1', 'Zoning', 'B-124', '321283124S3001,321283124S300103,B-124', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R125-001', '空调', '1', '1', 'Zoning', 'B-125', '321283124S3001,321283124S300104,B-125', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R126-001', '空调', '1', '1', 'Zoning', 'B-126', '321283124S3001,321283124S300104,B-126', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R127-001', '空调', '1', '1', 'Zoning', 'B-127', '321283124S3001,321283124S300104,B-127', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R128-001', '空调', '1', '1', 'Zoning', 'B-128', '321283124S3001,321283124S300104,B-128', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R129-001', '空调', '1', '1', 'Zoning', 'B-129', '321283124S3001,321283124S300105,B-129', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R130-001', '空调', '1', '1', 'Zoning', 'B-130', '321283124S3001,321283124S300105,B-130', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R131-001', '空调', '1', '1', 'Zoning', 'B-131', '321283124S3001,321283124S300105,B-131', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R132-001', '空调', '1', '1', 'Zoning', 'B-132', '321283124S3001,321283124S300105,B-132', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Car-001', '照明灯', '1', '1', 'Zoning', '321283124S3001_CW-XK', '321283124S3001,321283124S300106,321283124S3001_CW-XK', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Car-002', '智能监控系统', '1', NULL, 'Zoning', '321283124S3001_CW-CD', '321283124S3001,321283124S300106,321283124S3001_CW-CD', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Car-003', '照明灯', '1', NULL, 'Zoning', '321283124S3001_CW-WZA', '321283124S3001,321283124S300106,321283124S3001_CW-WZA', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Car-004', '照明灯', '1', NULL, 'Zoning', '321283124S3001_CW-DKC', '321283124S3001,321283124S300106,321283124S3001_CW-DKC', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Car-005', '照明灯', '1', NULL, 'Zoning', '321283124S3001_CW-HC', '321283124S3001,321283124S300106,321283124S3001_CW-HC', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Car-006', '停车场照明灯', '1', NULL, 'Zoning', '321283124S3001_CW-WXP', '321283124S3001,321283124S300106,321283124S3001_CW-WXP', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Car-007', '智能监控系统', '1', NULL, 'Zoning', '321283124S3001_CW-WXP', '321283124S3001,321283124S300106,321283124S3001_CW-WXP', 'Z110', null, 'SYS_BA');
+
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R101-101', '开水炉', '1', '2', 'Zoning', 'N-101', '321283124S3002,321283124S300201,N-101', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R102-101', '超市区空调', '2', '1', 'Zoning', 'N-102', '321283124S3002,321283124S300201,N-102', 'Z120', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R102-102', '超市照明灯', '1', '2', 'Zoning', 'N-102', '321283124S3002,321283124S300201,N-102', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R102-103', '超市监控和防盗设备', '1', '2', 'Zoning', 'N-102', '321283124S3002,321283124S300201,N-102', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R103-101', '空调', '2', NULL, 'Zoning', 'N-103', '321283124S3002,321283124S300201,N-103', 'Z120', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R103-102', '烤箱', '2', '2', 'Zoning', 'N-103', '321283124S3002,321283124S300201,N-103', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R103-103', '搅拌机', '2','2' , 'Zoning', 'N-103', '321283124S3002,321283124S300201,N-103', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R104-101', 'LED节能灯', '2', '1', 'Zoning', 'N-104', '321283124S3002,321283124S300201,N-104', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R104-102', '智能电表', '2', '1', 'Zoning', 'N-104', '321283124S3002,321283124S300201,N-104', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R104-103', '智慧路灯', '2', '1', 'Zoning', 'N-104', '321283124S3002,321283124S300201,N-104', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R105-101', '电源管理器', '2', '1', 'Zoning', 'N-105', '321283124S3002,321283124S300201,N-105', 'W201', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R105-102', '充电站', '1', '1', 'Zoning', 'N-105', '321283124S3002,321283124S300201,N-105', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R105-103', '调光系统', '1', '1', 'Zoning', 'N-105', '321283124S3002,321283124S300201,N-105', 'Z101', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R106-101', '吊灯', '2', '1', 'Zoning', 'N-106', '321283124S3002,321283124S300201,N-106', 'Z101', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R107-101', '橱窗照明','2', '1', 'Zoning', 'N-107', '321283124S3002,321283124S300201,N-107', 'Z101', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R107-102', 'UPS（不间断电源）系统', '1', '1', 'Zoning', 'N-107', '321283124S3002,321283124S300201,N-107', 'Z101', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R108-101', '吊灯', '2', '1', 'Zoning', 'N-108', '321283124S3002,321283124S300201,N-108', 'Z101', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R109-101', '指示灯', '2', '1', 'Zoning', 'N-109', '321283124S3002,321283124S300201,N-109', 'Z101', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R110-101', '应急照明', '2', '1', 'Zoning', 'N-110', '321283124S3002,321283124S300201,N-110', 'Z101', null, 'SYS_BA');
+
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R112-101', '自动感应灯', '2', '2', 'Zoning', 'N-112', '321283124S3002,321283124S300201,N-112', 'Z101', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R112-102', '电路保护装置', '1', '2', 'Zoning', 'N-112', '321283124S3002,321283124S300201,N-112', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R114-101', '自动感应灯', '2', '2', 'Zoning', 'N-114', '321283124S3002,321283124S300201,N-114', 'Z101', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R114-102', '电路保护装置', '1', '2', 'Zoning', 'N-114', '321283124S3002,321283124S300201,N-114', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R115-101', '工作灯', '1', '2', 'Zoning', 'N-115', '321283124S3002,321283124S300201,N-115', 'Z101', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R16-101', '防水灯具', '1', '2', 'Zoning', 'N-116', '321283124S3002,321283124S300201,N-115', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R117-101', '防水灯具', '1', '2', 'Zoning', 'N-117', '321283124S3002,321283124S300201,N-117', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R118-101', '防水灯具', '1', '1', 'Zoning', 'N-118', '321283124S3002,321283124S300201,N-118', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R119-101', '防水灯具', '1', '1', 'Zoning', 'N-119', '321283124S3002,321283124S300201,N-119', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R120-101', '控制面板', '1', '1', 'Zoning', 'N-120', '321283124S3002,321283124S300202,N-120', 'W201', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R121-101', '配电柜', '2', '1', 'Zoning', 'N-121', '321283124S3002,321283124S300202,N-121', 'W201', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R122-101', '断路器', '1', '1', 'Zoning', 'N-122', '321283124S3002,321283124S300202,N-122', 'W201', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R123-101', '电源插座', '1', '1', 'Zoning', 'N-123', '321283124S3002,321283124S300203,N-123', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R124-101', '加热器', '1', '1', 'Zoning', 'N-124', '321283124S3002,321283124S300203,N-124', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R125-101', '空调', '1', '1', 'Zoning', 'N-125', '321283124S3002,321283124S300204,N-125', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R126-101', '空调', '1', '1', 'Zoning', 'N-126', '321283124S3002,321283124S300204,N-126', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R127-101', '空调', '1', '1', 'Zoning', 'N-127', '321283124S3002,321283124S300204,N-127', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R128-101', '空调', '1', '1', 'Zoning', 'N-128', '321283124S3002,321283124S300204,N-128', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R129-101', '空调', '1', '1', 'Zoning', 'N-129', '321283124S3002,321283124S300205,N-129', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R130-101', '空调', '1', '1', 'Zoning', 'N-130', '321283124S3002,321283124S300205,N-130', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R131-101', '空调', '1', '1', 'Zoning', 'N-131', '321283124S3002,321283124S300205,N-131', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R132-101', '空调', '1', '1', 'Zoning', 'N-132', '321283124S3002,321283124S300205,N-132', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Car-101', '照明灯', '1', '1', 'Zoning', '321283124S3002_CW-XK', '321283124S3002,321283124S300206,321283124S3002_CW-XK', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Car-102', '智能监控系统', '1', NULL, 'Zoning', '321283124S3002_CW-CD', '321283124S3002,321283124S300206,321283124S3002_CW-CD', 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Car-103', '照明灯', '1', NULL, 'Zoning', '321283124S3002_CW-WZA', '321283124S3002,321283124S300206,321283124S3002_CW-WZA', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Car-104', '照明灯', '1', NULL, 'Zoning', '321283124S3002_CW-DKC', '321283124S3002,321283124S300206,321283124S3002_CW-DKC', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Car-105', '照明灯', '1', NULL, 'Zoning', '321283124S3002_CW-HC', '321283124S3002,321283124S300206,321283124S3002_CW-HC', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Car-106', '停车场照明灯', '1', NULL, 'Zoning', '321283124S3002_CW-WXP', '321283124S3002,321283124S300206,321283124S3002_CW-WXP', 'Z102', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Car-107', '智能监控系统', '1', NULL, 'Zoning', '321283124S3002_CW-WXP', '321283124S3002,321283124S300206,321283124S3002_CW-WXP', 'Z110', null, 'SYS_BA');
+
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'E503-K140-K150-001', '光伏板1', '2', '1', 'Building', 'S30K140-S30K150', '321283124S3003,S30K140-S30K150', 'E503', null, 'SYS_GF');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'E503-K140-K150-002', '光伏板2', '2', '1', 'Building', 'S30K140-S30K150', '321283124S3003,S30K140-S30K150', 'E503', null, 'SYS_GF');
+INSERT INTO `adm_ems_device` ( `device_code`, `device_name`, `device_type`, `device_status`, `area_type`, `ref_area`, `area_ancestors`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'E503-K140-K150-003', '光伏板3', '2', '1', 'Building', 'S30K150-S30K180', '321283124S3003,S30K150-S30K180', 'E503', null, 'SYS_GF');
 
 
 -- 配电柜DEMO数据
@@ -600,6 +606,31 @@ INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `dat
 INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3002', 'E502', '2024-09-18 22:00:00', '2024-09-18', '22:00:00', 23, 0.45, 0, 0, 0, 0);
 INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3002', 'E502', '2024-09-18 23:00:00', '2024-09-18', '23:00:00', 24, 0.45, 0, 0, 0, 0);
 
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 00:00:00', '2024-09-18', '00:00:00', 1, 0.45, 0, 0, 0, 0);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 01:00:00', '2024-09-18', '01:00:00', 2, 0.45, 0, 0, 0, 0);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 02:00:00', '2024-09-18', '02:00:00', 3, 0.45, 0, 0, 0, 0);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 03:00:00', '2024-09-18', '03:00:00', 4, 0.45, 0, 0, 0, 0);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 04:00:00', '2024-09-18', '04:00:00', 5, 0.45, 0, 0, 0, 0);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 05:00:00', '2024-09-18', '05:00:00', 6, 0.45, 0, 0, 0, 0);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 06:00:00', '2024-09-18', '06:00:00', 7, 0.45, 10, 10, 0, 0);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 07:00:00', '2024-09-18', '07:00:00', 8, 0.45, 17, 12, 5, 2.25);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 08:00:00', '2024-09-18', '08:00:00', 9, 0.45, 28, 15, 13, 5.85);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 09:00:00', '2024-09-18', '09:00:00', 10, 0.45, 40, 25, 25, 11.25);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 10:00:00', '2024-09-18', '10:00:00', 11, 0.45, 67, 30, 37, 16.65);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 11:00:00', '2024-09-18', '11:00:00', 12, 0.45, 88, 50, 38, 17.1);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 12:00:00', '2024-09-18', '12:00:00', 13, 0.45, 96, 72, 24, 10.8);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 13:00:00', '2024-09-18', '13:00:00', 14, 0.45, 112, 80, 32, 14.4);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 14:00:00', '2024-09-18', '14:00:00', 15, 0.45, 128, 97, 31, 13.95);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 15:00:00', '2024-09-18', '15:00:00', 16, 0.45, 108, 60, 48, 21.6);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 16:00:00', '2024-09-18', '16:00:00', 17, 0.45, 68, 38, 30, 13.5);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 17:00:00', '2024-09-18', '17:00:00', 18, 0.45, 37, 20, 17, 7.65);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 18:00:00', '2024-09-18', '18:00:00', 19, 0.45, 23, 10, 13, 5.85);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 19:00:00', '2024-09-18', '19:00:00', 20, 0.45, 0, 0, 0, 0);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 20:00:00', '2024-09-18', '20:00:00', 21, 0.45, 0, 0, 0, 0);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 21:00:00', '2024-09-18', '21:00:00', 22, 0.45, 0, 0, 0, 0);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 22:00:00', '2024-09-18', '22:00:00', 23, 0.45, 0, 0, 0, 0);
+INSERT INTO `adm_ems_pv_supply_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `up_unit_price`, `gen_elec_quantity`, `use_elec_quantity`, `up_elec_quantity`, `up_elec_earn`) VALUES ('321283124S3003', 'E503', '2024-09-18 23:00:00', '2024-09-18', '23:00:00', 24, 0.45, 0, 0, 0, 0);
+
 
 -- 储能计量demo数据
 INSERT INTO `adm_ems_elec_store_h` (`area_code`, `facs_code`, `record_time`, `date`, `time`, `time_index`, `charge_elec_quantity`, `discharge_elec_quantity`) VALUES ('321283124S3001', 'C101', '2024-09-18 00:00:00', '2024-09-18', '00:00:00', 1, 35, 0);

ems-cloud/sql/ems_server.sql

@@ -183,7 +183,7 @@ INSERT INTO `dim_gb_ems_cls` (`code`, `name`, `desc`, `level`, `parent_code`, `v
 
 
 -- ----------------------------
--- 能源设施/系统分类
+-- 能源设施分类
 -- ----------------------------
 drop table if exists dim_ems_facs_category;
 create table dim_ems_facs_category (
@@ -194,9 +194,9 @@ create table dim_ems_facs_category (
   `version`   varchar(64)     default null               comment '数据版本',
   primary key (`id`),
   unique key ux_ems_facs_category_code(`code`)
-) engine=innodb auto_increment=1 comment = '能源设施/系统分类';
+) engine=innodb auto_increment=1 comment = '能源设施分类';
 
--- 能源设施/系统初始数据
+-- 能源设施初始数据
 INSERT INTO `dim_ems_facs_category` (`code`, `name`, `desc`, `version`) VALUES ('E', '能源生产系统', '全站码', 'GB/T 43033-2013');
 INSERT INTO `dim_ems_facs_category` (`code`, `name`, `desc`, `version`) VALUES ('T', '中转系统', '全站码', 'GB/T 43033-2013');
 INSERT INTO `dim_ems_facs_category` (`code`, `name`, `desc`, `version`) VALUES ('W', '传输系统', '区位码', 'GB/T 43033-2013');
@@ -205,7 +205,7 @@ INSERT INTO `dim_ems_facs_category` (`code`, `name`, `desc`, `version`) VALUES (
 
 
 -- ----------------------------
--- 能源设施/系统子类
+-- 能源设施子类
 -- ----------------------------
 drop table if exists dim_ems_facs_subcategory;
 create table dim_ems_facs_subcategory (
@@ -217,9 +217,9 @@ create table dim_ems_facs_subcategory (
   `version`       varchar(64)     default null               comment '数据版本',
   primary key (`id`),
   unique key ux_ems_facs_subcategory_code(`code`)
-) engine=innodb auto_increment=1 comment = '能源设施/系统子类';
+) engine=innodb auto_increment=1 comment = '能源设施子类';
 
--- 能源设施/系统初始数据
+-- 能源设施初始数据
 INSERT INTO `dim_ems_facs_subcategory` (`code`, `name`, `parent_code`, `desc`, `version`) VALUES ('E1', '天然气分布式供能站', 'E', null, 'GB/T 43033-2013');
 INSERT INTO `dim_ems_facs_subcategory` (`code`, `name`, `parent_code`, `desc`, `version`) VALUES ('E2', '生物质发电站', 'E', null, 'GB/T 43033-2013');
 INSERT INTO `dim_ems_facs_subcategory` (`code`, `name`, `parent_code`, `desc`, `version`) VALUES ('E3', '分布式风力发电场', 'E', null, 'GB/T 43033-2013');
@@ -245,6 +245,39 @@ INSERT INTO `dim_ems_facs_subcategory` (`code`, `name`, `parent_code`, `desc`, `
 
 
 -- ----------------------------
+-- 能源设备工艺标识维表
+-- ----------------------------
+drop table if exists dim_ems_dev_process;
+create table dim_ems_dev_process (
+  `id`               bigint(20)      not null auto_increment    comment '序号',
+  `ps_code`          varchar(16)     not null                   comment '工艺代码',
+  `ps_name`          varchar(64)     not null                   comment '工艺名称',
+  `desc`             varchar(128)    default null               comment '工艺系统说明',
+  `category_code`    varchar(8)      default null               comment '设施分类代码',
+  `subcategory_code` varchar(8)      default null               comment '设施子类代码',
+  `version`          varchar(64)     default null               comment '数据版本',
+  primary key (`id`),
+  unique key ux_ems_facs_facs_process(`ps_code`)
+) engine=innodb auto_increment=1 comment = '能源设施工艺系统维表';
+
+-- 能源设备工艺标识维表初始数据
+INSERT INTO `dim_ems_dev_process` (`ps_code`, `ps_name`, `desc`, `category_code`, `subcategory_code`, `version`) VALUES ('AA', '高压配电柜', null, 'W', 'W2', null);
+INSERT INTO `dim_ems_dev_process` (`ps_code`, `ps_name`, `desc`, `category_code`, `subcategory_code`, `version`) VALUES ('AH', '高压开关柜', null, 'W', 'W2', null);
+INSERT INTO `dim_ems_dev_process` (`ps_code`, `ps_name`, `desc`, `category_code`, `subcategory_code`, `version`) VALUES ('AJ', '高压电容柜', null, 'W', 'W2', null);
+INSERT INTO `dim_ems_dev_process` (`ps_code`, `ps_name`, `desc`, `category_code`, `subcategory_code`, `version`) VALUES ('AM', '高压计量柜', null, 'W', 'W2', null);
+INSERT INTO `dim_ems_dev_process` (`ps_code`, `ps_name`, `desc`, `category_code`, `subcategory_code`, `version`) VALUES ('AP', '低压配电柜', null, 'W', 'W2', null);
+INSERT INTO `dim_ems_dev_process` (`ps_code`, `ps_name`, `desc`, `category_code`, `subcategory_code`, `version`) VALUES ('AL', '低压照明配电柜', null, 'W', 'W2', null);
+INSERT INTO `dim_ems_dev_process` (`ps_code`, `ps_name`, `desc`, `category_code`, `subcategory_code`, `version`) VALUES ('APE', '应急电力配电柜', null, 'W', 'W2', null);
+INSERT INTO `dim_ems_dev_process` (`ps_code`, `ps_name`, `desc`, `category_code`, `subcategory_code`, `version`) VALUES ('ALE', '应急照明配电柜', null, 'W', 'W2', null);
+INSERT INTO `dim_ems_dev_process` (`ps_code`, `ps_name`, `desc`, `category_code`, `subcategory_code`, `version`) VALUES ('AF', '低压负荷开关柜', null, 'W', 'W2', null);
+INSERT INTO `dim_ems_dev_process` (`ps_code`, `ps_name`, `desc`, `category_code`, `subcategory_code`, `version`) VALUES ('ACC', '低压电容补偿柜', null, 'W', 'W2', null);
+
+INSERT INTO `dim_ems_dev_process` (`ps_code`, `ps_name`, `desc`, `category_code`, `subcategory_code`, `version`) VALUES ('QF', '断路器', '空开', 'W', 'W2', null);
+INSERT INTO `dim_ems_dev_process` (`ps_code`, `ps_name`, `desc`, `category_code`, `subcategory_code`, `version`) VALUES ('QR', '漏电保护器', null, 'W', 'W2', null);
+INSERT INTO `dim_ems_dev_process` (`ps_code`, `ps_name`, `desc`, `category_code`, `subcategory_code`, `version`) VALUES ('QS', '隔离开关', null, 'W', 'W2', null);
+
+
+-- ----------------------------
 -- 标签分类
 -- ----------------------------
 drop table if exists dim_ems_tag;
@@ -282,22 +315,6 @@ INSERT INTO `dim_devc_type` (`type_code`, `type_name`) VALUES (6, '服务设备'
 INSERT INTO `dim_devc_type` (`type_code`, `type_name`) VALUES (7, '运输设备');
 
 -- ----------------------------
--- 动力柜电器设备符号
--- ----------------------------
-drop table if exists dim_box_eleceqpt_type;
-create table dim_box_eleceqpt_type (
-    `id`               bigint(20)      not null auto_increment    comment '序号',
-    `type_code`     varchar(16)     not null                   comment '类型代码',
-    `type_name`     varchar(64)     not null                   comment '类型名称',
-    primary key (`id`),
-    unique key ux_eleceqpt_type(`type_code`)
-) engine=innodb auto_increment=1 comment = '动力柜电器设备类型';
-
-INSERT INTO `dim_box_eleceqpt_type` (`type_code`, `type_name`) VALUES ('QF', '空气开关');
-INSERT INTO `dim_box_eleceqpt_type` (`type_code`, `type_name`) VALUES ('RCD', '漏电保护');
-INSERT INTO `dim_box_eleceqpt_type` (`type_code`, `type_name`) VALUES ('K', '继电器');
-
--- ----------------------------
 -- 电价计量分类
 -- ----------------------------
 drop table if exists dim_ems_elecprice_type;
@@ -438,7 +455,7 @@ create table adm_area_building_zoning (
 
 
 -- ----------------------------
--- 能源设施/系统表
+-- 能源设施表
 -- ----------------------------
 drop table if exists adm_ems_facs;
 create table adm_ems_facs  (
@@ -449,6 +466,9 @@ create table adm_ems_facs  (
   `facs_subcategory`  varchar(32)     not null                     comment '设施子类',
   `enable`            int             default '0'                  comment '启用状态0-停用，1-启用',
   `ref_area`          varchar(32)     not null                     comment '归属区域代码',
+  `attr_group`        varchar(16)     default null                 comment '属性分组代码',
+  `ability_group`     varchar(16)     default null                 comment '能力分组代码',
+  `event_group`       varchar(16)     default null                 comment '事件分组代码',
   `create_time`       datetime        default CURRENT_TIMESTAMP    comment '创建时间',
   `update_time`       datetime        default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP comment '更新时间',
   primary key (`id`),
@@ -457,51 +477,129 @@ create table adm_ems_facs  (
 
 
 -- ----------------------------
--- 能源设施属性表
+-- 能源设备表
+-- ----------------------------
+drop table if exists adm_ems_device;
+create table adm_ems_device  (
+  `id`              bigint(20)      not null auto_increment      comment '序号',
+  `device_code`     varchar(64)     not null                     comment '设备代码',
+  `device_name`     varchar(32)     not null                     comment '设备名称',
+  `device_type`     int             default null                 comment '设备类型',
+  `device_brand`    varchar(128)    default null                 comment '设备品牌',
+  `device_spec`     varchar(128)    default null                 comment '设备型号',
+  `location`        varchar(200)    default null                 comment '安装位置',
+  `device_status`   int             default null                 comment '设备状态',
+  `area_type`       varchar(32)     default null                 comment '区域层级',
+  `ref_area`        varchar(64)     default null                 comment '归属区域代码',
+  `area_ancestors`  varchar(200)    default null                 comment '区域祖级代码',
+  `attr_group`      varchar(16)     default null                 comment '属性分组代码',
+  `ability_group`   varchar(16)     default null                 comment '能力分组代码',
+  `event_group`     varchar(16)     default null                 comment '事件分组代码',
+  `ref_facs`        varchar(64)     default null                 comment '归属设施代码',
+  `ps_code`         varchar(16)     default null                 comment '工艺标识',
+  `subsystem_code`  varchar(16)     default null                 comment '子系统名称',
+  `create_time`     datetime        default CURRENT_TIMESTAMP    comment '创建时间',
+  `update_time`     datetime        default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP comment '更新时间',
+  primary key (`id`),
+  unique key ux_device_code(`device_code`)
+) engine=innodb auto_increment=1 comment = '能源设备表';
+
+
+-- ----------------------------
+-- 能源设备部件表
+-- ----------------------------
+drop table if exists adm_ems_device_component;
+create table adm_ems_device_component  (
+  `id`              bigint(20)      not null auto_increment      comment '序号',
+  `device_code`     varchar(64)     not null                     comment '设备编码',
+  `compo_code`      varchar(64)     not null                     comment '部件编码',
+  `ext_compo_code`  varchar(256)    default null                 comment '外部系统编码',
+  `ps_code`         varchar(16)     default null                 comment '工艺标识代码',
+  `ability_group`   varchar(16)     default null                 comment '能力分组代码',
+  `event_group`     varchar(16)     default null                 comment '事件分组代码',
+  `compo_brand`     varchar(128)    default null                 comment '部件品牌',
+  `compo_spec`      varchar(128)    default null                 comment '部件型号',
+  `ancestors`       varchar(256)    default null                 comment '祖籍列表',
+  `parent_compo`    varchar(64)     default null                 comment '上级部件',
+  primary key (`id`),
+  unique key ux_device_component(`device_code`,`compo_code`)
+) engine=innodb auto_increment=1 comment = '能源设备部件表';
+
+
+-- ----------------------------
+-- 计量设备表
 -- ----------------------------
-drop table if exists adm_ems_facs_attr;
-create table adm_ems_facs_attr  (
+drop table if exists adm_meter_device;
+create table adm_meter_device  (
   `id`              bigint(20)      not null auto_increment      comment '序号',
-  `facs_code`       varchar(16)     not null                     comment '设施代码',
+  `device_code`     varchar(32)     not null                     comment '设备代码',
+  `area_code`       varchar(16)     default null                 comment '区域代码',
+  `meter_cls`       int             not null                     comment '计量类别25-天然气 45-电 70-水',
+  `obj_type`        int             not null                     comment '计量对象类型 1-区域 2-设备',
+  `obj_sub_type`    int             not null                     comment '计量对象子类型',
+  `obj_code`        varchar(32)     not null                     comment '计量对象编码',
+  `obj_tag`         int             default null                 comment '对象标记',
+  `col_cycle`       int             default null                 comment '采集周期',
+  `col_mode`        int             default null                 comment '采集方式',
+  `magnification`   int             default 1                    comment '倍率',
+  `spec_desc`       varchar(128)    default null                 comment '规格描述',
+  primary key (`id`),
+  unique key ux_meter_device(`device_code`)
+) engine=innodb auto_increment=1 comment = '计量设备表';
+
+
+-- ----------------------------
+-- 能源对象属性表
+-- ----------------------------
+drop table if exists adm_ems_obj_attr;
+create table adm_ems_obj_attr  (
+  `id`              bigint(20)      not null auto_increment      comment '序号',
+  `group_code`      varchar(16)     not null                     comment '属性分组代码',
+  `group_name`      varchar(128)    default null                 comment '属性分组名称',
+  `obj_type`        int             not null                     comment '对象类型',
   `attr_name`       varchar(32)     not null                     comment '属性名称',
   `attr_desc`       varchar(64)     default null                 comment '属性描述',
   `attr_value`      varchar(64)     default null                 comment '属性值',
   `attr_unit`       varchar(32)     default null                 comment '属性单位',
    primary key (`id`),
-   key ux_ems_facs_code(`facs_code`)
-) engine=innodb auto_increment=1 comment = '能源设施属性表';
+   key ux_ems_obj_attr(`group_code`)
+) engine=innodb auto_increment=1 comment = '能源对象属性表';
 
 
 -- ----------------------------
--- 能源设施能力表
+-- 能源对象能力表
 -- ----------------------------
-drop table if exists adm_ems_facs_ability;
-create table adm_ems_facs_ability  (
+drop table if exists adm_ems_obj_ability;
+create table adm_ems_obj_ability  (
   `id`              bigint(20)      not null auto_increment      comment '序号',
-  `facs_code`       varchar(16)     not null                     comment '设施代码',
+  `group_code`      varchar(16)     not null                     comment '能力分组代码',
+  `group_name`      varchar(128)    default null                 comment '能力分组名称',
+  `obj_type`        int             not null                     comment '对象类型',
   `ability_name`    varchar(32)     not null                     comment '能力名称',
   `ability_desc`    varchar(64)     default null                 comment '能力描述',
-  `ability_param`   varchar(64)     default null                 comment '属性值',
+  `ability_param`   varchar(2048)   default null                 comment '能力参数',
   primary key (`id`),
-  key ux_ems_facs_ability(`facs_code`)
-) engine=innodb auto_increment=1 comment = '能源设施能力表';
+  key ux_ems_obj_ability(`group_code`)
+) engine=innodb auto_increment=1 comment = '能源对象能力表';
 
 
 -- ----------------------------
 -- 能源设施事件表
 -- ----------------------------
-drop table if exists adm_ems_facs_event;
-create table adm_ems_facs_event  (
+drop table if exists adm_ems_obj_event;
+create table adm_ems_obj_event  (
   `id`              bigint(20)      not null auto_increment      comment '序号',
-  `facs_code`       varchar(16)     not null                     comment '设施代码',
+  `group_code`      varchar(16)     not null                     comment '能力分组代码',
+  `group_name`      varchar(128)    default null                 comment '能力分组名称',
+  `obj_type`        int             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 = '能源设施事件表';
+  key ux_ems_obj_event(`group_code`)
+) engine=innodb auto_increment=1 comment = '能源对象事件表';
 
 
 -- ----------------------------
@@ -545,89 +643,6 @@ create table adm_ems_facs_flow_rel  (
 
 
 -- ----------------------------
--- 用能设备表
--- ----------------------------
-drop table if exists adm_ems_device;
-create table adm_ems_device  (
-  `id`              bigint(20)      not null auto_increment      comment '序号',
-  `device_code`     varchar(64)     not null                     comment '设备代码',
-  `device_name`     varchar(32)     not null                     comment '设备名称',
-  `device_type`     int             default null                 comment '设备类型',
-  `device_status`   int             default null                 comment '设备状态',
-  `area_type`       varchar(32)     default null                 comment '设备类型',
-  `ref_area`        varchar(64)     default null                 comment '归属区域代码',
-  `area_ancestors`  varchar(200)     default null                comment '区域祖级代码',
-  `ref_facs`        varchar(64)     default null                 comment '归属设施代码',
-  `subsystem_code`  varchar(16)     default null                 comment '子系统名称',
-  `create_time`     datetime        default CURRENT_TIMESTAMP    comment '创建时间',
-  `update_time`     datetime        default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP comment '更新时间',
-  primary key (`id`),
-  unique key ux_device_code(`device_code`)
-) engine=innodb auto_increment=1 comment = '用能设备表';
-
-
--- ----------------------------
--- 计量设备表
--- ----------------------------
-drop table if exists adm_meter_device;
-create table adm_meter_device  (
-  `id`              bigint(20)      not null auto_increment      comment '序号',
-  `device_code`     varchar(32)     not null                     comment '设备代码',
-  `area_code`       varchar(16)     default null                 comment '区域代码',
-  `meter_cls`       int             not null                     comment '计量类别25-天然气 45-电 70-水',
-  `obj_type`        int             not null                     comment '计量对象类型 1-区域 2-设备',
-  `obj_sub_type`    int             not null                     comment '计量对象子类型',
-  `obj_code`        varchar(32)     not null                     comment '计量对象编码',
-  `obj_tag`         int             default null                 comment '对象标记',
-  `col_cycle`       int             default null                 comment '采集周期',
-  `col_mode`        int             default null                 comment '采集方式',
-  `magnification`   int             default 1                    comment '倍率',
-  `spec_desc`       varchar(128)    default null                 comment '规格描述',
-  primary key (`id`),
-  unique key ux_meter_device(`device_code`)
-) engine=innodb auto_increment=1 comment = '计量设备表';
-
-
--- ----------------------------
--- 动力箱柜表
--- ----------------------------
-drop table if exists adm_power_box;
-create table adm_power_box  (
-  `id`              bigint(20)      not null auto_increment      comment '序号',
-  `box_code`        varchar(32)     not null                     comment '箱柜代码',
-  `box_type`        int             not null                     comment '箱体类型',
-  `area_code`       varchar(32)     default null                 comment '归属园区',
-  `location`        varchar(200)    default null                 comment '安装位置',
-  `box_size`        varchar(128)    default null                 comment '箱体尺寸',
-  `gateway_addr`    varchar(128)    default null                 comment '网关地址',
-  `gateway_port`    int             default null                 comment '网关端口',
-  primary key (`id`),
-  unique key ux_power_box(`box_code`)
-) engine=innodb auto_increment=1 comment = '动力箱柜表';
-
-
--- ----------------------------
--- 动力箱柜电气设备表
--- ----------------------------
-drop table if exists adm_box_elec_eqpt;
-create table adm_box_elec_eqpt  (
-  `id`              bigint(20)      not null auto_increment      comment '序号',
-  `box_code`        varchar(32)     not null                     comment '箱柜代码',
-  `eqpt_code`       varchar(32)     not null                     comment '电气编码',
-  `ext_eqpt_code`   varchar(64)     default null                 comment '外部系统编码',
-  `eqpt_type`       varchar(16)     not null                     comment '电气符号代码',
-  `eqpt_spec`       varchar(64)     default null                 comment '电气型号',
-  `rated_voltage`   int             default null                 comment '额定电压',
-  `rated_current`   int             default null                 comment '额定电流',
-  `ancestors`       varchar(256)    default null                 comment '祖籍列表',
-  `parent_eqpt`     varchar(32)     default null                 comment '上级电气件',
-  `sub_circuit`     varchar(64)     default null                 comment '下级支路',
-  primary key (`id`),
-  unique key ux_box_elec_eqpt(`box_code`,`eqpt_code`)
-) engine=innodb auto_increment=1 comment = '动力箱柜电气设备表';
-
-
--- ----------------------------
 -- 能源策略表
 -- ----------------------------
 drop table if exists adm_op_energy_strategy;
@@ -1193,48 +1208,6 @@ create table adm_ems_elec_load_index (
 
 
 -- ----------------------------
--- 动力箱指标表
--- ----------------------------
-drop table if exists adm_ems_elec_box_index;
-create table adm_ems_elec_box_index (
-  `id`                        bigint(20)      not null auto_increment      comment '序号',
-  `box_code`                  varchar(32)     not null                     comment '箱体代码',
-  `box_type`                  int             not null                     comment '箱体类型',
-  `area_code`                 varchar(16)     not null                     comment '服务区代码',
-  `date`                      date            not null                     comment '日期 yyyy-MM-dd',
-  `time`                      datetime        not null                     comment '时间 yyyy-MM-dd HH:mm:ss',
-  `voltage_a`                 double          default null                 comment '电压(A相) 单位：V（伏）',
-  `voltage_b`                 double          default null                 comment '电压(B相) 单位：V（伏）',
-  `voltage_c`                 double          default null                 comment '电压(C相) 单位：V（伏）',
-  `electricity_a`             double          default null                 comment '电流(A相) 单位：A（安培）',
-  `electricity_b`             double          default null                 comment '电流(B相) 单位：A（安培）',
-  `electricity_c`             double          default null                 comment '电流(C相) 单位：A（安培）',
-  `power`                     double          default null                 comment '功率 单位：kW（千瓦）',
-  primary key (`id`),
-  unique key ux_elec_box_index(`box_code`, `time`)
-) engine=innodb auto_increment=1 comment = '动力箱指标表';
-
-
--- ----------------------------
--- 动力箱元器件指标表
--- ----------------------------
-drop table if exists adm_ems_elec_box_eqpt_index;
-create table adm_ems_elec_box_eqpt_index (
-  `id`                        bigint(20)      not null auto_increment      comment '序号',
-  `box_code`                  varchar(32)     not null                     comment '箱体代码',
-  `eqpt_code`                 varchar(32)     not null                     comment '元件代码',
-  `area_code`                 varchar(16)     not null                     comment '服务区代码',
-  `date`                      date            not null                     comment '日期 yyyy-MM-dd',
-  `time`                      datetime        not null                     comment '时间 yyyy-MM-dd HH:mm:ss',
-  `voltage`                   double          default null                 comment '电压 单位：V（伏）',
-  `current`                   double          default null                 comment '电流 单位：A（安培）',
-  `power`                     double          default null                 comment '功率 单位：kW（千瓦）',
-  primary key (`id`),
-  unique key ux_elec_box_eqpt_index(`box_code`, `eqpt_code`, `time`)
-) engine=innodb auto_increment=1 comment = '动力箱元器件指标表';
-
-
--- ----------------------------
 -- 电力产能预测表
 -- ----------------------------
 drop table if exists adm_ems_elec_prod_forecast;