Merge remote-tracking branch 'origin/master'

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

@@ -29,8 +29,8 @@ import java.util.List;
  * @date 2024-07-11
  */
 @RestController
-@RequestMapping("/basecfg/emissionFactor")
-public class EmissionFactorController extends BaseController
+@RequestMapping("/basecfg/cacfg")
+public class CaConfigController extends BaseController
 {
     @Autowired
     private IEmissionFactorService emissionFactorService;
@@ -38,9 +38,9 @@ public class EmissionFactorController extends BaseController
     /**
      * 查询排放因子维列表
      */
-    @RequiresPermissions("basecfg:emissionFactor:list")
-    @GetMapping("/list")
-    public TableDataInfo list(EmissionFactor emissionFactor)
+    @RequiresPermissions("basecfg:cacfg:list")
+    @GetMapping("/emissionFactor/list")
+    public TableDataInfo listEmissionFactor(EmissionFactor emissionFactor)
     {
         startPage();
         List<EmissionFactor> list = emissionFactorService.selectEmissionFactorList(emissionFactor);
@@ -50,9 +50,9 @@ public class EmissionFactorController extends BaseController
     /**
      * 导出排放因子维列表
      */
-    @RequiresPermissions("basecfg:emissionFactor:export")
+    @RequiresPermissions("basecfg:cacfg:export")
     @Log(title = "排放因子", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+    @PostMapping("/emissionFactor/export")
     public void export(HttpServletResponse response, EmissionFactor emissionFactor)
     {
         List<EmissionFactor> list = emissionFactorService.selectEmissionFactorList(emissionFactor);
@@ -63,8 +63,8 @@ public class EmissionFactorController extends BaseController
     /**
      * 获取排放因子维详细信息
      */
-    @RequiresPermissions("basecfg:emissionFactor:query")
-    @GetMapping(value = "/{id}")
+    @RequiresPermissions("basecfg:cacfg:query")
+    @GetMapping(value = "/emissionFactor/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
         return success(emissionFactorService.selectEmissionFactorById(id));
@@ -73,9 +73,9 @@ public class EmissionFactorController extends BaseController
     /**
      * 新增排放因子维
      */
-    @RequiresPermissions("basecfg:emissionFactor:add")
+    @RequiresPermissions("basecfg:cacfg:add")
     @Log(title = "排放因子", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping(value = "/emissionFactor")
     public AjaxResult add(@RequestBody EmissionFactor emissionFactor)
     {
         return toAjax(emissionFactorService.insertEmissionFactor(emissionFactor));
@@ -84,9 +84,9 @@ public class EmissionFactorController extends BaseController
     /**
      * 修改排放因子维
      */
-    @RequiresPermissions("basecfg:emissionFactor:edit")
+    @RequiresPermissions("basecfg:cacfg:edit")
     @Log(title = "排放因子", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PutMapping(value = "/emissionFactor")
     public AjaxResult edit(@RequestBody EmissionFactor emissionFactor)
     {
         return toAjax(emissionFactorService.updateEmissionFactor(emissionFactor));
@@ -95,9 +95,9 @@ public class EmissionFactorController extends BaseController
     /**
      * 删除排放因子维
      */
-    @RequiresPermissions("basecfg:emissionFactor:remove")
+    @RequiresPermissions("basecfg:cacfg:remove")
     @Log(title = "排放因子", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@DeleteMapping("/emissionFactor/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(emissionFactorService.deleteEmissionFactorByIds(ids));

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

@@ -12,10 +12,12 @@ package com.ruoyi.ems.controller;
 
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.ems.domain.DevcType;
 import com.ruoyi.ems.domain.ElecValencyType;
 import com.ruoyi.ems.domain.EmsCls;
 import com.ruoyi.ems.domain.EmsTag;
 import com.ruoyi.ems.domain.vo.TreeEntity;
+import com.ruoyi.ems.service.IDevcTypeService;
 import com.ruoyi.ems.service.IElecValencyTypeService;
 import com.ruoyi.ems.service.IEmsClsService;
 import com.ruoyi.ems.service.IEmsTagService;
@@ -48,6 +50,9 @@ public class CommonController extends BaseController {
     @Autowired
     private IEmsTagService emsTagService;
 
+    @Autowired
+    private IDevcTypeService devcTypeService;
+
     /**
      * 电价分类
      *
@@ -71,7 +76,19 @@ public class CommonController extends BaseController {
     }
 
     /**
+     * 设备分类
+     *
+     * @return 分类列表
+     */
+    @GetMapping(value = "/devc/type")
+    public AjaxResult getDevcType() {
+        List<DevcType> types = devcTypeService.selectDevcTypeList(new DevcType());
+        return success(types);
+    }
+
+    /**
      * 标签列表
+     *
      * @return 标签列表
      */
     @GetMapping(value = "/emstag")

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

@@ -48,6 +48,18 @@ public class DeviceController extends BaseController
     }
 
     /**
+     * 查询能源设备列表
+     */
+    @RequiresPermissions("basecfg:device:list")
+    @GetMapping("/listByAreaTree")
+    public TableDataInfo listByAreaTree(EmsDevice emsDevice)
+    {
+        startPage();
+        List<EmsDevice> list = deviceService.selectEmsDeviceList(emsDevice);
+        return getDataTable(list);
+    }
+
+    /**
      * 导出能源设备列表
      */
     @RequiresPermissions("basecfg:device:export")

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

@@ -0,0 +1,65 @@
+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_devc_type
+ * 
+ * @author ruoyi
+ * @date 2024-08-05
+ */
+public class DevcType extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 序号 */
+    private Long id;
+
+    /** 标签代码 */
+    @Excel(name = "标签代码")
+    private Long typeCode;
+
+    /** 标签名称 */
+    @Excel(name = "标签名称")
+    private String typeName;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setTypeCode(Long typeCode) 
+    {
+        this.typeCode = typeCode;
+    }
+
+    public Long 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/EmsDevice.java

@@ -27,13 +27,19 @@ public class EmsDevice extends BaseEntity
     private String deviceName;
 
     /** 设备类型 */
-    @Excel(name = "设备类型")
     private Long deviceType;
 
+    /** 设备类型名称 */
+    @Excel(name = "设备类型")
+    private String deviceTypeName;
+
     /** 设备状态 */
     @Excel(name = "设备状态")
     private Long deviceStatus;
 
+    /** 区域类型 */
+    private String areaType;
+
     /** 归属区域代码 */
     private String refArea;
 
@@ -84,7 +90,16 @@ public class EmsDevice extends BaseEntity
     {
         return deviceType;
     }
-    public void setDeviceStatus(Long deviceStatus) 
+
+    public String getDeviceTypeName() {
+        return deviceTypeName;
+    }
+
+    public void setDeviceTypeName(String deviceTypeName) {
+        this.deviceTypeName = deviceTypeName;
+    }
+
+    public void setDeviceStatus(Long deviceStatus)
     {
         this.deviceStatus = deviceStatus;
     }
@@ -93,7 +108,16 @@ public class EmsDevice extends BaseEntity
     {
         return deviceStatus;
     }
-    public void setRefArea(String refArea) 
+
+    public String getAreaType() {
+        return areaType;
+    }
+
+    public void setAreaType(String areaType) {
+        this.areaType = areaType;
+    }
+
+    public void setRefArea(String refArea)
     {
         this.refArea = refArea;
     }
@@ -135,7 +159,9 @@ public class EmsDevice extends BaseEntity
             .append("deviceCode", getDeviceCode())
             .append("deviceName", getDeviceName())
             .append("deviceType", getDeviceType())
+            .append("deviceTypeName", getDeviceTypeName())
             .append("deviceStatus", getDeviceStatus())
+            .append("areaType", getAreaType())
             .append("refArea", getRefArea())
             .append("refFacs", getRefFacs())
             .append("createTime", getCreateTime())

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

@@ -20,6 +20,14 @@ public interface AreaBuildingMapper {
     AreaBuilding selectAreaBuildingById(Long id);
 
     /**
+     * 查询建筑基本信息
+     *
+     * @param code 建筑基本信息主键
+     * @return 建筑基本信息
+     */
+    AreaBuilding selectAreaBuildingByCode(String code);
+
+    /**
      * 查询建筑基本信息列表
      *
      * @param areaBuilding 建筑基本信息

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

@@ -20,6 +20,14 @@ public interface AreaBuildingZoningMapper {
     AreaBuildingZoning selectAreaBuildingZoningById(Long id);
 
     /**
+     * 查询建筑区域code
+     *
+     * @param code 建筑区域划分主键
+     * @return 建筑区域划分
+     */
+    AreaBuildingZoning selectAreaBuildingZoningByCode(String code);
+
+    /**
      * 查询建筑区域划分列表
      *
      * @param areaBuildingZoning 建筑区域划分

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

@@ -20,6 +20,14 @@ public interface AreaMapper {
     Area selectAreaById(Long id);
 
     /**
+     * 查询服务区
+     *
+     * @param code 服务区主键
+     * @return 服务区
+     */
+    Area selectAreaByCode(String code);
+
+    /**
      * 查询服务区列表
      *
      * @param admServiceArea 服务区

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

@@ -0,0 +1,61 @@
+package com.ruoyi.ems.mapper;
+
+import java.util.List;
+
+import com.ruoyi.ems.domain.DevcType;
+
+/**
+ * 设备类型Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-08-05
+ */
+public interface DevcTypeMapper {
+    /**
+     * 查询设备类型
+     *
+     * @param id 设备类型主键
+     * @return 设备类型
+     */
+    DevcType selectDevcTypeById(Long id);
+
+    /**
+     * 查询设备类型列表
+     *
+     * @param devcType 设备类型
+     * @return 设备类型集合
+     */
+    List<DevcType> selectDevcTypeList(DevcType devcType);
+
+    /**
+     * 新增设备类型
+     *
+     * @param devcType 设备类型
+     * @return 结果
+     */
+    int insertDevcType(DevcType devcType);
+
+    /**
+     * 修改设备类型
+     *
+     * @param devcType 设备类型
+     * @return 结果
+     */
+    int updateDevcType(DevcType devcType);
+
+    /**
+     * 删除设备类型
+     *
+     * @param id 设备类型主键
+     * @return 结果
+     */
+    int deleteDevcTypeById(Long id);
+
+    /**
+     * 批量删除设备类型
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteDevcTypeByIds(Long[] ids);
+}

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

@@ -20,6 +20,14 @@ public interface IAreaBuildingService {
     AreaBuilding selectAreaBuildingById(Long id);
 
     /**
+     * 查询建筑基本信息
+     *
+     * @param code 建筑基本信息主键
+     * @return 建筑基本信息
+     */
+    AreaBuilding selectAreaBuildingByCode(String code);
+
+    /**
      * 查询建筑基本信息列表
      *
      * @param areaBuilding 建筑基本信息

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

@@ -20,6 +20,14 @@ public interface IAreaBuildingZoningService {
     AreaBuildingZoning selectAreaBuildingZoningById(Long id);
 
     /**
+     * 查询建筑区域划分
+     *
+     * @param code 建筑区域划分code
+     * @return 建筑区域划分
+     */
+    AreaBuildingZoning selectAreaBuildingZoningByCode(String code);
+
+    /**
      * 查询建筑区域划分列表
      *
      * @param areaBuildingZoning 建筑区域划分

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

@@ -21,6 +21,13 @@ public interface IAreaService {
     Area selectAreaById(Long id);
 
     /**
+     * 查询服务区
+     * @param code 区域编码
+     * @return 服务区
+     */
+    Area selectAreaByCode(String code);
+
+    /**
      * 查询服务区列表
      *
      * @param area 服务区

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

@@ -0,0 +1,61 @@
+package com.ruoyi.ems.service;
+
+import com.ruoyi.ems.domain.DevcType;
+
+import java.util.List;
+
+/**
+ * 设备类型Service接口
+ *
+ * @author ruoyi
+ * @date 2024-08-05
+ */
+public interface IDevcTypeService {
+    /**
+     * 查询设备类型
+     *
+     * @param id 设备类型主键
+     * @return 设备类型
+     */
+    DevcType selectDevcTypeById(Long id);
+
+    /**
+     * 查询设备类型列表
+     *
+     * @param devcType 设备类型
+     * @return 设备类型集合
+     */
+    List<DevcType> selectDevcTypeList(DevcType devcType);
+
+    /**
+     * 新增设备类型
+     *
+     * @param devcType 设备类型
+     * @return 结果
+     */
+    int insertDevcType(DevcType devcType);
+
+    /**
+     * 修改设备类型
+     *
+     * @param devcType 设备类型
+     * @return 结果
+     */
+    int updateDevcType(DevcType devcType);
+
+    /**
+     * 批量删除设备类型
+     *
+     * @param ids 需要删除的设备类型主键集合
+     * @return 结果
+     */
+    int deleteDevcTypeByIds(Long[] ids);
+
+    /**
+     * 删除设备类型信息
+     *
+     * @param id 设备类型主键
+     * @return 结果
+     */
+    int deleteDevcTypeById(Long id);
+}

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

@@ -36,6 +36,17 @@ public class AreaBuildingServiceImpl implements IAreaBuildingService {
     }
 
     /**
+     * 查询建筑基本信息
+     *
+     * @param code 建筑基本信息code
+     * @return 建筑基本信息
+     */
+    @Override
+    public AreaBuilding selectAreaBuildingByCode(String code) {
+        return areaBuildingMapper.selectAreaBuildingByCode(code);
+    }
+
+    /**
      * 查询建筑基本信息列表
      *
      * @param areaBuilding 建筑基本信息

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

@@ -32,6 +32,17 @@ public class AreaBuildingZoningServiceImpl implements IAreaBuildingZoningService
     }
 
     /**
+     * 查询建筑区域划分
+     *
+     * @param code 建筑区域划分主键
+     * @return 建筑区域划分
+     */
+    @Override
+    public AreaBuildingZoning selectAreaBuildingZoningByCode(String code) {
+        return areaBuildingZoningMapper.selectAreaBuildingZoningByCode(code);
+    }
+
+    /**
      * 查询建筑区域划分列表
      * 
      * @param areaBuildingZoning 建筑区域划分

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

@@ -45,6 +45,17 @@ public class AreaServiceImpl implements IAreaService {
     }
 
     /**
+     * 查询服务区
+     *
+     * @param code 服务区代码
+     * @return 服务区
+     */
+    @Override
+    public Area selectAreaByCode(String code) {
+        return areaMapper.selectAreaByCode(code);
+    }
+
+    /**
      * 查询服务区列表
      *
      * @param area 服务区

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

@@ -0,0 +1,94 @@
+package com.ruoyi.ems.service.impl;
+
+import com.ruoyi.ems.domain.DevcType;
+import com.ruoyi.ems.mapper.DevcTypeMapper;
+import com.ruoyi.ems.service.IDevcTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 设备类型Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-08-05
+ */
+@Service
+public class DevcTypeServiceImpl implements IDevcTypeService
+{
+    @Autowired
+    private DevcTypeMapper devcTypeMapper;
+
+    /**
+     * 查询设备类型
+     * 
+     * @param id 设备类型主键
+     * @return 设备类型
+     */
+    @Override
+    public DevcType selectDevcTypeById(Long id)
+    {
+        return devcTypeMapper.selectDevcTypeById(id);
+    }
+
+    /**
+     * 查询设备类型列表
+     * 
+     * @param devcType 设备类型
+     * @return 设备类型
+     */
+    @Override
+    public List<DevcType> selectDevcTypeList(DevcType devcType)
+    {
+        return devcTypeMapper.selectDevcTypeList(devcType);
+    }
+
+    /**
+     * 新增设备类型
+     * 
+     * @param devcType 设备类型
+     * @return 结果
+     */
+    @Override
+    public int insertDevcType(DevcType devcType)
+    {
+        return devcTypeMapper.insertDevcType(devcType);
+    }
+
+    /**
+     * 修改设备类型
+     * 
+     * @param devcType 设备类型
+     * @return 结果
+     */
+    @Override
+    public int updateDevcType(DevcType devcType)
+    {
+        return devcTypeMapper.updateDevcType(devcType);
+    }
+
+    /**
+     * 批量删除设备类型
+     * 
+     * @param ids 需要删除的设备类型主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDevcTypeByIds(Long[] ids)
+    {
+        return devcTypeMapper.deleteDevcTypeByIds(ids);
+    }
+
+    /**
+     * 删除设备类型信息
+     * 
+     * @param id 设备类型主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDevcTypeById(Long id)
+    {
+        return devcTypeMapper.deleteDevcTypeById(id);
+    }
+}

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

@@ -1,96 +1,137 @@
 package com.ruoyi.ems.service.impl;
 
 import java.util.List;
+
 import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.ems.domain.Area;
+import com.ruoyi.ems.domain.AreaBuilding;
+import com.ruoyi.ems.domain.AreaBuildingZoning;
 import com.ruoyi.ems.domain.EmsDevice;
+import com.ruoyi.ems.domain.common.AreaTier;
 import com.ruoyi.ems.mapper.EmsDeviceMapper;
+import com.ruoyi.ems.service.IAreaBuildingService;
+import com.ruoyi.ems.service.IAreaBuildingZoningService;
+import com.ruoyi.ems.service.IAreaService;
 import com.ruoyi.ems.service.IEmsDeviceService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
  * 能源设备Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2024-07-10
  */
 @Service
-public class EmsDeviceServiceImpl implements IEmsDeviceService
-{
+public class EmsDeviceServiceImpl implements IEmsDeviceService {
     @Autowired
     private EmsDeviceMapper emsDeviceMapper;
 
+    @Autowired
+    private IAreaService areaService;
+
+    @Autowired
+    private IAreaBuildingService buildingService;
+
+    @Autowired
+    private IAreaBuildingZoningService zoningService;
+
     /**
      * 查询能源设备
-     * 
+     *
      * @param id 能源设备主键
      * @return 能源设备
      */
     @Override
-    public EmsDevice selectEmsDeviceById(Long id)
-    {
-        return emsDeviceMapper.selectEmsDeviceById(id);
+    public EmsDevice selectEmsDeviceById(Long id) {
+        EmsDevice emsDevice = emsDeviceMapper.selectEmsDeviceById(id);
+
+        if (null != emsDevice) {
+            fillAreaName(emsDevice);
+        }
+
+        return emsDevice;
     }
 
     /**
      * 查询能源设备列表
-     * 
+     *
      * @param emsDevice 能源设备
      * @return 能源设备
      */
     @Override
-    public List<EmsDevice> selectEmsDeviceList(EmsDevice emsDevice)
-    {
-        return emsDeviceMapper.selectEmsDeviceList(emsDevice);
+    public List<EmsDevice> selectEmsDeviceList(EmsDevice emsDevice) {
+        List<EmsDevice> list = emsDeviceMapper.selectEmsDeviceList(emsDevice);
+
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (EmsDevice device : list) {
+                fillAreaName(device);
+            }
+        }
+
+        return list;
     }
 
     /**
      * 新增能源设备
-     * 
+     *
      * @param emsDevice 能源设备
      * @return 结果
      */
     @Override
-    public int insertEmsDevice(EmsDevice emsDevice)
-    {
+    public int insertEmsDevice(EmsDevice emsDevice) {
         emsDevice.setCreateTime(DateUtils.getNowDate());
         return emsDeviceMapper.insertEmsDevice(emsDevice);
     }
 
     /**
      * 修改能源设备
-     * 
+     *
      * @param emsDevice 能源设备
      * @return 结果
      */
     @Override
-    public int updateEmsDevice(EmsDevice emsDevice)
-    {
+    public int updateEmsDevice(EmsDevice emsDevice) {
         emsDevice.setUpdateTime(DateUtils.getNowDate());
         return emsDeviceMapper.updateEmsDevice(emsDevice);
     }
 
     /**
      * 批量删除能源设备
-     * 
+     *
      * @param ids 需要删除的能源设备主键
      * @return 结果
      */
     @Override
-    public int deleteEmsDeviceByIds(Long[] ids)
-    {
+    public int deleteEmsDeviceByIds(Long[] ids) {
         return emsDeviceMapper.deleteEmsDeviceByIds(ids);
     }
 
     /**
      * 删除能源设备信息
-     * 
+     *
      * @param id 能源设备主键
      * @return 结果
      */
     @Override
-    public int deleteEmsDeviceById(Long id)
-    {
+    public int deleteEmsDeviceById(Long id) {
         return emsDeviceMapper.deleteEmsDeviceById(id);
     }
+
+    private void fillAreaName(EmsDevice emsDevice) {
+        if (StringUtils.equals(emsDevice.getAreaType(), AreaTier.Area.name())) {
+            Area area = areaService.selectAreaByCode(emsDevice.getRefArea());
+            emsDevice.setRefAreaName(area != null ? area.getAreaName() : "未知");
+        }
+        else if (StringUtils.equals(emsDevice.getAreaType(), AreaTier.Building.name())) {
+            AreaBuilding building = buildingService.selectAreaBuildingByCode(emsDevice.getRefArea());
+            emsDevice.setRefAreaName(building != null ? building.getBldgName() : "未知");
+        }
+        else if (StringUtils.equals(emsDevice.getAreaType(), AreaTier.Zoning.name())) {
+            AreaBuildingZoning zoning = zoningService.selectAreaBuildingZoningByCode(emsDevice.getRefArea());
+            emsDevice.setRefAreaName(zoning != null ? zoning.getZoningName() : "未知");
+        }
+    }
 }

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

@@ -42,6 +42,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where b.`id` = #{id}
     </select>
 
+    <select id="selectAreaBuildingByCode" parameterType="String" resultMap="AreaBuildingResult">
+        <include refid="selectAreaBuildingVo"/>
+        where b.`bldg_code` = #{code}
+    </select>
+
     <insert id="insertAreaBuilding" parameterType="com.ruoyi.ems.domain.AreaBuilding" useGeneratedKeys="true" keyProperty="id">
         insert into adm_area_building
         <trim prefix="(" suffix=")" suffixOverrides=",">

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

@@ -40,6 +40,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectAreaBuildingZoningVo"/>
         where z.`id` = #{id}
     </select>
+
+    <select id="selectAreaBuildingZoningByCode" parameterType="String" resultMap="AreaBuildingZoningResult">
+        <include refid="selectAreaBuildingZoningVo"/>
+        where z.`zoning_code` = #{code}
+    </select>
         
     <insert id="insertAreaBuildingZoning" parameterType="com.ruoyi.ems.domain.AreaBuildingZoning" useGeneratedKeys="true" keyProperty="id">
         insert into adm_area_building_zoning

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

@@ -48,7 +48,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectAreaById" parameterType="Long" resultMap="AdmServiceAreaResult">
         <include refid="selectAreaVo"/>
-        where id = #{id}
+        where `id` = #{id}
+    </select>
+
+    <select id="selectAreaByCode" parameterType="String" resultMap="AdmServiceAreaResult">
+        <include refid="selectAreaVo"/>
+        where area_code = #{code}
     </select>
         
     <insert id="insertArea" parameterType="com.ruoyi.ems.domain.Area" useGeneratedKeys="true" keyProperty="id">

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

@@ -0,0 +1,61 @@
+<?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.DevcTypeMapper">
+    
+    <resultMap type="com.ruoyi.ems.domain.DevcType" id="devcTypeResult">
+        <result property="id"    column="id"    />
+        <result property="typeCode"    column="type_code"    />
+        <result property="typeName"    column="type_name"    />
+    </resultMap>
+
+    <sql id="selectDevcTypeVo">
+        select id, type_code, type_name from dim_devc_type
+    </sql>
+
+    <select id="selectDevcTypeList" parameterType="com.ruoyi.ems.domain.DevcType" resultMap="devcTypeResult">
+        <include refid="selectDevcTypeVo"/>
+        <where>  
+            <if test="typeCode != null "> and type_code = #{typeCode}</if>
+            <if test="typeName != null  and typeName != ''"> and type_name like concat('%', #{typeName}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectDevcTypeById" parameterType="Long" resultMap="devcTypeResult">
+        <include refid="selectDevcTypeVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertDevcType" parameterType="com.ruoyi.ems.domain.DevcType" useGeneratedKeys="true" keyProperty="id">
+        insert into dim_devc_type
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="typeCode != null">type_code,</if>
+            <if test="typeName != null and typeName != ''">type_name,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="typeCode != null">#{typeCode},</if>
+            <if test="typeName != null and typeName != ''">#{typeName},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDevcType" parameterType="com.ruoyi.ems.domain.DevcType">
+        update dim_devc_type
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="typeCode != null">type_code = #{typeCode},</if>
+            <if test="typeName != null and typeName != ''">type_name = #{typeName},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDevcTypeById" parameterType="Long">
+        delete from dim_devc_type where id = #{id}
+    </delete>
+
+    <delete id="deleteDevcTypeByIds" parameterType="String">
+        delete from dim_devc_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/EmsDeviceMapper.xml

@@ -6,23 +6,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="com.ruoyi.ems.domain.EmsDevice" id="EmsDeviceResult">
         <result property="id"    column="id"    />
-        <result property="deviceCode"    column="device_code"    />
-        <result property="deviceName"    column="device_name"    />
-        <result property="deviceType"    column="device_type"    />
-        <result property="deviceStatus"   column="device_status"    />
-        <result property="refArea"        column="ref_area"    />
-        <result property="refAreaName"    column="ref_area_name"    />
-        <result property="refFacs"        column="ref_facs"    />
-        <result property="refFacsName"    column="ref_facs_name"    />
+        <result property="deviceCode"        column="device_code"    />
+        <result property="deviceName"        column="device_name"    />
+        <result property="deviceType"        column="device_type"    />
+        <result property="deviceTypeName"    column="device_type_name"    />
+        <result property="deviceStatus"      column="device_status"    />
+        <result property="areaType"          column="area_type"    />
+        <result property="refArea"           column="ref_area"    />
+        <result property="refFacs"           column="ref_facs"    />
+        <result property="refFacsName"       column="ref_facs_name"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectEmsDeviceVo">
         select
-            d.`id`, d.`device_code`, d.`device_name`, d.`device_type`, d.`device_status`, d.`ref_area`, z.`zoning_name` as ref_area_name, d.`ref_facs`, f.`facs_name` as ref_facs_name, d.`create_time`, d.`update_time`
+            d.`id`, d.`device_code`, d.`device_name`, d.`device_type`, dt.`type_name` as device_type_name, d.`device_status`, d.`area_type`, d.`ref_area`, d.`ref_facs`, f.`facs_name` as ref_facs_name, d.`create_time`, d.`update_time`
         from adm_ems_device d
-            LEFT JOIN adm_area_building_zoning z ON d.`ref_area` = z.`zoning_code`
+            LEFT JOIN dim_devc_type dt ON d.`device_type` = dt.`type_code`
             LEFT JOIN adm_ems_facs f ON d.`ref_facs` = f.`facs_code`
     </sql>
 
@@ -33,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceName != null  and deviceName != ''"> and d.`device_name` like concat('%', #{deviceName}, '%')</if>
             <if test="deviceType != null "> and d.`device_type` = #{deviceType}</if>
             <if test="deviceStatus != null "> and d.`device_status` = #{deviceStatus}</if>
+            <if test="areaType != null and areaType != ''"> and d.`area_type` = #{areaType}</if>
             <if test="refArea != null  and refArea != ''"> and d.`ref_area` = #{refArea}</if>
             <if test="refFacs != null  and refFacs != ''"> and d.`ref_facs` = #{refFacs}</if>
         </where>
@@ -50,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceName != null and deviceName != ''">device_name,</if>
             <if test="deviceType != null">device_type,</if>
             <if test="deviceStatus != null">device_status,</if>
+            <if test="areaType != null">area_type,</if>
             <if test="refArea != null">ref_area,</if>
             <if test="refFacs != null">ref_facs,</if>
             <if test="createTime != null">create_time,</if>
@@ -60,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceName != null and deviceName != ''">#{deviceName},</if>
             <if test="deviceType != null">#{deviceType},</if>
             <if test="deviceStatus != null">#{deviceStatus},</if>
+            <if test="areaType != null">#{areaType},</if>
             <if test="refArea != null">#{refArea},</if>
             <if test="refFacs != null">#{refFacs},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -74,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceName != null and deviceName != ''">device_name = #{deviceName},</if>
             <if test="deviceType != null">device_type = #{deviceType},</if>
             <if test="deviceStatus != null">device_status = #{deviceStatus},</if>
+            <if test="areaType != null">area_type = #{areaType},</if>
             <if test="refArea != null">ref_area = #{refArea},</if>
             <if test="refFacs != null">ref_facs = #{refFacs},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

ems-cloud/ems-modules/ruoyi-gen/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ruoyi-modules-gen</artifactId>
+    <artifactId>ruoyi-gen</artifactId>
 
     <description>
         ruoyi-modules-gen代码生成

ems-cloud/sql/ems_server.sql

@@ -237,7 +237,11 @@ INSERT INTO `dim_ems_facs_subtype` (`code`, `name`, `parent_code`, `desc`, `vers
 INSERT INTO `dim_ems_facs_subtype` (`code`, `name`, `parent_code`, `desc`, `version`) VALUES ('C1', '电化学储能站', 'C', null, 'GB/T 43033-2013');
 INSERT INTO `dim_ems_facs_subtype` (`code`, `name`, `parent_code`, `desc`, `version`) VALUES ('C2', '飞轮、压缩空气等机械储能站', 'C', null, 'GB/T 43033-2013');
 INSERT INTO `dim_ems_facs_subtype` (`code`, `name`, `parent_code`, `desc`, `version`) VALUES ('C3', '蓄冷/热站', 'C', null, 'GB/T 43033-2013');
-INSERT INTO `dim_ems_facs_subtype` (`code`, `name`, `parent_code`, `desc`, `version`) VALUES ('c4', '储氢站', 'C', null, 'GB/T 43033-2013');
+INSERT INTO `dim_ems_facs_subtype` (`code`, `name`, `parent_code`, `desc`, `version`) VALUES ('C4', '储氢站', 'C', null, 'GB/T 43033-2013');
+INSERT INTO `dim_ems_facs_subtype` (`code`, `name`, `parent_code`, `desc`, `version`) VALUES ('Z001', '室内照明', 'Z', null, null);
+INSERT INTO `dim_ems_facs_subtype` (`code`, `name`, `parent_code`, `desc`, `version`) VALUES ('Z002', '室外照明', 'Z', null, null);
+INSERT INTO `dim_ems_facs_subtype` (`code`, `name`, `parent_code`, `desc`, `version`) VALUES ('Z010', '公共设施', 'Z', null, null);
+INSERT INTO `dim_ems_facs_subtype` (`code`, `name`, `parent_code`, `desc`, `version`) VALUES ('Z020', '空调设施', 'Z', null, null);
 
 -- ----------------------------
 -- 标签分类
@@ -255,6 +259,26 @@ create table dim_ems_tag (
 INSERT INTO `dim_ems_tag` (`tag_model`, `tag_code`, `tag_name`) VALUES ('Area', 'Area_00', '公共区域');
 INSERT INTO `dim_ems_tag` (`tag_model`, `tag_code`, `tag_name`) VALUES ('Area', 'Area_01', '商户区域');
 
+
+-- ----------------------------
+-- 设备类型
+-- ----------------------------
+drop table if exists dim_devc_type;
+create table dim_devc_type (
+  `id`            bigint(20)      not null auto_increment    comment '序号',
+  `type_code`     int             not null                   comment '标签代码',
+  `type_name`     varchar(128)    not null                   comment '标签名称',
+  primary key (`id`),
+  unique key ux_devc_type(`type_code`)
+) engine=innodb auto_increment=1 comment = '设备类型';
+
+INSERT INTO `dim_devc_type` (`type_code`, `type_name`) VALUES (0, '未分类');
+INSERT INTO `dim_devc_type` (`type_code`, `type_name`) VALUES (1, '照明设备');
+INSERT INTO `dim_devc_type` (`type_code`, `type_name`) VALUES (2, '暖通设备');
+INSERT INTO `dim_devc_type` (`type_code`, `type_name`) VALUES (3, '运输设备');
+INSERT INTO `dim_devc_type` (`type_code`, `type_name`) VALUES (4, '服务设备');
+INSERT INTO `dim_devc_type` (`type_code`, `type_name`) VALUES (5, '信息设备');
+
 -- ----------------------------
 -- 电价计量分类
 -- ----------------------------
@@ -466,12 +490,18 @@ create table adm_ems_facs  (
 ) engine=innodb auto_increment=1 comment = '能源设施/系统表';
 
 -- 能源设施/系统DEMO数据
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('W201', '北区供电网', 'W', 'W2', 1, '321283124S3001', '华设');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('W202', '南区供电网', 'W', 'W2', 1, '321283124S3002', '华设');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('E501', '北区光伏', 'E', 'E5', 1, '321283124S3001', '华设');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('E502', '南区光伏', 'E', 'E5', 1, '321283124S3002', '华设');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('Z101', '北区负荷', 'Z', 'Z1', 1, '321283124S3001', '华设');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('Z102', '南区负荷', 'Z', 'Z1', 1, '321283124S3002', '华设');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('W201', '北区-供电网', 'W', 'W2', 1, '321283124S3001', '华设');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('W202', '南区-供电网', 'W', 'W2', 1, '321283124S3002', '华设');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('E501', '北区-光伏', 'E', 'E5', 1, '321283124S3001', '华设');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('E502', '南区-光伏', 'E', 'E5', 1, '321283124S3002', '华设');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('Z101', '北区-室内照明', 'Z', 'Z001', 1, '321283124S3001', '华设');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('Z102', '北区-室外照明', 'Z', 'Z002', 1, '321283124S3001', '华设');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('Z110', '北区-公共设施', 'Z', 'Z010', 1, '321283124S3001', '华设');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('Z120', '北区-空调设施', 'Z', 'Z020', 1, '321283124S3001', '华设');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('Z201', '南区-室内照明', 'Z', 'Z001', 1, '321283124S3002', '华设');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('Z202', '南区-室外照明', 'Z', 'Z002', 1, '321283124S3002', '华设');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('Z210', '南区-公共设施', 'Z', 'Z010', 1, '321283124S3002', '华设');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('Z220', '南区-空调设施', 'Z', 'Z020', 1, '321283124S3002', '华设');
 
 
 -- ----------------------------
@@ -531,6 +561,7 @@ create table adm_ems_device  (
   `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 '归属区域代码',
   `ref_facs`        varchar(64)     default null                 comment '归属设施代码',
   `create_time`     datetime        default CURRENT_TIMESTAMP    comment '创建时间',
@@ -541,6 +572,25 @@ create table adm_ems_device  (
 
 
 -- ----------------------------
+-- 计量设备表
+-- ----------------------------
+drop table if exists adm_meter_device;
+create table adm_meter_device  (
+  `id`              bigint(20)      not null auto_increment      comment '序号',
+  `device_code`     varchar(16)     not null                     comment '设备代码',
+  `device_name`     varchar(32)     not null                     comment '设备名称',
+  `meter_cls`       varchar(16)     not null                     comment '计量介质',
+  `meter_obj_type`  int             not null                     comment '计量对象类型 1-区块 2-设备',
+  `obj_code`        varchar(32)     not null                     comment '计量对象编码',
+  `col_cycle`       int             not null                     comment '采集周期',
+  `col_mode`        int             not null                     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_op_energy_strategy;

ems-cloud/sql/ems_sys.sql

@@ -223,16 +223,16 @@ insert into sys_menu values ('531',  '用能报表', '111', '2',  'statement-con
 insert into sys_menu values ('532',  '告警报表', '111', '3',  'statement-warn',    'analysis/statement/warn',    '', 1, 0, 'C', '0', '0',    'analysis:statement:warn',      'warn',     'admin', sysdate(), '', null, '告警报表');
 insert into sys_menu values ('533',  '自定义报表', '111', '4',  'statement-warn',  'analysis/statement/custom',   '', 1, 0, 'C', '0', '0',   'analysis:statement:custom',    'statement-zdy',   'admin', sysdate(), '', null, '自定义报表');
 -- 业务配置菜单
-insert into sys_menu values ('534',  '服务区',     '123', '1',  'basecfg-servicearea',    'basecfg/area/index',             '', 1, 0, 'C', '0', '0',   'basecfg:area:list',           'cfgwrite',   'admin', sysdate(), '', null, '服务区配置');
-insert into sys_menu values ('535',  '建筑配置',   '123', '2',  'basecfg-building',       'basecfg/building/index',         '', 1, 0, 'C', '0', '0',   'basecfg:building:list',        'cfgwrite',   'admin', sysdate(), '', null, '楼宇建筑配置');
-insert into sys_menu values ('536',  '区块配置',   '123', '3',  'basecfg-zoning',         'basecfg/zoning/index',           '', 1, 0, 'C', '0', '0',   'basecfg:zoning:list',          'cfgwrite',   'admin', sysdate(), '', null, '区块配置');
-insert into sys_menu values ('537',  '设施分类',   '124', '1',  'basecfg-facstype',       'basecfg/facstype/index',         '', 1, 0, 'C', '0', '0',   'basecfg:facstype:list',        'cfgwrite',   'admin', sysdate(), '', null, '设施配置');
-insert into sys_menu values ('538',  '能源设施',   '124', '2',  'basecfg-facscfg',        'basecfg/emsfacs/index',          '', 1, 0, 'C', '0', '0',   'basecfg:emsfacs:list',         'cfgwrite',   'admin', sysdate(), '', null, '设施配置');
-insert into sys_menu values ('539',  '能流关系',   '124', '3',  'basecfg-flowrel',        'basecfg/flowrel/index',          '', 1, 0, 'C', '0', '0',   'basecfg:flowrel:list',         'cfgwrite',   'admin', sysdate(), '', null, '设备配置');
-insert into sys_menu values ('540',  '能源设备',   '124', '4',  'basecfg-devccfg',        'basecfg/device/index',           '', 1, 0, 'C', '0', '0',   'basecfg:device:list',          'cfgwrite',   'admin', sysdate(), '', null, '设备配置');
-insert into sys_menu values ('541',  '国网电价',   '125', '1',  'basecfg-electricity',    'basecfg/electricity/index',   '', 1, 0, 'C', '0', '0',   'basecfg:electricity:list',  'cfgwrite',   'admin', sysdate(), '', null, '电价属性');
-insert into sys_menu values ('542',  '碳核算',     '125', '2',  'basecfg-carbon',          'basecfg/carbon/index',          '', 1, 0, 'C', '0', '0',   'basecfg:carbon:list',          'cfgwrite',   'admin', sysdate(), '', null, '核算配置');
-insert into sys_menu values ('543',  '排放因子',   '125', '3',  'basecfg-emissionFactor',  'basecfg/emissionfactor/index',  '', 1, 0, 'C', '0', '0',   'basecfg:emissionFactor:list',  'cfgwrite',   'admin', sysdate(), '', null, '碳排因子');
+insert into sys_menu values ('534',  '服务区',     '123', '1',  'basecfg-servicearea',    'basecfg/area/index',         '', 1, 0, 'C', '0', '0',   'basecfg:area:list',           'cfgwrite',   'admin', sysdate(), '', null, '服务区配置');
+insert into sys_menu values ('535',  '建筑配置',   '123', '2',  'basecfg-building',       'basecfg/building/index',     '', 1, 0, 'C', '0', '0',   'basecfg:building:list',        'cfgwrite',   'admin', sysdate(), '', null, '楼宇建筑配置');
+insert into sys_menu values ('536',  '区块配置',   '123', '3',  'basecfg-zoning',         'basecfg/zoning/index',       '', 1, 0, 'C', '0', '0',   'basecfg:zoning:list',          'cfgwrite',   'admin', sysdate(), '', null, '区块配置');
+insert into sys_menu values ('537',  '设施分类',   '124', '1',  'basecfg-facstype',       'basecfg/facstype/index',     '', 1, 0, 'C', '0', '0',   'basecfg:facstype:list',        'cfgwrite',   'admin', sysdate(), '', null, '设施配置');
+insert into sys_menu values ('538',  '能源设施',   '124', '2',  'basecfg-facscfg',        'basecfg/emsfacs/index',      '', 1, 0, 'C', '0', '0',   'basecfg:emsfacs:list',         'cfgwrite',   'admin', sysdate(), '', null, '设施配置');
+insert into sys_menu values ('539',  '能流关系',   '124', '3',  'basecfg-flowrel',        'basecfg/flowrel/index',      '', 1, 0, 'C', '0', '0',   'basecfg:flowrel:list',         'cfgwrite',   'admin', sysdate(), '', null, '设备配置');
+insert into sys_menu values ('540',  '用能设备',   '124', '4',  'basecfg-devccfg',        'basecfg/device/index',       '', 1, 0, 'C', '0', '0',   'basecfg:device:list',          'cfgwrite',   'admin', sysdate(), '', null, '设备配置');
+insert into sys_menu values ('541',  '国网电价',   '125', '1',  'basecfg-electricity',    'basecfg/electricity/index',   '', 1, 0, 'C', '0', '0',  'basecfg:electricity:list',     'cfgwrite',   'admin', sysdate(), '', null, '电价属性');
+insert into sys_menu values ('542',  '计量设备',   '125', '2',  'basecfg-meterdevc',      'basecfg/meterdevc/index',     '', 1, 0, 'C', '0', '0',  'basecfg:meterdevc:list',       'cfgwrite',   'admin', sysdate(), '', null, '核算配置');
+insert into sys_menu values ('543',  '碳核算',     '125', '3',  'basecfg-cacfg',          'basecfg/cacfg/index',        '', 1, 0, 'C', '0', '0',   'basecfg:cacfg:list',           'cfgwrite',   'admin', sysdate(), '', null, '碳排因子');
 
 
 -- 用户管理按钮