lv.wenbin vor 9 Monaten
Ursprung
Commit
dd10a640c4

+ 2 - 1
ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/ElecUseHMapper.xml

@@ -160,9 +160,10 @@
           adm_ems_facs f
           left join adm_ems_obj_use_h u on f.facs_code = u.obj_code
         <where>
+            <if test="facsSubCategory != null and facsSubCategory != ''">and f.facs_subcategory = #{facsSubCategory}</if>
             and u.obj_type = 1
+            <if test="objCode != null and objCode != ''">and f.facs_code = #{objCode}</if>
             <if test="areaCode != null and areaCode != '' and areaCode != '-1'">and u.area_code = #{areaCode}</if>
-            <if test="facsSubCategory != null and facsSubCategory != ''">and f.facs_subcategory = #{facsSubCategory}</if>
             <if test="startRecTime != null  and startRecTime != '' and endRecTime != null and endRecTime !=''">
                 and u.record_time &gt;= #{startRecTime} and u.record_time &lt;= #{endRecTime}
             </if>

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

@@ -276,7 +276,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         adm_ems_device
         <where>
             <if test="areaCode !=null and areaCode!=''">
-                area_ancestors like CONCAT('%',#{areaCode},'%')
+                area_code = #{areaCode}
             </if>
         </where>
         GROUP BY

+ 15 - 16
ems-cloud/sql/ems_init_data.sql

@@ -176,9 +176,8 @@ INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R103-002', '烤箱',                'Z040', '格兰仕', 'G-111', '2', '综合楼', 'Zoning', 'B-103', '321283124S3001', '321283124S3001,321283124S300101,B-103', null, 'Z110', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R103-003', '搅拌机',              'Z040', '9阳',    'G-111', '2', '综合楼', 'Zoning', 'B-103', '321283124S3001', '321283124S3001,321283124S300101,B-103', null, 'Z110', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R104-001', 'LED节能灯',           'Z010', '欧普',    'G-111', '1', '综合楼', 'Zoning', 'B-104', '321283124S3001', '321283124S3001,321283124S300101,B-104', null, 'Z110', null, 'SYS_BA');
-INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R104-002', '智能插座',            'W2', '公牛',    'G-111', '1', '综合楼', 'Zoning', 'B-104', '321283124S3001', '321283124S3001,321283124S300101,B-104', null, 'Z110', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R104-003', '智慧路灯',            'Z010', '欧普',    'G-111', '1', '广场', 'Zoning', 'B-104', '321283124S3001', '321283124S3001,321283124S300101,B-104', null, 'Z102', null, 'SYS_BA');
-INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R105-001', '电源管理器',          'Z040', null, null, '1', null, 'Zoning', 'B-105', '321283124S3001', '321283124S3001,321283124S300101,B-105', null, 'W201', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R105-001', '智慧屏',              'Z040', null, null, '1', null, 'Zoning', 'B-105', '321283124S3001', '321283124S3001,321283124S300101,B-105', null, 'W201', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R105-002', '充电站',              'Z040', null, null, '1', null, 'Zoning', 'B-105', '321283124S3001', '321283124S3001,321283124S300101,B-105', null, 'Z110', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R105-003', '调光系统',            'Z010', null, null, '1', null, 'Zoning', 'B-105', '321283124S3001', '321283124S3001,321283124S300101,B-105', null, 'Z101', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R106-001', '吊灯',                'Z010', null, null, '1', null, 'Zoning', 'B-106', '321283124S3001', '321283124S3001,321283124S300101,B-106', null, 'Z101', null, 'SYS_BA');
@@ -188,18 +187,18 @@ INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R109-001', '指示灯',              'Z010', null, null, '1', null, 'Zoning', 'B-109', '321283124S3001', '321283124S3001,321283124S300101,B-109', null, 'Z101', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R110-001', '应急照明',            'Z030', null, null, '1', null, 'Zoning', 'B-110', '321283124S3001', '321283124S3001,321283124S300101,B-110', null, 'Z101', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R112-001', '自动感应灯',           'Z010', null, null, '2', null, 'Zoning', 'B-112', '321283124S3001', '321283124S3001,321283124S300101,B-112', null, 'Z101', null, 'SYS_BA');
-INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R112-002', '电路保护装置',         'W2', null, null, '2', null, 'Zoning', 'B-112', '321283124S3001', '321283124S3001,321283124S300101,B-112', null, 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R112-002', '二级配电箱',           'W2', null, null, '2', null, 'Zoning', 'B-112', '321283124S3001', '321283124S3001,321283124S300101,B-112', null, 'Z110', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R114-001', '自动感应灯',           'Z010', null, null, '2', null, 'Zoning', 'B-114', '321283124S3001', '321283124S3001,321283124S300101,B-114', null, 'Z101', null, 'SYS_BA');
-INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R114-002', '电路保护装置',         'W2', null, null, '2', null, 'Zoning', 'B-114', '321283124S3001', '321283124S3001,321283124S300101,B-114', null, 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R114-002', '二级配电箱',           'W2', null, null, '2', null, 'Zoning', 'B-114', '321283124S3001', '321283124S3001,321283124S300101,B-114', null, 'Z110', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R115-001', '工作灯',              'Z010', null, null, '2', null, 'Zoning', 'B-115', '321283124S3001', '321283124S3001,321283124S300101,B-115', null, 'Z101', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R16-001',  '防水灯具',            'Z010', null, null, '2', null, 'Zoning', 'B-116', '321283124S3001', '321283124S3001,321283124S300101,B-116', null, 'Z102', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R117-001', '防水灯具',            'Z010', null, null, '2', null, 'Zoning', 'B-117', '321283124S3001', '321283124S3001,321283124S300101,B-117', null, 'Z102', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R118-001', '灯具',               'Z010', null, null, '2', null, 'Zoning', 'B-118', '321283124S3001', '321283124S3001,321283124S300101,B-118', null, 'Z102', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R119-001', '防水灯具',            'Z010', null, null, '2', null, 'Zoning', 'B-119', '321283124S3001', '321283124S3001,321283124S300101,B-119', null, 'Z102', null, 'SYS_BA');
-INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R120-001', '控制面板',            'W2', null, null, '1', null, 'Zoning', 'B-120', '321283124S3001', '321283124S3001,321283124S300102,B-120', null, 'W201', null, 'SYS_BA');
-INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R121-001', '配电柜',              'W2', null, null, '1', null, 'Zoning', 'B-121', '321283124S3001', '321283124S3001,321283124S300102,B-121', null, 'W201', null, 'SYS_BA');
-INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R122-001', '断路器',              'W2', null, null, '1', null, 'Zoning', 'B-122', '321283124S3001', '321283124S3001,321283124S300102,B-122', null, 'W201', null, 'SYS_BA');
-INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R123-001', '电源插座',            'W2', null, null, '1', null, 'Zoning', 'B-123', '321283124S3001', '321283124S3001,321283124S300103,B-123', null, 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R120-001', '二级配电箱',           'W2', null, null, '1', null, 'Zoning', 'B-120', '321283124S3001', '321283124S3001,321283124S300102,B-120', null, 'W201', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R121-001', '二级配电箱',           'W2', null, null, '1', null, 'Zoning', 'B-121', '321283124S3001', '321283124S3001,321283124S300102,B-121', null, 'W201', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R122-001', '二级配电箱',           'W2', null, null, '1', null, 'Zoning', 'B-122', '321283124S3001', '321283124S3001,321283124S300102,B-122', null, 'W201', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R123-001', '二级配电箱',           'W2', null, null, '1', null, 'Zoning', 'B-123', '321283124S3001', '321283124S3001,321283124S300103,B-123', null, 'Z110', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R124-001', '加热器',              'Z040', null, null, '1', null, 'Zoning', 'B-124', '321283124S3001', '321283124S3001,321283124S300103,B-124', null, 'Z102', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R125-001', '空调',                'Z020', '格力', null, '1', null, 'Zoning', 'B-125', '321283124S3001', '321283124S3001,321283124S300104,B-125', null, 'Z110', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R126-001', '空调',                'Z020', '格力', null, '1', null, 'Zoning', 'B-126', '321283124S3001', '321283124S3001,321283124S300104,B-126', null, 'Z110', null, 'SYS_BA');
@@ -225,9 +224,9 @@ INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R103-102', '烤箱',                'Z040', null, null, '1', null, 'Zoning', 'N-103', '321283124S3002', '321283124S3002,321283124S300201,N-103', null, 'Z110', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R103-103', '搅拌机',              'Z040', null, null, '1', null, 'Zoning', 'N-103', '321283124S3002', '321283124S3002,321283124S300201,N-103', null, 'Z110', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R104-101', 'LED节能灯',           'Z010', null, null, '1', null, 'Zoning', 'N-104', '321283124S3002', '321283124S3002,321283124S300201,N-104', null, 'Z110', null, 'SYS_BA');
-INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R104-102', '智能电表',             'W2', null, null, '1', null, 'Zoning', 'N-104', '321283124S3002', '321283124S3002,321283124S300201,N-104', null, 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R104-102', '智慧屏',              'Z010', null, null, '1', null, 'Zoning', 'N-104', '321283124S3002', '321283124S3002,321283124S300201,N-104', null, 'Z110', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R104-103', '智慧路灯',            'Z010', null, null, '1', null, 'Zoning', 'N-104', '321283124S3002', '321283124S3002,321283124S300201,N-104', null, 'Z102', null, 'SYS_BA');
-INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R105-101', '电源管理器',          'W2', null, null, '1', null, 'Zoning', 'N-105', '321283124S3002', '321283124S3002,321283124S300201,N-105', null, 'W201', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R105-101', '二级配电箱',           'W2', null, null, '1', null, 'Zoning', 'N-105', '321283124S3002', '321283124S3002,321283124S300201,N-105', null, 'W201', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R105-102', '充电站',              'Z040', null, null, '1', null, 'Zoning', 'N-105', '321283124S3002', '321283124S3002,321283124S300201,N-105', null, 'Z110', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R105-103', '调光系统',            'Z010', null, null, '1', null, 'Zoning', 'N-105', '321283124S3002', '321283124S3002,321283124S300201,N-105', null, 'Z101', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R106-101', '吊灯',               'Z010', null, null, '1', null, 'Zoning', 'N-106', '321283124S3002', '321283124S3002,321283124S300201,N-106', null, 'Z101', null, 'SYS_BA');
@@ -237,18 +236,18 @@ INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R109-101', '指示灯',             'Z010', null, null, '1', null, 'Zoning', 'N-109', '321283124S3002', '321283124S3002,321283124S300201,N-109', null,  'Z101', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R110-101', '应急照明',           'Z010', null, null, '1', null, 'Zoning', 'N-110', '321283124S3002', '321283124S3002,321283124S300201,N-110', null, 'Z101', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R112-101', '自动感应灯',         'Z010', null, null, '1', null, 'Zoning', 'N-112', '321283124S3002', '321283124S3002,321283124S300201,N-112', null, 'Z101', null, 'SYS_BA');
-INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R112-102', '电路保护装置',       'W2', null, null, '1', null, 'Zoning', 'N-112', '321283124S3002', '321283124S3002,321283124S300201,N-112', null, 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R112-102', '二级配电箱',         'W2', null, null, '1', null, 'Zoning', 'N-112', '321283124S3002', '321283124S3002,321283124S300201,N-112', null, 'Z110', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R114-101', '自动感应灯',         'Z010', null, null, '1', null, 'Zoning', 'N-114', '321283124S3002', '321283124S3002,321283124S300201,N-114', null, 'Z101', null, 'SYS_BA');
-INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R114-102', '电路保护装置',       'W2', null, null, '1', null, 'Zoning', 'N-114', '321283124S3002', '321283124S3002,321283124S300201,N-114', null, 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R114-102', '二级配电箱',         'W2', null, null, '1', null, 'Zoning', 'N-114', '321283124S3002', '321283124S3002,321283124S300201,N-114', null, 'Z110', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R115-101', '工作灯',            'Z010', null, null, '1', null, 'Zoning', 'N-115', '321283124S3002', '321283124S3002,321283124S300201,N-115', null, 'Z101', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R16-101', '防水灯具',           'Z010', null, null, '1', null, 'Zoning', 'N-116', '321283124S3002', '321283124S3002,321283124S300201,N-115', null, 'Z102', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R117-101', '防水灯具',          'Z010', null, null, '1', null, 'Zoning', 'N-117', '321283124S3002', '321283124S3002,321283124S300201,N-117', null, 'Z102', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R118-101', '防水灯具',          'Z010', null, null, '1', null, 'Zoning', 'N-118', '321283124S3002', '321283124S3002,321283124S300201,N-118', null, 'Z102', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R119-101', '防水灯具',          'Z010', null, null, '1', null, 'Zoning', 'N-119', '321283124S3002', '321283124S3002,321283124S300201,N-119', null, 'Z102', null, 'SYS_BA');
-INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R120-101', '控制面板',          'W2', null, null, '1', null, 'Zoning', 'N-120', '321283124S3002', '321283124S3002,321283124S300202,N-120', null, 'W201', null, 'SYS_BA');
-INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R121-101', '配电柜',            'W2', null, null, '1', null, 'Zoning', 'N-121', '321283124S3002', '321283124S3002,321283124S300202,N-121', null, 'W201', null, 'SYS_BA');
-INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R122-101', '断路器',            'W2', null, null, '1', null, 'Zoning', 'N-122', '321283124S3002', '321283124S3002,321283124S300202,N-122', null, 'W201', null, 'SYS_BA');
-INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R123-101', '电源插座',          'W2', null, null, '1', null, 'Zoning', 'N-123', '321283124S3002', '321283124S3002,321283124S300203,N-123', null, 'Z110', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R120-101', '二级配电箱',         'W2', null, null, '1', null, 'Zoning', 'N-120', '321283124S3002', '321283124S3002,321283124S300202,N-120', null, 'W201', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R121-101', '二级配电箱',         'W2', null, null, '1', null, 'Zoning', 'N-121', '321283124S3002', '321283124S3002,321283124S300202,N-121', null, 'W201', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R122-101', '二级配电箱',         'W2', null, null, '1', null, 'Zoning', 'N-122', '321283124S3002', '321283124S3002,321283124S300202,N-122', null, 'W201', null, 'SYS_BA');
+INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R123-101', '二级配电箱',         'W2', null, null, '1', null, 'Zoning', 'N-123', '321283124S3002', '321283124S3002,321283124S300203,N-123', null, 'Z110', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R124-101', '加热器',            'Z020', null, null, '1', null, 'Zoning', 'N-124', '321283124S3002', '321283124S3002,321283124S300203,N-124', null, 'Z102', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R125-101', '空调',              'Z020', null, null, '1', null, 'Zoning', 'N-125', '321283124S3002', '321283124S3002,321283124S300204,N-125', null, 'Z110', null, 'SYS_BA');
 INSERT INTO `adm_ems_device` (`device_code`, `device_name`, `device_category`, `device_brand`, `device_spec`, `device_status`, `location`, `location_type`, `location_ref`, `area_code`, `area_ancestors`, `device_model`, `ref_facs`, `ps_code`, `subsystem_code`) VALUES ( 'Z010-R126-101', '空调',              'Z020', null, null, '1', null, 'Zoning', 'N-126', '321283124S3002', '321283124S3002,321283124S300204,N-126', null, 'Z110', null, 'SYS_BA');

+ 21 - 20
ems-cloud/sql/ems_server.sql

@@ -471,7 +471,7 @@ create table adm_ems_device  (
   `location`        varchar(200)    default null                 comment '安装位置',
   `location_type`   varchar(32)     default null                 comment '安装位置层级',
   `location_ref`    varchar(64)     default null                 comment '安装位置关联区域',
-  `area_code`       varchar(64)     default null                 comment '归属地块代码',
+  `area_code`       varchar(32)     default null                 comment '归属地块代码',
   `area_ancestors`  varchar(200)    default null                 comment '区域祖级代码',
   `device_model`    varchar(16)     default null                 comment '设备模型',
   `ref_facs`        varchar(64)     default null                 comment '归属设施代码',
@@ -512,7 +512,7 @@ drop table if exists adm_meter_device;
 create table adm_meter_device  (
   `id`              bigint(20)      not null auto_increment      comment '序号',
   `device_code`     varchar(32)     not null                     comment '设备代码',
-  `area_code`       varchar(16)     default null                 comment '区域代码',
+  `area_code`       varchar(32)     default null                 comment '区域代码',
   `meter_cls`       int             not null                     comment '计量类别25-天然气 45-电 70-水',
   `obj_type`        int             not null                     comment '计量对象类型 1-区域 2-设备',
   `obj_sub_type`    int             not null                     comment '计量对象子类型',
@@ -681,13 +681,14 @@ create table adm_ems_flow_rel  (
 drop table if exists adm_op_energy_strategy;
 create table adm_op_energy_strategy  (
   `id`                bigint(20)      not null auto_increment      comment '序号',
+  `area_code`         varchar(32)     not null                     comment '地块代码',
   `strategy_code`     varchar(16)     not null                     comment '策略代码',
   `strategy_name`     varchar(32)     not null                     comment '策略名称',
   `strategy_desc`     varchar(128)    default null                 comment '策略描述',
-  `strategy_type`     int             not null                     comment '1:源网协调,2:源荷互动',
-  `exec_mode`         int             not null                     comment '0:固定策略 1:规则引擎 2:定时执行(cron)99:手动执行',
+  `strategy_type`     int             not null                     comment '1:源网协调,2:源荷互动, 3:网储互动,4:其他',
+  `strategy_state`    int             not null                     comment '0:关闭 1:启动',
+  `exec_mode`         int             not null                     comment '1:定时执行(cron)99:手动执行',
   `exec_rule`         varchar(64)     default null                 comment '执行规则',
-  `allow_modify`      boolean         not null                     comment '允许修改标记',
   `create_time`       datetime        default CURRENT_TIMESTAMP    comment '创建时间',
   `update_time`       datetime        default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP comment '更新时间',
   primary key (`id`),
@@ -879,7 +880,7 @@ drop table if exists adm_meter_reading;
 create table adm_meter_reading (
   `id`               bigint(20)      not null auto_increment      comment '序号',
   `device_code`      varchar(64)     not null                     comment '计量设备code',
-  `area_code`        varchar(16)     not null                     comment '服务区代码',
+  `area_code`        varchar(32)     not null                     comment '服务区代码',
   `year`             varchar(4)      not null                     comment '年份yyyy',
   `meter_month`      varchar(6)      not null                     comment '计量月yyyyMM',
   `last_reading`     int             default null                 comment '上次示数',
@@ -1001,7 +1002,7 @@ create table adm_elecprice_strategy_hour (
 drop table if exists adm_co_charging_config;
 create table adm_co_charging_config (
   `id`                    bigint(20)      not null auto_increment      comment '序号',
-  `area_code`             varchar(16)     not null                     comment '服务区代码',
+  `area_code`             varchar(32)     not null                     comment '服务区代码',
   `elec_unit_price`       double          not null                     comment '电计量单价 1度',
   `elec_gt_compute_type`  int             not null                     comment '电公摊计算类型',
   `elec_compute_desc`     varchar(200)    default null                 comment '电费计算说明',
@@ -1030,7 +1031,7 @@ create table adm_co_charging_config_rel (
 drop table if exists adm_ems_pg_supply_h;
 create table adm_ems_pg_supply_h (
   `id`                 bigint(20)      not null auto_increment      comment '序号',
-  `area_code`          varchar(16)     not null                     comment '园区代码',
+  `area_code`          varchar(32)     not null                     comment '园区代码',
   `facs_code`          varchar(16)     not null                     comment '设施代码',
   `record_time`        timestamp       not null                     comment '记录时间',
   `date`               date            not null                     comment '日期 yyyy-MM-dd',
@@ -1053,7 +1054,7 @@ create table adm_ems_pg_supply_h (
 drop table if exists adm_ems_pv_supply_h;
 create table adm_ems_pv_supply_h (
   `id`                 bigint(20)      not null auto_increment      comment '序号',
-  `area_code`          varchar(16)     not null                     comment '园区代码',
+  `area_code`          varchar(32)     not null                     comment '园区代码',
   `facs_code`          varchar(16)     not null                     comment '设施代码',
   `record_time`        timestamp       not null                     comment '记录时间',
   `date`               date            not null                     comment '日期 yyyy-MM-dd',
@@ -1077,7 +1078,7 @@ create table adm_ems_pv_supply_h (
 drop table if exists adm_ems_obj_use_h;
 create table adm_ems_obj_use_h (
   `id`                 bigint(20)      not null auto_increment      comment '序号',
-  `area_code`          varchar(16)     not null                     comment '园区代码',
+  `area_code`          varchar(32)     not null                     comment '园区代码',
   `obj_type`           int             not null                     comment '对象类型',
   `obj_code`           varchar(64)     not null                     comment '对象代码',
   `record_time`        timestamp       not null                     comment '记录时间',
@@ -1098,7 +1099,7 @@ create table adm_ems_obj_use_h (
 drop table if exists adm_ems_elec_store_h;
 create table adm_ems_elec_store_h (
   `id`                        bigint(20)      not null auto_increment      comment '序号',
-  `area_code`                 varchar(16)     not null                     comment '园区代码',
+  `area_code`                 varchar(32)     not null                     comment '园区代码',
   `facs_code`                 varchar(16)     not null                     comment '设施代码',
   `record_time`               timestamp       not null                     comment '记录时间',
   `date`                      date            not null                     comment '日期 yyyy-MM-dd',
@@ -1119,7 +1120,7 @@ create table adm_ems_elec_store_h (
 drop table if exists adm_ems_elec_meter_d;
 create table adm_ems_elec_meter_d (
   `id`                        bigint(20)      not null auto_increment      comment '序号',
-  `area_code`                 varchar(16)     not null                     comment '园区代码',
+  `area_code`                 varchar(32)     not null                     comment '园区代码',
   `date`                      date            not null                     comment '日期 yyyy-MM-dd',
   `total_use_quantity`        double          default null                 comment '总用电量 单位:kW-h(千瓦时)',
   `pg_quantity`               double          default null                 comment '电网供应电量 单位:kW-h(千瓦时)',
@@ -1140,7 +1141,7 @@ create table adm_ems_elec_meter_d (
 drop table if exists adm_ems_ca_meter_d;
 create table adm_ems_ca_meter_d (
   `id`                        bigint(20)      not null auto_increment      comment '序号',
-  `area_code`                 varchar(16)     not null                     comment '园区代码',
+  `area_code`                 varchar(32)     not null                     comment '园区代码',
   `date`                      date            not null                     comment '日期 yyyy-MM-dd',
   `ca_emission_quantity`      double          default null                 comment '碳排放量 单位:单位:kg(千克)',
   `ca_sink_quantity`          double          default null                 comment '碳汇量 单位:单位:kg(千克)',
@@ -1172,7 +1173,7 @@ create table adm_ems_index_range (
 drop table if exists adm_ems_elec_pg_index;
 create table adm_ems_elec_pg_index (
   `id`                        bigint(20)      not null auto_increment      comment '序号',
-  `area_code`                 varchar(16)     not null                     comment '园区代码',
+  `area_code`                 varchar(32)     not null                     comment '园区代码',
   `facs_code`                 varchar(16)     not null                     comment '设施代码',
   `date`                      date            not null                     comment '日期 yyyy-MM-dd',
   `time`                      datetime        not null                     comment '时间 yyyy-MM-dd HH:mm:ss',
@@ -1190,7 +1191,7 @@ create table adm_ems_elec_pg_index (
 drop table if exists adm_ems_elec_pv_index;
 create table adm_ems_elec_pv_index (
   `id`                        bigint(20)      not null auto_increment      comment '序号',
-  `area_code`                 varchar(16)     not null                     comment '园区代码',
+  `area_code`                 varchar(32)     not null                     comment '园区代码',
   `facs_code`                 varchar(16)     not null                     comment '设施代码',
   `date`                      date            not null                     comment '日期 yyyy-MM-dd',
   `time`                      datetime        not null                     comment '时间 yyyy-MM-dd HH:mm:ss',
@@ -1208,7 +1209,7 @@ create table adm_ems_elec_pv_index (
 drop table if exists adm_ems_elec_store_index;
 create table adm_ems_elec_store_index (
   `id`                        bigint(20)      not null auto_increment      comment '序号',
-  `area_code`                 varchar(16)     not null                     comment '园区代码',
+  `area_code`                 varchar(32)     not null                     comment '园区代码',
   `facs_code`                 varchar(16)     not null                     comment '设施代码',
   `date`                      date            not null                     comment '日期 yyyy-MM-dd',
   `time`                      datetime        not null                     comment '时间 yyyy-MM-dd HH:mm:ss',
@@ -1228,7 +1229,7 @@ create table adm_ems_elec_store_index (
 drop table if exists adm_ems_elec_load_index;
 create table adm_ems_elec_load_index (
   `id`                        bigint(20)      not null auto_increment      comment '序号',
-  `area_code`                 varchar(16)     not null                     comment '园区代码',
+  `area_code`                 varchar(32)     not null                     comment '园区代码',
   `obj_type`                  int             not null                     comment '对象类型',
   `obj_code`                  varchar(64)     not null                     comment '对象编码',
   `record_time`               timestamp       not null                     comment '记录时间',
@@ -1262,7 +1263,7 @@ create table adm_ems_elec_load_index (
 drop table if exists adm_ems_elec_prod_forecast;
 create table adm_ems_elec_prod_forecast (
   `id`                        bigint(20)      not null auto_increment      comment '序号',
-  `area_code`                 varchar(16)     not null                     comment '园区代码',
+  `area_code`                 varchar(32)     not null                     comment '园区代码',
   `facs_code`                 varchar(16)     not null                     comment '设施代码',
   `date`                      date            not null                     comment '日期 yyyy-MM-dd',
   `elec_prod_quantity`        double          not null                     comment '发电量 单位:kW-h(千瓦·时)',
@@ -1278,7 +1279,7 @@ create table adm_ems_elec_prod_forecast (
 drop table if exists adm_ems_elec_expend_forecast;
 create table adm_ems_elec_expend_forecast (
   `id`                        bigint(20)      not null auto_increment      comment '序号',
-  `area_code`                 varchar(16)     not null                     comment '园区代码',
+  `area_code`                 varchar(32)     not null                     comment '园区代码',
   `obj_code`                  varchar(32)     not null                     comment '对象代码',
   `obj_type`                  int             not null                     comment '1-建筑 2-设施 3-设备',
   `date`                      date            not null                     comment '日期 yyyy-MM-dd',
@@ -1294,7 +1295,7 @@ create table adm_ems_elec_expend_forecast (
 drop table if exists adm_ems_ca_emission_forecast;
 create table adm_ems_ca_emission_forecast (
   `id`                        bigint(20)      not null auto_increment      comment '序号',
-  `area_code`                 varchar(16)     not null                     comment '园区代码',
+  `area_code`                 varchar(32)     not null                     comment '园区代码',
   `date`                      date            not null                     comment '日期 yyyy-MM-dd',
   `ca_emission`               double          default null                 comment '单位:kg(千克)',
   primary key (`id`),

+ 1 - 1
ems-cloud/sql/ems_sys.sql

@@ -177,7 +177,7 @@ insert into sys_menu values ('113',  '储能',            '2',    '2',  'strateg
 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',  'powerdist',          'mgr/powerdist',             '', 1, 0, 'C', '0', '0',   'power-mgr:dist',         'powerdist',      'admin', sysdate(), '', null, '配电监控');
 insert into sys_menu values ('116',  '计费',            '2',    '5',  'charging',           'mgr/charging',              '', 1, 0, 'C', '0', '0',   'power-mgr:charging',     'charging',       'admin', sysdate(), '', null, '配电监控');
-insert into sys_menu values ('117',  '调度',            '2',    '6',  'strategy-mgr',       'mgr/strategy',              '', 1, 0, 'C', '0', '0',   'power-mgr:strategy',     'strategy',       'admin', sysdate(), '', null, '管能策略');
+insert into sys_menu values ('117',  '策略',            '2',    '6',  'strategy-mgr',       'mgr/strategy',              '', 1, 0, 'C', '0', '0',   'power-mgr:strategy',     'strategy',       '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, '储能分析');