Merge remote-tracking branch 'origin/master'

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

@@ -10,9 +10,6 @@ import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.Area;
 import com.ruoyi.ems.service.IAreaService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -96,6 +93,19 @@ public class AreaController extends BaseController {
     /**
      * 获取服务区树
      *
+     * @param tier    层级 Area、Building、Zoning
+     * @param tagCode 标签
+     * @return 区域位置树
+     */
+    @GetMapping(value = "/areaTreeByTag")
+    public AjaxResult getCoTree(@RequestParam(name = "tier") String tier,
+        @RequestParam(name = "tagCode") String tagCode) {
+        return success(areaService.selectAreaTreeByTag(tier, tagCode));
+    }
+
+    /**
+     * 获取服务区树
+     *
      * @param tier 层级 Area、Building、Zoning
      * @param code 代码
      * @return 区域位置树
@@ -103,7 +113,7 @@ public class AreaController extends BaseController {
     @GetMapping(value = "/areaTreeByCode")
     public AjaxResult getAreaTreeByCode(@RequestParam(name = "tier") String tier,
         @RequestParam(name = "code") String code) {
-        return success(areaService.selectAreaTreeList(tier, code));
+        return success(areaService.selectAreaTreeByCode(tier, code));
     }
 
     /**

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

@@ -0,0 +1,38 @@
+/*
+ * 文 件 名:  CoBillController
+ * 版    权:  浩鲸云计算科技股份有限公司
+ * 描    述:  <描述>
+ * 修 改 人:  lvwenbin
+ * 修改时间:  2024/8/30
+ * 跟踪单号:  <跟踪单号>
+ * 修改单号:  <修改单号>
+ * 修改内容:  <修改内容>
+ */
+package com.ruoyi.ems.controller;
+
+/**
+ * 商户账单接口
+ * <功能详细描述>
+ *
+ * @author lvwenbin
+ * @version [版本号, 2024/8/30]
+ * @see [相关类/方法]
+ * @since [产品/模块版本]
+ */
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 商户能源账单配置Controller
+ *
+ * @author ruoyi
+ * @date 2024-08-26
+ */
+@RestController
+@RequestMapping("/basecfg/bill/coCharging")
+@Api(value = "CoChargingBillController", description = "商户计费账单服务")
+public class CoChargingBillController {
+
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 文 件 名:  CoChargingBill
+ * 版    权:  浩鲸云计算科技股份有限公司
+ * 描    述:  <描述>
+ * 修 改 人:  lvwenbin
+ * 修改时间:  2024/8/30
+ * 跟踪单号:  <跟踪单号>
+ * 修改单号:  <修改单号>
+ * 修改内容:  <修改内容>
+ */
+package com.ruoyi.ems.domain;
+
+/**
+ * 商户计费账单
+ * <功能详细描述>
+ *
+ * @author lvwenbin
+ * @version [版本号, 2024/8/30]
+ * @see [相关类/方法]
+ * @since [产品/模块版本]
+ */
+public class CoChargingBill {
+    private String objCode;
+
+    private String objName;
+
+
+}

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

@@ -43,12 +43,20 @@ public interface IAreaService {
     List<TreeEntity> selectAreaTreeList(String tier);
 
     /**
-     * 查询区域位置树
+     * 查询区域位置树byCode
+     * @param tier 层级
+     * @param code 编码
+     * @return 区域位置树
+     */
+    List<TreeEntity> selectAreaTreeByCode(String tier, String code);
+
+    /**
+     * 查询区域位置树by标签
      * @param tier 层级
      * @param code 编码
      * @return 区域位置树
      */
-    List<TreeEntity> selectAreaTreeList(String tier, String code);
+    List<TreeEntity> selectAreaTreeByTag(String tier, String code);
 
     /**
      * 新增服务区

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

@@ -0,0 +1,24 @@
+/*
+ * 文 件 名:  ICoChargingBillService
+ * 版    权:  浩鲸云计算科技股份有限公司
+ * 描    述:  <描述>
+ * 修 改 人:  lvwenbin
+ * 修改时间:  2024/8/30
+ * 跟踪单号:  <跟踪单号>
+ * 修改单号:  <修改单号>
+ * 修改内容:  <修改内容>
+ */
+package com.ruoyi.ems.service;
+
+/**
+ * 商户计费账单
+ * <功能详细描述>
+ *
+ * @author lvwenbin
+ * @version [版本号, 2024/8/30]
+ * @see [相关类/方法]
+ * @since [产品/模块版本]
+ */
+public interface ICoChargingBillService {
+
+}

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

@@ -10,10 +10,12 @@ import com.ruoyi.ems.mapper.AreaMapper;
 import com.ruoyi.ems.service.IAreaBuildingService;
 import com.ruoyi.ems.service.IAreaBuildingZoningService;
 import com.ruoyi.ems.service.IAreaService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -134,7 +136,7 @@ public class AreaServiceImpl implements IAreaService {
             entities = areas.stream().map(TreeEntity::new).collect(Collectors.toList());
             entities.forEach(area -> {
                 List<TreeEntity> buildings = getAreaBuilding(area.getId());
-                buildings.forEach(building -> building.setChildren(getBuildingZoning(building.getId())));
+                buildings.forEach(building -> building.setChildren(getBuildingZoning(building.getId(), null)));
                 area.setChildren(buildings);
             });
         }
@@ -143,7 +145,7 @@ public class AreaServiceImpl implements IAreaService {
     }
 
     @Override
-    public List<TreeEntity> selectAreaTreeList(String tier, String code) {
+    public List<TreeEntity> selectAreaTreeByCode(String tier, String code) {
         List<TreeEntity> retList = new ArrayList<>();
 
         if (StringUtils.equals(AreaTier.Area.name(), tier)) {
@@ -153,7 +155,7 @@ public class AreaServiceImpl implements IAreaService {
                 TreeEntity entity = new TreeEntity(area);
                 entity.setChildren(getAreaBuilding(code));
                 entity.getChildren().forEach(building -> {
-                    building.setChildren(getBuildingZoning(building.getId()));
+                    building.setChildren(getBuildingZoning(building.getId(), null));
                 });
 
                 retList.add(entity);
@@ -164,7 +166,7 @@ public class AreaServiceImpl implements IAreaService {
 
             if (null != building) {
                 TreeEntity entity = new TreeEntity(building);
-                entity.setChildren(getBuildingZoning(building.getBldgCode()));
+                entity.setChildren(getBuildingZoning(building.getBldgCode(), null));
                 retList.add(entity);
             }
         }
@@ -180,6 +182,36 @@ public class AreaServiceImpl implements IAreaService {
         return retList;
     }
 
+    @Override
+    public List<TreeEntity> selectAreaTreeByTag(String tier, String tagCode) {
+        List<TreeEntity> retList = new ArrayList<>();
+        List<String> tagCodes = Arrays.asList(tagCode);
+
+        if (StringUtils.equals(AreaTier.Zoning.name(), tier)) {
+            List<Area> areas = areaMapper.selectAreaList(new Area());
+            List<TreeEntity> entities = areas.stream().map(TreeEntity::new).collect(Collectors.toList());
+
+            for (TreeEntity area : entities) {
+                List<TreeEntity> dbBuildings = getAreaBuilding(area.getId());
+                List<TreeEntity> buildings = new ArrayList<>();
+
+                for (TreeEntity building : dbBuildings) {
+                    List<TreeEntity> zonings = getBuildingZoning(building.getId(), tagCodes);
+
+                    if (CollectionUtils.isNotEmpty(zonings)) {
+                        building.setChildren(zonings);
+                        buildings.add(building);
+                    }
+                }
+
+                area.setChildren(buildings);
+                retList.add(area);
+            }
+        }
+
+        return retList;
+    }
+
     private void deleteRel(long id) {
         Area area = areaMapper.selectAreaById(id);
 
@@ -202,9 +234,10 @@ public class AreaServiceImpl implements IAreaService {
         return areaBuildings.stream().map(TreeEntity::new).collect(Collectors.toList());
     }
 
-    private List<TreeEntity> getBuildingZoning(String buildingCode) {
+    private List<TreeEntity> getBuildingZoning(String buildingCode, List<String> tagCodes) {
         AreaBuildingZoning param = new AreaBuildingZoning();
         param.setBldgCode(buildingCode);
+        param.setTagCodeList(tagCodes);
         List<AreaBuildingZoning> zonings = zoningService.selectAreaBuildingZoningList(param);
         return zonings.stream().map(TreeEntity::new).collect(Collectors.toList());
     }

ems-cloud/sql/ems_server.sql

@@ -754,7 +754,7 @@ create table adm_op_alarm  (
 drop table if exists adm_op_inspection_task;
 create table adm_op_inspection_task (
   `id`              bigint(20)      not null auto_increment      comment '序号',
-  `task_code`       varchar(16)     not null                     comment '任务代码',
+  `task_code`       varchar(64)     not null                     comment '任务代码',
   `task_name`       varchar(16)     not null                     comment '任务名称',
   `task_type`       int             default null                 comment '任务类型 1：自动，2：手动',
   `task_status`     int             default null                 comment '任务名称 0：未执行 1：执行中 2：已完成',
@@ -775,7 +775,7 @@ create table adm_op_inspection_task (
 drop table if exists adm_op_inspection_report;
 create table adm_op_inspection_report (
   `id`              bigint(20)      not null auto_increment      comment '序号',
-  `task_code`       varchar(16)     not null                     comment '任务代码',
+  `task_code`       varchar(64)     not null                     comment '任务代码',
   `result_status`   int             not null                     comment '结果状态 0：正常  1：异常',
   `result_msg`      text            default null                 comment '结果描述',
   `finish_time`     datetime        default null                 comment '完成时间',

ems-cloud/sql/ems_sys.sql

@@ -158,7 +158,7 @@ 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 ('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, '设备管理');
@@ -174,9 +174,10 @@ insert into sys_menu values ('101',  '主路光伏',       '1',   '2',   'hp-vie
 
 insert into sys_menu values ('112',  '源网',            '2',    '1',  'strategy-pg',        'mgr/powergrid',             '', 1, 0, 'C', '0', '0',   'power-mgr:pg',           'powergrid',      'admin', sysdate(), '', null, '源网协调');
 insert into sys_menu values ('113',  '储能',            '2',    '2',  'strategy-gs',        'mgr/powerstore',            '', 1, 0, 'C', '0', '0',   'power-mgr:gs',           'powerstore',     'admin', sysdate(), '', null, '网储互动');
-insert into sys_menu values ('114',  '负荷',            '2',    '3',  'strategy-use',       'mgr/poweruse',              '', 1, 0, 'C', '0', '0',   'power-mgr:use',           'powerload',      'admin', sysdate(), '', null, '源荷互动');
+insert into sys_menu values ('114',  '负荷',            '2',    '3',  'strategy-use',       'mgr/poweruse',              '', 1, 0, 'C', '0', '0',   'power-mgr:use',          'powerload',      'admin', sysdate(), '', null, '源荷互动');
 insert into sys_menu values ('115',  '调度',            '2',    '4',  'strategy-mgr',       'mgr/strategy',              '', 1, 0, 'C', '0', '0',   'power-mgr:strategy',     'strategy',       'admin', sysdate(), '', null, '管能策略');
-insert into sys_menu values ('116',  '配电',            '2',    '5',  'strategy-dist',      'mgr/powerdist',             '', 1, 0, 'C', '0', '0',   'power-mgr:dist',         'powerdist',      'admin', sysdate(), '', null, '配电监控');
+insert into sys_menu values ('116',  '配电',            '2',    '5',  'powerdist',          'mgr/powerdist',             '', 1, 0, 'C', '0', '0',   'power-mgr:dist',         'powerdist',      'admin', sysdate(), '', null, '配电监控');
+insert into sys_menu values ('117',  '计费',            '2',    '6',  'charging',           'mgr/charging',              '', 1, 0, 'C', '0', '0',   'power-mgr:charging',     'charging',       'admin', sysdate(), '', null, '配电监控');
 
 insert into sys_menu values ('126',  '产能分析',       '3',    '1',  'power-prod',         'analysis/power/prod',       '', 1, 0, 'C', '0', '0',    'analysis:power:prod',    'energyprod',     'admin', sysdate(), '', null, '产能分析');
 insert into sys_menu values ('127',  '储能分析',       '3',    '2',  'power-store',        'analysis/power/store',      '', 1, 0, 'C', '0', '0',    'analysis:power:store',   'energystore',    'admin', sysdate(), '', null, '储能分析');
@@ -490,226 +491,244 @@ 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', '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', '120');
-insert into sys_role_menu values ('2', '121');
-insert into sys_role_menu values ('2', '126');
-insert into sys_role_menu values ('2', '127');
-insert into sys_role_menu values ('2', '128');
-insert into sys_role_menu values ('2', '129');
-insert into sys_role_menu values ('2', '131');
-insert into sys_role_menu values ('2', '132');
-insert into sys_role_menu values ('2', '141');
-insert into sys_role_menu values ('2', '142');
-insert into sys_role_menu values ('2', '143');
-insert into sys_role_menu values ('2', '144');
-insert into sys_role_menu values ('2', '151');
-insert into sys_role_menu values ('2', '152');
-insert into sys_role_menu values ('2', '153');
-insert into sys_role_menu values ('2', '154');
-insert into sys_role_menu values ('2', '161');
-insert into sys_role_menu values ('2', '162');
-insert into sys_role_menu values ('2', '163');
-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', '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', '998');
-insert into sys_role_menu values ('2', '999');
-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', '1124');
-insert into sys_role_menu values ('2', '1125');
-insert into sys_role_menu values ('2', '1130');
-insert into sys_role_menu values ('2', '1131');
-insert into sys_role_menu values ('2', '1132');
-insert into sys_role_menu values ('2', '1133');
-insert into sys_role_menu values ('2', '1134');
-insert into sys_role_menu values ('2', '1135');
-insert into sys_role_menu values ('2', '1150');
-insert into sys_role_menu values ('2', '1151');
-insert into sys_role_menu values ('2', '1152');
-insert into sys_role_menu values ('2', '1153');
-insert into sys_role_menu values ('2', '1154');
-insert into sys_role_menu values ('2', '1155');
-insert into sys_role_menu values ('2', '1200');
-insert into sys_role_menu values ('2', '1201');
-insert into sys_role_menu values ('2', '1202');
-insert into sys_role_menu values ('2', '1210');
-insert into sys_role_menu values ('2', '1211');
-insert into sys_role_menu values ('2', '1212');
-insert into sys_role_menu values ('2', '1213');
-insert into sys_role_menu values ('2', '1310');
-insert into sys_role_menu values ('2', '1311');
-insert into sys_role_menu values ('2', '1312');
-insert into sys_role_menu values ('2', '1313');
-insert into sys_role_menu values ('2', '1314');
-insert into sys_role_menu values ('2', '1315');
-insert into sys_role_menu values ('2', '1320');
-insert into sys_role_menu values ('2', '1321');
-insert into sys_role_menu values ('2', '1322');
-insert into sys_role_menu values ('2', '1323');
-insert into sys_role_menu values ('2', '1324');
-insert into sys_role_menu values ('2', '1325');
-insert into sys_role_menu values ('2', '1510');
-insert into sys_role_menu values ('2', '1511');
-insert into sys_role_menu values ('2', '1512');
-insert into sys_role_menu values ('2', '1513');
-insert into sys_role_menu values ('2', '1514');
-insert into sys_role_menu values ('2', '1515');
-insert into sys_role_menu values ('2', '1520');
-insert into sys_role_menu values ('2', '1521');
-insert into sys_role_menu values ('2', '1522');
-insert into sys_role_menu values ('2', '1523');
-insert into sys_role_menu values ('2', '1524');
-insert into sys_role_menu values ('2', '1525');
-insert into sys_role_menu values ('2', '1610');
-insert into sys_role_menu values ('2', '1611');
-insert into sys_role_menu values ('2', '1612');
-insert into sys_role_menu values ('2', '1620');
-insert into sys_role_menu values ('2', '1621');
-insert into sys_role_menu values ('2', '1622');
-insert into sys_role_menu values ('2', '1623');
-insert into sys_role_menu values ('2', '1630');
-insert into sys_role_menu values ('2', '1631');
-insert into sys_role_menu values ('2', '1632');
-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', '1800');
-insert into sys_role_menu values ('2', '1801');
-insert into sys_role_menu values ('2', '1802');
-insert into sys_role_menu values ('2', '1803');
-insert into sys_role_menu values ('2', '1804');
-insert into sys_role_menu values ('2', '1805');
-insert into sys_role_menu values ('2', '1806');
-insert into sys_role_menu values ('2', '1807');
-insert into sys_role_menu values ('2', '12000');
-insert into sys_role_menu values ('2', '12001');
-insert into sys_role_menu values ('2', '12002');
-insert into sys_role_menu values ('2', '12003');
-insert into sys_role_menu values ('2', '12004');
-insert into sys_role_menu values ('2', '12005');
-insert into sys_role_menu values ('2', '12010');
-insert into sys_role_menu values ('2', '12011');
-insert into sys_role_menu values ('2', '12012');
-insert into sys_role_menu values ('2', '12013');
-insert into sys_role_menu values ('2', '12014');
-insert into sys_role_menu values ('2', '12015');
-insert into sys_role_menu values ('2', '12020');
-insert into sys_role_menu values ('2', '12021');
-insert into sys_role_menu values ('2', '12022');
-insert into sys_role_menu values ('2', '12023');
-insert into sys_role_menu values ('2', '12024');
-insert into sys_role_menu values ('2', '12025');
-insert into sys_role_menu values ('2', '16100');
-insert into sys_role_menu values ('2', '16101');
-insert into sys_role_menu values ('2', '16102');
-insert into sys_role_menu values ('2', '16103');
-insert into sys_role_menu values ('2', '16110');
-insert into sys_role_menu values ('2', '16111');
-insert into sys_role_menu values ('2', '16112');
-insert into sys_role_menu values ('2', '16113');
-insert into sys_role_menu values ('2', '16120');
-insert into sys_role_menu values ('2', '16121');
-insert into sys_role_menu values ('2', '16122');
-insert into sys_role_menu values ('2', '16123');
-insert into sys_role_menu values ('2', '16200');
-insert into sys_role_menu values ('2', '16201');
-insert into sys_role_menu values ('2', '16202');
-insert into sys_role_menu values ('2', '16210');
-insert into sys_role_menu values ('2', '16211');
-insert into sys_role_menu values ('2', '16212');
-insert into sys_role_menu values ('2', '16213');
-insert into sys_role_menu values ('2', '16220');
-insert into sys_role_menu values ('2', '16221');
-insert into sys_role_menu values ('2', '16222');
-insert into sys_role_menu values ('2', '16230');
-insert into sys_role_menu values ('2', '16231');
-insert into sys_role_menu values ('2', '16232');
-insert into sys_role_menu values ('2', '16233');
-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 (`role_id`, `menu_id`) VALUES (2, 1);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 2);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 3);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 4);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 5);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 6);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 7);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 8);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 9);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 99);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 100);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 101);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 112);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 113);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 114);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 115);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 116);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 120);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 121);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 126);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 127);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 128);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 129);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 131);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 132);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 141);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 142);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 143);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 144);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 151);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 152);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 153);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 154);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 161);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 162);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 163);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 164);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 170);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 171);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 172);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 173);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 174);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 175);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 176);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 177);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 178);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 179);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 180);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 190);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 191);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 192);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 193);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 194);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 195);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 196);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 197);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 198);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 199);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 997);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 998);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 999);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1120);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1121);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1122);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1123);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1124);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1125);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1130);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1131);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1132);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1133);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1134);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1135);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1150);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1151);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1152);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1153);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1154);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1155);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1200);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1201);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1202);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1210);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1211);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1212);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1213);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1310);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1311);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1312);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1313);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1314);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1315);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1320);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1321);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1322);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1323);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1324);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1325);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1510);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1511);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1512);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1513);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1514);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1515);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1520);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1521);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1522);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1523);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1524);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1525);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1531);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1532);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1534);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1535);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1536);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1537);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1538);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1539);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1541);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1542);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1543);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1544);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1545);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1546);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1610);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1611);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1612);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1620);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1621);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1622);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1623);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1624);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1630);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1631);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1632);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1700);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1701);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1702);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1703);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1704);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1705);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1706);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1710);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1711);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1712);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1713);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1714);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1720);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1721);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1722);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1723);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1730);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1731);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1732);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1733);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1740);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1741);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1742);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1743);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1744);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1750);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1751);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1752);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1753);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1754);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1760);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1761);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1762);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1763);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1764);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1770);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1771);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1772);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1773);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1780);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1781);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1790);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1791);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1792);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1800);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1801);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1802);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1803);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1804);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1805);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1806);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 1807);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 12000);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 12001);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 12002);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 12003);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 12004);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 12005);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 12010);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 12011);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 12012);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 12013);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 12014);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 12015);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 12020);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 12021);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 12022);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 12023);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 12024);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 12025);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16100);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16101);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16102);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16103);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16110);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16111);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16112);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16113);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16120);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16121);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16122);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16123);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16200);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16201);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16202);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16210);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16211);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16212);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16213);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16220);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16221);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16222);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16230);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16231);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16232);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 16233);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 17800);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 17801);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 17802);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 17810);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 17811);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 17812);
+INSERT INTO sys_role_menu (`role_id`, `menu_id`) VALUES (2, 17813);
 
 -- ----------------------------
 -- 8、角色和部门关联表  角色1-N部门