计量设备调整

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

@@ -1,8 +1,5 @@
 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;
 
 /**
@@ -19,131 +16,97 @@ public class MeterDevice extends BaseEntity
     private Long id;
 
     /** 设备代码 */
-    @Excel(name = "设备代码")
     private String deviceCode;
 
-    /** 设备名称 */
-    @Excel(name = "设备名称")
-    private String deviceName;
-
-    /** 计量介质 */
-    @Excel(name = "计量介质")
-    private String meterCls;
+    /** 计量类别 */
+    private Long meterCls;
 
     /** 计量对象类型 1-区块 2-设备 */
-    @Excel(name = "计量对象类型 1-区块 2-设备")
-    private Long meterObjType;
+    private Long objType;
 
     /** 计量对象编码 */
-    @Excel(name = "计量对象编码")
     private String objCode;
 
+    private String objName;
+
     /** 采集周期 */
-    @Excel(name = "采集周期")
     private Long colCycle;
 
     /** 采集方式 */
-    @Excel(name = "采集方式")
     private Long colMode;
 
     /** 规格描述 */
-    @Excel(name = "规格描述")
     private String specDesc;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
+    public Long getId() {
         return id;
     }
-    public void setDeviceCode(String deviceCode) 
-    {
-        this.deviceCode = deviceCode;
+
+    public void setId(Long id) {
+        this.id = id;
     }
 
-    public String getDeviceCode() 
-    {
+    public String getDeviceCode() {
         return deviceCode;
     }
-    public void setDeviceName(String deviceName) 
-    {
-        this.deviceName = deviceName;
+
+    public void setDeviceCode(String deviceCode) {
+        this.deviceCode = deviceCode;
     }
 
-    public String getDeviceName() 
-    {
-        return deviceName;
+    public Long getMeterCls() {
+        return meterCls;
     }
-    public void setMeterCls(String meterCls) 
-    {
+
+    public void setMeterCls(Long meterCls) {
         this.meterCls = meterCls;
     }
 
-    public String getMeterCls() 
-    {
-        return meterCls;
+    public Long getObjType() {
+        return objType;
     }
-    public void setMeterObjType(Long meterObjType) 
-    {
-        this.meterObjType = meterObjType;
+
+    public void setObjType(Long objType) {
+        this.objType = objType;
     }
 
-    public Long getMeterObjType() 
-    {
-        return meterObjType;
+    public String getObjCode() {
+        return objCode;
     }
-    public void setObjCode(String objCode) 
-    {
+
+    public void setObjCode(String objCode) {
         this.objCode = objCode;
     }
 
-    public String getObjCode() 
-    {
-        return objCode;
+    public String getObjName() {
+        return objName;
     }
-    public void setColCycle(Long colCycle) 
-    {
-        this.colCycle = colCycle;
+
+    public void setObjName(String objName) {
+        this.objName = objName;
     }
 
-    public Long getColCycle() 
-    {
+    public Long getColCycle() {
         return colCycle;
     }
-    public void setColMode(Long colMode) 
-    {
-        this.colMode = colMode;
+
+    public void setColCycle(Long colCycle) {
+        this.colCycle = colCycle;
     }
 
-    public Long getColMode() 
-    {
+    public Long getColMode() {
         return colMode;
     }
-    public void setSpecDesc(String specDesc) 
-    {
-        this.specDesc = specDesc;
+
+    public void setColMode(Long colMode) {
+        this.colMode = colMode;
     }
 
-    public String getSpecDesc() 
-    {
+    public String getSpecDesc() {
         return specDesc;
     }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("deviceCode", getDeviceCode())
-            .append("deviceName", getDeviceName())
-            .append("meterCls", getMeterCls())
-            .append("meterObjType", getMeterObjType())
-            .append("objCode", getObjCode())
-            .append("colCycle", getColCycle())
-            .append("colMode", getColMode())
-            .append("specDesc", getSpecDesc())
-            .toString();
+    public void setSpecDesc(String specDesc) {
+        this.specDesc = specDesc;
     }
 }

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

@@ -75,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and d.`area_type` = 'Zoning' and d.`ref_area` = #{refArea}
             </if>
         </where>
+        ORDER BY d.`area_type`, d.`ref_area`
     </select>
     
     <select id="selectEmsDeviceById" parameterType="Long" resultMap="EmsDeviceResult">

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

@@ -7,26 +7,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.ruoyi.ems.domain.MeterDevice" id="meterDeviceResult">
         <result property="id"    column="id"    />
         <result property="deviceCode"    column="device_code"    />
-        <result property="deviceName"    column="device_name"    />
         <result property="meterCls"    column="meter_cls"    />
-        <result property="meterObjType"    column="meter_obj_type"    />
+        <result property="objType"    column="obj_type"    />
         <result property="objCode"    column="obj_code"    />
+        <result property="objName"    column="obj_name"    />
         <result property="colCycle"    column="col_cycle"    />
         <result property="colMode"    column="col_mode"    />
         <result property="specDesc"    column="spec_desc"    />
     </resultMap>
 
     <sql id="selectMeterDeviceVo">
-        select id, device_code, device_name, meter_cls, meter_obj_type, obj_code, col_cycle, col_mode, spec_desc from adm_meter_device
+        select id, device_code, meter_cls, obj_type, obj_code, col_cycle, col_mode, spec_desc from adm_meter_device
     </sql>
 
     <select id="selectMeterDeviceList" parameterType="com.ruoyi.ems.domain.MeterDevice" resultMap="meterDeviceResult">
         <include refid="selectMeterDeviceVo"/>
         <where>  
             <if test="deviceCode != null  and deviceCode != ''"> and device_code = #{deviceCode}</if>
-            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
             <if test="meterCls != null  and meterCls != ''"> and meter_cls = #{meterCls}</if>
-            <if test="meterObjType != null "> and meter_obj_type = #{meterObjType}</if>
+            <if test="objType != null "> and obj_type = #{objType}</if>
             <if test="objCode != null  and objCode != ''"> and obj_code = #{objCode}</if>
             <if test="colCycle != null "> and col_cycle = #{colCycle}</if>
             <if test="colMode != null "> and col_mode = #{colMode}</if>
@@ -43,9 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into adm_meter_device
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deviceCode != null and deviceCode != ''">device_code,</if>
-            <if test="deviceName != null and deviceName != ''">device_name,</if>
             <if test="meterCls != null and meterCls != ''">meter_cls,</if>
-            <if test="meterObjType != null">meter_obj_type,</if>
+            <if test="objType != null">obj_type,</if>
             <if test="objCode != null and objCode != ''">obj_code,</if>
             <if test="colCycle != null">col_cycle,</if>
             <if test="colMode != null">col_mode,</if>
@@ -53,9 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceCode != null and deviceCode != ''">#{deviceCode},</if>
-            <if test="deviceName != null and deviceName != ''">#{deviceName},</if>
             <if test="meterCls != null and meterCls != ''">#{meterCls},</if>
-            <if test="meterObjType != null">#{meterObjType},</if>
+            <if test="objType != null">#{objType},</if>
             <if test="objCode != null and objCode != ''">#{objCode},</if>
             <if test="colCycle != null">#{colCycle},</if>
             <if test="colMode != null">#{colMode},</if>
@@ -67,9 +64,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update adm_meter_device
         <trim prefix="SET" suffixOverrides=",">
             <if test="deviceCode != null and deviceCode != ''">device_code = #{deviceCode},</if>
-            <if test="deviceName != null and deviceName != ''">device_name = #{deviceName},</if>
             <if test="meterCls != null and meterCls != ''">meter_cls = #{meterCls},</if>
-            <if test="meterObjType != null">meter_obj_type = #{meterObjType},</if>
+            <if test="objType != null">obj_type = #{objType},</if>
             <if test="objCode != null and objCode != ''">obj_code = #{objCode},</if>
             <if test="colCycle != null">col_cycle = #{colCycle},</if>
             <if test="colMode != null">col_mode = #{colMode},</if>

ems-cloud/sql/ems_server.sql

@@ -580,9 +580,8 @@ 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-设备',
+  `meter_cls`       int             not null                     comment '计量类别25-天然气 45-电 70-水',
+  `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 '采集方式',

ems-cloud/sql/ems_sys.sql

@@ -157,203 +157,217 @@ create table sys_menu (
 -- 初始化-菜单信息表数据
 -- ----------------------------
 -- 一级菜单
-insert into sys_menu values ('1',  '全景可视', '0', '1', 'view',             null, '', 1, 0, 'M', '0', '0', '',  'eye-open',    'admin', sysdate(), '', null, '全景可视');
-insert into sys_menu values ('2',  '管能到位', '0', '2', 'power-mgr',        null, '', 1, 0, 'M', '0', '0', '',  'energy',      'admin', sysdate(), '', null, '管能到位');
-insert into sys_menu values ('3',  '碳排清晰', '0', '3', 'ca-analysis',      null, '', 1, 0, 'M', '0', '0', '',  'ca',          'admin', sysdate(), '', null, '碳排管理');
-insert into sys_menu values ('4',  '精准分析', '0', '4', 'analysis',         null, '', 1, 0, 'M', '0', '0', '',  'analysis',    'admin', sysdate(), '', null, '设备分析');
-insert into sys_menu values ('5',  '趋势预测', '0', '5', 'prediction',       null, '', 1, 0, 'M', '0', '0', '',  'prediction',  'admin', sysdate(), '', null, '趋势预测');
-insert into sys_menu values ('6',  '告警管理', '0', '6', 'warn-mgr',         null, '', 1, 0, 'M', '0', '0', '',  'warn',        'admin', sysdate(), '', null, '告警管理');
-insert into sys_menu values ('7',  '设备管理', '0', '7', 'device-mgr',       null, '', 1, 0, 'M', '0', '0', '',  'devicemgr',   'admin', sysdate(), '', null, '设备管理');
-insert into sys_menu values ('8',  '运维管理', '0', '8', 'oper-mgr',         null, '', 1, 0, 'M', '0', '0', '',  'opermgr',     'admin', sysdate(), '', null, '运维管理');
-insert into sys_menu values ('9',  '业务配置', '0', '9', 'param-cfg',        null, '', 1, 0, 'M', '0', '0', '',  'paramcfg',    'admin', sysdate(), '', null, '系统管理目录');
-insert into sys_menu values ('10', '系统管理', '0', '10','system',           null, '', 1, 0, 'M', '0', '0', '',  'system',      'admin', sysdate(), '', null, '系统管理目录');
-insert into sys_menu values ('99', '开发工具', '0', '99', 'tool',            null, '', 1, 0, 'M', '0', '0', '',  'tool',        'admin', sysdate(), '', null, '开发工具目录');
+insert into sys_menu values ('1',  '监控大屏', '0', '1', 'view',             null, '', 1, 0, 'M', '0', '0', '',  'eye-open',    'admin', sysdate(), '', null, '监控大屏');
+insert into sys_menu values ('2',  '能流态势', '0', '2', 'power-mgr',        null, '', 1, 0, 'M', '0', '0', '',  'energy',      'admin', sysdate(), '', null, '能流态势');
+insert into sys_menu values ('3',  '数据分析', '0', '3', 'analysis',         null, '', 1, 0, 'M', '0', '0', '',  'analysis',    'admin', sysdate(), '', null, '数据分析');
+insert into sys_menu values ('4',  '碳排监测', '0', '4', 'ca-analysis',      null, '', 1, 0, 'M', '0', '0', '',  'ca',          'admin', sysdate(), '', null, '碳排监测');
+insert into sys_menu values ('5',  '设备管理', '0', '5', 'device-mgr',       null, '', 1, 0, 'M', '0', '0', '',  'devicemgr',   'admin', sysdate(), '', null, '设备管理');
+insert into sys_menu values ('6',  '运维保障', '0', '6', 'oper-mgr',         null, '', 1, 0, 'M', '0', '0', '',  'opermgr',     'admin', sysdate(), '', null, '运维保障');
+insert into sys_menu values ('7',  '业务配置', '0', '7', 'param-cfg',        null, '', 1, 0, 'M', '0', '0', '',  'paramcfg',    'admin', sysdate(), '', null, '业务配置');
+insert into sys_menu values ('8',  '系统管理', '0', '8', 'system',           null, '', 1, 0, 'M', '0', '0', '',  'system',      'admin', sysdate(), '', null, '系统管理');
+insert into sys_menu values ('9',  '系统对接', '0', '9', 'adapter',          null, '', 1, 0, 'M', '0', '0', '',  'client',      'admin', sysdate(), '', null, '系统对接');
+insert into sys_menu values ('99', '开发工具', '0', '99', 'tool',            null, '', 1, 0, 'M', '0', '0', '',  'tool',        'admin', sysdate(), '', null, '开发工具');
 
 -- 二级菜单
-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',  '三维可视',       '1',   '3',   'hp-view-3d',         'view/3d',                '', 1, 0, 'C', '0', '0',   'view:3d',                '3d',             'admin', sysdate(), '', null, '电网（供能）');
-insert into sys_menu values ('103',  '管能策略',       '2',    '1',  'strategy-mgr',       'mgr/strategy',           '', 1, 0, 'C', '0', '0',   'power-mgr:strategy',     'strategy',       'admin', sysdate(), '', null, '管能策略');
-insert into sys_menu values ('104',  '源网协调',       '2',    '2',  'strategy-pg',        'mgr/powergrid',          '', 1, 0, 'C', '0', '0',   'power-mgr:pg',           'powergrid',      'admin', sysdate(), '', null, '源网协调');
-insert into sys_menu values ('105',  '网储互动',       '2',    '3',  'strategy-gs',        'mgr/powerstore',         '', 1, 0, 'C', '0', '0',   'power-mgr:gs',           'powerstore',     'admin', sysdate(), '', null, '网储互动');
-insert into sys_menu values ('106',  '源荷互动',       '2',    '4',  'strategy-pl',        'mgr/powerload',          '', 1, 0, 'C', '0', '0',   'power-mgr:pl',           'powerload',      'admin', sysdate(), '', null, '源荷互动');
-insert into sys_menu values ('107',  '碳排分析',       '3',    '1',  'ca-emission',        'ca/emission',            '', 1, 0, 'C', '0', '0',   'ca-analysis:emission',   'caemission',     'admin', sysdate(), '', null, '碳排分析');
-insert into sys_menu values ('108',  '碳汇分析',       '3',    '2',  'ca-sink',            'ca/sink',                '', 1, 0, 'C', '0', '0',   'ca-analysis:sink',       'casink',         'admin', sysdate(), '', null, '碳汇分析');
-insert into sys_menu values ('109',  '设备分析',       '4',    '1',  'analysis-device',    '',                       '', 1, 0, 'M', '0', '0',   'analysis:device',        'deviceanalyze',  'admin', sysdate(), '', null, '设备分析');
-insert into sys_menu values ('110',  '管能分析',       '4',    '2',  'analysis-power',     '',                       '', 1, 0, 'M', '0', '0',   'analysis:power',         'energyanalyze',  'admin', sysdate(), '', null, '管能分析');
-insert into sys_menu values ('111',  '数据报表',       '4',    '3',  'analysis-statement', '',                       '', 1, 0, 'M', '0', '0',   'analysis:statement',     'statement',      'admin', sysdate(), '', null, '数据报表');
-insert into sys_menu values ('112',  '产能预测',       '5',    '1',  'prediction-prod',    'prediction/prod',        '', 1, 0, 'C', '0', '0',   'prediction:prod',        'energyprod',     'admin', sysdate(), '', null, '产能预测');
-insert into sys_menu values ('113',  '用能预测',       '5',    '2',  'prediction-consume', 'prediction/consume',     '', 1, 0, 'C', '0', '0',   'prediction:consume',     'energyconsume',  'admin', sysdate(), '', null, '用能预测');
-insert into sys_menu values ('114',  '碳排预测',       '5',    '3',  'prediction-ca',      'prediction/ca',          '', 1, 0, 'C', '0', '0',   'prediction:ca',          'caemission',     'admin', sysdate(), '', null, '碳排预测');
-insert into sys_menu values ('115',  '告警策略',       '6',    '1',  'warn-strategy',      'warn/strategy',          '', 1, 0, 'C', '0', '0',   'warn:strategy',          'warnstrategy',   'admin', sysdate(), '', null, '告警策略');
-insert into sys_menu values ('116',  '告警列表',       '6',    '2',  'warn-list',          'warn/list',              '', 1, 0, 'C', '0', '0',   'warn:list',              'warnmsg',        'admin', sysdate(), '', null, '告警策略');
-insert into sys_menu values ('117',  '设备列表',       '7',    '1',  'device-list',        'device/list',            '', 1, 0, 'C', '0', '0',   'device:list',            'tree',           'admin', sysdate(), '', null, '设备列表');
-insert into sys_menu values ('118',  '设备台账',       '7',    '2',  'device-el',          'device/el',              '', 1, 0, 'C', '0', '0',   'device:el',              'note',           'admin', sysdate(), '', null, '设备台账');
-insert into sys_menu values ('119',  '设备接入',       '7',    '3',  'device-access',      'device/access',          '', 1, 0, 'C', '0', '0',   'device:access',          'deviceaccess',   'admin', sysdate(), '', null, '设备接入');
-insert into sys_menu values ('120',  '设备状态',       '7',    '4',  'device-status',      'device/status',          '', 1, 0, 'C', '0', '0',   'device:status',          'devicestatus',   'admin', sysdate(), '', null, '设备状态');
-insert into sys_menu values ('121',  '巡检任务',       '8',    '1',  'oper-task',          'oper-mgr/task',          '', 1, 0, 'C', '0', '0',   'oper-mgr:task',          'task',           'admin', sysdate(), '', null, '巡检任务');
-insert into sys_menu values ('122',  '巡检报告',       '8',    '2',  'oper-report',        'oper-mgr/report',        '', 1, 0, 'C', '0', '0',   'oper-mgr:report',        'note',           'admin', sysdate(), '', null, '巡检报告');
-insert into sys_menu values ('123',  '建筑区块',       '9',    '1',  'buildingcfg',        '',                       '', 1, 0, 'M', '0', '0',   'basecfg:building',       'building',       'admin', sysdate(), '', null, '用户管理菜单');
-insert into sys_menu values ('124',  '设备设施',       '9',    '2',  'devicecfg',          '',                       '', 1, 0, 'M', '0', '0',   'basecfg:device',         'devicemgr',      'admin', sysdate(), '', null, '用户管理菜单');
-insert into sys_menu values ('125',  '能源计量',       '9',    '3',  'energycfg',          '',                       '', 1, 0, 'M', '0', '0',   'basecfg:energy',         'energy',         'admin', sysdate(), '', null, '用户管理菜单');
-insert into sys_menu values ('190',  '用户管理',       '10',   '1',  'user',               'system/user/index',      '', 1, 0, 'C', '0', '0',   'system:user:list',       'user',           'admin', sysdate(), '', null, '用户管理菜单');
-insert into sys_menu values ('191',  '角色管理',       '10',   '2',  'role',               'system/role/index',      '', 1, 0, 'C', '0', '0',   'system:role:list',       'peoples',        'admin', sysdate(), '', null, '角色管理菜单');
-insert into sys_menu values ('192',  '菜单管理',       '10',   '3',  'menu',               'system/menu/index',      '', 1, 0, 'C', '0', '0',   'system:menu:list',       'tree-table',     'admin', sysdate(), '', null, '菜单管理菜单');
-insert into sys_menu values ('193',  '部门管理',       '10',   '4',  'dept',               'system/dept/index',      '', 1, 0, 'C', '0', '0',   'system:dept:list',       'tree',           'admin', sysdate(), '', null, '部门管理菜单');
-insert into sys_menu values ('194',  '岗位管理',       '10',   '5',  'post',               'system/post/index',      '', 1, 0, 'C', '0', '0',   'system:post:list',       'post',           'admin', sysdate(), '', null, '岗位管理菜单');
-insert into sys_menu values ('195',  '字典管理',       '10',   '6',  'dict',               'system/dict/index',      '', 1, 0, 'C', '0', '0',   'system:dict:list',       'dict',           'admin', sysdate(), '', null, '字典管理菜单');
-insert into sys_menu values ('196',  '参数设置',       '10',   '7',  'config',             'system/config/index',    '', 1, 0, 'C', '0', '0',   'system:config:list',     'edit',           'admin', sysdate(), '', null, '参数设置菜单');
-insert into sys_menu values ('197',  '通知公告',       '10',   '8',  'notice',             'system/notice/index',    '', 1, 0, 'C', '0', '0',   'system:notice:list',     'message',        'admin', sysdate(), '', null, '通知公告菜单');
-insert into sys_menu values ('198',  '日志管理',       '10',   '9',  'log',                '',                       '', 1, 0, 'M', '0', '0',   '',                       'log',            'admin', sysdate(), '', null, '日志管理菜单');
-insert into sys_menu values ('199',  '在线用户',       '10',   '10', 'online',             'monitor/online/index',   '', 1, 0, 'C', '0', '0',   'monitor:online:list',    'online',         'admin', sysdate(), '', null, '在线用户菜单');
-insert into sys_menu values ('188',  '表单构建',       '99',   '1',  'build',              'tool/build/index',       '', 1, 0, 'C', '0', '0',   'tool:build:list',        'build',          'admin', sysdate(), '', null, '表单构建菜单');
-insert into sys_menu values ('189',  '代码生成',       '99',   '2',  'gen',                'tool/gen/index',         '', 1, 0, 'C', '0', '0',   'tool:gen:list',          'code',           'admin', sysdate(), '', null, '代码生成菜单');
+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 ('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-pl',        'mgr/powerload',             '', 1, 0, 'C', '0', '0',   'power-mgr:pl',           '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-list',        'device/list',            '', 1, 0, 'C', '0', '0',   'device:status',          'devicestatus',   'admin', sysdate(), '', null, '设备状态');
+insert into sys_menu values ('115',  '设备台账',       '5',    '2',  'device-el',          'device/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, '角色管理菜单');
+insert into sys_menu values ('172',  '菜单管理',       '8',   '3',  'menu',               'system/menu/index',      '', 1, 0, 'C', '0', '0',   'system:menu:list',       'tree-table',     'admin', sysdate(), '', null, '菜单管理菜单');
+insert into sys_menu values ('173',  '部门管理',       '8',   '4',  'dept',               'system/dept/index',      '', 1, 0, 'C', '0', '0',   'system:dept:list',       'tree',           'admin', sysdate(), '', null, '部门管理菜单');
+insert into sys_menu values ('174',  '岗位管理',       '8',   '5',  'post',               'system/post/index',      '', 1, 0, 'C', '0', '0',   'system:post:list',       'post',           'admin', sysdate(), '', null, '岗位管理菜单');
+insert into sys_menu values ('175',  '字典管理',       '8',   '6',  'dict',               'system/dict/index',      '', 1, 0, 'C', '0', '0',   'system:dict:list',       'dict',           'admin', sysdate(), '', null, '字典管理菜单');
+insert into sys_menu values ('176',  '参数设置',       '8',   '7',  'config',             'system/config/index',    '', 1, 0, 'C', '0', '0',   'system:config:list',     'edit',           'admin', sysdate(), '', null, '参数设置菜单');
+insert into sys_menu values ('177',  '通知公告',       '8',   '8',  'notice',             'system/notice/index',    '', 1, 0, 'C', '0', '0',   'system:notice:list',     'message',        'admin', sysdate(), '', null, '通知公告菜单');
+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-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 ('500',  '操作日志', '198', '1',  'operlog',           'system/operlog/index',       '', 1, 0, 'C', '0', '0',    'system:operlog:list',          'form',          'admin', sysdate(), '', null, '操作日志菜单');
-insert into sys_menu values ('501',  '登录日志', '198', '2',  'logininfor',        'system/logininfor/index',    '', 1, 0, 'C', '0', '0',    'system:logininfor:list',       'logininfor',    'admin', sysdate(), '', null, '登录日志菜单');
-insert into sys_menu values ('510',  '设备指标', '109', '1',  'device-index',      'ems/device/index',           '', 1, 0, 'C', '0', '0',    'analysis:device:index',        'deviceindex',   'admin', sysdate(), '', null, '设备状态');
-insert into sys_menu values ('511',  '告警分析', '109', '2',  'device-warn',       'analysis/device/warn',       '', 1, 0, 'C', '0', '0',    'analysis:device:warn',         'warn',          'admin', sysdate(), '', null, '告警分析');
-insert into sys_menu values ('520',  '产能分析', '110', '1',  'power-prod',        'analysis/power/prod',        '', 1, 0, 'C', '0', '0',    'analysis:power:prod',          'energyprod',     'admin', sysdate(), '', null, '产能分析');
-insert into sys_menu values ('521',  '储能分析', '110', '2',  'power-store',       'analysis/power/store',       '', 1, 0, 'C', '0', '0',    'analysis:power:store',         'energystore',    'admin', sysdate(), '', null, '储能分析');
-insert into sys_menu values ('522',  '用能分析', '110', '3',  'power-consume',     'analysis/power/consume',     '', 1, 0, 'C', '0', '0',    'analysis:power:consume',       'energyconsume',  'admin', sysdate(), '', null, '用能分析');
-insert into sys_menu values ('523',  '节能分析', '110', '4',  'power-save',        'analysis/power/save',        '', 1, 0, 'C', '0', '0',    'analysis:power:save',          'energysave',     'admin', sysdate(), '', null, '节能分析');
-insert into sys_menu values ('530',  '产能报表', '111', '1',  'statement-prod',    'analysis/statement/prod',    '', 1, 0, 'C', '0', '0',    'analysis:statement:prod',      'energyprod',     'admin', sysdate(), '', null, '产能报表');
-insert into sys_menu values ('531',  '用能报表', '111', '2',  'statement-consume', 'analysis/statement/consume', '', 1, 0, 'C', '0', '0',    'analysis:statement:consume',   'energyconsume',  'admin', sysdate(), '', null, '用能报表');
-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 ('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 ('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 ('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',  'ems: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, '碳排因子');
-
+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 ('1000', '用户查询', '190', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:query',          '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1001', '用户新增', '190', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:add',            '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1002', '用户修改', '190', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:edit',           '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1003', '用户删除', '190', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:remove',         '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1004', '用户导出', '190', '5',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:export',         '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1005', '用户导入', '190', '6',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:import',         '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1006', '重置密码', '190', '7',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:resetPwd',       '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1700', '用户查询', '170', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:query',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1701', '用户新增', '170', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:add',            '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1702', '用户修改', '170', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:edit',           '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1703', '用户删除', '170', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:remove',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1704', '用户导出', '170', '5',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:export',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1705', '用户导入', '170', '6',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:import',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1706', '重置密码', '170', '7',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:resetPwd',       '#', 'admin', sysdate(), '', null, '');
 -- 角色管理按钮
-insert into sys_menu values ('1007', '角色查询', '191', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:query',          '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1008', '角色新增', '191', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:add',            '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1009', '角色修改', '191', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:edit',           '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1010', '角色删除', '191', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:remove',         '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1011', '角色导出', '191', '5',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:export',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1710', '角色查询', '171', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:query',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1711', '角色新增', '171', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:add',            '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1712', '角色修改', '171', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:edit',           '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1713', '角色删除', '171', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:remove',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1714', '角色导出', '171', '5',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:export',         '#', 'admin', sysdate(), '', null, '');
 -- 菜单管理按钮
-insert into sys_menu values ('1012', '菜单查询', '192', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:menu:query',          '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1013', '菜单新增', '192', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:menu:add',            '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1014', '菜单修改', '192', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:menu:edit',           '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1015', '菜单删除', '192', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:menu:remove',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1720', '菜单查询', '172', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:menu:query',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1721', '菜单新增', '172', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:menu:add',            '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1722', '菜单修改', '172', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:menu:edit',           '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1723', '菜单删除', '172', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:menu:remove',         '#', 'admin', sysdate(), '', null, '');
 -- 部门管理按钮
-insert into sys_menu values ('1016', '部门查询', '193', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:query',          '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1017', '部门新增', '193', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:add',            '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1018', '部门修改', '193', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:edit',           '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1019', '部门删除', '193', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:remove',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1730', '部门查询', '173', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:query',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1731', '部门新增', '173', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:add',            '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1732', '部门修改', '173', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:edit',           '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1733', '部门删除', '173', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:remove',         '#', 'admin', sysdate(), '', null, '');
 -- 岗位管理按钮
-insert into sys_menu values ('1020', '岗位查询', '194', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:query',          '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1021', '岗位新增', '194', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:add',            '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1022', '岗位修改', '194', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:edit',           '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1023', '岗位删除', '194', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:remove',         '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1024', '岗位导出', '194', '5',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:export',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1740', '岗位查询', '174', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:query',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1741', '岗位新增', '174', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:add',            '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1742', '岗位修改', '174', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:edit',           '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1743', '岗位删除', '174', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:remove',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1744', '岗位导出', '174', '5',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:export',         '#', 'admin', sysdate(), '', null, '');
 -- 字典管理按钮
-insert into sys_menu values ('1025', '字典查询', '195', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:query',          '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1026', '字典新增', '195', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:add',            '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1027', '字典修改', '195', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:edit',           '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1028', '字典删除', '195', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:remove',         '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1029', '字典导出', '195', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:export',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1750', '字典查询', '175', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:query',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1751', '字典新增', '175', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:add',            '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1752', '字典修改', '175', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:edit',           '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1753', '字典删除', '175', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:remove',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1754', '字典导出', '175', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:export',         '#', 'admin', sysdate(), '', null, '');
 -- 参数设置按钮
-insert into sys_menu values ('1030', '参数查询', '196', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:query',        '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1031', '参数新增', '196', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:add',          '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1032', '参数修改', '196', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:edit',         '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1033', '参数删除', '196', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:remove',       '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1034', '参数导出', '196', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:export',       '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1760', '参数查询', '176', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:query',        '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1761', '参数新增', '176', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:add',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1762', '参数修改', '176', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:edit',         '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1763', '参数删除', '176', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:remove',       '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1764', '参数导出', '176', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:export',       '#', 'admin', sysdate(), '', null, '');
 -- 通知公告按钮
-insert into sys_menu values ('1035', '公告查询', '197', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:query',        '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1036', '公告新增', '197', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:add',          '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1037', '公告修改', '197', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit',         '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1038', '公告删除', '197', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove',       '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1770', '公告查询', '177', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:query',        '#', 'admin', sysdate(), '', null, '');
+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 ('1039', '操作查询', '500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:query',       '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1040', '操作删除', '500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:remove',      '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1041', '日志导出', '500', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:export',      '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('17800', '操作查询', '1780', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:query',       '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('17801', '操作删除', '1780', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:remove',      '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('17802', '日志导出', '1780', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:export',      '#', 'admin', sysdate(), '', null, '');
 -- 登录日志按钮
-insert into sys_menu values ('1042', '登录查询', '501', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:query',    '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1043', '登录删除', '501', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:remove',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1044', '日志导出', '501', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:export',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1045', '账户解锁', '501', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:unlock',   '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('17810', '登录查询', '1781', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:query',    '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('17811', '登录删除', '1781', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:remove',   '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('17812', '日志导出', '1781', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:export',   '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('17813', '账户解锁', '1781', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:unlock',   '#', 'admin', sysdate(), '', null, '');
 -- 在线用户按钮
-insert into sys_menu values ('1046', '在线查询', '129', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query',       '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1047', '批量强退', '129', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1048', '单条强退', '129', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values ('1790', '在线查询', '179', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query',       '#', 'admin', sysdate(), '', null, '');
+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 ('1049', '服务区新增', '534', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:area:add',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1050', '服务区修改', '534', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:area:edit',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1051', '服务区删除', '534', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:area:remove','#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1052', '服务区导出', '534', '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 ('1053', '建筑新增', '535', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:building:add',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1054', '建筑修改', '535', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:building:edit',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1055', '建筑删除', '535', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:building:remove','#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1056', '建筑导出', '535', '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 ('1057', '区块新增', '536', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:zoning:add',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1058', '区块修改', '536', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:zoning:edit',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1059', '区块删除', '536', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:zoning:remove','#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1060', '区块导出', '536', '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 ('1061', '分类新增', '537', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:facstype:add',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1062', '分类修改', '537', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:facstype:edit',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1063', '分类删除', '537', '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 ('1064', '设施新增', '538', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:emsfacs:add',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1065', '设施修改', '538', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:emsfacs:edit',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1066', '设施删除', '538', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:emsfacs:remove','#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1067', '设施导出', '538', '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 ('1068', '关系新增', '539', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:add',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1069', '关系修改', '539', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:edit',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1070', '关系删除', '539', '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 ('1071', '设备新增', '540', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:add',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1072', '设备修改', '540', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:edit',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1073', '设备删除', '540', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:remove','#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1074', '设备导出', '540', '4', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:flowrel:export','#', 'admin', sysdate(), '', null, '');
--- 碳排因子配置按钮
-insert into sys_menu values ('1075', '新增因子', '543', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:emissionFactor:add',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1076', '修改因子', '543', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:emissionFactor:edit',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1077', '删除因子', '543', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:emissionFactor:remove','#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1078', '因子导出', '543', '4', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:emissionFactor: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, '');
-INSERT INTO `sys_menu` VALUES (2001, 'export', 103, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:strategy:export', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2002, 'query', 103, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:strategy:query', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2003, 'add', 103, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:strategy:add', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2004, 'edit', 103, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:strategy:edit', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (2005, 'remove', 103, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:strategy:remove', '#', '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, '');
+INSERT INTO sys_menu VALUES (2001, 'export', 103, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:strategy:export', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO sys_menu VALUES (2002, 'query', 103, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:strategy:query', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO sys_menu VALUES (2003, 'add', 103, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:strategy:add', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO sys_menu VALUES (2004, 'edit', 103, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:strategy:edit', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO sys_menu VALUES (2005, 'remove', 103, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:strategy:remove', '#', 'admin', sysdate(), '', NULL, '');
+
 -- 源网协调按钮
-INSERT INTO `sys_menu` VALUES ( null, 'list',104, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:pg:list', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES ( null, 'export',104, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:pg:export', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES ( null, 'query',104, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:pg:query', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES ( null, 'add',104, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:pg:add', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES ( null, 'edit',104, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:pg:edit', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES ( null, 'remove',104, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:pg:remove', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES ( 2006, 'list',104, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:pg:list', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES ( 2007, 'export',104, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:pg:export', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES ( 2008, 'query',104, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:pg:query', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES ( 2009, 'add',104, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:pg:add', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES ( 2010, 'edit',104, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:pg:edit', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES ( 2011, 'remove',104, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:pg:remove', '#', 'admin', sysdate(), '', NULL, '');
 -- 网储互动
-INSERT INTO `sys_menu` VALUES (null,'list',105, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:gs:list', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'export',105, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:gs:export', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'query',105, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:gs:query', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'add',105, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:gs:add', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'edit',105, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:gs:edit', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'remove',105, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:gs:remove', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2012,'list',105, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:gs:list', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2013,'export',105, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:gs:export', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2014,'query',105, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:gs:query', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2015,'add',105, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:gs:add', '#', 'admin', sysdate(), '', NULL, '');
+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, '');
+
+
 -- ----------------------------
 -- 6、用户和角色关联表  用户N-1角色
 -- ----------------------------