删除设施模型

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

@@ -6,7 +6,6 @@ import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.ems.domain.EmsDevice;
-import com.ruoyi.ems.domain.EmsFacs;
 import com.ruoyi.ems.domain.EmsObjAttrValue;
 import com.ruoyi.ems.enums.DevObjType;
 import com.ruoyi.ems.service.IEmsDeviceService;
@@ -99,13 +98,7 @@ public class EmsObjAttrValueController extends BaseController {
         String modeCode = null;
         int cnt = 0;
 
-        if (objType == DevObjType.FACS.getCode()) {
-            EmsFacs facs = facsService.selectEmsFacsByCode(objCode);
-            Assert.notNull(facs, -1, "能源设施不存在");
-            modeCode = facs.getFacsModel();
-            cnt = objAttrValueService.deleteByObjCode(modeCode, objCode);
-        }
-        else if (objType == DevObjType.DEVC.getCode()) {
+        if (objType == DevObjType.DEVC.getCode()) {
             EmsDevice device = deviceService.selectByCode(objCode);
             Assert.notNull(device, -1, "能源设备不存在");
             modeCode = device.getDeviceModel();

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/task/TaskService.java

@@ -21,6 +21,7 @@ import com.huashe.common.utils.HttpUtils;
 import com.ruoyi.ems.config.DateAttrConfig;
 import com.ruoyi.ems.config.WeatherConfig;
 import com.ruoyi.ems.service.IDateService;
+import com.ruoyi.ems.service.IEmsFacsService;
 import com.ruoyi.ems.service.IWeatherService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -53,6 +54,9 @@ public class TaskService {
     private static final Logger log = LoggerFactory.getLogger(TaskService.class);
 
     @Resource
+    private IEmsFacsService facsService;
+
+    @Resource
     private WeatherConfig weatherConfig;
 
     @Resource
@@ -181,4 +185,21 @@ public class TaskService {
             log.error("collect date attr fail!", e);
         }
     }
+
+
+    /**
+     * 光伏发电预测
+     */
+    @Async
+    @Scheduled(cron = "${forecast-task.pv-forecast.cron}")
+    public void pvForecastTask() {
+        log.debug("start pv forecast task.");
+
+        try {
+            //facsService.getFacsWithMeterDev()
+        }
+        catch (Exception e) {
+            log.error("pv forecast fail!", e);
+        }
+    }
 }

ems/ems-cloud/ems-server/src/main/resources/application-local.yml

@@ -59,6 +59,12 @@ general-data:
     cron: 0 13 19 * * ?
     api-addr: http://${general-data.server}/general-data/date/getAttrs
 
+forecast-task:
+  area:
+  pv-forecast:
+
+    cron: 0 30 8 * * ?
+
 # mybatis配置
 mybatis:
   # 搜索指定包别名

ems/ems-cloud/ems-server/src/main/resources/application-prod-ct.yml

@@ -58,6 +58,10 @@ general-data:
     cron: 0 0 12 1 * ?
     api-addr: http://${general-data.server}/general-data/date/getAttrs
 
+forecast-task:
+  pv-forecast:
+    cron: 0 30 8 * * ?
+
 # mybatis配置
 mybatis:
   # 搜索指定包别名

ems/ems-core/src/main/java/com/ruoyi/ems/domain/EmsFacs.java

@@ -50,9 +50,6 @@ public class EmsFacs extends BaseEntity
     @Excel(name = "归属区域")
     private String refAreaName;
 
-    /** 设施模型code */
-    private String facsModel;
-
     /** 设施模型名称 */
     @Excel(name = "设施模型")
     private String facsModelName;
@@ -137,14 +134,6 @@ public class EmsFacs extends BaseEntity
         this.refAreaName = refAreaName;
     }
 
-    public String getFacsModel() {
-        return facsModel;
-    }
-
-    public void setFacsModel(String facsModel) {
-        this.facsModel = facsModel;
-    }
-
     public String getFacsModelName() {
         return facsModelName;
     }
@@ -163,7 +152,6 @@ public class EmsFacs extends BaseEntity
             .append("facsSubCategory", getFacsSubCategory())
             .append("enable", getEnable())
             .append("refArea", getRefArea())
-            .append("facsModel", getFacsModel())
             .append("facsModelName", getFacsModelName())
             .toString();
     }

ems/ems-core/src/main/java/com/ruoyi/ems/service/forecast/ElecProdForecastService.java

@@ -0,0 +1,53 @@
+/*
+ * 文 件 名:  ElecProdForecastService
+ * 版    权:  华设设计集团股份有限公司
+ * 描    述:  <描述>
+ * 修 改 人:  lvwenbin
+ * 修改时间:  2025/6/19
+ * 跟踪单号:  <跟踪单号>
+ * 修改单号:  <修改单号>
+ * 修改内容:  <修改内容>
+ */
+package com.ruoyi.ems.service.forecast;
+
+import com.ruoyi.ems.service.IElecPvSupplyHService;
+import com.ruoyi.ems.service.IWeatherService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+
+/**
+ * 产能预测
+ * <功能详细描述>
+ *
+ * @author lvwenbin
+ * @version [版本号, 2025/6/19]
+ * @see [相关类/方法]
+ * @since [产品/模块版本]
+ */
+@Service
+public class ElecProdForecastService {
+    /**
+     * 光伏产能预测数据服务
+     */
+    private IElecPvSupplyHService pvSupplyHService;
+
+    /**
+     * 天气服务
+     */
+    @Resource
+    private IWeatherService weatherService;
+
+    /**
+     * 执行光伏产能预测
+     *
+     * @param areaCode   园区代码
+     * @param facsCode   设施编码
+     * @param today      当前日期
+     * @param forecastDay 预测天数
+     */
+    public void executePvForecast(String areaCode, String facsCode, LocalDate today, int forecastDay) {
+
+    }
+}

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

@@ -1,7 +1,6 @@
 package com.ruoyi.ems.service.impl;
 
 import com.ruoyi.ems.domain.EmsDevice;
-import com.ruoyi.ems.domain.EmsFacs;
 import com.ruoyi.ems.domain.EmsObjAttr;
 import com.ruoyi.ems.domain.EmsObjAttrDto;
 import com.ruoyi.ems.domain.EmsObjAttrEnum;
@@ -217,11 +216,7 @@ public class EmsObjAttrServiceImpl implements IEmsObjAttrService {
     private String getModeCode(Integer objType, String objCode) {
         String modeCode = null;
 
-        if (objType == DevObjType.FACS.getCode()) {
-            EmsFacs facs = facsService.selectEmsFacsByCode(objCode);
-            modeCode = null != facs ? facs.getFacsModel() : null;
-        }
-        else if (objType == DevObjType.DEVC.getCode()) {
+        if (objType == DevObjType.DEVC.getCode()) {
             EmsDevice device = deviceService.selectByCode(objCode);
             modeCode = null != device ? device.getDeviceModel() : null;
         }

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

@@ -15,7 +15,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="enable"    column="enable"    />
         <result property="refArea"    column="ref_area"    />
         <result property="refAreaName"    column="ref_area_name"    />
-        <result property="facsModel"    column="facs_model"    />
         <result property="facsModelName"    column="facs_model_name"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
@@ -30,16 +29,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectEmsFacsVo">
         SELECT
-            f.`id`, f.`facs_code`, f.`facs_name`, f.`facs_category`, f.`facs_subcategory`, f.`enable`, f.`ref_area`, f.`facs_model`, f.`create_time`, f.`update_time`,
+            f.`id`, f.`facs_code`, f.`facs_name`, f.`facs_category`, f.`facs_subcategory`, f.`enable`, f.`ref_area`, f.`create_time`, f.`update_time`,
             t.`name` as facs_category_name,
             s.`name` as facs_subcategory_name,
-            a.`area_name` as ref_area_name,
-            m.`model_name` as facs_model_name
+            a.`area_name` as ref_area_name
         FROM adm_ems_facs f
             LEFT JOIN dim_ems_facs_category t ON f.`facs_category` = t.`code`
             LEFT JOIN dim_ems_facs_subcategory s ON f.`facs_subcategory`= s.`code`
             LEFT JOIN adm_area a ON f.`ref_area` = a.`area_code`
-            LEFT JOIN adm_ems_obj_model m ON f.`facs_model` = m.`model_code`
     </sql>
 
     <select id="selectEmsFacsList" parameterType="com.ruoyi.ems.domain.EmsFacs" resultMap="EmsFacsResult">
@@ -49,7 +46,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facsName != null  and facsName != ''"> and f.`facs_name` like concat('%', #{facsName}, '%')</if>
             <if test="facsCategory != null  and facsCategory != ''"> and f.`facs_category` = #{facsCategory}</if>
             <if test="facsSubCategory != null  and facsSubCategory != ''"> and f.`facs_subcategory` = #{facsSubCategory}</if>
-            <if test="facsModel != null  and facsModel != ''"> and f.`facs_model` = #{facsModel}</if>
             <if test="enable != null "> and f.`enable` = #{enable}</if>
             <if test="refArea != null and refArea != '' and refArea != '-1'"> and f.`ref_area` = #{refArea}</if>
         </where>
@@ -95,7 +91,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facsSubCategory != null and facsSubCategory != ''">facs_subcategory,</if>
             <if test="enable != null">enable,</if>
             <if test="refArea != null and refArea != ''">ref_area,</if>
-            <if test="facsModel != null and facsModel != ''">facs_model,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="facsCode != null and facsCode != ''">#{facsCode},</if>
@@ -104,7 +99,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facsSubCategory != null and facsSubCategory != ''">#{facsSubCategory},</if>
             <if test="enable != null">#{enable},</if>
             <if test="refArea != null and refArea != ''">#{refArea},</if>
-            <if test="facsModel != null and facsModel != ''">#{facsModel},</if>
          </trim>
     </insert>
 
@@ -117,7 +111,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facsSubCategory != null and facsSubCategory != ''">facs_subcategory = #{facsSubCategory},</if>
             <if test="enable != null">enable = #{enable},</if>
             <if test="refArea != null and refArea != ''">ref_area = #{refArea},</if>
-            <if test="facsModel != null and facsModel != ''">facs_model=#{facsModel},</if>
         </trim>
         where id = #{id}
     </update>

ems/sql/ems_init_data.sql

@@ -217,23 +217,23 @@ INSERT INTO `adm_area_attr` (`area_code`, `attr_org`, `mgr_org`, `leader`, `phon
 
 
 -- 能源设施初始数据
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('W201', '北区-供电网', 'W', 'W2', 1, '321283124S3001', 'M_W2');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('W202', '南区-供电网', 'W', 'W2', 1, '321283124S3002', 'M_W2');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('E501', '北区-光伏',   'E', 'E5', 1, '321283124S3001', 'M_E501');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('E502', '南区-光伏',   'E', 'E5', 1, '321283124S3002', 'M_E502');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('E503', '主路-光伏',   'E', 'E5', 1, '321283124S3003', 'M_E503');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('C101', '北区-储能',   'C', 'C1', 1, '321283124S3001', 'M_C101');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('C102', '南区-储能',   'C', 'C1', 1, '321283124S3002', 'M_C102');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z101', '北区-室内照明', 'Z', 'Z010', 1, '321283124S3001', null);
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z102', '北区-室外照明', 'Z', 'Z010', 1, '321283124S3001', null);
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z110', '北区-公共设施', 'Z', 'Z040', 1, '321283124S3001', null);
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z120', '北区-空调设施', 'Z', 'Z020', 1, '321283124S3001', null);
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z130', '北区-充电桩', 'Z', 'Z040', 1, '321283124S3001', null);
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z201', '南区-室内照明', 'Z', 'Z010', 1, '321283124S3002', null);
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z202', '南区-室外照明', 'Z', 'Z010', 1, '321283124S3002', null);
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z210', '南区-公共设施', 'Z', 'Z040', 1, '321283124S3002', null);
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z220', '南区-空调设施', 'Z', 'Z020', 1, '321283124S3002', null);
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z230', '南区-充电桩', 'Z', 'Z040', 1, '321283124S3002', null);
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('W201', '北区-供电网', 'W', 'W2', 1, '321283124S3001');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('W202', '南区-供电网', 'W', 'W2', 1, '321283124S3002');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('E501', '北区-光伏',   'E', 'E5', 1, '321283124S3001');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('E502', '南区-光伏',   'E', 'E5', 1, '321283124S3002');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('E503', '主路-光伏',   'E', 'E5', 1, '321283124S3003');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('C101', '北区-储能',   'C', 'C1', 1, '321283124S3001');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('C102', '南区-储能',   'C', 'C1', 1, '321283124S3002');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('Z101', '北区-室内照明', 'Z', 'Z010', 1, '321283124S3001');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('Z102', '北区-室外照明', 'Z', 'Z010', 1, '321283124S3001');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('Z110', '北区-公共设施', 'Z', 'Z040', 1, '321283124S3001');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('Z120', '北区-空调设施', 'Z', 'Z020', 1, '321283124S3001');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('Z130', '北区-充电桩', 'Z', 'Z040', 1, '321283124S3001');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('Z201', '南区-室内照明', 'Z', 'Z010', 1, '321283124S3002');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('Z202', '南区-室外照明', 'Z', 'Z010', 1, '321283124S3002');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('Z210', '南区-公共设施', 'Z', 'Z040', 1, '321283124S3002');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('Z220', '南区-空调设施', 'Z', 'Z020', 1, '321283124S3002');
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`) VALUES ('Z230', '南区-充电桩', 'Z', 'Z040', 1, '321283124S3002');
 
 
 -- 策略初始数据

ems/sql/ems_server.sql

@@ -605,7 +605,6 @@ create table adm_ems_facs  (
   `facs_subcategory`  varchar(32)     not null                     comment '设施子类',
   `enable`            int             default '0'                  comment '启用状态0-停用，1-启用',
   `ref_area`          varchar(32)     not null                     comment '归属区域代码',
-  `facs_model`        varchar(16)     default null                 comment '设施模型',
   `create_time`       datetime        default CURRENT_TIMESTAMP    comment '创建时间',
   `update_time`       datetime        default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP comment '更新时间',
   primary key (`id`),
@@ -1523,4 +1522,4 @@ create table adm_ems_ca_emission_forecast (
   `ca_emission`               double          default null                 comment '单位：kg（千克）',
   primary key (`id`),
   unique key ux_ems_ca_emission_forecast(`area_code`, `date`)
-) engine=innodb auto_increment=1 comment = '碳排放预测表';
+) engine=innodb auto_increment=1 comment = '碳排放预测表';

ems/sql/ems_sys_data.sql

@@ -42,7 +42,7 @@ insert into sys_menu values ('101',  '主路光伏',       '1',   '2',   'hp-vie
 insert into sys_menu values ('111',  '源网',            '2',    '1',  'strategy-pg',        'mgr/powergrid',             '', 1, 0, 'C', '0', '0',   'power-mgr:pg',           'powergrid',      'admin', sysdate(), '', null, '源网协调');
 insert into sys_menu values ('112',  '储能',            '2',    '2',  'strategy-gs',        'mgr/powerstore',            '', 1, 0, 'C', '0', '0',   'power-mgr:gs',           'powerstore',     'admin', sysdate(), '', null, '网储互动');
 insert into sys_menu values ('113',  '负荷',            '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',    '4',  'powerdist',          'mgr/powerdist',             '', 1, 0, 'C', '0', '0',   'power-mgr:dist',         'powerdist',      'admin', sysdate(), '', null, '配电监控');
+insert into sys_menu values ('114',  '配电',            '2',    '4',  'powerdist',          'mgr/powerdist',             '', 1, 0, 'C', '0', '1',   'power-mgr:dist',         'powerdist',      'admin', sysdate(), '', null, '配电监控');
 insert into sys_menu values ('115',  '充电桩',          '2',    '5',  'charging-pile',      'mgr/chargingpile',          '', 1, 0, 'C', '0', '0',   'power-mgr:chargingpile', 'chargingpile',   'admin', sysdate(), '', null, '充电桩');
 insert into sys_menu values ('116',  '计费',            '2',    '6',  'charging',           'mgr/charging',              '', 1, 0, 'C', '0', '0',   'power-mgr:charging',     'charging',       'admin', sysdate(), '', null, '计费');
 insert into sys_menu values ('117',  '策略',            '2',    '7',  'strategy-mgr',       'mgr/strategy',              '', 1, 0, 'C', '0', '0',   'power-mgr:strategy',     'strategy',       'admin', sysdate(), '', null, '管能策略');
@@ -190,21 +190,6 @@ insert into sys_menu values ('17813', '账户解锁', '1781', '4', '#', '', '',
 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 ('16100', '地块新增', '1610', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:area:add',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('16101', '地块修改', '1610', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:area:edit',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('16102', '地块删除', '1610', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:area:remove','#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('16103', '地块导出', '1610', '4', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:area:export','#', 'admin', sysdate(), '', null, '');
--- 服务区建筑配置按钮
-insert into sys_menu values ('16110', '建筑新增', '1611', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:building:add',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('16111', '建筑修改', '1611', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:building:edit',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('16112', '建筑删除', '1611', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:building:remove','#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('16113', '建筑导出', '1611', '4', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:building:export','#', 'admin', sysdate(), '', null, '');
--- 服务区建筑区块配置按钮
-insert into sys_menu values ('16120', '分区新增', '1612', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:zoning:add',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('16121', '分区修改', '1612', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:zoning:edit',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('16122', '分区删除', '1612', '3', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:zoning:remove','#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('16123', '分区导出', '1612', '4', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:zoning:export','#', 'admin', sysdate(), '', null, '');
 -- 能源设施分类配置按钮
 insert into sys_menu values ('16200', '分类新增', '1620', '1', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:facscategory:add',   '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values ('16201', '分类修改', '1620', '2', '#', '', '', 1, 0, 'F', '0', '0', 'basecfg:facscategory:edit',  '#', 'admin', sysdate(), '', null, '');
@@ -556,18 +541,6 @@ 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);