设备台账第一次提交

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

@@ -0,0 +1,108 @@
+package com.ruoyi.ems.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.ems.domain.AdmEmsDeviceRbook;
+import com.ruoyi.ems.service.IAdmEmsDeviceRbookService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 设备台账Controller
+ * 
+ * @author ruoyi
+ * @date 2024-08-26
+ */
+@RestController
+@RequestMapping("/device/rbook")
+@Api(value = "AdmEmsDeviceRbookController", description = "设备台账")
+public class AdmEmsDeviceRbookController extends BaseController
+{
+    @Autowired
+    private IAdmEmsDeviceRbookService admEmsDeviceRbookService;
+
+    /**
+     * 查询设备台账列表
+     */
+    //@RequiresPermissions("ems:rbook:list")
+    @GetMapping("/list")
+    public TableDataInfo list(AdmEmsDeviceRbook admEmsDeviceRbook)
+    {
+        startPage();
+        List<AdmEmsDeviceRbook> list = admEmsDeviceRbookService.selectAdmEmsDeviceRbookList(admEmsDeviceRbook);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出设备台账列表
+     */
+    @RequiresPermissions("ems:rbook:export")
+    @Log(title = "设备台账", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AdmEmsDeviceRbook admEmsDeviceRbook)
+    {
+        List<AdmEmsDeviceRbook> list = admEmsDeviceRbookService.selectAdmEmsDeviceRbookList(admEmsDeviceRbook);
+        ExcelUtil<AdmEmsDeviceRbook> util = new ExcelUtil<AdmEmsDeviceRbook>(AdmEmsDeviceRbook.class);
+        util.exportExcel(response, list, "设备台账数据");
+    }
+
+    /**
+     * 获取设备台账详细信息
+     */
+    @RequiresPermissions("ems:rbook:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(admEmsDeviceRbookService.selectAdmEmsDeviceRbookById(id));
+    }
+
+    /**
+     * 新增设备台账
+     */
+    @RequiresPermissions("ems:rbook:add")
+    @Log(title = "设备台账", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody AdmEmsDeviceRbook admEmsDeviceRbook)
+    {
+        return toAjax(admEmsDeviceRbookService.insertAdmEmsDeviceRbook(admEmsDeviceRbook));
+    }
+
+    /**
+     * 修改设备台账
+     */
+    @RequiresPermissions("ems:rbook:edit")
+    @Log(title = "设备台账", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody AdmEmsDeviceRbook admEmsDeviceRbook)
+    {
+        return toAjax(admEmsDeviceRbookService.updateAdmEmsDeviceRbook(admEmsDeviceRbook));
+    }
+
+    /**
+     * 删除设备台账
+     */
+    @RequiresPermissions("ems:rbook:remove")
+    @Log(title = "设备台账", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(admEmsDeviceRbookService.deleteAdmEmsDeviceRbookByIds(ids));
+    }
+}

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

@@ -91,6 +91,7 @@ public class EmsTagController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody EmsTag dimEmsTag)
     {
+
         return toAjax(emsTagService.updateEmsTag(dimEmsTag));
     }
 

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

@@ -0,0 +1,151 @@
+package com.ruoyi.ems.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 设备台账对象 adm_ems_device_rbook
+ * 
+ * @author ruoyi
+ * @date 2024-08-26
+ */
+public class AdmEmsDeviceRbook extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 序号 */
+    private Long id;
+
+    /** 记录编号 */
+    @Excel(name = "记录编号")
+    private String recordCode;
+
+    /** 对象类型 1：设施 2：设备 */
+    @Excel(name = "对象类型 1：设施 2：设备")
+    private Long objType;
+
+    /** 对象代码 */
+    @Excel(name = "对象代码")
+    private String objCode;
+
+    /** 对象名称 */
+    @Excel(name = "对象名称")
+    private String objName;
+
+    /** 安装位置 */
+    @Excel(name = "安装位置")
+    private String insLocation;
+
+    /** 维护标题 */
+    @Excel(name = "维护标题")
+    private String maintainTitle;
+
+    /** 维护内容 */
+    @Excel(name = "维护内容")
+    private String maintainContent;
+
+    /** 维护人 */
+    @Excel(name = "维护人")
+    private String maintainPerson;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setRecordCode(String recordCode) 
+    {
+        this.recordCode = recordCode;
+    }
+
+    public String getRecordCode() 
+    {
+        return recordCode;
+    }
+    public void setObjType(Long objType) 
+    {
+        this.objType = objType;
+    }
+
+    public Long getObjType() 
+    {
+        return objType;
+    }
+    public void setObjCode(String objCode) 
+    {
+        this.objCode = objCode;
+    }
+
+    public String getObjCode() 
+    {
+        return objCode;
+    }
+    public void setObjName(String objName) 
+    {
+        this.objName = objName;
+    }
+
+    public String getObjName() 
+    {
+        return objName;
+    }
+    public void setInsLocation(String insLocation) 
+    {
+        this.insLocation = insLocation;
+    }
+
+    public String getInsLocation() 
+    {
+        return insLocation;
+    }
+    public void setMaintainTitle(String maintainTitle) 
+    {
+        this.maintainTitle = maintainTitle;
+    }
+
+    public String getMaintainTitle() 
+    {
+        return maintainTitle;
+    }
+    public void setMaintainContent(String maintainContent) 
+    {
+        this.maintainContent = maintainContent;
+    }
+
+    public String getMaintainContent() 
+    {
+        return maintainContent;
+    }
+    public void setMaintainPerson(String maintainPerson) 
+    {
+        this.maintainPerson = maintainPerson;
+    }
+
+    public String getMaintainPerson() 
+    {
+        return maintainPerson;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("recordCode", getRecordCode())
+            .append("objType", getObjType())
+            .append("objCode", getObjCode())
+            .append("objName", getObjName())
+            .append("insLocation", getInsLocation())
+            .append("maintainTitle", getMaintainTitle())
+            .append("maintainContent", getMaintainContent())
+            .append("maintainPerson", getMaintainPerson())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.ems.mapper;
+
+import java.util.List;
+import com.ruoyi.ems.domain.AdmEmsDeviceRbook;
+
+/**
+ * 设备台账Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-08-26
+ */
+public interface AdmEmsDeviceRbookMapper 
+{
+    /**
+     * 查询设备台账
+     * 
+     * @param id 设备台账主键
+     * @return 设备台账
+     */
+    public AdmEmsDeviceRbook selectAdmEmsDeviceRbookById(Long id);
+
+    /**
+     * 查询设备台账列表
+     * 
+     * @param admEmsDeviceRbook 设备台账
+     * @return 设备台账集合
+     */
+    public List<AdmEmsDeviceRbook> selectAdmEmsDeviceRbookList(AdmEmsDeviceRbook admEmsDeviceRbook);
+
+    /**
+     * 新增设备台账
+     * 
+     * @param admEmsDeviceRbook 设备台账
+     * @return 结果
+     */
+     int insertAdmEmsDeviceRbook(AdmEmsDeviceRbook admEmsDeviceRbook);
+
+    /**
+     * 修改设备台账
+     * 
+     * @param admEmsDeviceRbook 设备台账
+     * @return 结果
+     */
+     int updateAdmEmsDeviceRbook(AdmEmsDeviceRbook admEmsDeviceRbook);
+
+    /**
+     * 删除设备台账
+     * 
+     * @param id 设备台账主键
+     * @return 结果
+     */
+    int deleteAdmEmsDeviceRbookById(Long id);
+
+    /**
+     * 批量删除设备台账
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+     int deleteAdmEmsDeviceRbookByIds(Long[] ids);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.ems.service;
+
+import java.util.List;
+import com.ruoyi.ems.domain.AdmEmsDeviceRbook;
+
+/**
+ * 设备台账Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-08-26
+ */
+public interface IAdmEmsDeviceRbookService 
+{
+    /**
+     * 查询设备台账
+     * 
+     * @param id 设备台账主键
+     * @return 设备台账
+     */
+    public AdmEmsDeviceRbook selectAdmEmsDeviceRbookById(Long id);
+
+    /**
+     * 查询设备台账列表
+     * 
+     * @param admEmsDeviceRbook 设备台账
+     * @return 设备台账集合
+     */
+    public List<AdmEmsDeviceRbook> selectAdmEmsDeviceRbookList(AdmEmsDeviceRbook admEmsDeviceRbook);
+
+    /**
+     * 新增设备台账
+     * 
+     * @param admEmsDeviceRbook 设备台账
+     * @return 结果
+     */
+    public int insertAdmEmsDeviceRbook(AdmEmsDeviceRbook admEmsDeviceRbook);
+
+    /**
+     * 修改设备台账
+     * 
+     * @param admEmsDeviceRbook 设备台账
+     * @return 结果
+     */
+     int updateAdmEmsDeviceRbook(AdmEmsDeviceRbook admEmsDeviceRbook);
+
+    /**
+     * 批量删除设备台账
+     * 
+     * @param ids 需要删除的设备台账主键集合
+     * @return 结果
+     */
+     int deleteAdmEmsDeviceRbookByIds(Long[] ids);
+
+    /**
+     * 删除设备台账信息
+     * 
+     * @param id 设备台账主键
+     * @return 结果
+     */
+    int deleteAdmEmsDeviceRbookById(Long id);
+}

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

@@ -0,0 +1,96 @@
+package com.ruoyi.ems.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.core.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ems.mapper.AdmEmsDeviceRbookMapper;
+import com.ruoyi.ems.domain.AdmEmsDeviceRbook;
+import com.ruoyi.ems.service.IAdmEmsDeviceRbookService;
+
+/**
+ * 设备台账Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-08-26
+ */
+@Service
+public class AdmEmsDeviceRbookServiceImpl implements IAdmEmsDeviceRbookService 
+{
+    @Autowired
+    private AdmEmsDeviceRbookMapper admEmsDeviceRbookMapper;
+
+    /**
+     * 查询设备台账
+     * 
+     * @param id 设备台账主键
+     * @return 设备台账
+     */
+    @Override
+    public AdmEmsDeviceRbook selectAdmEmsDeviceRbookById(Long id)
+    {
+        return admEmsDeviceRbookMapper.selectAdmEmsDeviceRbookById(id);
+    }
+
+    /**
+     * 查询设备台账列表
+     * 
+     * @param admEmsDeviceRbook 设备台账
+     * @return 设备台账
+     */
+    @Override
+    public List<AdmEmsDeviceRbook> selectAdmEmsDeviceRbookList(AdmEmsDeviceRbook admEmsDeviceRbook)
+    {
+        return admEmsDeviceRbookMapper.selectAdmEmsDeviceRbookList(admEmsDeviceRbook);
+    }
+
+    /**
+     * 新增设备台账
+     * 
+     * @param admEmsDeviceRbook 设备台账
+     * @return 结果
+     */
+    @Override
+    public int insertAdmEmsDeviceRbook(AdmEmsDeviceRbook admEmsDeviceRbook)
+    {
+        admEmsDeviceRbook.setCreateTime(DateUtils.getNowDate());
+        return admEmsDeviceRbookMapper.insertAdmEmsDeviceRbook(admEmsDeviceRbook);
+    }
+
+    /**
+     * 修改设备台账
+     * 
+     * @param admEmsDeviceRbook 设备台账
+     * @return 结果
+     */
+    @Override
+    public int updateAdmEmsDeviceRbook(AdmEmsDeviceRbook admEmsDeviceRbook)
+    {
+        admEmsDeviceRbook.setUpdateTime(DateUtils.getNowDate());
+        return admEmsDeviceRbookMapper.updateAdmEmsDeviceRbook(admEmsDeviceRbook);
+    }
+
+    /**
+     * 批量删除设备台账
+     * 
+     * @param ids 需要删除的设备台账主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAdmEmsDeviceRbookByIds(Long[] ids)
+    {
+        return admEmsDeviceRbookMapper.deleteAdmEmsDeviceRbookByIds(ids);
+    }
+
+    /**
+     * 删除设备台账信息
+     * 
+     * @param id 设备台账主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAdmEmsDeviceRbookById(Long id)
+    {
+        return admEmsDeviceRbookMapper.deleteAdmEmsDeviceRbookById(id);
+    }
+}

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

@@ -0,0 +1,99 @@
+<?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.AdmEmsDeviceRbookMapper">
+    
+    <resultMap type="com.ruoyi.ems.domain.AdmEmsDeviceRbook" id="AdmEmsDeviceRbookResult">
+        <result property="id"    column="id"    />
+        <result property="recordCode"    column="record_code"    />
+        <result property="objType"    column="obj_type"    />
+        <result property="objCode"    column="obj_code"    />
+        <result property="objName"    column="obj_name"    />
+        <result property="insLocation"    column="ins_location"    />
+        <result property="maintainTitle"    column="maintain_title"    />
+        <result property="maintainContent"    column="maintain_content"    />
+        <result property="maintainPerson"    column="maintain_person"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectAdmEmsDeviceRbookVo">
+        select id, record_code, obj_type, obj_code, obj_name, ins_location, maintain_title, maintain_content, maintain_person, create_time, update_time from adm_ems_device_rbook
+    </sql>
+
+    <select id="selectAdmEmsDeviceRbookList" parameterType="com.ruoyi.ems.domain.AdmEmsDeviceRbook" resultMap="AdmEmsDeviceRbookResult">
+        <include refid="selectAdmEmsDeviceRbookVo"/>
+        <where>  
+            <if test="recordCode != null  and recordCode != ''"> and record_code = #{recordCode}</if>
+            <if test="objType != null "> and obj_type = #{objType}</if>
+            <if test="objCode != null  and objCode != ''"> and obj_code = #{objCode}</if>
+            <if test="objName != null  and objName != ''"> and obj_name like concat('%', #{objName}, '%')</if>
+            <if test="insLocation != null  and insLocation != ''"> and ins_location = #{insLocation}</if>
+            <if test="maintainTitle != null  and maintainTitle != ''"> and maintain_title = #{maintainTitle}</if>
+            <if test="maintainContent != null  and maintainContent != ''"> and maintain_content = #{maintainContent}</if>
+            <if test="maintainPerson != null  and maintainPerson != ''"> and maintain_person = #{maintainPerson}</if>
+        </where>
+    </select>
+    
+    <select id="selectAdmEmsDeviceRbookById" parameterType="Long" resultMap="AdmEmsDeviceRbookResult">
+        <include refid="selectAdmEmsDeviceRbookVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertAdmEmsDeviceRbook" parameterType="com.ruoyi.ems.domain.AdmEmsDeviceRbook" useGeneratedKeys="true" keyProperty="id">
+        insert into adm_ems_device_rbook
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="recordCode != null and recordCode != ''">record_code,</if>
+            <if test="objType != null">obj_type,</if>
+            <if test="objCode != null and objCode != ''">obj_code,</if>
+            <if test="objName != null">obj_name,</if>
+            <if test="insLocation != null">ins_location,</if>
+            <if test="maintainTitle != null and maintainTitle != ''">maintain_title,</if>
+            <if test="maintainContent != null">maintain_content,</if>
+            <if test="maintainPerson != null">maintain_person,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="recordCode != null and recordCode != ''">#{recordCode},</if>
+            <if test="objType != null">#{objType},</if>
+            <if test="objCode != null and objCode != ''">#{objCode},</if>
+            <if test="objName != null">#{objName},</if>
+            <if test="insLocation != null">#{insLocation},</if>
+            <if test="maintainTitle != null and maintainTitle != ''">#{maintainTitle},</if>
+            <if test="maintainContent != null">#{maintainContent},</if>
+            <if test="maintainPerson != null">#{maintainPerson},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateAdmEmsDeviceRbook" parameterType="com.ruoyi.ems.domain.AdmEmsDeviceRbook">
+        update adm_ems_device_rbook
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="recordCode != null and recordCode != ''">record_code = #{recordCode},</if>
+            <if test="objType != null">obj_type = #{objType},</if>
+            <if test="objCode != null and objCode != ''">obj_code = #{objCode},</if>
+            <if test="objName != null">obj_name = #{objName},</if>
+            <if test="insLocation != null">ins_location = #{insLocation},</if>
+            <if test="maintainTitle != null and maintainTitle != ''">maintain_title = #{maintainTitle},</if>
+            <if test="maintainContent != null">maintain_content = #{maintainContent},</if>
+            <if test="maintainPerson != null">maintain_person = #{maintainPerson},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteAdmEmsDeviceRbookById" parameterType="Long">
+        delete from adm_ems_device_rbook where id = #{id}
+    </delete>
+
+    <delete id="deleteAdmEmsDeviceRbookByIds" parameterType="String">
+        delete from adm_ems_device_rbook where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -34,10 +34,6 @@ spring:
             - Path=/ems/**
           filters:
             - StripPrefix=0
-        - id: ems-server-74
-          uri: http://172.192.13.74:9202
-          predicates:
-            - Path=/74/ems/**
         # 定时任务
         - id: ruoyi-job
           uri: lb://ruoyi-job

ems-cloud/sql/ems_sys.sql

@@ -172,35 +172,33 @@ insert into sys_menu values ('99', '开发工具', '0', '99', 'tool',
 insert into sys_menu values ('100',  '服务区',         '1',   '1',   'hp-view-sa',         'view/servicearea',          '', 1, 0, 'C', '0', '0',   'view:service-area',      'servicearea',    'admin', sysdate(), '', null, '园区能源概览');
 insert into sys_menu values ('101',  '主路光伏',       '1',   '2',   'hp-view-rpv',        'view/road/photovoltaic',    '', 1, 0, 'C', '0', '0',   'view:road-pv',           'photovoltaic',   'admin', sysdate(), '', null, '主路光伏概览');
 
-    insert into sys_menu values ('102',  '源网',            '2',    '1',  'strategy-pg',        'mgr/powergrid',             '', 1, 0, 'C', '0', '0',   'power-mgr:pg',           'powergrid',      'admin', sysdate(), '', null, '源网协调');
+insert into sys_menu values ('102',  '源网',            '2',    '1',  'strategy-pg',        'mgr/powergrid',             '', 1, 0, 'C', '0', '0',   'power-mgr:pg',           'powergrid',      'admin', sysdate(), '', null, '源网协调');
 insert into sys_menu values ('103',  '储能',            '2',    '2',  'strategy-gs',        'mgr/powerstore',            '', 1, 0, 'C', '0', '0',   'power-mgr:gs',           'powerstore',     'admin', sysdate(), '', null, '网储互动');
-insert into sys_menu values ('104',  '负荷',            '2',    '3',  'strategy-use',       'mgr/poweruse',              '', 1, 0, 'C', '0', '0',   'power-mgr:use',          'powerload',      'admin', sysdate(), '', null, '源荷互动');
-insert into sys_menu values ('105',  '配电',            '2',    '4',  'strategy-dist',      'mgr/powerdist',             '', 1, 0, 'C', '0', '0',   'power-mgr:dist',         'powerdist',      'admin', sysdate(), '', null, '配电监控');
-insert into sys_menu values ('106',  '调度',            '2',    '5',  'strategy-mgr',       'mgr/strategy',              '', 1, 0, 'C', '0', '0',   'power-mgr:strategy',     'strategy',       'admin', sysdate(), '', null, '管能策略');
-
-insert into sys_menu values ('107',  '产能分析',       '3',    '1',  'power-prod',         'analysis/power/prod',       '', 1, 0, 'C', '0', '0',    'analysis:power:prod',    'energyprod',     'admin', sysdate(), '', null, '产能分析');
-insert into sys_menu values ('108',  '储能分析',       '3',    '2',  'power-store',        'analysis/power/store',      '', 1, 0, 'C', '0', '0',    'analysis:power:store',   'energystore',    'admin', sysdate(), '', null, '储能分析');
-insert into sys_menu values ('109',  '用能分析',       '3',    '3',  'power-consume',      'analysis/power/consume',    '', 1, 0, 'C', '0', '0',    'analysis:power:consume', 'energyconsume',  'admin', sysdate(), '', null, '用能分析');
-insert into sys_menu values ('110',  '节能分析',       '3',    '4',  'power-save',         'analysis/power/save',       '', 1, 0, 'C', '0', '0',    'analysis:power:save',    'energysave',     'admin', sysdate(), '', null, '节能分析');
-insert into sys_menu values ('111',  '趋势预测',       '3',    '5',  'prediction',         '',                          '', 1, 0, 'M', '0', '0',    '',                       'prediction',     'admin', sysdate(), '', null, '趋势预测');
-insert into sys_menu values ('112',  '数据报表',       '3',    '6',  'analysis-statement', '',                          '', 1, 0, 'M', '0', '0',    'analysis:statement',     'statement',      'admin', sysdate(), '', null, '数据报表');
-
-insert into sys_menu values ('113',  '碳排计量',       '4',    '1',  'ca-emission',        'ca/emission',            '', 1, 0, 'C', '0', '0',   'ca-analysis:emission',   'caemission',     'admin', sysdate(), '', null, '碳排分析');
-insert into sys_menu values ('114',  '碳汇测算',       '4',    '2',  'ca-sink',            'ca/sink',                '', 1, 0, 'C', '0', '0',   'ca-analysis:sink',       'casink',         'admin', sysdate(), '', null, '碳汇分析');
-
-insert into sys_menu values ('115',  '设备状态',       '5',    '1',  'device-state',        'devmgr/state',           '', 1, 0, 'C', '0', '0',  'device:status',          'devicestatus',   'admin', sysdate(), '', null, '设备状态');
-insert into sys_menu values ('116',  '设备台账',       '5',    '2',  'device-el',          'device/el',              '', 1, 0, 'C', '0', '0',   'device:el',              'excel',       'admin', sysdate(), '', null, '设备台账');
-insert into sys_menu values ('117',  '设备告警',       '5',    '3',  'analysis-warn',      'analysis/device/warn',   '', 1, 0, 'C', '0', '0',   'analysis:device',        'deviceanalyze',  'admin', sysdate(), '', null, '设备分析');
-
-insert into sys_menu values ('118',  '告警策略',       '6',    '1',  'warn-strategy',      'warn/strategy',          '', 1, 0, 'C', '0', '0',   'warn:strategy',          'warnstrategy',   'admin', sysdate(), '', null, '告警策略');
-insert into sys_menu values ('119',  '告警列表',       '6',    '2',  'warn-list',          'warn/list',              '', 1, 0, 'C', '0', '0',   'warn:list',              'warnmsg',        'admin', sysdate(), '', null, '告警策略');
-insert into sys_menu values ('120',  '巡检任务',       '6',    '3',  'oper-task',          'oper-mgr/task',          '', 1, 0, 'C', '0', '0',   'oper-mgr:task',          'task',           'admin', sysdate(), '', null, '巡检任务');
-insert into sys_menu values ('121',  '巡检报告',       '6',    '4',  'oper-report',        'oper-mgr/report',        '', 1, 0, 'C', '0', '0',   'oper-mgr:report',        'note',           'admin', sysdate(), '', null, '巡检报告');
-
-insert into sys_menu values ('122',  '建筑区块',       '7',    '1',  'buildingcfg',        '',                       '', 1, 0, 'M', '0', '0',   'basecfg:building',       'building',       'admin', sysdate(), '', null, '建筑区块菜单');
-insert into sys_menu values ('123',  '设备设施',       '7',    '2',  'devicecfg',          '',                       '', 1, 0, 'M', '0', '0',   'basecfg:device',         'devicemgr',      'admin', sysdate(), '', null, '设备设施菜单');
-insert into sys_menu values ('124',  '能源计量',       '7',    '3',  'energycfg',          '',                       '', 1, 0, 'M', '0', '0',   'basecfg:energy',         'energy',         'admin', sysdate(), '', null, '能源计量菜单');
-insert into sys_menu values ('125',  '标签管理',       '7',    '4',  'emstag',             'basecfg/tag',            '', 1, 0, 'C', '0', '0',   'basecfg:tag:list',       'tree',           'admin', sysdate(), '', null, '标签菜单');
+insert into sys_menu values ('104',  '负荷',            '2',    '3',  'strategy-use',       'mgr/poweruse',              '', 1, 0, 'C', '0', '0',   'power-mgr:use',           'powerload',      'admin', sysdate(), '', null, '源荷互动');
+insert into sys_menu values ('105',  '调度',           '2',    '4',  'strategy-mgr',       'mgr/strategy',              '', 1, 0, 'C', '0', '0',   'power-mgr:strategy',     'strategy',       'admin', sysdate(), '', null, '管能策略');
+
+insert into sys_menu values ('106',  '产能分析',       '3',    '1',  'power-prod',         'analysis/power/prod',       '', 1, 0, 'C', '0', '0',    'analysis:power:prod',    'energyprod',     'admin', sysdate(), '', null, '产能分析');
+insert into sys_menu values ('107',  '储能分析',       '3',    '2',  'power-store',        'analysis/power/store',      '', 1, 0, 'C', '0', '0',    'analysis:power:store',   'energystore',    'admin', sysdate(), '', null, '储能分析');
+insert into sys_menu values ('108',  '用能分析',       '3',    '3',  'power-consume',      'analysis/power/consume',    '', 1, 0, 'C', '0', '0',    'analysis:power:consume', 'energyconsume',  'admin', sysdate(), '', null, '用能分析');
+insert into sys_menu values ('109',  '节能分析',       '3',    '4',  'power-save',         'analysis/power/save',       '', 1, 0, 'C', '0', '0',    'analysis:power:save',    'energysave',     'admin', sysdate(), '', null, '节能分析');
+insert into sys_menu values ('110',  '趋势预测',       '3',    '5',  'prediction',         '',                          '', 1, 0, 'M', '0', '0',    '',                       'prediction',     'admin', sysdate(), '', null, '趋势预测');
+insert into sys_menu values ('111',  '数据报表',       '3',    '6',  'analysis-statement', '',                          '', 1, 0, 'M', '0', '0',    'analysis:statement',     'statement',      'admin', sysdate(), '', null, '数据报表');
+
+insert into sys_menu values ('112',  '碳排计量',       '4',    '1',  'ca-emission',        'ca/emission',            '', 1, 0, 'C', '0', '0',   'ca-analysis:emission',   'caemission',     'admin', sysdate(), '', null, '碳排分析');
+insert into sys_menu values ('113',  '碳汇测算',       '4',    '2',  'ca-sink',            'ca/sink',                '', 1, 0, 'C', '0', '0',   'ca-analysis:sink',       'casink',         'admin', sysdate(), '', null, '碳汇分析');
+
+insert into sys_menu values ('114',  '设备状态',       '5',    '1',  'device-state',        'devmgr/state',           '', 1, 0, 'C', '0', '0',  'device:status',          'devicestatus',   'admin', sysdate(), '', null, '设备状态');
+insert into sys_menu values ('115',  '设备台账',       '5',    '2',  'device-el',          'devmgr/el',              '', 1, 0, 'C', '0', '0',   'device:el',              'excel',       'admin', sysdate(), '', null, '设备台账');
+insert into sys_menu values ('116',  '设备告警',       '5',    '3',  'analysis-warn',      'analysis/device/warn',   '', 1, 0, 'C', '0', '0',   'analysis:device',        'deviceanalyze',  'admin', sysdate(), '', null, '设备分析');
+
+insert into sys_menu values ('117',  '告警策略',       '6',    '1',  'warn-strategy',      'warn/strategy',          '', 1, 0, 'C', '0', '0',   'warn:strategy',          'warnstrategy',   'admin', sysdate(), '', null, '告警策略');
+insert into sys_menu values ('118',  '告警列表',       '6',    '2',  'warn-list',          'warn/list',              '', 1, 0, 'C', '0', '0',   'warn:list',              'warnmsg',        'admin', sysdate(), '', null, '告警策略');
+insert into sys_menu values ('119',  '巡检任务',       '6',    '3',  'oper-task',          'oper-mgr/task',          '', 1, 0, 'C', '0', '0',   'oper-mgr:task',          'task',           'admin', sysdate(), '', null, '巡检任务');
+insert into sys_menu values ('120',  '巡检报告',       '6',    '4',  'oper-report',        'oper-mgr/report',        '', 1, 0, 'C', '0', '0',   'oper-mgr:report',        'note',           'admin', sysdate(), '', null, '巡检报告');
+
+insert into sys_menu values ('121',  '建筑区块',       '7',    '1',  'buildingcfg',        '',                       '', 1, 0, 'M', '0', '0',   'basecfg:building',       'building',       'admin', sysdate(), '', null, '用户管理菜单');
+insert into sys_menu values ('122',  '设备设施',       '7',    '2',  'devicecfg',          '',                       '', 1, 0, 'M', '0', '0',   'basecfg:device',         'devicemgr',      'admin', sysdate(), '', null, '用户管理菜单');
+insert into sys_menu values ('123',  '能源计量',       '7',    '3',  'energycfg',          '',                       '', 1, 0, 'M', '0', '0',   'basecfg:energy',         'energy',         'admin', sysdate(), '', null, '用户管理菜单');
 
 insert into sys_menu values ('170',  '用户管理',       '8',   '1',  'user',               'system/user/index',      '', 1, 0, 'C', '0', '0',   'system:user:list',       'user',           'admin', sysdate(), '', null, '用户管理菜单');
 insert into sys_menu values ('171',  '角色管理',       '8',   '2',  'role',               'system/role/index',      '', 1, 0, 'C', '0', '0',   'system:role:list',       'peoples',        'admin', sysdate(), '', null, '角色管理菜单');
@@ -213,43 +211,40 @@ insert into sys_menu values ('177',  '通知公告',       '8',   '8',  'notice'
 insert into sys_menu values ('178',  '日志管理',       '8',   '9',  'log',                '',                       '', 1, 0, 'M', '0', '0',   '',                       'log',            'admin', sysdate(), '', null, '日志管理菜单');
 insert into sys_menu values ('179',  '在线用户',       '8',   '10', 'online',             'monitor/online/index',   '', 1, 0, 'C', '0', '0',   'monitor:online:list',    'online',         'admin', sysdate(), '', null, '在线用户菜单');
 
-insert into sys_menu values ('180',  '系统信息',       '9',   '1',  'adapter-subsystem',  'adapter/subsystem/index',  '', 1, 0, 'C', '0', '0',   'adapter:subsystem:list',  'note',           'admin', sysdate(), '', null, '光伏');
-insert into sys_menu values ('181',  '光伏',          '9',   '2',  'adapter-pv',         'adapter/pv/index',         '', 1, 0, 'C', '0', '0',   'adapter:pv:list',         'photovoltaic',   'admin', sysdate(), '', null, '光伏');
-insert into sys_menu values ('182',  '光储直柔',       '9',   '3',  'adapter-gczr',       'adapter/gczr/index',       '', 1, 0, 'C', '0', '0',   'adapter:gczr:list',       'deviceaccess',   'admin', sysdate(), '', null, '光储直柔');
-insert into sys_menu values ('183',  '光储充',         '9',   '4',  'adapter-gcc',        'adapter/gcc/index',        '', 1, 0, 'C', '0', '0',   'adapter:gcc:list',       'energyconsume',   'admin', sysdate(), '', null, '光储充');
-insert into sys_menu values ('184',  '充电桩',         '9',   '5',  'adapter-cdz',        'adapter/cdz/index',        '', 1, 0, 'C', '0', '0',   'adapter:cdz:list',       'powerstore',      'admin', sysdate(), '', null, '充电桩');
-insert into sys_menu values ('185',  '智慧照明',       '9',   '6',  'adapter-zm',         'adapter/zm/index',         '', 1, 0, 'C', '0', '0',   'adapter:zm:list',        'illumination',    'admin', sysdate(), '', null, '智慧照明');
-insert into sys_menu values ('186',  '智慧海绵',       '9',   '7',  'adapter-hm',         'adapter/hm/index',         '', 1, 0, 'C', '0', '0',   'adapter:hm:list',        'sponge',          'admin', sysdate(), '', null, '智慧海绵');
-insert into sys_menu values ('187',  '垃圾厨余',       '9',   '8',  'adapter-ljcy',       'adapter/ljcy/index',       '', 1, 0, 'C', '0', '0',   'adapter:ljcy:list',      'foodwaste',       'admin', sysdate(), '', null, '垃圾厨余');
-insert into sys_menu values ('188',  '能耗监测',       '9',   '9',  'adapter-nhjc',       'adapter/nhjc/index',       '', 1, 0, 'C', '0', '0',   'adapter:nhjc:list',      'econsumption',    'admin', sysdate(), '', null, '能耗监测');
-insert into sys_menu values ('189',  '设备管理',       '9',   '10', 'adapter-devc',       'adapter/devc/index',       '', 1, 0, 'M', '0', '0',   'adapter:devc:list',      'devicemgr',         'admin', sysdate(), '', null, '设备管理');
-
-insert into sys_menu values ('997',  '表单构建',       '99',   '1',  'build',              'tool/build/index',       '', 1, 0, 'C', '0', '0',   'tool:build:list',        'build',          'admin', sysdate(), '', null, '表单构建菜单');
-insert into sys_menu values ('998',  '代码生成',       '99',   '2',  'gen',                'tool/gen/index',         '', 1, 0, 'C', '0', '0',   'tool:gen:list',          'code',           'admin', sysdate(), '', null, '代码生成菜单');
-insert into sys_menu values ('999',  '系统接口',       '99',   '3',  'http://localhost:9100/swagger-ui/index.html',   '', '', 0, 0, 'C', '0', '0', 'tool:swagger:list',   'swagger',        'admin', sysdate(), '', null, '系统接口菜单');
+insert into sys_menu values ('180',  '光伏',          '9',   '1',  'adapter-pv',         'adapter/pv/index',      '', 1, 0, 'C', '0', '0',   'adapter:user:list',       'photovoltaic',        'admin', sysdate(), '', null, '光伏');
+insert into sys_menu values ('181',  '光储直柔',       '9',   '2',  'adapter-gczr',       'adapter/gczr/index',    '', 1, 0, 'C', '0', '0',   'adapter:role:list',       'deviceaccess',      'admin', sysdate(), '', null, '光储直柔');
+insert into sys_menu values ('182',  '光储充',         '9',   '3',  'adapter-gcc',        'adapter/gcc/index',     '', 1, 0, 'C', '0', '0',   'adapter:menu:list',       'energyconsume',       'admin', sysdate(), '', null, '光储充');
+insert into sys_menu values ('183',  '充电桩',         '9',   '4',  'adapter-cdz',        'adapter/cdz/index',     '', 1, 0, 'C', '0', '0',   'adapter:dept:list',       'powerstore',       'admin', sysdate(), '', null, '充电桩');
+insert into sys_menu values ('184',  '智慧照明',       '9',   '5',  'adapter-zm',         'adapter/zm/index',      '', 1, 0, 'C', '0', '0',   'adapter:post:list',       'system',        'admin', sysdate(), '', null, '智慧照明');
+insert into sys_menu values ('185',  '智慧海绵',       '9',   '6',  'adapter-hm',         'adapter/hm/index',      '', 1, 0, 'C', '0', '0',   'adapter:dict:list',       'system',        'admin', sysdate(), '', null, '智慧海绵');
+insert into sys_menu values ('186',  '垃圾厨余',       '9',   '7',  'adapter-ljcy',       'adapter/ljcy/index',    '', 1, 0, 'C', '0', '0',   'adapter:config:list',     'system',      'admin', sysdate(), '', null, '垃圾厨余');
+insert into sys_menu values ('187',  '能耗监测',       '9',   '8',  'adapter-nhjc',       'adapter/nhjc/index',    '', 1, 0, 'C', '0', '0',   'adapter:notice:list',     'system',      'admin', sysdate(), '', null, '能耗监测');
+insert into sys_menu values ('188',  '设备管理',       '9',   '9',  'adapter-devc',       'adapter/devc/index',    '', 1, 0, 'M', '0', '0',   'adapter:devc:list',       'system',      'admin', sysdate(), '', null, '设备管理');
+
+insert into sys_menu values ('998',  '表单构建',       '99',   '1',  'build',              'tool/build/index',       '', 1, 0, 'C', '0', '0',   'tool:build:list',        'build',          'admin', sysdate(), '', null, '表单构建菜单');
+insert into sys_menu values ('999',  '代码生成',       '99',   '2',  'gen',                'tool/gen/index',         '', 1, 0, 'C', '0', '0',   'tool:gen:list',          'code',           'admin', sysdate(), '', null, '代码生成菜单');
 
 -- 三级菜单
 -- 预测菜单
-insert into sys_menu values ('1110',  '产能预测', '111', '1',  'prediction-prod',    'prediction/prod',        '', 1, 0, 'C', '0', '0',   'prediction:prod',        'energyprod',     'admin', sysdate(), '', null, '产能预测');
-insert into sys_menu values ('1111',  '用能预测', '111', '2',  'prediction-consume', 'prediction/consume',     '', 1, 0, 'C', '0', '0',   'prediction:consume',     'energyconsume',  'admin', sysdate(), '', null, '用能预测');
-insert into sys_menu values ('1112',  '碳排预测', '111', '3',  'prediction-ca',      'prediction/ca',          '', 1, 0, 'C', '0', '0',   'prediction:ca',          'caemission',     'admin', sysdate(), '', null, '碳排预测');
+insert into sys_menu values ('1100',  '产能预测', '110', '1',  'prediction-prod',    'prediction/prod',        '', 1, 0, 'C', '0', '0',   'prediction:prod',        'energyprod',     'admin', sysdate(), '', null, '产能预测');
+insert into sys_menu values ('1101',  '用能预测', '110', '2',  'prediction-consume', 'prediction/consume',     '', 1, 0, 'C', '0', '0',   'prediction:consume',     'energyconsume',  'admin', sysdate(), '', null, '用能预测');
+insert into sys_menu values ('1102',  '碳排预测', '110', '3',  'prediction-ca',      'prediction/ca',          '', 1, 0, 'C', '0', '0',   'prediction:ca',          'caemission',     'admin', sysdate(), '', null, '碳排预测');
 -- 报表菜单
-insert into sys_menu values ('1120',  '产能报表',   '112', '1',  'statement-prod',    'analysis/statement/prod',     '', 1, 0, 'C', '0', '0',    'analysis:statement:prod',      'energyprod',     'admin', sysdate(), '', null, '产能报表');
-insert into sys_menu values ('1121',  '用能报表',   '112', '2',  'statement-consume', 'analysis/statement/consume',  '', 1, 0, 'C', '0', '0',    'analysis:statement:consume',   'energyconsume',  'admin', sysdate(), '', null, '用能报表');
-insert into sys_menu values ('1122',  '告警报表',   '112', '3',  'statement-warn',    'analysis/statement/warn',     '', 1, 0, 'C', '0', '0',    'analysis:statement:warn',      'warn',     'admin', sysdate(), '', null, '告警报表');
-insert into sys_menu values ('1123',  '自定义',     '112', '4',  'statement-warn',    'analysis/statement/custom',   '', 1, 0, 'C', '0', '0',   'analysis:statement:custom',    'statement-zdy',   'admin', sysdate(), '', null, '自定义报表');
+insert into sys_menu values ('1110',  '产能报表',   '111', '1',  'statement-prod',    'analysis/statement/prod',     '', 1, 0, 'C', '0', '0',    'analysis:statement:prod',      'energyprod',     'admin', sysdate(), '', null, '产能报表');
+insert into sys_menu values ('1111',  '用能报表',   '111', '2',  'statement-consume', 'analysis/statement/consume',  '', 1, 0, 'C', '0', '0',    'analysis:statement:consume',   'energyconsume',  'admin', sysdate(), '', null, '用能报表');
+insert into sys_menu values ('1112',  '告警报表',   '111', '3',  'statement-warn',    'analysis/statement/warn',     '', 1, 0, 'C', '0', '0',    'analysis:statement:warn',      'warn',     'admin', sysdate(), '', null, '告警报表');
+insert into sys_menu values ('1113',  '自定义',     '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 ('1220',  '地块划分',   '122', '1',  'basecfg-servicearea',    'basecfg/area/index',         '', 1, 0, 'C', '0', '0',   'basecfg:area:list',           'cfgwrite',   'admin', sysdate(), '', null, '地块划分');
-insert into sys_menu values ('1221',  '建筑配置',   '122', '2',  'basecfg-building',       'basecfg/building/index',     '', 1, 0, 'C', '0', '0',   'basecfg:building:list',        'cfgwrite',   'admin', sysdate(), '', null, '建筑配置');
-insert into sys_menu values ('1222',  '功能分区',   '122', '3',  'basecfg-zoning',         'basecfg/zoning/index',       '', 1, 0, 'C', '0', '0',   'basecfg:zoning:list',          'cfgwrite',   'admin', sysdate(), '', null, '功能分区');
-insert into sys_menu values ('1230',  '设施分类',   '123', '1',  'basecfg-facstype',       'basecfg/facstype/index',     '', 1, 0, 'C', '0', '0',   'basecfg:facstype:list',        'cfgwrite',   'admin', sysdate(), '', null, '设施分类');
-insert into sys_menu values ('1231',  '能源设施',   '123', '2',  'basecfg-facscfg',        'basecfg/emsfacs/index',      '', 1, 0, 'C', '0', '0',   'basecfg:emsfacs:list',         'cfgwrite',   'admin', sysdate(), '', null, '能源设施');
-insert into sys_menu values ('1232',  '能流关系',   '123', '3',  'basecfg-flowrel',        'basecfg/flowrel/index',      '', 1, 0, 'C', '0', '0',   'basecfg:flowrel:list',         'cfgwrite',   'admin', sysdate(), '', null, '能流关系');
-insert into sys_menu values ('1233',  '能源设备',   '123', '4',  'basecfg-devccfg',        'basecfg/device/index',       '', 1, 0, 'C', '0', '0',   'basecfg:device:list',          'cfgwrite',   'admin', sysdate(), '', null, '能源设备');
-insert into sys_menu values ('1234',  '配电设施',   '123', '5',  'basecfg-powerbox',       'basecfg/powerbox/index',     '', 1, 0, 'C', '0', '0',   'ems:powerbox:list',            'cfgwrite',   'admin', sysdate(), '', null, '配电设施');
-insert into sys_menu values ('1240',  '价格策略',   '124', '1',  'basecfg-electricity',    'basecfg/price/index',        '', 1, 0, 'C', '0', '0',   'basecfg:price:list',           'cfgwrite',   'admin', sysdate(), '', null, '价格策略');
-insert into sys_menu values ('1241',  '计量设备',   '124', '2',  'basecfg-meterdevc',      'basecfg/meterdevc/index',     '', 1, 0, 'C', '0', '0',  'ems:meterdevc:list',           'cfgwrite',   'admin', sysdate(), '', null, '计量设备');
-insert into sys_menu values ('1242',  '碳核算',     '124', '3',  'basecfg-cacfg',          'basecfg/cacfg/index',        '', 1, 0, 'C', '0', '0',   'basecfg:cacfg:list',           'cfgwrite',   'admin', sysdate(), '', null, '碳排因子');
+insert into sys_menu values ('1210',  '服务区',     '121', '1',  'basecfg-servicearea',    'basecfg/area/index',         '', 1, 0, 'C', '0', '0',   'basecfg:area:list',           'cfgwrite',   'admin', sysdate(), '', null, '服务区配置');
+insert into sys_menu values ('1211',  '地块配置',   '121', '2',  'basecfg-building',       'basecfg/building/index',     '', 1, 0, 'C', '0', '0',   'basecfg:building:list',        'cfgwrite',   'admin', sysdate(), '', null, '楼宇建筑配置');
+insert into sys_menu values ('1212',  '区域配置',   '121', '3',  'basecfg-zoning',         'basecfg/zoning/index',       '', 1, 0, 'C', '0', '0',   'basecfg:zoning:list',          'cfgwrite',   'admin', sysdate(), '', null, '区块配置');
+insert into sys_menu values ('1220',  '设施分类',   '122', '1',  'basecfg-facstype',       'basecfg/facstype/index',     '', 1, 0, 'C', '0', '0',   'basecfg:facstype:list',        'cfgwrite',   'admin', sysdate(), '', null, '设施配置');
+insert into sys_menu values ('1221',  '能源设施',   '122', '2',  'basecfg-facscfg',        'basecfg/emsfacs/index',      '', 1, 0, 'C', '0', '0',   'basecfg:emsfacs:list',         'cfgwrite',   'admin', sysdate(), '', null, '设施配置');
+insert into sys_menu values ('1222',  '能流关系',   '122', '3',  'basecfg-flowrel',        'basecfg/flowrel/index',      '', 1, 0, 'C', '0', '0',   'basecfg:flowrel:list',         'cfgwrite',   'admin', sysdate(), '', null, '设备配置');
+insert into sys_menu values ('1223',  '用能设备',   '122', '4',  'basecfg-devccfg',        'basecfg/device/index',       '', 1, 0, 'C', '0', '0',   'basecfg:device:list',          'cfgwrite',   'admin', sysdate(), '', null, '设备配置');
+insert into sys_menu values ('1230',  '国网电价',   '123', '1',  'basecfg-electricity',    'basecfg/electricity/index',   '', 1, 0, 'C', '0', '0',  'basecfg:electricity:list',     'cfgwrite',   'admin', sysdate(), '', null, '电价属性');
+insert into sys_menu values ('1231',  '计量设备',   '123', '2',  'basecfg-meterdevc',      'basecfg/meterdevc/index',     '', 1, 0, 'C', '0', '0',  'ems:meterdevc:list',           'cfgwrite',   'admin', sysdate(), '', null, '计量设备');
+insert into sys_menu values ('1232',  '碳核算',     '123', '3',  'basecfg-cacfg',          'basecfg/cacfg/index',        '', 1, 0, 'C', '0', '0',   'basecfg:cacfg:list',           'cfgwrite',   'admin', sysdate(), '', null, '碳排因子');
 
 -- 用户管理按钮
 insert into sys_menu values ('1700', '用户查询', '170', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:query',          '#', 'admin', sysdate(), '', null, '');
@@ -298,8 +293,8 @@ insert into sys_menu values ('1770', '公告查询', '177', '1', '#', '', '', 1,
 insert into sys_menu values ('1771', '公告新增', '177', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:add',          '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values ('1772', '公告修改', '177', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit',         '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values ('1773', '公告删除', '177', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove',       '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1780', '操作日志', '178', '1',  'operlog',           'system/operlog/index',       '', 1, 0, 'C', '0', '0',    'system:operlog:list',          'form',          'admin', sysdate(), '', null, '操作日志菜单');
-insert into sys_menu values ('1781', '登录日志', '178', '2',  'logininfor',        'system/logininfor/index',    '', 1, 0, 'C', '0', '0',    'system:logininfor:list',       'logininfor',    'admin', sysdate(), '', null, '登录日志菜单');
+insert into sys_menu values ('1780',  '操作日志', '178', '1',  'operlog',           'system/operlog/index',       '', 1, 0, 'C', '0', '0',    'system:operlog:list',          'form',          'admin', sysdate(), '', null, '操作日志菜单');
+insert into sys_menu values ('1781',  '登录日志', '178', '2',  'logininfor',        'system/logininfor/index',    '', 1, 0, 'C', '0', '0',    'system:logininfor:list',       'logininfor',    'admin', sysdate(), '', null, '登录日志菜单');
 
 -- 操作日志按钮
 insert into sys_menu values ('17800', '操作查询', '1780', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:query',       '#', 'admin', sysdate(), '', null, '');
@@ -315,38 +310,38 @@ insert into sys_menu values ('1790', '在线查询', '179', '1', '#', '', '', 1,
 insert into sys_menu values ('1791', '批量强退', '179', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values ('1792', '单条强退', '179', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 'admin', sysdate(), '', null, '');
 -- 服务区配置按钮
-insert into sys_menu values ('12200', '地块新增', '1220', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:area:add',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('12201', '地块修改', '1220', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:area:edit',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('12202', '地块删除', '1220', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:area:remove','#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('12203', '地块导出', '1220', '4', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:area:export','#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12100', '服务区新增', '1210', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:area:add',   '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12101', '服务区修改', '1210', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:area:edit',  '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12102', '服务区删除', '1210', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:area:remove','#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12103', '服务区导出', '1210', '4', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:area:export','#', 'admin', sysdate(), '', null, '');
 -- 服务区建筑配置按钮
-insert into sys_menu values ('12210', '建筑新增', '1221', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:building:add',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('12211', '建筑修改', '1221', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:building:edit',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('12212', '建筑删除', '1221', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:building:remove','#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('12213', '建筑导出', '1221', '4', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:building:export','#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12110', '建筑新增', '1211', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:building:add',   '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12111', '建筑修改', '1211', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:building:edit',  '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12112', '建筑删除', '1211', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:building:remove','#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12113', '建筑导出', '1211', '4', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:building:export','#', 'admin', sysdate(), '', null, '');
 -- 服务区建筑区块配置按钮
-insert into sys_menu values ('12220', '区块新增', '1222', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:zoning:add',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('12221', '区块修改', '1222', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:zoning:edit',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('12222', '区块删除', '1222', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:zoning:remove','#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('12223', '区块导出', '1222', '4', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:zoning:export','#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12120', '区块新增', '1212', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:zoning:add',   '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12121', '区块修改', '1212', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:zoning:edit',  '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12122', '区块删除', '1212', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:zoning:remove','#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12123', '区块导出', '1212', '4', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:zoning:export','#', 'admin', sysdate(), '', null, '');
 -- 能源设施分类配置按钮
-insert into sys_menu values ('12300', '分类新增', '1230', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:facstype:add',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('12301', '分类修改', '1230', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:facstype:edit',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('12302', '分类删除', '1230', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:facstype:remove','#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12200', '分类新增', '1220', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:facstype:add',   '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12201', '分类修改', '1220', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:facstype:edit',  '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12202', '分类删除', '1220', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:facstype:remove','#', 'admin', sysdate(), '', null, '');
 -- 服务区能源设施配置按钮
-insert into sys_menu values ('12310', '设施新增', '1231', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:emsfacs:add',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('12311', '设施修改', '1231', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:emsfacs:edit',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('12312', '设施删除', '1231', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:emsfacs:remove','#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('12313', '设施导出', '1231', '4', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:emsfacs:export','#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12210', '设施新增', '1221', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:emsfacs:add',   '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12211', '设施修改', '1221', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:emsfacs:edit',  '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12212', '设施删除', '1221', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:emsfacs:remove','#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12213', '设施导出', '1221', '4', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:emsfacs:export','#', 'admin', sysdate(), '', null, '');
 -- 服务区能流关系配置按钮
-insert into sys_menu values ('12320', '关系新增', '1232', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:add',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('12321', '关系修改', '1232', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:edit',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('12322', '关系删除', '1232', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:remove','#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12220', '关系新增', '1222', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:add',   '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12221', '关系修改', '1222', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:edit',  '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12222', '关系删除', '1222', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:remove','#', 'admin', sysdate(), '', null, '');
 -- 服务区设备配置按钮
-insert into sys_menu values ('12330', '设备新增', '1233', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:add',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('12331', '设备修改', '1233', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:edit',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('12332', '设备删除', '1233', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:remove','#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('12333', '设备导出', '1233', '4', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:export','#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12230', '设备新增', '1223', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:add',   '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12231', '设备修改', '1223', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:edit',  '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12232', '设备删除', '1223', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:remove','#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('12233', '设备导出', '1223', '4', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:export','#', 'admin', sysdate(), '', null, '');
 
 -- 能源策略按钮
 INSERT INTO sys_menu VALUES (2000, 'list', 103, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:strategy:list', '#', 'admin', sysdate(), '', NULL, '');
@@ -371,45 +366,45 @@ INSERT INTO `sys_menu` VALUES (2015,'add',105, 1, '', NULL, NULL, 1, 0, 'F', '0'
 INSERT INTO `sys_menu` VALUES (2016,'edit',105, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:gs:edit', '#', 'admin', sysdate(), '', NULL, '');
 INSERT INTO `sys_menu` VALUES (2017,'remove',105, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:gs:remove', '#', 'admin', sysdate(), '', NULL, '');
 -- 产能预测
-INSERT INTO `sys_menu` VALUES (2018,'list',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:list', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2019,'export',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:export', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2020,'query',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:query', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2021,'add',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:add', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2022,'edit',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:edit', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2023,'remove',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:remove', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'list',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:list', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'export',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:export', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'query',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:query', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'add',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:add', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'edit',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:edit', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'remove',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:remove', '#', 'admin', sysdate(), '', NULL, '');
 
 -- 用能预测
-INSERT INTO `sys_menu` VALUES (2024,'list',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:list', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2025,'export',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:export', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2026,'query',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:query', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2027,'add',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:add', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2028,'edit',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:edit', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2029,'remove',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:remove', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'list',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:list', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'export',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:export', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'query',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:query', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'add',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:add', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'edit',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:edit', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'remove',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:remove', '#', 'admin', sysdate(), '', NULL, '');
 
 -- 碳排预测
-INSERT INTO `sys_menu` VALUES (2030,'list',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:list', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2031,'export',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:export', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2032,'query',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:query', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2033,'add',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:add', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2034,'edit',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:edit', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2035,'remove',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:remove', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'list',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:list', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'export',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:export', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'query',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:query', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'add',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:add', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'edit',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:edit', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'remove',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:remove', '#', 'admin', sysdate(), '', NULL, '');
 
 -- 碳排计量
-INSERT INTO `sys_menu` VALUES (2036,'list',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:list', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2037,'export',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:export', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2038,'query',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:query', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2039,'add',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:add', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2040,'edit',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:edit', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2041,'remove',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:remove', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'list',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:list', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'export',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:export', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'query',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:query', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'add',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:add', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'edit',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:edit', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'remove',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:remove', '#', 'admin', sysdate(), '', NULL, '');
 
 
 -- 碳排计量
-INSERT INTO `sys_menu` VALUES (2042,'list',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:list', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2043,'export',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:export', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2044,'query',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:query', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2045,'add',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:add', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2046,'edit',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:edit', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2047,'remove',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:remove', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'list',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:list', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'export',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:export', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'query',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:query', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'add',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:add', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'edit',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:edit', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (null,'remove',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:remove', '#', 'admin', sysdate(), '', NULL, '');
 
 -- 告警策略
 INSERT INTO sys_menu VALUES(17823, 'list', 118, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ems:alarm-strategy:list', '#', 'admin', '2024-08-26 11:08:42', '', NULL, '');
@@ -457,207 +452,155 @@ create table sys_role_menu (
 -- ----------------------------
 -- 初始化-角色和菜单关联表数据
 -- ----------------------------
-insert into sys_role_menu values ('2',1);
-insert into sys_role_menu values ('2',2);
-insert into sys_role_menu values ('2',3);
-insert into sys_role_menu values ('2',4);
-insert into sys_role_menu values ('2',5);
-insert into sys_role_menu values ('2',6);
-insert into sys_role_menu values ('2',7);
-insert into sys_role_menu values ('2',8);
-insert into sys_role_menu values ('2',9);
-insert into sys_role_menu values ('2',99);
-insert into sys_role_menu values ('2',100);
-insert into sys_role_menu values ('2',101);
-insert into sys_role_menu values ('2',102);
-insert into sys_role_menu values ('2',103);
-insert into sys_role_menu values ('2',104);
-insert into sys_role_menu values ('2',105);
-insert into sys_role_menu values ('2',106);
-insert into sys_role_menu values ('2',107);
-insert into sys_role_menu values ('2',108);
-insert into sys_role_menu values ('2',109);
-insert into sys_role_menu values ('2',110);
-insert into sys_role_menu values ('2',111);
-insert into sys_role_menu values ('2',112);
-insert into sys_role_menu values ('2',113);
-insert into sys_role_menu values ('2',114);
-insert into sys_role_menu values ('2',115);
-insert into sys_role_menu values ('2',116);
-insert into sys_role_menu values ('2',117);
-insert into sys_role_menu values ('2',118);
-insert into sys_role_menu values ('2',119);
-insert into sys_role_menu values ('2',120);
-insert into sys_role_menu values ('2',121);
-insert into sys_role_menu values ('2',122);
-insert into sys_role_menu values ('2',123);
-insert into sys_role_menu values ('2',124);
-insert into sys_role_menu values ('2',125);
-insert into sys_role_menu values ('2',170);
-insert into sys_role_menu values ('2',171);
-insert into sys_role_menu values ('2',172);
-insert into sys_role_menu values ('2',173);
-insert into sys_role_menu values ('2',174);
-insert into sys_role_menu values ('2',175);
-insert into sys_role_menu values ('2',176);
-insert into sys_role_menu values ('2',177);
-insert into sys_role_menu values ('2',178);
-insert into sys_role_menu values ('2',179);
-insert into sys_role_menu values ('2',180);
-insert into sys_role_menu values ('2',181);
-insert into sys_role_menu values ('2',182);
-insert into sys_role_menu values ('2',183);
-insert into sys_role_menu values ('2',184);
-insert into sys_role_menu values ('2',185);
-insert into sys_role_menu values ('2',186);
-insert into sys_role_menu values ('2',187);
-insert into sys_role_menu values ('2',188);
-insert into sys_role_menu values ('2',189);
-insert into sys_role_menu values ('2',998);
-insert into sys_role_menu values ('2',999);
-insert into sys_role_menu values ('2',1110);
-insert into sys_role_menu values ('2',1111);
-insert into sys_role_menu values ('2',1112);
-insert into sys_role_menu values ('2',1120);
-insert into sys_role_menu values ('2',1121);
-insert into sys_role_menu values ('2',1122);
-insert into sys_role_menu values ('2',1123);
-insert into sys_role_menu values ('2',1220);
-insert into sys_role_menu values ('2',1221);
-insert into sys_role_menu values ('2',1222);
-insert into sys_role_menu values ('2',1230);
-insert into sys_role_menu values ('2',1231);
-insert into sys_role_menu values ('2',1232);
-insert into sys_role_menu values ('2',1233);
-insert into sys_role_menu values ('2',1234);
-insert into sys_role_menu values ('2',1240);
-insert into sys_role_menu values ('2',1241);
-insert into sys_role_menu values ('2',1242);
-insert into sys_role_menu values ('2',1700);
-insert into sys_role_menu values ('2',1701);
-insert into sys_role_menu values ('2',1702);
-insert into sys_role_menu values ('2',1703);
-insert into sys_role_menu values ('2',1704);
-insert into sys_role_menu values ('2',1705);
-insert into sys_role_menu values ('2',1706);
-insert into sys_role_menu values ('2',1710);
-insert into sys_role_menu values ('2',1711);
-insert into sys_role_menu values ('2',1712);
-insert into sys_role_menu values ('2',1713);
-insert into sys_role_menu values ('2',1714);
-insert into sys_role_menu values ('2',1720);
-insert into sys_role_menu values ('2',1721);
-insert into sys_role_menu values ('2',1722);
-insert into sys_role_menu values ('2',1723);
-insert into sys_role_menu values ('2',1730);
-insert into sys_role_menu values ('2',1731);
-insert into sys_role_menu values ('2',1732);
-insert into sys_role_menu values ('2',1733);
-insert into sys_role_menu values ('2',1740);
-insert into sys_role_menu values ('2',1741);
-insert into sys_role_menu values ('2',1742);
-insert into sys_role_menu values ('2',1743);
-insert into sys_role_menu values ('2',1744);
-insert into sys_role_menu values ('2',1750);
-insert into sys_role_menu values ('2',1751);
-insert into sys_role_menu values ('2',1752);
-insert into sys_role_menu values ('2',1753);
-insert into sys_role_menu values ('2',1754);
-insert into sys_role_menu values ('2',1760);
-insert into sys_role_menu values ('2',1761);
-insert into sys_role_menu values ('2',1762);
-insert into sys_role_menu values ('2',1763);
-insert into sys_role_menu values ('2',1764);
-insert into sys_role_menu values ('2',1770);
-insert into sys_role_menu values ('2',1771);
-insert into sys_role_menu values ('2',1772);
-insert into sys_role_menu values ('2',1773);
-insert into sys_role_menu values ('2',1780);
-insert into sys_role_menu values ('2',1781);
-insert into sys_role_menu values ('2',1790);
-insert into sys_role_menu values ('2',1791);
-insert into sys_role_menu values ('2',1792);
-insert into sys_role_menu values ('2',2000);
-insert into sys_role_menu values ('2',2001);
-insert into sys_role_menu values ('2',2002);
-insert into sys_role_menu values ('2',2003);
-insert into sys_role_menu values ('2',2004);
-insert into sys_role_menu values ('2',2005);
-insert into sys_role_menu values ('2',2006);
-insert into sys_role_menu values ('2',2007);
-insert into sys_role_menu values ('2',2008);
-insert into sys_role_menu values ('2',2009);
-insert into sys_role_menu values ('2',2010);
-insert into sys_role_menu values ('2',2011);
-insert into sys_role_menu values ('2',2012);
-insert into sys_role_menu values ('2',2013);
-insert into sys_role_menu values ('2',2014);
-insert into sys_role_menu values ('2',2015);
-insert into sys_role_menu values ('2',2016);
-insert into sys_role_menu values ('2',2017);
-insert into sys_role_menu values ('2',2018);
-insert into sys_role_menu values ('2',2019);
-insert into sys_role_menu values ('2',2020);
-insert into sys_role_menu values ('2',2021);
-insert into sys_role_menu values ('2',2022);
-insert into sys_role_menu values ('2',2023);
-insert into sys_role_menu values ('2',2024);
-insert into sys_role_menu values ('2',2025);
-insert into sys_role_menu values ('2',2026);
-insert into sys_role_menu values ('2',2027);
-insert into sys_role_menu values ('2',2028);
-insert into sys_role_menu values ('2',2029);
-insert into sys_role_menu values ('2',2030);
-insert into sys_role_menu values ('2',2031);
-insert into sys_role_menu values ('2',2032);
-insert into sys_role_menu values ('2',2033);
-insert into sys_role_menu values ('2',2034);
-insert into sys_role_menu values ('2',2035);
-insert into sys_role_menu values ('2',2036);
-insert into sys_role_menu values ('2',2037);
-insert into sys_role_menu values ('2',2038);
-insert into sys_role_menu values ('2',2039);
-insert into sys_role_menu values ('2',2040);
-insert into sys_role_menu values ('2',2041);
-insert into sys_role_menu values ('2',2042);
-insert into sys_role_menu values ('2',2043);
-insert into sys_role_menu values ('2',2044);
-insert into sys_role_menu values ('2',2045);
-insert into sys_role_menu values ('2',2046);
-insert into sys_role_menu values ('2',2047);
-insert into sys_role_menu values ('2',12200);
-insert into sys_role_menu values ('2',12201);
-insert into sys_role_menu values ('2',12202);
-insert into sys_role_menu values ('2',12203);
-insert into sys_role_menu values ('2',12210);
-insert into sys_role_menu values ('2',12211);
-insert into sys_role_menu values ('2',12212);
-insert into sys_role_menu values ('2',12213);
-insert into sys_role_menu values ('2',12220);
-insert into sys_role_menu values ('2',12221);
-insert into sys_role_menu values ('2',12222);
-insert into sys_role_menu values ('2',12223);
-insert into sys_role_menu values ('2',12300);
-insert into sys_role_menu values ('2',12301);
-insert into sys_role_menu values ('2',12302);
-insert into sys_role_menu values ('2',12310);
-insert into sys_role_menu values ('2',12311);
-insert into sys_role_menu values ('2',12312);
-insert into sys_role_menu values ('2',12313);
-insert into sys_role_menu values ('2',12320);
-insert into sys_role_menu values ('2',12321);
-insert into sys_role_menu values ('2',12322);
-insert into sys_role_menu values ('2',12330);
-insert into sys_role_menu values ('2',12331);
-insert into sys_role_menu values ('2',12332);
-insert into sys_role_menu values ('2',12333);
-insert into sys_role_menu values ('2',17800);
-insert into sys_role_menu values ('2',17801);
-insert into sys_role_menu values ('2',17802);
-insert into sys_role_menu values ('2',17810);
-insert into sys_role_menu values ('2',17811);
-insert into sys_role_menu values ('2',17812);
-insert into sys_role_menu values ('2',17813);
+insert into sys_role_menu values ('2', '1');
+insert into sys_role_menu values ('2', '2');
+insert into sys_role_menu values ('2', '3');
+insert into sys_role_menu values ('2', '4');
+insert into sys_role_menu values ('2', '5');
+insert into sys_role_menu values ('2', '6');
+insert into sys_role_menu values ('2', '7');
+insert into sys_role_menu values ('2', '8');
+insert into sys_role_menu values ('2', '9');
+insert into sys_role_menu values ('2', '10');
+insert into sys_role_menu values ('2', '99');
+insert into sys_role_menu values ('2', '100');
+insert into sys_role_menu values ('2', '101');
+insert into sys_role_menu values ('2', '102');
+insert into sys_role_menu values ('2', '103');
+insert into sys_role_menu values ('2', '104');
+insert into sys_role_menu values ('2', '105');
+insert into sys_role_menu values ('2', '106');
+insert into sys_role_menu values ('2', '107');
+insert into sys_role_menu values ('2', '108');
+insert into sys_role_menu values ('2', '109');
+insert into sys_role_menu values ('2', '110');
+insert into sys_role_menu values ('2', '111');
+insert into sys_role_menu values ('2', '112');
+insert into sys_role_menu values ('2', '113');
+insert into sys_role_menu values ('2', '114');
+insert into sys_role_menu values ('2', '115');
+insert into sys_role_menu values ('2', '116');
+insert into sys_role_menu values ('2', '117');
+insert into sys_role_menu values ('2', '118');
+insert into sys_role_menu values ('2', '119');
+insert into sys_role_menu values ('2', '120');
+insert into sys_role_menu values ('2', '121');
+insert into sys_role_menu values ('2', '122');
+insert into sys_role_menu values ('2', '123');
+insert into sys_role_menu values ('2', '124');
+insert into sys_role_menu values ('2', '125');
+insert into sys_role_menu values ('2', '190');
+insert into sys_role_menu values ('2', '191');
+insert into sys_role_menu values ('2', '192');
+insert into sys_role_menu values ('2', '193');
+insert into sys_role_menu values ('2', '194');
+insert into sys_role_menu values ('2', '195');
+insert into sys_role_menu values ('2', '196');
+insert into sys_role_menu values ('2', '197');
+insert into sys_role_menu values ('2', '198');
+insert into sys_role_menu values ('2', '199');
+insert into sys_role_menu values ('2', '188');
+insert into sys_role_menu values ('2', '189');
+insert into sys_role_menu values ('2', '500');
+insert into sys_role_menu values ('2', '501');
+insert into sys_role_menu values ('2', '510');
+insert into sys_role_menu values ('2', '511');
+insert into sys_role_menu values ('2', '520');
+insert into sys_role_menu values ('2', '521');
+insert into sys_role_menu values ('2', '522');
+insert into sys_role_menu values ('2', '523');
+insert into sys_role_menu values ('2', '530');
+insert into sys_role_menu values ('2', '531');
+insert into sys_role_menu values ('2', '532');
+insert into sys_role_menu values ('2', '533');
+insert into sys_role_menu values ('2', '534');
+insert into sys_role_menu values ('2', '535');
+insert into sys_role_menu values ('2', '536');
+insert into sys_role_menu values ('2', '537');
+insert into sys_role_menu values ('2', '538');
+insert into sys_role_menu values ('2', '539');
+insert into sys_role_menu values ('2', '540');
+insert into sys_role_menu values ('2', '541');
+insert into sys_role_menu values ('2', '542');
+insert into sys_role_menu values ('2', '543');
+insert into sys_role_menu values ('2', '1000');
+insert into sys_role_menu values ('2', '1001');
+insert into sys_role_menu values ('2', '1002');
+insert into sys_role_menu values ('2', '1003');
+insert into sys_role_menu values ('2', '1004');
+insert into sys_role_menu values ('2', '1005');
+insert into sys_role_menu values ('2', '1006');
+insert into sys_role_menu values ('2', '1007');
+insert into sys_role_menu values ('2', '1008');
+insert into sys_role_menu values ('2', '1009');
+insert into sys_role_menu values ('2', '1010');
+insert into sys_role_menu values ('2', '1011');
+insert into sys_role_menu values ('2', '1012');
+insert into sys_role_menu values ('2', '1013');
+insert into sys_role_menu values ('2', '1014');
+insert into sys_role_menu values ('2', '1015');
+insert into sys_role_menu values ('2', '1016');
+insert into sys_role_menu values ('2', '1017');
+insert into sys_role_menu values ('2', '1018');
+insert into sys_role_menu values ('2', '1019');
+insert into sys_role_menu values ('2', '1020');
+insert into sys_role_menu values ('2', '1021');
+insert into sys_role_menu values ('2', '1022');
+insert into sys_role_menu values ('2', '1023');
+insert into sys_role_menu values ('2', '1024');
+insert into sys_role_menu values ('2', '1025');
+insert into sys_role_menu values ('2', '1026');
+insert into sys_role_menu values ('2', '1027');
+insert into sys_role_menu values ('2', '1028');
+insert into sys_role_menu values ('2', '1029');
+insert into sys_role_menu values ('2', '1030');
+insert into sys_role_menu values ('2', '1031');
+insert into sys_role_menu values ('2', '1032');
+insert into sys_role_menu values ('2', '1033');
+insert into sys_role_menu values ('2', '1034');
+insert into sys_role_menu values ('2', '1035');
+insert into sys_role_menu values ('2', '1036');
+insert into sys_role_menu values ('2', '1037');
+insert into sys_role_menu values ('2', '1038');
+insert into sys_role_menu values ('2', '1039');
+insert into sys_role_menu values ('2', '1040');
+insert into sys_role_menu values ('2', '1041');
+insert into sys_role_menu values ('2', '1042');
+insert into sys_role_menu values ('2', '1043');
+insert into sys_role_menu values ('2', '1044');
+insert into sys_role_menu values ('2', '1045');
+insert into sys_role_menu values ('2', '1046');
+insert into sys_role_menu values ('2', '1047');
+insert into sys_role_menu values ('2', '1048');
+insert into sys_role_menu values ('2', '1049');
+insert into sys_role_menu values ('2', '1050');
+insert into sys_role_menu values ('2', '1051');
+insert into sys_role_menu values ('2', '1052');
+insert into sys_role_menu values ('2', '1053');
+insert into sys_role_menu values ('2', '1054');
+insert into sys_role_menu values ('2', '1055');
+insert into sys_role_menu values ('2', '1056');
+insert into sys_role_menu values ('2', '1057');
+insert into sys_role_menu values ('2', '1058');
+insert into sys_role_menu values ('2', '1059');
+insert into sys_role_menu values ('2', '1060');
+insert into sys_role_menu values ('2', '1061');
+insert into sys_role_menu values ('2', '1062');
+insert into sys_role_menu values ('2', '1063');
+insert into sys_role_menu values ('2', '1064');
+insert into sys_role_menu values ('2', '1065');
+insert into sys_role_menu values ('2', '1066');
+insert into sys_role_menu values ('2', '1067');
+insert into sys_role_menu values ('2', '1068');
+insert into sys_role_menu values ('2', '1069');
+insert into sys_role_menu values ('2', '1071');
+insert into sys_role_menu values ('2', '1072');
+insert into sys_role_menu values ('2', '1073');
+insert into sys_role_menu values ('2', '1074');
+insert into sys_role_menu values ('2', '1075');
+insert into sys_role_menu values ('2', '1076');
+insert into sys_role_menu values ('2', '1077');
+insert into sys_role_menu values ('2', '1078');
 
 -- ----------------------------
 -- 8、角色和部门关联表  角色1-N部门