Merge remote-tracking branch 'origin/master'

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

@@ -7,7 +7,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.ems.domain.ElecLoadIndex;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 import com.ruoyi.ems.service.IElecLoadIndexService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,22 +38,22 @@ public class ElecLoadIndexController extends BaseController {
      * 查询电力负荷设施指标列表
      */
     @GetMapping("/min/15/list")
-    public TableDataInfo min15List(QueryIndex index) {
+    public TableDataInfo min15List(QueryMeter param) {
         startPage();
-        List<ElecLoadIndex> list = indexService.selectMin15IndexList(index);
+        List<ElecLoadIndex> list = indexService.selectMin15IndexList(param);
         return getDataTable(list);
     }
 
     @GetMapping("/min/15/getMaxLoad")
-    public AjaxResult getMin15MaxLoad(QueryIndex index) {
-        ElecLoadIndex maxLoad = indexService.selectMin15IndexMaxLoad(index);
+    public AjaxResult getMin15MaxLoad(QueryMeter param) {
+        ElecLoadIndex maxLoad = indexService.selectMin15IndexMaxLoad(param);
         return success(maxLoad);
     }
 
     @GetMapping("/day/getMaxLoad")
-    public TableDataInfo getMaxLoad(QueryIndex index) {
+    public TableDataInfo getMaxLoad(QueryMeter param) {
         startPage();
-        List<ElecLoadIndex> list = indexService.selectDayIndexMaxLoad(index);
+        List<ElecLoadIndex> list = indexService.selectDayIndexMaxLoad(param);
         return getDataTable(list);
     }
 
@@ -76,8 +76,8 @@ public class ElecLoadIndexController extends BaseController {
      */
     @Log(title = "电力负荷设施指标", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, QueryIndex index) {
-        List<ElecLoadIndex> list = indexService.selectMin15IndexList(index);
+    public void export(HttpServletResponse response, QueryMeter param) {
+        List<ElecLoadIndex> list = indexService.selectMin15IndexList(param);
         ExcelUtil<ElecLoadIndex> util = new ExcelUtil<ElecLoadIndex>(ElecLoadIndex.class);
         util.exportExcel(response, list, "电力负荷设施指标数据");
     }

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

@@ -7,7 +7,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.ems.domain.ElecPgSupplyH;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 import com.ruoyi.ems.service.IElecPgSupplyHService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,9 +55,9 @@ public class ElecPgSupplyHController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('power-mgr:pg:list')")
     @GetMapping("/listByDate")
-    public AjaxResult listByDate(QueryIndex queryIndex)
+    public AjaxResult listByDate(QueryMeter queryMeter)
     {
-        List<ElecPgSupplyH> list = pgSupplyHService.selectPgSupplyH(queryIndex);
+        List<ElecPgSupplyH> list = pgSupplyHService.selectPgSupplyH(queryMeter);
         return success(list);
     }
 

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

@@ -7,7 +7,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.ems.domain.ElecPvSupplyH;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 import com.ruoyi.ems.service.IElecPvSupplyHService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,8 +49,8 @@ public class ElecPvSupplyHController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('ems:prod:list')")
     @GetMapping("/day/list")
-    public AjaxResult listByDay(QueryIndex queryIndex) {
-        List<ElecPvSupplyH> list = pvSupplyHService.selectPvSupplyDayList(queryIndex);
+    public AjaxResult listByDay(QueryMeter param) {
+        List<ElecPvSupplyH> list = pvSupplyHService.selectPvSupplyDayList(param);
         return success(list);
     }
 

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

@@ -8,7 +8,7 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.ems.domain.ElecStoreH;
 import com.ruoyi.ems.model.ElecStoreAnalyze;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 import com.ruoyi.ems.service.IElecStoreService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,8 +50,8 @@ public class ElecStoreController extends BaseController {
     }
 
     @GetMapping("/day/list")
-    public AjaxResult listByDay(QueryIndex queryIndex) {
-        List<ElecStoreH> list = elecStoreService.selectDayList(queryIndex);
+    public AjaxResult listByDay(QueryMeter param) {
+        List<ElecStoreH> list = elecStoreService.selectDayList(param);
         return success(list);
     }
 

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

@@ -1,91 +0,0 @@
-package com.ruoyi.web.controller.ems;
-
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.huashe.common.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.ems.domain.ElecUseH;
-import com.ruoyi.ems.model.ElecUseSta;
-import com.ruoyi.ems.model.QueryIndex;
-import com.ruoyi.ems.service.IElecUseHService;
-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.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 用能计量-小时Controller
- *
- * @author ruoyi
- * @date 2024-08-15
- */
-@Deprecated
-@RestController
-@RequestMapping("/ems/elec/use")
-@Api(value = "ElecUseHController", description = "用电计量数据接口")
-public class ElecUseHController extends BaseController {
-    @Autowired
-    private IElecUseHService elecUseHService;
-
-    /**
-     * 查询用能计量-小时列表
-     */
-    @GetMapping("/hour/list")
-    public TableDataInfo hourList(ElecUseH elecUseH) {
-        startPage();
-        List<ElecUseH> list = elecUseHService.getElecUseHList(elecUseH);
-        return getDataTable(list);
-    }
-
-    @GetMapping("/day/list")
-    public TableDataInfo dayList(QueryIndex queryIndex) {
-        List<ElecUseH> list = elecUseHService.getElecUseDayList(queryIndex);
-        return getDataTable(list);
-    }
-
-    @GetMapping("/hour/sumBySubCategory")
-    public AjaxResult sumBySubCategory(ElecUseH elecUseH) {
-        List<ElecUseSta> list = elecUseHService.getSumBySubCategory(elecUseH);
-        return success(list);
-    }
-
-    @GetMapping("/hour/sumByFacs")
-    public AjaxResult sumByFacs(ElecUseH elecUseH) {
-        List<ElecUseSta> list = elecUseHService.getSumByFacs(elecUseH);
-        return success(list);
-    }
-
-    @GetMapping("/hour/listSum")
-    public TableDataInfo listSum(ElecUseH elecUseH) {
-        startPage();
-        List<ElecUseH> list = elecUseHService.getElecUseHListSum(elecUseH);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出用能计量-小时列表
-     */
-    @Log(title = "用能计量-小时", businessType = BusinessType.EXPORT)
-    @PostMapping("/hour/export")
-    public void export(HttpServletResponse response, ElecUseH elecUseH) {
-        List<ElecUseH> list = elecUseHService.getElecUseHList(elecUseH);
-        ExcelUtil<ElecUseH> util = new ExcelUtil<ElecUseH>(ElecUseH.class);
-        util.exportExcel(response, list, "用能计量-小时数据");
-    }
-
-    /**
-     * 获取用能计量-小时详细信息
-     */
-    @GetMapping(value = "/hour/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(elecUseHService.getElecUseHById(id));
-    }
-}

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

@@ -31,7 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -65,7 +64,6 @@ public class GeekOpenCbHandler extends MqttBaseHandler {
 
         JSONObject sendObject = JSONObject.parseObject(abilityParam.getAbilityParam());
         String type = sendObject.getString("type");
-        String system = sendObject.getString("system");
         String deviceCode = abilityParam.getObjCode();
         String messageId = StringUtils.equals("statistic", type) ? "auto" : ("CALL-" + IdUtils.generateMessageId());
         String msgBody = addMsgId(abilityParam.getAbilityParam(), "messageId", messageId);
@@ -76,7 +74,9 @@ public class GeekOpenCbHandler extends MqttBaseHandler {
         sendMqttMsg(topic, msgBody, 2, false);
 
         // 需要监测回包的流程
-        if (StringUtils.equals(type, "event") || (StringUtils.equals(type, "setting") && StringUtils.isEmpty(system))) {
+        if (StringUtils.equals(type, "event")
+            || (StringUtils.equals(type, "setting")
+            && (sendObject.containsKey("keyLock") || sendObject.containsKey("timerEnable") || sendObject.containsKey("onState")))) {
             // 写入日志
             EmsObjAbilityCallLog logItem = saveCallLog(abilityParam, sendTime, 1);
 
@@ -87,16 +87,17 @@ public class GeekOpenCbHandler extends MqttBaseHandler {
                     String receiveParam = cacheMsg.getPayload();
                     JSONObject receiveObject = JSONObject.parseObject(receiveParam);
                     callResponse = checkResult(sendObject, receiveObject);
-                    updateCallLog(logItem, cacheMsg, callResponse.getCode() == 0 ? 0:2);
+                    updateCallLog(logItem, cacheMsg, callResponse.getCode() == 0 ? 0 : 2);
 
                     break;
                 }
 
                 ThreadUtils.sleep(100);
 
-                if (System.currentTimeMillis() - sendTime > 20000) {
-                    EmsDevice device = deviceService.selectByCode(deviceCode);
-                    refreshStatus(device, DevOnlineStatus.OFFLINE);
+                if (System.currentTimeMillis() - sendTime > 30000) {
+                    logItem.setResPayload("响应超时");
+                    logItem.setCallStatus(2);
+                    objAbilityCallLogService.updateLog(logItem);
                     callResponse = new CallResponse<>(-1, "响应超时!");
                     break;
                 }

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

@@ -1,13 +1,13 @@
 package com.ruoyi.ems.controller;
 
+import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
-import com.huashe.common.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.ems.domain.ElecLoadIndex;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 import com.ruoyi.ems.service.IElecLoadIndexService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,22 +38,22 @@ public class ElecLoadIndexController extends BaseController {
      * 查询电力负荷设施指标列表
      */
     @GetMapping("/min/15/list")
-    public TableDataInfo min15List(QueryIndex index) {
+    public TableDataInfo min15List(QueryMeter param) {
         startPage();
-        List<ElecLoadIndex> list = indexService.selectMin15IndexList(index);
+        List<ElecLoadIndex> list = indexService.selectMin15IndexList(param);
         return getDataTable(list);
     }
 
     @GetMapping("/min/15/getMaxLoad")
-    public AjaxResult getMin15MaxLoad(QueryIndex index) {
-        ElecLoadIndex maxLoad = indexService.selectMin15IndexMaxLoad(index);
+    public AjaxResult getMin15MaxLoad(QueryMeter param) {
+        ElecLoadIndex maxLoad = indexService.selectMin15IndexMaxLoad(param);
         return success(maxLoad);
     }
 
     @GetMapping("/day/getMaxLoad")
-    public TableDataInfo getMaxLoad(QueryIndex index) {
+    public TableDataInfo getMaxLoad(QueryMeter param) {
         startPage();
-        List<ElecLoadIndex> list = indexService.selectDayIndexMaxLoad(index);
+        List<ElecLoadIndex> list = indexService.selectDayIndexMaxLoad(param);
         return getDataTable(list);
     }
 
@@ -76,8 +76,8 @@ public class ElecLoadIndexController extends BaseController {
      */
     @Log(title = "电力负荷设施指标", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, QueryIndex index) {
-        List<ElecLoadIndex> list = indexService.selectMin15IndexList(index);
+    public void export(HttpServletResponse response, QueryMeter param) {
+        List<ElecLoadIndex> list = indexService.selectMin15IndexList(param);
         ExcelUtil<ElecLoadIndex> util = new ExcelUtil<ElecLoadIndex>(ElecLoadIndex.class);
         util.exportExcel(response, list, "电力负荷设施指标数据");
     }

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

@@ -8,7 +8,7 @@ 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.ElecPgSupplyH;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 import com.ruoyi.ems.service.IElecPgSupplyHService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,9 +55,9 @@ public class ElecPgSupplyHController extends BaseController
      */
     @RequiresPermissions("power-mgr:pg:list")
     @GetMapping("/listByDate")
-    public AjaxResult listByDate(QueryIndex queryIndex)
+    public AjaxResult listByDate(QueryMeter queryMeter)
     {
-        List<ElecPgSupplyH> list = pgSupplyHService.selectPgSupplyH(queryIndex);
+        List<ElecPgSupplyH> list = pgSupplyHService.selectPgSupplyH(queryMeter);
         return success(list);
     }
 

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

@@ -8,7 +8,7 @@ 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.ElecPvSupplyH;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 import com.ruoyi.ems.service.IElecPvSupplyHService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,8 +49,8 @@ public class ElecPvSupplyHController extends BaseController {
      */
     @RequiresPermissions("ems:prod:list")
     @GetMapping("/day/list")
-    public AjaxResult listByDay(QueryIndex queryIndex) {
-        List<ElecPvSupplyH> list = pvSupplyHService.selectPvSupplyDayList(queryIndex);
+    public AjaxResult listByDay(QueryMeter queryMeter) {
+        List<ElecPvSupplyH> list = pvSupplyHService.selectPvSupplyDayList(queryMeter);
         return success(list);
     }
 

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

@@ -9,7 +9,7 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.ElecStoreH;
 import com.ruoyi.ems.model.ElecStoreAnalyze;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 import com.ruoyi.ems.service.IElecStoreService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,8 +50,8 @@ public class ElecStoreController extends BaseController {
     }
 
     @GetMapping("/day/list")
-    public AjaxResult listByDay(QueryIndex queryIndex) {
-        List<ElecStoreH> list = elecStoreService.selectDayList(queryIndex);
+    public AjaxResult listByDay(QueryMeter param) {
+        List<ElecStoreH> list = elecStoreService.selectDayList(param);
         return success(list);
     }
 

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

@@ -1,91 +0,0 @@
-package com.ruoyi.ems.controller;
-
-import com.huashe.common.domain.AjaxResult;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.ems.domain.ElecUseH;
-import com.ruoyi.ems.model.ElecUseSta;
-import com.ruoyi.ems.model.QueryIndex;
-import com.ruoyi.ems.service.IElecUseHService;
-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.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 用能计量-小时Controller
- *
- * @author ruoyi
- * @date 2024-08-15
- */
-@Deprecated
-@RestController
-@RequestMapping("/elec/use")
-@Api(value = "ElecUseHController", description = "用电计量数据接口")
-public class ElecUseHController extends BaseController {
-    @Autowired
-    private IElecUseHService elecUseHService;
-
-    /**
-     * 查询用能计量-小时列表
-     */
-    @GetMapping("/hour/list")
-    public TableDataInfo hourList(ElecUseH elecUseH) {
-        startPage();
-        List<ElecUseH> list = elecUseHService.getElecUseHList(elecUseH);
-        return getDataTable(list);
-    }
-
-    @GetMapping("/day/list")
-    public TableDataInfo dayList(QueryIndex queryIndex) {
-        List<ElecUseH> list = elecUseHService.getElecUseDayList(queryIndex);
-        return getDataTable(list);
-    }
-
-    @GetMapping("/hour/sumBySubCategory")
-    public AjaxResult sumBySubCategory(ElecUseH elecUseH) {
-        List<ElecUseSta> list = elecUseHService.getSumBySubCategory(elecUseH);
-        return success(list);
-    }
-
-    @GetMapping("/hour/sumByFacs")
-    public AjaxResult sumByFacs(ElecUseH elecUseH) {
-        List<ElecUseSta> list = elecUseHService.getSumByFacs(elecUseH);
-        return success(list);
-    }
-
-    @GetMapping("/hour/listSum")
-    public TableDataInfo listSum(ElecUseH elecUseH) {
-        startPage();
-        List<ElecUseH> list = elecUseHService.getElecUseHListSum(elecUseH);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出用能计量-小时列表
-     */
-    @Log(title = "用能计量-小时", businessType = BusinessType.EXPORT)
-    @PostMapping("/hour/export")
-    public void export(HttpServletResponse response, ElecUseH elecUseH) {
-        List<ElecUseH> list = elecUseHService.getElecUseHList(elecUseH);
-        ExcelUtil<ElecUseH> util = new ExcelUtil<ElecUseH>(ElecUseH.class);
-        util.exportExcel(response, list, "用能计量-小时数据");
-    }
-
-    /**
-     * 获取用能计量-小时详细信息
-     */
-    @GetMapping(value = "/hour/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(elecUseHService.getElecUseHById(id));
-    }
-}

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

@@ -9,7 +9,8 @@ import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.ems.domain.EmsObjAttr;
 import com.ruoyi.ems.domain.EmsObjAttrDto;
-import com.ruoyi.ems.domain.MeterBoundaryRel;
+import com.ruoyi.ems.domain.EmsObjAttrEnum;
+import com.ruoyi.ems.service.IEmsObjAttrEnumService;
 import com.ruoyi.ems.service.IEmsObjAttrService;
 import io.swagger.annotations.Api;
 import org.apache.commons.collections4.CollectionUtils;
@@ -24,10 +25,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -43,6 +42,9 @@ public class EmsObjAttrController extends BaseController {
     @Autowired
     private IEmsObjAttrService attrService;
 
+    @Autowired
+    private IEmsObjAttrEnumService enumService;
+
     /**
      * 查询能源对象属性列表
      */
@@ -54,6 +56,15 @@ public class EmsObjAttrController extends BaseController {
     }
 
     /**
+     * 查询能源对象属性列表
+     */
+    @GetMapping("/enum/list")
+    public AjaxResult list(@RequestParam(name="modelCode") String modelCode, @RequestParam(name = "attrKey")String attrKey) {
+        List<EmsObjAttrEnum> list = enumService.getObjAttrEnumList(modelCode, attrKey);
+        return AjaxResult.success(list);
+    }
+
+    /**
      * 获取能源对象属性详细信息
      */
     @GetMapping(value = "/{id}")

ems/ems-core/src/main/java/com/ruoyi/ems/mapper/ElecLoadIndex15minMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.mapper;
 
 import com.ruoyi.ems.domain.ElecLoadIndex;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -35,26 +35,26 @@ public interface ElecLoadIndex15minMapper {
     /**
      * 查询电力负荷设施指标列表
      *
-     * @param queryIndex 查询条件
+     * @param queryMeter 查询条件
      * @return 电力负荷设施指标集合
      */
-    List<ElecLoadIndex> selectIndexList(QueryIndex queryIndex);
+    List<ElecLoadIndex> selectIndexList(QueryMeter queryMeter);
 
     /**
      * 查询电力负荷设施指标（最大负荷）
      *
-     * @param queryIndex 查询条件
+     * @param queryMeter 查询条件
      * @return 电力负荷设施指标集合
      */
-    ElecLoadIndex selectIndexMaxLoad(QueryIndex queryIndex);
+    ElecLoadIndex selectIndexMaxLoad(QueryMeter queryMeter);
 
     /**
      * 查询每日电力负荷设施指标（最大负荷）
      *
-     * @param queryIndex 查询条件
+     * @param queryMeter 查询条件
      * @return 电力负荷设施指标集合
      */
-    List<ElecLoadIndex> selectDayIndexMaxLoad(QueryIndex queryIndex);
+    List<ElecLoadIndex> selectDayIndexMaxLoad(QueryMeter queryMeter);
 
     /**
      * 新增电力负荷设施指标

ems/ems-core/src/main/java/com/ruoyi/ems/mapper/ElecPgSupplyHMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.mapper;
 
 import com.ruoyi.ems.domain.ElecPgSupplyH;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 
@@ -41,10 +41,10 @@ public interface ElecPgSupplyHMapper {
     /**
      * 查询电网供应计量-小时列表
      *
-     * @param queryIndex 查询对象
+     * @param queryMeter 查询对象
      * @return 电网供应计量-小时集合
      */
-    List<ElecPgSupplyH> selectPgSupplyH(QueryIndex queryIndex);
+    List<ElecPgSupplyH> selectPgSupplyH(QueryMeter queryMeter);
 
     /**
      * 新增电网供应计量-小时

ems/ems-core/src/main/java/com/ruoyi/ems/mapper/ElecPvSupplyHMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.mapper;
 
 import com.ruoyi.ems.domain.ElecPvSupplyH;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 
@@ -33,7 +33,7 @@ public interface ElecPvSupplyHMapper {
 
     List<ElecPvSupplyH> selectPvSupplyHAll(ElecPvSupplyH pvSupplyH);
 
-    List<ElecPvSupplyH> selectPvSupplyDayList(QueryIndex queryIndex);
+    List<ElecPvSupplyH> selectPvSupplyDayList(QueryMeter param);
 
     Map<String, Object> calThisDayPv(@Param("thisDay") String thisDay);
 

ems/ems-core/src/main/java/com/ruoyi/ems/mapper/ElecUseHMapper.java

@@ -1,84 +0,0 @@
-package com.ruoyi.ems.mapper;
-
-import com.ruoyi.ems.domain.ElecUseH;
-import com.ruoyi.ems.model.ElecUseSta;
-import com.ruoyi.ems.model.QueryIndex;
-
-import java.util.List;
-
-/**
- * 用能计量-小时Mapper接口
- *
- * @author ruoyi
- * @date 2024-08-15
- */
-@Deprecated
-public interface ElecUseHMapper {
-    /**
-     * 查询用能计量-小时
-     *
-     * @param id 用能计量-小时主键
-     * @return 用能计量-小时
-     */
-    ElecUseH selectElecUseHById(Long id);
-
-    /**
-     * 查询用能计量-小时列表
-     *
-     * @param elecUseH 用能计量-小时
-     * @return 用能计量-小时集合
-     */
-    List<ElecUseH> selectElecUseHList(ElecUseH elecUseH);
-
-    List<ElecUseH> selectElecUseDayList(QueryIndex queryIndex);
-
-    List<ElecUseH> selectElecUseHListSum(ElecUseH elecUseH);
-
-    /**
-     * 根据设施子类合并统计
-     *
-     * @param elecUseH 条件
-     * @return 结果
-     */
-    List<ElecUseSta> selectSumBySubCategory(ElecUseH elecUseH);
-
-    /**
-     * 根据设施子类合并统计
-     *
-     * @param elecUseH 条件
-     * @return 结果
-     */
-    List<ElecUseSta> selectSumByFacs(ElecUseH elecUseH);
-
-    /**
-     * 新增用能计量-小时
-     *
-     * @param elecUseH 用能计量-小时
-     * @return 结果
-     */
-    int insertElecUseH(ElecUseH elecUseH);
-
-    /**
-     * 修改用能计量-小时
-     *
-     * @param elecUseH 用能计量-小时
-     * @return 结果
-     */
-    int updateElecUseH(ElecUseH elecUseH);
-
-    /**
-     * 删除用能计量-小时
-     *
-     * @param id 用能计量-小时主键
-     * @return 结果
-     */
-    int deleteElecUseHById(Long id);
-
-    /**
-     * 批量删除用能计量-小时
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    int deleteElecUseHByIds(Long[] ids);
-}

ems/ems-core/src/main/java/com/ruoyi/ems/mapper/EmsElecStoreHMapper.java

@@ -2,7 +2,7 @@ package com.ruoyi.ems.mapper;
 
 import com.ruoyi.ems.domain.ElecStoreH;
 import com.ruoyi.ems.model.ElecStoreSta;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -49,10 +49,10 @@ public interface EmsElecStoreHMapper {
     /**
      * 查询储能计量-日列表
      *
-     * @param queryIndex 参数
+     * @param queryMeter 参数
      * @return 储能计量-日集合
      */
-    List<ElecStoreH> selectStoreDayList(QueryIndex queryIndex);
+    List<ElecStoreH> selectStoreDayList(QueryMeter queryMeter);
 
     /**
      * 查询储能计量-小时列表(全部区域)

ems/ems-core/src/main/java/com/ruoyi/ems/model/QueryIndex.java

@@ -1,116 +0,0 @@
-/*
- * 文 件 名:  QueryIndex
- * 版    权:  浩鲸云计算科技股份有限公司
- * 描    述:  <描述>
- * 修 改 人:  lvwenbin
- * 修改时间:  2024/9/10
- * 跟踪单号:  <跟踪单号>
- * 修改单号:  <修改单号>
- * 修改内容:  <修改内容>
- */
-package com.ruoyi.ems.model;
-
-import com.huashe.common.domain.BaseEntity;
-
-/**
- * 查询指标
- * <功能详细描述>
- *
- * @author lvwenbin
- * @version [版本号, 2024/9/10]
- * @see [相关类/方法]
- * @since [产品/模块版本]
- */
-@Deprecated
-public class QueryIndex extends BaseEntity {
-    /**
-     * 区域编码
-     */
-    private String areaCode;
-
-    /**
-     * 对象类型
-     */
-    private String objType;
-
-    /**
-     * 对象编码
-     */
-    private String objCode;
-
-    /**
-     * 开始时间
-     */
-    private String startTime;
-
-    /**
-     * 结束时间
-     */
-    private String endTime;
-
-    /**
-     * 设施分类
-     */
-    private String facsCategory;
-
-    /**
-     * 设施子类
-     */
-    private String facsSubCategory;
-
-    public String getAreaCode() {
-        return areaCode;
-    }
-
-    public void setAreaCode(String areaCode) {
-        this.areaCode = areaCode;
-    }
-
-    public String getObjType() {
-        return objType;
-    }
-
-    public void setObjType(String objType) {
-        this.objType = objType;
-    }
-
-    public String getObjCode() {
-        return objCode;
-    }
-
-    public void setObjCode(String objCode) {
-        this.objCode = objCode;
-    }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-
-    public String getFacsCategory() {
-        return facsCategory;
-    }
-
-    public void setFacsCategory(String facsCategory) {
-        this.facsCategory = facsCategory;
-    }
-
-    public String getFacsSubCategory() {
-        return facsSubCategory;
-    }
-
-    public void setFacsSubCategory(String facsSubCategory) {
-        this.facsSubCategory = facsSubCategory;
-    }
-}

ems/ems-core/src/main/java/com/ruoyi/ems/service/IElecLoadIndexService.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.service;
 
 import com.ruoyi.ems.domain.ElecLoadIndex;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 
 import java.util.List;
 
@@ -25,26 +25,26 @@ public interface IElecLoadIndexService {
     /**
      * 查询电力负荷设施指标列表
      *
-     * @param queryIndex 电力负荷设施指标
+     * @param queryMeter 电力负荷设施指标
      * @return 电力负荷设施指标集合
      */
-    List<ElecLoadIndex> selectMin15IndexList(QueryIndex queryIndex);
+    List<ElecLoadIndex> selectMin15IndexList(QueryMeter queryMeter);
 
     /**
      * 查询最大功率负荷
      *
-     * @param queryIndex 条件
+     * @param queryMeter 条件
      * @return 结果
      */
-    ElecLoadIndex selectMin15IndexMaxLoad(QueryIndex queryIndex);
+    ElecLoadIndex selectMin15IndexMaxLoad(QueryMeter queryMeter);
 
     /**
      * 查询日最大功率负荷
      *
-     * @param queryIndex 条件
+     * @param queryMeter 条件
      * @return 结果
      */
-    List<ElecLoadIndex> selectDayIndexMaxLoad(QueryIndex queryIndex);
+    List<ElecLoadIndex> selectDayIndexMaxLoad(QueryMeter queryMeter);
 
     /**
      * 新增电力负荷设施指标

ems/ems-core/src/main/java/com/ruoyi/ems/service/IElecPgSupplyHService.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.service;
 
 import com.ruoyi.ems.domain.ElecPgSupplyH;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 
 import java.util.List;
 import java.util.Map;
@@ -32,10 +32,10 @@ public interface IElecPgSupplyHService {
     /**
      * 查询电网供应计量-小时列表
      *
-     * @param queryIndex 参数对象
+     * @param queryMeter 参数对象
      * @return 电网供应计量-小时集合
      */
-    List<ElecPgSupplyH> selectPgSupplyH(QueryIndex queryIndex);
+    List<ElecPgSupplyH> selectPgSupplyH(QueryMeter queryMeter);
 
     Map<String, Object> selectSupplyPvByH();
 

ems/ems-core/src/main/java/com/ruoyi/ems/service/IElecPvSupplyHService.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.service;
 
 import com.ruoyi.ems.domain.ElecPvSupplyH;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 
 import java.util.List;
 
@@ -31,10 +31,10 @@ public interface IElecPvSupplyHService {
     /**
      * 查询光伏并网计量-小时列表
      *
-     * @param queryIndex 光伏并网计量-小时
+     * @param queryMeter 光伏并网计量-小时
      * @return 光伏并网计量-小时集合
      */
-    List<ElecPvSupplyH> selectPvSupplyDayList(QueryIndex queryIndex);
+    List<ElecPvSupplyH> selectPvSupplyDayList(QueryMeter queryMeter);
 
     /**
      * 新增光伏并网计量-小时

ems/ems-core/src/main/java/com/ruoyi/ems/service/IElecStoreService.java

@@ -2,7 +2,7 @@ package com.ruoyi.ems.service;
 
 import com.ruoyi.ems.domain.ElecStoreH;
 import com.ruoyi.ems.model.ElecStoreAnalyze;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 
 import java.util.List;
 
@@ -40,10 +40,10 @@ public interface IElecStoreService {
     /**
      * 查询储能计量-日列表
      *
-     * @param queryIndex 参数
+     * @param param 参数
      * @return 储能计量-日集合
      */
-    List<ElecStoreH> selectDayList(QueryIndex queryIndex);
+    List<ElecStoreH> selectDayList(QueryMeter param);
 
     /**
      * 新增储能计量-小时

ems/ems-core/src/main/java/com/ruoyi/ems/service/IElecUseHService.java

@@ -1,84 +0,0 @@
-package com.ruoyi.ems.service;
-
-import com.ruoyi.ems.domain.ElecUseH;
-import com.ruoyi.ems.model.ElecUseSta;
-import com.ruoyi.ems.model.QueryIndex;
-
-import java.util.List;
-
-/**
- * 用能计量-小时Service接口
- *
- * @author ruoyi
- * @date 2024-08-15
- */
-@Deprecated
-public interface IElecUseHService {
-    /**
-     * 查询用能计量-小时
-     *
-     * @param id 用能计量-小时主键
-     * @return 用能计量-小时
-     */
-    ElecUseH getElecUseHById(Long id);
-
-    /**
-     * 查询用能计量-小时列表
-     *
-     * @param elecUseH 条件参数
-     * @return 用能计量-小时集合
-     */
-    List<ElecUseH> getElecUseHList(ElecUseH elecUseH);
-
-    /**
-     * 查询用能计量-日列表
-     *
-     * @param queryIndex 条件参数
-     * @return 用能计量-日集合
-     */
-    List<ElecUseH> getElecUseDayList(QueryIndex queryIndex);
-
-    /**
-     * 查询用能计量-小时列表(合并计算)
-     *
-     * @param elecUseH 条件参数
-     * @return 用能计量-小时集合
-     */
-    List<ElecUseH> getElecUseHListSum(ElecUseH elecUseH);
-
-    List<ElecUseSta> getSumBySubCategory(ElecUseH elecUseH);
-
-    List<ElecUseSta> getSumByFacs(ElecUseH elecUseH);
-
-    /**
-     * 新增用能计量-小时
-     *
-     * @param elecUseH 用能计量-小时
-     * @return 结果
-     */
-    int insertElecUseH(ElecUseH elecUseH);
-
-    /**
-     * 修改用能计量-小时
-     *
-     * @param elecUseH 用能计量-小时
-     * @return 结果
-     */
-    int updateElecUseH(ElecUseH elecUseH);
-
-    /**
-     * 批量删除用能计量-小时
-     *
-     * @param ids 需要删除的用能计量-小时主键集合
-     * @return 结果
-     */
-    int deleteElecUseHByIds(Long[] ids);
-
-    /**
-     * 删除用能计量-小时信息
-     *
-     * @param id 用能计量-小时主键
-     * @return 结果
-     */
-    int deleteElecUseHById(Long id);
-}

ems/ems-core/src/main/java/com/ruoyi/ems/service/impl/ElecLoadIndexServiceImpl.java

@@ -2,7 +2,7 @@ package com.ruoyi.ems.service.impl;
 
 import com.ruoyi.ems.domain.ElecLoadIndex;
 import com.ruoyi.ems.mapper.ElecLoadIndex15minMapper;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 import com.ruoyi.ems.service.IElecLoadIndexService;
 import com.ruoyi.ems.util.PowerUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,12 +29,12 @@ public class ElecLoadIndexServiceImpl implements IElecLoadIndexService {
     /**
      * 查询电力负荷设施指标列表
      *
-     * @param queryIndex 查询参数
+     * @param queryMeter 查询参数
      * @return 电力负荷设施指标
      */
     @Override
-    public List<ElecLoadIndex> selectMin15IndexList(QueryIndex queryIndex) {
-        List<ElecLoadIndex> indexList = index15minMapper.selectIndexList(queryIndex);
+    public List<ElecLoadIndex> selectMin15IndexList(QueryMeter queryMeter) {
+        List<ElecLoadIndex> indexList = index15minMapper.selectIndexList(queryMeter);
 
         for (ElecLoadIndex index : indexList) {
             index.setS(PowerUtils.getSPower(index.getP(), index.getQ()));
@@ -45,8 +45,8 @@ public class ElecLoadIndexServiceImpl implements IElecLoadIndexService {
     }
 
     @Override
-    public ElecLoadIndex selectMin15IndexMaxLoad(QueryIndex queryIndex) {
-        ElecLoadIndex index = index15minMapper.selectIndexMaxLoad(queryIndex);
+    public ElecLoadIndex selectMin15IndexMaxLoad(QueryMeter queryMeter) {
+        ElecLoadIndex index = index15minMapper.selectIndexMaxLoad(queryMeter);
 
         if (null != index) {
             index.setS(PowerUtils.getSPower(index.getP(), index.getQ()));
@@ -57,8 +57,8 @@ public class ElecLoadIndexServiceImpl implements IElecLoadIndexService {
     }
 
     @Override
-    public List<ElecLoadIndex> selectDayIndexMaxLoad(QueryIndex queryIndex) {
-        List<ElecLoadIndex> indexList = index15minMapper.selectDayIndexMaxLoad(queryIndex);
+    public List<ElecLoadIndex> selectDayIndexMaxLoad(QueryMeter queryMeter) {
+        List<ElecLoadIndex> indexList = index15minMapper.selectDayIndexMaxLoad(queryMeter);
 
         for (ElecLoadIndex index : indexList) {
             index.setS(PowerUtils.getSPower(index.getP(), index.getQ()));

ems/ems-core/src/main/java/com/ruoyi/ems/service/impl/ElecPgSupplyHServiceImpl.java

@@ -4,7 +4,7 @@ import com.ruoyi.common.core.utils.DateTimeUtil;
 import com.ruoyi.ems.domain.ElecPgSupplyH;
 import com.ruoyi.ems.mapper.ElecPgSupplyHMapper;
 import com.ruoyi.ems.mapper.ElecPvSupplyHMapper;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 import com.ruoyi.ems.service.IElecPgSupplyHService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,8 +56,8 @@ public class ElecPgSupplyHServiceImpl implements IElecPgSupplyHService {
     }
 
     @Override
-    public List<ElecPgSupplyH> selectPgSupplyH(QueryIndex queryIndex) {
-        return pgSupplyHMapper.selectPgSupplyH(queryIndex);
+    public List<ElecPgSupplyH> selectPgSupplyH(QueryMeter queryMeter) {
+        return pgSupplyHMapper.selectPgSupplyH(queryMeter);
     }
 
     @Override

ems/ems-core/src/main/java/com/ruoyi/ems/service/impl/ElecPvSupplyHServiceImpl.java

@@ -1,9 +1,8 @@
 package com.ruoyi.ems.service.impl;
 
-
 import com.ruoyi.ems.domain.ElecPvSupplyH;
 import com.ruoyi.ems.mapper.ElecPvSupplyHMapper;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 import com.ruoyi.ems.service.IElecPvSupplyHService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,8 +49,8 @@ public class ElecPvSupplyHServiceImpl implements IElecPvSupplyHService {
     }
 
     @Override
-    public List<ElecPvSupplyH> selectPvSupplyDayList(QueryIndex queryIndex) {
-        return pvSupplyHMapper.selectPvSupplyDayList(queryIndex);
+    public List<ElecPvSupplyH> selectPvSupplyDayList(QueryMeter param) {
+        return pvSupplyHMapper.selectPvSupplyDayList(param);
     }
 
     /**

ems/ems-core/src/main/java/com/ruoyi/ems/service/impl/ElecStoreServiceImpl.java

@@ -4,7 +4,7 @@ import com.ruoyi.ems.domain.ElecStoreH;
 import com.ruoyi.ems.mapper.EmsElecStoreHMapper;
 import com.ruoyi.ems.model.ElecStoreAnalyze;
 import com.ruoyi.ems.model.ElecStoreSta;
-import com.ruoyi.ems.model.QueryIndex;
+import com.ruoyi.ems.model.QueryMeter;
 import com.ruoyi.ems.service.IElecStoreService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,8 +63,8 @@ public class ElecStoreServiceImpl implements IElecStoreService {
     }
 
     @Override
-    public List<ElecStoreH> selectDayList(QueryIndex queryIndex) {
-        return elecStoreHMapper.selectStoreDayList(queryIndex);
+    public List<ElecStoreH> selectDayList(QueryMeter param) {
+        return elecStoreHMapper.selectStoreDayList(param);
     }
 
     /**

ems/ems-core/src/main/java/com/ruoyi/ems/service/impl/ElecUseHServiceImpl.java

@@ -1,121 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import com.ruoyi.ems.domain.ElecUseH;
-import com.ruoyi.ems.mapper.ElecUseHMapper;
-import com.ruoyi.ems.model.ElecUseSta;
-import com.ruoyi.ems.model.QueryIndex;
-import com.ruoyi.ems.service.IElecUseHService;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 用能计量-小时Service业务层处理
- *
- * @author ruoyi
- * @date 2024-08-15
- */
-@Deprecated
-@Service
-public class ElecUseHServiceImpl implements IElecUseHService {
-    @Autowired
-    private ElecUseHMapper elecUseHMapper;
-
-    /**
-     * 查询用能计量-小时
-     *
-     * @param id 用能计量-小时主键
-     * @return 用能计量-小时
-     */
-    @Override
-    public ElecUseH getElecUseHById(Long id) {
-        return elecUseHMapper.selectElecUseHById(id);
-    }
-
-    /**
-     * 查询用能计量-小时列表
-     *
-     * @param ElecUseH 用能计量-小时
-     * @return 用能计量-小时
-     */
-    @Override
-    public List<ElecUseH> getElecUseHList(ElecUseH ElecUseH) {
-        return elecUseHMapper.selectElecUseHList(ElecUseH);
-    }
-
-    @Override
-    public List<ElecUseH> getElecUseDayList(QueryIndex queryIndex) {
-        return elecUseHMapper.selectElecUseDayList(queryIndex);
-    }
-
-    @Override
-    public List<ElecUseH> getElecUseHListSum(ElecUseH elecUseH) {
-        return elecUseHMapper.selectElecUseHListSum(elecUseH);
-    }
-
-    @Override
-    public List<ElecUseSta> getSumBySubCategory(ElecUseH elecUseH) {
-        List<ElecUseSta> retList = elecUseHMapper.selectSumBySubCategory(elecUseH);
-
-        if (CollectionUtils.isNotEmpty(retList)) {
-            for (ElecUseSta staObj : retList) {
-                elecUseH.setFacsSubCategory(staObj.getObjCode());
-                List<ElecUseSta> subentryList = elecUseHMapper.selectSumByFacs(elecUseH);
-                staObj.setSubentry(subentryList);
-            }
-        }
-
-        return retList;
-    }
-
-    @Override
-    public List<ElecUseSta> getSumByFacs(ElecUseH elecUseH) {
-        return elecUseHMapper.selectSumByFacs(elecUseH);
-    }
-
-    /**
-     * 新增用能计量-小时
-     *
-     * @param ElecUseH 用能计量-小时
-     * @return 结果
-     */
-    @Override
-    public int insertElecUseH(ElecUseH ElecUseH) {
-        return elecUseHMapper.insertElecUseH(ElecUseH);
-    }
-
-    /**
-     * 修改用能计量-小时
-     *
-     * @param ElecUseH 用能计量-小时
-     * @return 结果
-     */
-    @Override
-    public int updateElecUseH(ElecUseH ElecUseH) {
-        return elecUseHMapper.updateElecUseH(ElecUseH);
-    }
-
-    /**
-     * 批量删除用能计量-小时
-     *
-     * @param ids 需要删除的用能计量-小时主键
-     * @return 结果
-     */
-    @Override
-    public int deleteElecUseHByIds(Long[] ids) {
-        return elecUseHMapper.deleteElecUseHByIds(ids);
-    }
-
-    /**
-     * 删除用能计量-小时信息
-     *
-     * @param id 用能计量-小时主键
-     * @return 结果
-     */
-    @Override
-    public int deleteElecUseHById(Long id) {
-        return elecUseHMapper.deleteElecUseHById(id);
-    }
-}

ems/ems-core/src/main/resources/mapper/ems/ElecLoadIndex15minMapper.xml

@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, area_code, obj_type, obj_code, record_time, `date`, `time`, time_index, ua, ub, uc, la, lb, lc, p, pa, pb, pc, q, qa, qb, qc, pf from adm_ems_elec_load_index_15min
     </sql>
 
-    <select id="selectIndexList" parameterType="com.ruoyi.ems.domain.ElecLoadIndex" resultMap="indexResult">
+    <select id="selectIndexList" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="indexResult">
         select
         <if test="areaCode != null and areaCode != '' and areaCode != '-1'">
           i.area_code,
@@ -99,15 +99,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="objCode != null  and objCode != ''">and i.obj_code = #{objCode}</if>
             <if test="facsCategory != null and facsCategory != ''">and fa.facs_category = #{facsCategory}</if>
             <if test="facsSubCategory != null and facsSubCategory != ''">and fa.facs_subcategory = #{facsSubCategory}</if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime !=''">
-                and i.`record_time` &gt;= #{startTime} and i.`record_time` &lt;= #{endTime}
+            <if test="startRecTime != null and startRecTime != '' and endRecTime != null and endRecTime !=''">
+                and i.`record_time` &gt;= #{startRecTime} and i.`record_time` &lt;= #{endRecTime}
             </if>
         </where>
         GROUP BY i.`record_time`
         ORDER BY i.`record_time`
     </select>
 
-    <select id="selectIndexMaxLoad" parameterType="com.ruoyi.ems.domain.ElecLoadIndex" resultMap="indexResult">
+    <select id="selectIndexMaxLoad" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="indexResult">
         SELECT
             MAX(t.total_p) AS p,
             MAX(t.total_q) AS q
@@ -131,8 +131,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="objCode != null  and objCode != ''">and i.obj_code = #{objCode}</if>
             <if test="facsCategory != null and facsCategory != ''">and fa.facs_category = #{facsCategory}</if>
             <if test="facsSubCategory != null and facsSubCategory != ''">and fa.facs_subcategory = #{facsSubCategory}</if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime !=''">
-                and i.`record_time` BETWEEN  #{startTime} and #{endTime}
+            <if test="startRecTime != null and startRecTime != '' and endRecTime != null and endRecTime !=''">
+                and i.`record_time` BETWEEN  #{startRecTime} and #{endRecTime}
             </if>
         </where>
         GROUP BY
@@ -140,7 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             i.`time`) t
     </select>
 
-    <select id="selectDayIndexMaxLoad" parameterType="com.ruoyi.ems.domain.ElecLoadIndex" resultMap="indexResult">
+    <select id="selectDayIndexMaxLoad" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="indexResult">
         SELECT
             t.date_part as `date`,
             MAX(t.total_p) AS p,
@@ -164,8 +164,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="objCode != null  and objCode != ''">and i.obj_code = #{objCode}</if>
             <if test="facsCategory != null and facsCategory != ''">and fa.facs_category = #{facsCategory}</if>
             <if test="facsSubCategory != null and facsSubCategory != ''">and fa.facs_subcategory = #{facsSubCategory}</if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime !=''">
-                and i.`date` between #{startTime} and #{endTime}
+            <if test="startRecTime != null and startRecTime != '' and endRecTime != null and endRecTime !=''">
+                and i.`date` between #{startRecTime} and #{endRecTime}
             </if>
         </where>
         GROUP BY

ems/ems-core/src/main/resources/mapper/ems/ElecPgSupplyHMapper.xml

@@ -102,12 +102,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             DATE, time_index
     </select>
 
-    <select id="selectPgSupplyH" parameterType="com.ruoyi.ems.model.QueryIndex" resultMap="PgSupplyHResult">
+    <select id="selectPgSupplyH" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="PgSupplyHResult">
         <include refid="selectPgSupplyHVo"/>
         <where>
             <if test="areaCode != null  and areaCode != ''"> and pg.`area_code` = #{areaCode}</if>
             <if test="startTime != null  and startTime != '' and endTime != null and endTime !=''">
-             and pg.`record_time` &gt;= #{startTime} and pg.`record_time` &lt;= #{endTime}
+             and pg.`record_time` &gt;= #{startRecTime} and pg.`record_time` &lt;= #{endRecTime}
             </if>
         </where>
     </select>

ems/ems-core/src/main/resources/mapper/ems/ElecPvSupplyHMapper.xml

@@ -97,7 +97,7 @@
             pv.`time_index`
     </select>
 
-    <select id="selectPvSupplyDayList" parameterType="com.ruoyi.ems.model.QueryIndex" resultMap="PvSupplyHResult">
+    <select id="selectPvSupplyDayList" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="PvSupplyHResult">
         SELECT
             <if test="facsSubCategory != null and facsSubCategory !=''">
               sc.`name` as facs_name,
@@ -119,8 +119,8 @@
             <if test="areaCode != null and areaCode != '' and areaCode != '-1'">
                 and pv.area_code = #{areaCode}
             </if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime !=''">
-                and pv.`date` &gt;= #{startTime} and pv.`date` &lt;= #{endTime}
+            <if test="startRecTime != null and startRecTime != '' and endRecTime != null and endRecTime !=''">
+                and pv.`date` &gt;= #{startRecTime} and pv.`date` &lt;= #{endRecTime}
             </if>
             <if test="facsSubCategory != null and facsSubCategory !=''">
                 and f.facs_subcategory = #{facsSubCategory}

ems/ems-core/src/main/resources/mapper/ems/ElecUseHMapper.xml

@@ -1,288 +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.ElecUseHMapper">
-
-    <resultMap type="com.ruoyi.ems.domain.ElecUseH" id="elecUseHResult">
-        <result property="id" column="id"/>
-        <result property="areaCode" column="area_code"/>
-        <result property="areaName" column="area_name"/>
-        <result property="areaShortName" column="area_short_name"/>
-        <result property="objType" column="obj_type"/>
-        <result property="objCode" column="obj_code"/>
-        <result property="objName" column="obj_name"/>
-        <result property="recordTime" column="record_time"/>
-        <result property="date" column="date"/>
-        <result property="time" column="time"/>
-        <result property="timeIndex" column="time_index"/>
-        <result property="elecQuantity" column="elec_quantity"/>
-    </resultMap>
-
-    <resultMap type="com.ruoyi.ems.model.ElecUseSta" id="elecUseResult">
-        <result property="objCode" column="obj_code"/>
-        <result property="objName" column="obj_name"/>
-        <result property="elecQuantity" column="elec_quantity"/>
-    </resultMap>
-
-    <sql id="selectElecUseHVo">
-        select u.id,
-               u.area_code,
-               a.area_name,
-               a.short_name as area_short_name,
-               u.obj_type,
-               u.obj_code,
-               CASE
-                   WHEN u.obj_type = 1 THEN a2.area_name
-                   WHEN u.obj_type = 2 THEN f.facs_name
-                   WHEN u.obj_type = 3 THEN d.device_name
-               END as obj_name,
-               f.facs_category,
-               f.facs_subcategory,
-               u.record_time,
-               u.`date`,
-               u.`time`,
-               u.time_index,
-               u.elec_quantity
-        from adm_ems_obj_use_h u
-                 LEFT JOIN adm_area a ON u.`area_code` = a.`area_code`
-                 LEFT JOIN adm_area a2 ON u.`obj_code` = a2.`area_code`
-                 LEFT JOIN adm_ems_facs f ON u.`obj_code` = f.`facs_code`
-                 LEFT JOIN adm_ems_device d ON u.`obj_code` = d.`device_code`
-    </sql>
-
-    <select id="selectElecUseHList" parameterType="com.ruoyi.ems.domain.ElecUseH" resultMap="elecUseHResult">
-        <include refid="selectElecUseHVo"/>
-        <where>
-            <if test="areaCode != null and areaCode != ''">and u.area_code = #{areaCode}</if>
-            <if test="objType != null">and u.obj_type = #{objType}</if>
-            <if test="objCode != null  and objCode != ''">and u.obj_code = #{objCode}</if>
-            <if test="facsCategory != null  and facsCategory != ''">and f.facs_category = #{facsCategory}</if>
-            <if test="facsSubCategory != null  and facsSubCategory != ''">and f.facs_subcategory = #{facsSubCategory}</if>
-            <if test="date != null ">and u.`date` = #{date}</if>
-            <if test="time != null ">and u.`time` = #{time}</if>
-            <if test="timeIndex != null ">and u.time_index = #{timeIndex}</if>
-            <if test="elecQuantity != null ">and u.elec_quantity = #{elecQuantity}</if>
-            <if test="startRecTime != null  and startRecTime != '' and endRecTime != null and endRecTime !=''">
-                and u.`record_time` &gt;= #{startRecTime} and u.`record_time` &lt;= #{endRecTime}
-            </if>
-        </where>
-        ORDER BY u.`date` DESC,
-        u.`time` DESC,
-        u.`time_index`
-    </select>
-
-    <select id="selectElecUseDayList" parameterType="com.ruoyi.ems.model.QueryIndex" resultMap="elecUseHResult">
-        select
-        <if test="areaCode != null and areaCode != '' and areaCode != '-1'">
-            u.area_code,
-            a.area_name,
-            a.short_name as area_short_name,
-        </if>
-        <if test="objCode != null and objCode != ''">
-            u.obj_code,
-            CASE
-              WHEN u.obj_type = 1 THEN a2.area_name
-              WHEN u.obj_type = 2 THEN f.facs_name
-              WHEN u.obj_type = 3 THEN d.device_name
-            END as obj_name,
-        </if>
-        <if test="(facsCategory != null and facsCategory != '') or (facsSubCategory != null and facsSubCategory != '')">
-            fa.facs_category,
-            fa.facs_subcategory,
-            <if test="objCode == null or objCode == ''">
-                fs.name as obj_name,
-            </if>
-        </if>
-        u.`date`,
-        sum(COALESCE(u.elec_quantity,0)) elec_quantity
-        from adm_ems_obj_use_h u
-        <if test="areaCode != null and areaCode != '' and areaCode != '-1'">
-            LEFT JOIN adm_area a ON u.`area_code` = a.`area_code`
-        </if>
-        <if test="(facsCategory != null  and facsCategory != '') or (facsSubCategory != null  and facsSubCategory != '')">
-            LEFT JOIN adm_ems_facs fa ON u.`obj_code` = fa.`facs_code`
-            <if test="objCode == null or objCode == ''">
-                LEFT JOIN dim_ems_facs_subcategory fs ON fa.`facs_subcategory` = fs.`code`
-            </if>
-        </if>
-        <if test="objCode != null and objCode != ''">
-            LEFT JOIN adm_area a2 ON u.`obj_code` = a2.`area_code`
-            LEFT JOIN adm_ems_facs f ON u.`obj_code` = f.`facs_code`
-            LEFT JOIN adm_ems_device d ON u.`obj_code` = d.`device_code`
-        </if>
-        <where>
-            <if test="areaCode != null and areaCode != '' and areaCode != '-1'">and u.area_code = #{areaCode}</if>
-            <if test="objType != null ">and u.obj_type = #{objType}</if>
-            <if test="objCode != null and objCode != ''">and u.obj_code = #{objCode}</if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime !=''">
-                and u.`date` &gt;= #{startTime} and u.`date` &lt;= #{endTime}
-            </if>
-            <if test="facsCategory != null and facsCategory != ''">and fa.facs_category = #{facsCategory}</if>
-            <if test="facsSubCategory != null and facsSubCategory != ''">and fa.facs_subcategory = #{facsSubCategory}</if>
-        </where>
-        GROUP BY u.`date`
-        ORDER BY u.`date`
-    </select>
-
-    <select id="selectElecUseHListSum" parameterType="com.ruoyi.ems.domain.ElecUseH" resultMap="elecUseHResult">
-        select
-            <if test="areaCode != null and areaCode != '' and areaCode != '-1'">
-              u.area_code,
-              a.area_name,
-              a.short_name as area_short_name,
-            </if>
-            <if test="objCode != null and objCode != ''">
-              u.obj_code,
-              CASE
-                WHEN u.obj_type = 1 THEN a2.area_name
-                WHEN u.obj_type = 2 THEN f.facs_name
-                WHEN u.obj_type = 3 THEN d.device_name
-              END as obj_name,
-            </if>
-            <if test="(facsCategory != null and facsCategory != '') or (facsSubCategory != null and facsSubCategory != '')">
-              fa.facs_category,
-              fa.facs_subcategory,
-              <if test="objCode == null or objCode == ''">
-                fs.name as obj_name,
-              </if>
-            </if>
-              u.`record_time`,
-              u.`date`,
-              u.`time`,
-              u.`time_index`,
-              sum(COALESCE(u.elec_quantity,0)) elec_quantity
-        from adm_ems_obj_use_h u
-            <if test="areaCode != null and areaCode != '' and areaCode != '-1'">
-              LEFT JOIN adm_area a ON u.`area_code` = a.`area_code`
-            </if>
-            <if test="(facsCategory != null  and facsCategory != '') or (facsSubCategory != null  and facsSubCategory != '')">
-              LEFT JOIN adm_ems_facs fa ON u.`obj_code` = fa.`facs_code`
-              <if test="objCode == null or objCode == ''">
-                LEFT JOIN dim_ems_facs_subcategory fs ON fa.`facs_subcategory` = fs.`code`
-              </if>
-            </if>
-            <if test="objCode != null and objCode != ''">
-              LEFT JOIN adm_area a2 ON u.`obj_code` = a2.`area_code`
-              LEFT JOIN adm_ems_facs f ON u.`obj_code` = f.`facs_code`
-              LEFT JOIN adm_ems_device d ON u.`obj_code` = d.`device_code`
-            </if>
-        <where>
-            <if test="areaCode != null and areaCode != '' and areaCode != '-1'">and u.area_code = #{areaCode}</if>
-            <if test="objType != null ">and u.obj_type = #{objType}</if>
-            <if test="objCode != null and objCode != ''">and u.obj_code = #{objCode}</if>
-            <if test="startRecTime != null  and startRecTime != '' and endRecTime != null and endRecTime !=''">
-                and u.`record_time` &gt;= #{startRecTime} and u.`record_time` &lt;= #{endRecTime}
-            </if>
-            <if test="facsCategory != null and facsCategory != ''">and fa.facs_category = #{facsCategory}</if>
-            <if test="facsSubCategory != null and facsSubCategory != ''">and fa.facs_subcategory = #{facsSubCategory}</if>
-        </where>
-        GROUP BY
-            u.`date`,
-            u.`time_index`,
-            u.`time`
-        ORDER BY
-            u.`date` DESC,
-            u.`time` DESC,
-            u.`time_index`
-    </select>
-
-    <select id="selectSumBySubCategory" parameterType="com.ruoyi.ems.domain.ElecUseH" resultMap="elecUseResult">
-        select
-          sc.`code` as obj_code, sc.`name` as obj_name, sum(t.elec_quantity) as elec_quantity
-        from dim_ems_facs_subcategory sc
-        left join
-          ( select
-              f.facs_subcategory, sum(u.elec_quantity) as elec_quantity
-            from
-              adm_ems_facs f
-            left join adm_ems_obj_use_h u on f.facs_code = u.obj_code
-            <where>
-              f.facs_category = 'Z'
-              and u.obj_type = 2
-              <if test="areaCode != null and areaCode != '' and areaCode != '-1'">and f.ref_area = #{areaCode}</if>
-              <if test="startRecTime != null  and startRecTime != '' and endRecTime != null and endRecTime !=''">
-                  and u.record_time &gt;= #{startRecTime} and u.record_time &lt;= #{endRecTime}
-              </if>
-            </where>
-            GROUP BY f.facs_subcategory
-          ) t on sc.`code` = t.facs_subcategory
-        where sc.parent_code = 'Z'
-        GROUP BY sc.`code`, sc.`name`;
-    </select>
-
-    <select id="selectSumByFacs" parameterType="com.ruoyi.ems.domain.ElecUseH" resultMap="elecUseResult">
-        select
-          f.facs_code as obj_code, f.facs_name as obj_name, sum(u.elec_quantity) as elec_quantity
-        from
-          adm_ems_facs f
-          left join adm_ems_obj_use_h u on f.facs_code = u.obj_code
-        <where>
-            <if test="facsSubCategory != null and facsSubCategory != ''">and f.facs_subcategory = #{facsSubCategory}</if>
-            and u.obj_type = 2
-            <if test="objCode != null and objCode != ''">and f.facs_code = #{objCode}</if>
-            <if test="areaCode != null and areaCode != '' and areaCode != '-1'">and u.area_code = #{areaCode}</if>
-            <if test="startRecTime != null and startRecTime != '' and endRecTime != null and endRecTime !=''">
-                and u.record_time &gt;= #{startRecTime} and u.record_time &lt;= #{endRecTime}
-            </if>
-        </where>
-        GROUP BY f.facs_code, f.facs_name
-    </select>
-
-    <select id="selectElecUseHById" parameterType="Long" resultMap="elecUseHResult">
-        <include refid="selectElecUseHVo"/>
-        where u.`id` = #{id}
-    </select>
-
-    <insert id="insertElecUseH" parameterType="com.ruoyi.ems.domain.ElecUseH" useGeneratedKeys="true" keyProperty="id">
-        insert into adm_ems_obj_use_h
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="areaCode != null and areaCode != ''">area_code,</if>
-            <if test="objType != null">obj_type,</if>
-            <if test="objCode != null  and objCode != ''">obj_code,</if>
-            <if test="recordTime != null">record_time,</if>
-            <if test="date != null">`date`,</if>
-            <if test="time != null">`time`,</if>
-            <if test="timeIndex != null">time_index,</if>
-            <if test="elecQuantity != null">elec_quantity,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="areaCode != null and areaCode != ''">#{areaCode},</if>
-            <if test="objType != null">#{obj_type},</if>
-            <if test="objCode != null  and objCode != ''">#{obj_code},</if>
-            <if test="recordTime != null">#{recordTime},</if>
-            <if test="date != null">#{date},</if>
-            <if test="time != null">#{time},</if>
-            <if test="timeIndex != null">#{timeIndex},</if>
-            <if test="elecQuantity != null">#{elecQuantity},</if>
-        </trim>
-    </insert>
-
-    <update id="updateElecUseH" parameterType="com.ruoyi.ems.domain.ElecUseH">
-        update adm_ems_obj_use_h
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
-            <if test="objType != null">obj_type = #{objType},</if>
-            <if test="objCode != null  and objCode != ''">obj_code = #{objCode},</if>
-            <if test="recordTime != null">record_time = #{recordTime},</if>
-            <if test="date != null">`date` = #{date},</if>
-            <if test="time != null">`time` = #{time},</if>
-            <if test="timeIndex != null">time_index = #{timeIndex},</if>
-            <if test="elecQuantity != null">elec_quantity = #{elecQuantity},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteElecUseHById" parameterType="Long">
-        delete
-        from adm_ems_obj_use_h
-        where id = #{id}
-    </delete>
-
-    <delete id="deleteElecUseHByIds" parameterType="String">
-        delete from adm_ems_obj_use_h where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

ems/ems-core/src/main/resources/mapper/ems/EmsElecStoreHMapper.xml

@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         st.`time_index`
     </select>
 
-    <select id="selectStoreDayList" parameterType="com.ruoyi.ems.model.QueryIndex" resultMap="StoreHResult">
+    <select id="selectStoreDayList" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="StoreHResult">
         SELECT
             <if test="facsSubCategory != null and facsSubCategory !=''">
               sc.`name` as facs_name,
@@ -108,8 +108,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="areaCode != null and areaCode != '' and areaCode != '-1'">
                 and s.area_code = #{areaCode}
             </if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime !=''">
-                and s.`date` &gt;= #{startTime} and s.`date` &lt;= #{endTime}
+            <if test="startRecTime != null and startRecTime != '' and endRecTime != null and endRecTime !=''">
+                and s.`date` &gt;= #{startRecTime} and s.`date` &lt;= #{endRecTime}
             </if>
             <if test="facsSubCategory != null and facsSubCategory !=''">
                 and f.facs_subcategory = #{facsSubCategory}

ems/sql/ems_sys_data.sql

@@ -118,8 +118,8 @@ insert into sys_menu values ('1441',  '自动抄表',   '144', '2',  'meterRead-
 insert into sys_menu values ('1620',  '设备模型',   '162', '1',  'basecfg-devmode',        'basecfg/device/model',       '', 1, 0, 'C', '0', '0',   'ems:devmode:list',              'cfgwrite',   'admin', sysdate(), '', null, '设备模型');
 insert into sys_menu values ('1621',  '设施分类',   '162', '2',  'basecfg-facscategory',   'basecfg/facscategory/index', '', 1, 0, 'C', '0', '0',   'basecfg:facscategory:list',     'cfgwrite',   'admin', sysdate(), '', null, '设施配置');
 insert into sys_menu values ('1622',  '能流关系',   '162', '3',  'basecfg-flowrel',        'basecfg/flowrel/index',      '', 1, 0, 'C', '0', '0',   'basecfg:flowrel:list',          'cfgwrite',   'admin', sysdate(), '', null, '设备配置');
-insert into sys_menu values ('1623',  '能源设施',   '162', '4',  'basecfg-facscfg',        'basecfg/emsfacs/index',      '', 1, 0, 'C', '0', '0',   'basecfg:emsfacs:list',          'cfgwrite',   'admin', sysdate(), '', null, '设施配置');
-insert into sys_menu values ('1624',  '能源设备',   '162', '5',  'basecfg-devccfg',        'basecfg/device/index',       '', 1, 0, 'C', '0', '0',   'basecfg:device:list',           'cfgwrite',   'admin', sysdate(), '', null, '设备配置');
+insert into sys_menu values ('1623',  '设施管理',   '162', '4',  'basecfg-facscfg',        'basecfg/emsfacs/index',      '', 1, 0, 'C', '0', '0',   'basecfg:emsfacs:list',          'cfgwrite',   'admin', sysdate(), '', null, '设施配置');
+insert into sys_menu values ('1624',  '设备管理',   '162', '5',  'basecfg-devccfg',        'basecfg/device/index',       '', 1, 0, 'C', '0', '0',   'basecfg:device:list',           'cfgwrite',   'admin', sysdate(), '', null, '设备配置');
 insert into sys_menu values ('1630',  '计量设备',   '163', '1',  'basecfg-meterdevc',      'basecfg/meterdevc/index',    '', 1, 0, 'C', '0', '0',   'ems:meterdevc:list',            'cfgwrite',   'admin', sysdate(), '', null, '计量设备');
 insert into sys_menu values ('1631',  '计量绑定',   '163', '2',  'basecfg-boundaryRel',    'basecfg/boundaryRel/index',  '', 1, 0, 'C', '0', '0',   'ems:meterBoundary:list',     'cfgwrite',   'admin', sysdate(), '', null, '边界划分');
 insert into sys_menu values ('1632',  '价格策略',   '163', '3',  'basecfg-electricity',    'basecfg/price/index',        '', 1, 0, 'C', '0', '0',   'basecfg:price:list',            'cfgwrite',   'admin', sysdate(), '', null, '价格策略');