Skip to content

A
amos-boot-biz
Commit de4a43ab authored by chenhao's avatar chenhao
Browse files
Options

Merge branch 'chenhao' into developer

parents 486062e5 9fa4a660
Show whitespace changes
Inline Side-by-side
Showing with 404 additions and 112 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java
View file @ de4a43ab
...@@ -218,8 +218,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe ...@@ -218,8 +218,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
} }
// 3.消防队伍-监控大队 // 3.消防队伍-监控大队
List<FireBrigadeResourceDto> monitorFireBrigadeList = fireTeamService.listMonitorFireBrigade(FireBrigadeTypeEnum.监控大队.getCode()); //List<FireBrigadeResourceDto> monitorFireBrigadeList = fireTeamService.listMonitorFireBrigade(FireBrigadeTypeEnum.监控大队.getCode());
//List<FireBrigadeResourceDto> monitorFireBrigadeList = fireTeamService.listMonitorFireBrigade(); List<FireBrigadeResourceDto> monitorFireBrigadeList = fireTeamService.listMonitorFireBrigade();
/*bug 2403 队伍未显示图片 2021-09-23 陈召开始 */ /*bug 2403 队伍未显示图片 2021-09-23 陈召开始 */
for (FireBrigadeResourceDto fireBrigadeResourceDto : monitorFireBrigadeList) { for (FireBrigadeResourceDto fireBrigadeResourceDto : monitorFireBrigadeList) {
if (fireBrigadeResourceDto.getPic() != null) { if (fireBrigadeResourceDto.getPic() != null) {
......
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ de4a43ab
...@@ -7,6 +7,187 @@ ...@@ -7,6 +7,187 @@
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
<changeSet author="tb" id="2021-08-27-tb-1">
<preConditions onFail="MARK_RAN">
<not>
<tableExists tableName="jc_rally_point"/>
</not>
</preConditions>
<comment>create table jc_rally_point</comment>
<sql>
CREATE TABLE `jc_rally_point` (
`sequence_nbr` bigint(30) NOT NULL COMMENT '主键',
`name` varchar(100) DEFAULT NULL COMMENT '名称',
`address` varchar(255) DEFAULT NULL COMMENT '地址',
`alert_id` bigint(30) NOT NULL COMMENT '警情id',
`longitude` varchar(20) NOT NULL COMMENT '经度',
`latitude` varchar(20) NOT NULL COMMENT '纬度',
`rec_user_id` bigint(30) NOT NULL COMMENT '更新用户id',
`rec_user_name` varchar(30) NOT NULL COMMENT '更新用户名称',
`rec_date` datetime NOT NULL COMMENT '更新日期',
`is_delete` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除(1:删除,0:未删除)',
PRIMARY KEY (`sequence_nbr`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='集结点';
</sql>
</changeSet>
<changeSet author="tb" id="2021-08-27-tb-2">
<preConditions onFail="MARK_RAN">
<not>
<tableExists tableName="jc_alert_location_log"/>
</not>
</preConditions>
<comment>create table jc_alert_location_log</comment>
<sql>
CREATE TABLE `jc_alert_location_log` (
`sequence_nbr` bigint(30) NOT NULL COMMENT '主键',
`alert_id` bigint(30) NOT NULL COMMENT '警情id',
`longitude` varchar(30) NOT NULL COMMENT '经度',
`latitude` varchar(30) NOT NULL COMMENT '纬度',
`rec_user_id` bigint(30) NOT NULL COMMENT '更新人员id',
`rec_user_name` varchar(50) NOT NULL COMMENT '更新人员名称',
`rec_date` datetime NOT NULL COMMENT '更新时间',
`is_delete` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除(1: 已删除，0:未删除)',
PRIMARY KEY (`sequence_nbr`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
</sql>
</changeSet>
<changeSet author="chenhao" id="2021-08-31-chenhao-1">
<comment>modify table cb_firefighters_thought add one columns</comment>
<sql>
ALTER TABLE `cb_firefighters_thought` modify talking_time datetime COMMENT '谈话时间';
</sql>
</changeSet>
<changeSet author="litengwei" id="2021-09-01-litengwei-1">
<preConditions onFail="MARK_RAN">
<tableExists tableName="cb_data_dictionary" />
<!-- <sqlCheck expectedResult="0">select count(*) from cb_data_dictionary where sequence_nbr between 1152 and-->
<!-- 1166</sqlCheck>-->
<not>
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
</not>
</preConditions>
<comment>add data cb_data_dictionary</comment>
<sql>
INSERT INTO `cb_data_dictionary` VALUES(1152, '1152', '大面积航班延误保障', 'QTZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
INSERT INTO `cb_data_dictionary` VALUES(1153, '1153', '二类运行保障', 'QTZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
INSERT INTO `cb_data_dictionary` VALUES(1154, '1154', '施工加油保障', 'QTZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
INSERT INTO `cb_data_dictionary` VALUES(1155, '1155', '航空器失事', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
INSERT INTO `cb_data_dictionary` VALUES(1156, '1156', '空中遇险', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
INSERT INTO `cb_data_dictionary` VALUES(1157, '1157', '跑道事件', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
INSERT INTO `cb_data_dictionary` VALUES(1158, '1158', '地面遇险', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
INSERT INTO `cb_data_dictionary` VALUES(1159, '1159', '劫机', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
INSERT INTO `cb_data_dictionary` VALUES(1160, '1160', '发现爆炸物', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
INSERT INTO `cb_data_dictionary` VALUES(1161, '1161', '爆炸物威胁', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
INSERT INTO `cb_data_dictionary` VALUES(1162, '1162', '其他非法干扰', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
INSERT INTO `cb_data_dictionary` VALUES(1163, '1163', '残损航空器搬移', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
INSERT INTO `cb_data_dictionary` VALUES(1164, '1164', '紧急出动', 'XYJB', NULL, NULL, NULL, NULL, NULL, 0, 1);
INSERT INTO `cb_data_dictionary` VALUES(1165, '1165', '紧急集结', 'XYJB', NULL, NULL, NULL, NULL, NULL, 0, 1);
INSERT INTO `cb_data_dictionary` VALUES(1166, '1166', '原地待命', 'XYJB', NULL, NULL, NULL, NULL, NULL, 0, 1);
</sql>
</changeSet>
<changeSet author="litengwei" id="2021-09-01-litengwei-2">
<preConditions onFail="MARK_RAN">
<tableExists tableName="jc_alert_form" />
<not>
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="jc_alert_form"/>
</not>
</preConditions>
<comment>add data jc_alert_form</comment>
<sql>
INSERT INTO `jc_alert_form` VALUES(127, '230', 'HKQJYZL', '航空器救援子类', 'aircraftRescueSub', 'radio', NULL, NULL, NULL, 0, 1, 1, NULL);
INSERT INTO `jc_alert_form` VALUES(128, '242', 'QTZL', '子类', 'sub', 'radio', NULL, NULL, NULL, 0, 1, 1, NULL);
INSERT INTO `jc_alert_form` VALUES(129, '230', NULL, '机位', 'mechinePosition', 'select', NULL, NULL, NULL, 0, 0, 5, NULL);
INSERT INTO `jc_alert_form` VALUES(130, '230', NULL, '响应级别', 'responseLevel', 'select', NULL, NULL, NULL, 0, 0, 8, NULL);
</sql>
</changeSet>
<changeSet author="litengwei" id="2021-09-01-litengwei-3">
<preConditions onFail="MARK_RAN">
<tableExists tableName="jc_alert_form" />
</preConditions>
<comment>update data jc_alert_form</comment>
<sql>
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='航班号', field_code='flightNumber', field_type='selectDelay', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=2, url='aircraft/getAircraftNum' WHERE sequence_nbr=103;
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='航空器型号', field_code='aircraftModel', field_type='input', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=3, url='aircraft/getAircraft' WHERE sequence_nbr=104;
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='落地时间', field_code='landingTime', field_type='datetime', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=4, url=NULL WHERE sequence_nbr=105;
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='航空器故障部位', field_code='damageLocation', field_type='selectDelay', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=7, url='data-dictionary/gwmcDataDictionary/FJSSWZ' WHERE sequence_nbr=106;
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='燃油量(吨)', field_code='fuelQuantity', field_type='inputNumber', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=10, url=NULL WHERE sequence_nbr=107;
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='载客量', field_code='passengerCapacity', field_type='inputNumber', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=9, url=NULL WHERE sequence_nbr=108;
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code='PJPD', field_name='迫降跑道', field_code='forcedLandingTrack ', field_type='select', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=6, url='' WHERE sequence_nbr=109;
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='灾害事故情况', field_code='accidentSituation', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=1, sort_num=11, url=NULL WHERE sequence_nbr=110;
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='发展态势', field_code='developmentTrend', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=1, sort_num=12, url=NULL WHERE sequence_nbr=111;
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='备注', field_code='remarks', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=1, sort_num=13, url=NULL WHERE sequence_nbr=112;
UPDATE `jc_alert_form` SET alert_type_code='242', field_value_code=NULL, field_name='保障类别', field_code='securityCategory', field_type='selectDelay', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=2, url='data-dictionary/gwmcDataDictionary/YGCJ' WHERE sequence_nbr=124;
UPDATE `jc_alert_form` SET alert_type_code='242', field_value_code=NULL, field_name='事件概述', field_code='eventOverview', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=1, sort_num=3, url=NULL WHERE sequence_nbr=125;
UPDATE `jc_alert_form` SET alert_type_code='242', field_value_code=NULL, field_name='备注', field_code='remarks', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=1, sort_num=4, url=NULL WHERE sequence_nbr=126;
</sql>
</changeSet>
<changeSet author="chenhao" id="2021-09-02-chenhao-1">
<comment>update data cb_data_dictionary</comment>
<sql>
update cb_data_dictionary set name ='无固定期合同' where name ='无固定器合同' and type='HTLB';
</sql>
</changeSet>
<changeSet author="chenhao" id="2021-09-02-chenhao-2">
<comment>update data jc_alert_form</comment>
<sql>
update jc_alert_form set field_name ='燃油量(吨)' where alert_type_code ='230' and field_code='fuelQuantity';
update jc_alert_form set field_name ='载客量(人)' where alert_type_code ='230' and field_code='passengerCapacity';
</sql>
</changeSet>
<changeSet author="chenhao" id="2021-09-02-chenhao-3">
<comment>update data cb_fire_team</comment>
<sql>
ALTER TABLE `cb_fire_team` modify longitude double(18,14) COMMENT '经度';
ALTER TABLE `cb_fire_team` modify latitude double(18,14) COMMENT '纬度';
</sql>
</changeSet>
<changeSet author="chenhao" id="2021-09-02-chenhao-4">
<comment>update data cb_fire_station</comment>
<sql>
ALTER TABLE `cb_fire_station` modify longitude double(18,14) COMMENT '经度';
ALTER TABLE `cb_fire_station` modify latitude double(18,14) COMMENT '纬度';
</sql>
</changeSet>
<changeSet author="chenhao" id="2021-09-02-chenhao-5">
<comment>update data cb_linkage_unit</comment>
<sql>
ALTER TABLE `cb_linkage_unit` modify longitude double(18,14) COMMENT '经度';
ALTER TABLE `cb_linkage_unit` modify latitude double(18,14) COMMENT '纬度';
</sql>
</changeSet>
<changeSet author="chenhao" id="2021-09-02-chenhao-6">
<comment>update data cb_water_resource</comment>
<sql>
ALTER TABLE `cb_water_resource` modify longitude double(18,14) COMMENT '经度';
ALTER TABLE `cb_water_resource` modify latitude double(18,14) COMMENT '纬度';
</sql>
</changeSet>
<changeSet author="kongfm" id="2021-09-03-kongfm-1">
<preConditions onFail="MARK_RAN">
<tableExists tableName="cb_firefighters"/>
</preConditions>
<comment>modify table cb_firefighters add several columns</comment>
<sql>
ALTER TABLE `cb_firefighters` add native_place_value varchar(255) COMMENT '户籍所在地的值';
</sql>
</changeSet>
<changeSet author="chenhao" id="2021-09-06-chenhao-1">
<preConditions onFail="MARK_RAN">
<tableExists tableName="cb_data_dictionary" />
<not>
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
</not>
</preConditions>
<comment>insert data cb_data_dictionary</comment>
<sql>
INSERT INTO cb_data_dictionary (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1168', '1168', '环状管网', 'XFJSGW', NULL, NULL, NULL, NULL, NULL, '\0', '1');
INSERT INTO cb_data_dictionary (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1169', '1169', '环支状管网', 'XFJSGW', NULL, NULL, NULL, NULL, NULL, '\0', '1');
INSERT INTO cb_data_dictionary (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1170', '1170', '可用', 'SYZT', NULL, NULL, NULL, NULL, NULL, '\0', '1');
INSERT INTO cb_data_dictionary (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1171', '1171', '不可用', 'SYZT', NULL, NULL, NULL, NULL, NULL, '\0', '1');
</sql>
</changeSet>
<changeSet author="guowubin" id="1629430730658-1"> <changeSet author="guowubin" id="1629430730658-1">
<comment>alter table jc_controller</comment> <comment>alter table jc_controller</comment>
<sql> <sql>
...@@ -30,18 +211,26 @@ ...@@ -30,18 +211,26 @@
<changeSet author="guowubin" id="1629430730658-2"> <changeSet author="guowubin" id="1629430730658-2">
<preConditions onFail="MARK_RAN"> <preConditions onFail="MARK_RAN">
<tableExists tableName="jc_controller" /> <tableExists tableName="jc_controller"/>
</preConditions> </preConditions>
<comment>add data table jc_controller</comment> <comment>add data table jc_controller</comment>
<sql> <sql>
INSERT INTO `jc_controller` VALUES (1245230062463119361, '2', NULL, NULL, '南站广播', '2', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0'); INSERT INTO `jc_controller` VALUES (1245230062463119361, '2', NULL, NULL, '南站广播', '2', '1', '2021-08-20
INSERT INTO `jc_controller` VALUES (1308575795966443521, '1', NULL, NULL, '主站警铃', '1', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0'); 09:46:02', 3111584, 'admin_jcs', '0');
INSERT INTO `jc_controller` VALUES (1428303671921250305, '3', NULL, NULL, '北站广播', '2', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0'); INSERT INTO `jc_controller` VALUES (1308575795966443521, '1', NULL, NULL, '主站警铃', '1', '1', '2021-08-20
INSERT INTO `jc_controller` VALUES (1428306948020801538, '3', NULL, NULL, '北站警铃', '1', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0'); 09:46:02', 3111584, 'admin_jcs', '0');
INSERT INTO `jc_controller` VALUES (1428323093599784962, '2', '172.19.111.163', 502, '南站电门控制', '3', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0'); INSERT INTO `jc_controller` VALUES (1428303671921250305, '3', NULL, NULL, '北站广播', '2', '1', '2021-08-20
INSERT INTO `jc_controller` VALUES (1428325245344845826, '2', NULL, NULL, '南站警铃', '1', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0'); 09:46:02', 3111584, 'admin_jcs', '0');
INSERT INTO `jc_controller` VALUES (1428325285853433857, '3', '172.19.111.153', 502, '北站电门控制', '3', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0'); INSERT INTO `jc_controller` VALUES (1428306948020801538, '3', NULL, NULL, '北站警铃', '1', '1', '2021-08-20
INSERT INTO `jc_controller` VALUES (1428325336898113537, '1', NULL, NULL, '主站广播', '2', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0'); 09:46:02', 3111584, 'admin_jcs', '0');
INSERT INTO `jc_controller` VALUES (1428323093599784962, '2', '172.19.111.163', 502, '南站电门控制', '3', '1',
'2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
INSERT INTO `jc_controller` VALUES (1428325245344845826, '2', NULL, NULL, '南站警铃', '1', '1', '2021-08-20
09:46:02', 3111584, 'admin_jcs', '0');
INSERT INTO `jc_controller` VALUES (1428325285853433857, '3', '172.19.111.153', 502, '北站电门控制', '3', '1',
'2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
INSERT INTO `jc_controller` VALUES (1428325336898113537, '1', NULL, NULL, '主站广播', '2', '1', '2021-08-20
09:46:02', 3111584, 'admin_jcs', '0');
</sql> </sql>
</changeSet> </changeSet>
...@@ -66,21 +255,32 @@ ...@@ -66,21 +255,32 @@
<changeSet author="guowubin" id="1629430730658-4"> <changeSet author="guowubin" id="1629430730658-4">
<preConditions onFail="MARK_RAN"> <preConditions onFail="MARK_RAN">
<tableExists tableName="jc_controller_equip" /> <tableExists tableName="jc_controller_equip"/>
</preConditions> </preConditions>
<comment>add data table jc_controller_equip</comment> <comment>add data table jc_controller_equip</comment>
<sql> <sql>
INSERT INTO `jc_controller_equip` VALUES (1192346783527378946, 1428325245344845826, '206', '警铃终端', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0'); INSERT INTO `jc_controller_equip` VALUES (1192346783527378946, 1428325245344845826, '206', '警铃终端', '1',
INSERT INTO `jc_controller_equip` VALUES (1245230052539396097, 1245230062463119361, '202', '广播终端', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0'); '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
INSERT INTO `jc_controller_equip` VALUES (1272442241152421890, 1428325285853433857, '100', '1号门', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0'); INSERT INTO `jc_controller_equip` VALUES (1245230052539396097, 1245230062463119361, '202', '广播终端', '1',
INSERT INTO `jc_controller_equip` VALUES (1274947632054542338, 1428325285853433857, '101', '2号门', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0'); '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
INSERT INTO `jc_controller_equip` VALUES (1302793235940249602, 1428306948020801538, '205', '警铃终端', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0'); INSERT INTO `jc_controller_equip` VALUES (1272442241152421890, 1428325285853433857, '100', '1号门', '1',
INSERT INTO `jc_controller_equip` VALUES (1315854437968797697, 1428323093599784962, '100', '4个电门', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0'); '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
INSERT INTO `jc_controller_equip` VALUES (1320637765980856322, 1428325285853433857, '102', '3号门', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0'); INSERT INTO `jc_controller_equip` VALUES (1274947632054542338, 1428325285853433857, '101', '2号门', '1',
INSERT INTO `jc_controller_equip` VALUES (1332610043605946369, 1308575795966443521, '204', '警铃终端', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0'); '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
INSERT INTO `jc_controller_equip` VALUES (1343765647514955778, 1428325336898113537, '201', '广播终端', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0'); INSERT INTO `jc_controller_equip` VALUES (1302793235940249602, 1428306948020801538, '205', '警铃终端', '1',
INSERT INTO `jc_controller_equip` VALUES (1397143491787747330, 1428303671921250305, '203', '广播终端', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0'); '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
INSERT INTO `jc_controller_equip` VALUES (1397145718640209921, 1428325285853433857, '103', '4号门', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0'); INSERT INTO `jc_controller_equip` VALUES (1315854437968797697, 1428323093599784962, '100', '4个电门', '1',
'2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
INSERT INTO `jc_controller_equip` VALUES (1320637765980856322, 1428325285853433857, '102', '3号门', '1',
'2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
INSERT INTO `jc_controller_equip` VALUES (1332610043605946369, 1308575795966443521, '204', '警铃终端', '1',
'2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
INSERT INTO `jc_controller_equip` VALUES (1343765647514955778, 1428325336898113537, '201', '广播终端', '1',
'2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
INSERT INTO `jc_controller_equip` VALUES (1397143491787747330, 1428303671921250305, '203', '广播终端', '1',
'2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
INSERT INTO `jc_controller_equip` VALUES (1397145718640209921, 1428325285853433857, '103', '4号门', '1',
'2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="tb" id="2021-08-23-tb-1"> <changeSet author="tb" id="2021-08-23-tb-1">
...@@ -163,28 +363,31 @@ ...@@ -163,28 +363,31 @@
</changeSet> </changeSet>
<changeSet author="litengwei" id="2021-09-01-litengwei-1"> <changeSet author="litengwei" id="2021-09-01-litengwei-1">
<preConditions onFail="MARK_RAN"> <preConditions onFail="MARK_RAN">
<tableExists tableName="cb_data_dictionary"/>
<tableExists tableName="cb_data_dictionary" />
<!-- <sqlCheck expectedResult="0">select count(*) from cb_data_dictionary where sequence_nbr between 1152 and-->
<!-- 1166</sqlCheck>-->
<not>
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
</not>
</preConditions> </preConditions>
<comment>add data cb_data_dictionary</comment> <comment>add data cb_data_dictionary</comment>
<sql> <sql>
INSERT INTO `cb_data_dictionary` VALUES(1152, '1152', '大面积航班延误保障', 'QTZL', NULL, NULL, NULL, NULL, NULL, 0, 1); INSERT INTO `cb_data_dictionary` VALUES(1152, '1152', '大面积航班延误保障', 'QTZL', NULL, NULL, NULL, NULL, NULL, 0,
1);
INSERT INTO `cb_data_dictionary` VALUES(1153, '1153', '二类运行保障', 'QTZL', NULL, NULL, NULL, NULL, NULL, 0, 1); INSERT INTO `cb_data_dictionary` VALUES(1153, '1153', '二类运行保障', 'QTZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
INSERT INTO `cb_data_dictionary` VALUES(1154, '1154', '施工加油保障', 'QTZL', NULL, NULL, NULL, NULL, NULL, 0, 1); INSERT INTO `cb_data_dictionary` VALUES(1154, '1154', '施工加油保障', 'QTZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
INSERT INTO `cb_data_dictionary` VALUES(1155, '1155', '航空器失事', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1); INSERT INTO `cb_data_dictionary` VALUES(1155, '1155', '航空器失事', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0,
INSERT INTO `cb_data_dictionary` VALUES(1156, '1156', '空中遇险', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1); 1);
INSERT INTO `cb_data_dictionary` VALUES(1157, '1157', '跑道事件', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1); INSERT INTO `cb_data_dictionary` VALUES(1156, '1156', '空中遇险', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0,
INSERT INTO `cb_data_dictionary` VALUES(1158, '1158', '地面遇险', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1); 1);
INSERT INTO `cb_data_dictionary` VALUES(1157, '1157', '跑道事件', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0,
1);
INSERT INTO `cb_data_dictionary` VALUES(1158, '1158', '地面遇险', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0,
1);
INSERT INTO `cb_data_dictionary` VALUES(1159, '1159', '劫机', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1); INSERT INTO `cb_data_dictionary` VALUES(1159, '1159', '劫机', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
INSERT INTO `cb_data_dictionary` VALUES(1160, '1160', '发现爆炸物', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1); INSERT INTO `cb_data_dictionary` VALUES(1160, '1160', '发现爆炸物', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0,
INSERT INTO `cb_data_dictionary` VALUES(1161, '1161', '爆炸物威胁', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1); 1);
INSERT INTO `cb_data_dictionary` VALUES(1162, '1162', '其他非法干扰', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1); INSERT INTO `cb_data_dictionary` VALUES(1161, '1161', '爆炸物威胁', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0,
INSERT INTO `cb_data_dictionary` VALUES(1163, '1163', '残损航空器搬移', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1); 1);
INSERT INTO `cb_data_dictionary` VALUES(1162, '1162', '其他非法干扰', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0,
1);
INSERT INTO `cb_data_dictionary` VALUES(1163, '1163', '残损航空器搬移', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0,
1);
INSERT INTO `cb_data_dictionary` VALUES(1164, '1164', '紧急出动', 'XYJB', NULL, NULL, NULL, NULL, NULL, 0, 1); INSERT INTO `cb_data_dictionary` VALUES(1164, '1164', '紧急出动', 'XYJB', NULL, NULL, NULL, NULL, NULL, 0, 1);
INSERT INTO `cb_data_dictionary` VALUES(1165, '1165', '紧急集结', 'XYJB', NULL, NULL, NULL, NULL, NULL, 0, 1); INSERT INTO `cb_data_dictionary` VALUES(1165, '1165', '紧急集结', 'XYJB', NULL, NULL, NULL, NULL, NULL, 0, 1);
INSERT INTO `cb_data_dictionary` VALUES(1166, '1166', '原地待命', 'XYJB', NULL, NULL, NULL, NULL, NULL, 0, 1); INSERT INTO `cb_data_dictionary` VALUES(1166, '1166', '原地待命', 'XYJB', NULL, NULL, NULL, NULL, NULL, 0, 1);
...@@ -192,38 +395,66 @@ ...@@ -192,38 +395,66 @@
</changeSet> </changeSet>
<changeSet author="litengwei" id="2021-09-01-litengwei-2"> <changeSet author="litengwei" id="2021-09-01-litengwei-2">
<preConditions onFail="MARK_RAN"> <preConditions onFail="MARK_RAN">
<tableExists tableName="jc_alert_form" /> <tableExists tableName="jc_alert_form"/>
<not>
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="jc_alert_form"/>
</not>
</preConditions> </preConditions>
<comment>add data jc_alert_form</comment> <comment>add data jc_alert_form</comment>
<sql> <sql>
INSERT INTO `jc_alert_form` VALUES(127, '230', 'HKQJYZL', '航空器救援子类', 'aircraftRescueSub', 'radio', NULL, NULL, NULL, 0, 1, 1, NULL); INSERT INTO `jc_alert_form` VALUES(127, '230', 'HKQJYZL', '航空器救援子类', 'aircraftRescueSub', 'radio', NULL,
INSERT INTO `jc_alert_form` VALUES(128, '242', 'QTZL', '子类', 'sub', 'radio', NULL, NULL, NULL, 0, 1, 1, NULL); NULL, NULL, 0, 1, 1, NULL);
INSERT INTO `jc_alert_form` VALUES(129, '230', NULL, '机位', 'mechinePosition', 'select', NULL, NULL, NULL, 0, 0, 5, NULL); INSERT INTO `jc_alert_form` VALUES(128, '242', 'QTZL', '子类', 'sub', 'radio', NULL, NULL, NULL, 0, 1, 1,
INSERT INTO `jc_alert_form` VALUES(130, '230', NULL, '响应级别', 'responseLevel', 'select', NULL, NULL, NULL, 0, 0, 8, NULL); NULL);
INSERT INTO `jc_alert_form` VALUES(129, '230', NULL, '机位', 'mechinePosition', 'select', NULL, NULL, NULL, 0,
0, 5, NULL);
INSERT INTO `jc_alert_form` VALUES(130, '230', NULL, '响应级别', 'responseLevel', 'select', NULL, NULL, NULL, 0,
0, 8, NULL);
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="litengwei" id="2021-09-01-litengwei-3"> <changeSet author="litengwei" id="2021-09-01-litengwei-3">
<preConditions onFail="MARK_RAN"> <preConditions onFail="MARK_RAN">
<tableExists tableName="jc_alert_form" /> <tableExists tableName="jc_alert_form"/>
</preConditions> </preConditions>
<comment>update data jc_alert_form</comment> <comment>update data jc_alert_form</comment>
<sql> <sql>
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='航班号', field_code='flightNumber', field_type='selectDelay', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=2, url='aircraft/getAircraftNum' WHERE sequence_nbr=103; UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='航班号',
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='航空器型号', field_code='aircraftModel', field_type='input', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=3, url='aircraft/getAircraft' WHERE sequence_nbr=104; field_code='flightNumber', field_type='selectDelay', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL,
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='落地时间', field_code='landingTime', field_type='datetime', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=4, url=NULL WHERE sequence_nbr=105; is_delete=0, block=0, sort_num=2, url='aircraft/getAircraftNum' WHERE sequence_nbr=103;
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='航空器故障部位', field_code='damageLocation', field_type='selectDelay', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=7, url='data-dictionary/gwmcDataDictionary/FJSSWZ' WHERE sequence_nbr=106; UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='航空器型号',
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='燃油量(吨)', field_code='fuelQuantity', field_type='inputNumber', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=10, url=NULL WHERE sequence_nbr=107; field_code='aircraftModel', field_type='input', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL,
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='载客量', field_code='passengerCapacity', field_type='inputNumber', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=9, url=NULL WHERE sequence_nbr=108; is_delete=0, block=0, sort_num=3, url='aircraft/getAircraft' WHERE sequence_nbr=104;
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code='PJPD', field_name='迫降跑道', field_code='forcedLandingTrack ', field_type='select', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=6, url='' WHERE sequence_nbr=109; UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='落地时间',
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='灾害事故情况', field_code='accidentSituation', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=1, sort_num=11, url=NULL WHERE sequence_nbr=110; field_code='landingTime', field_type='datetime', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL,
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='发展态势', field_code='developmentTrend', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=1, sort_num=12, url=NULL WHERE sequence_nbr=111; is_delete=0, block=0, sort_num=4, url=NULL WHERE sequence_nbr=105;
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='备注', field_code='remarks', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=1, sort_num=13, url=NULL WHERE sequence_nbr=112; UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='航空器故障部位',
UPDATE `jc_alert_form` SET alert_type_code='242', field_value_code=NULL, field_name='保障类别', field_code='securityCategory', field_type='selectDelay', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=2, url='data-dictionary/gwmcDataDictionary/YGCJ' WHERE sequence_nbr=124; field_code='damageLocation', field_type='selectDelay', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL,
UPDATE `jc_alert_form` SET alert_type_code='242', field_value_code=NULL, field_name='事件概述', field_code='eventOverview', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=1, sort_num=3, url=NULL WHERE sequence_nbr=125; is_delete=0, block=0, sort_num=7, url='data-dictionary/gwmcDataDictionary/FJSSWZ' WHERE sequence_nbr=106;
UPDATE `jc_alert_form` SET alert_type_code='242', field_value_code=NULL, field_name='备注', field_code='remarks', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=1, sort_num=4, url=NULL WHERE sequence_nbr=126; UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='燃油量(吨)',
field_code='fuelQuantity', field_type='inputNumber', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL,
is_delete=0, block=0, sort_num=10, url=NULL WHERE sequence_nbr=107;
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='载客量',
field_code='passengerCapacity', field_type='inputNumber', rec_user_name=NULL, rec_user_id=NULL,
rec_date=NULL, is_delete=0, block=0, sort_num=9, url=NULL WHERE sequence_nbr=108;
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code='PJPD', field_name='迫降跑道',
field_code='forcedLandingTrack ', field_type='select', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL,
is_delete=0, block=0, sort_num=6, url='' WHERE sequence_nbr=109;
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='灾害事故情况',
field_code='accidentSituation', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL,
is_delete=0, block=1, sort_num=11, url=NULL WHERE sequence_nbr=110;
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='发展态势',
field_code='developmentTrend', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL,
is_delete=0, block=1, sort_num=12, url=NULL WHERE sequence_nbr=111;
UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='备注',
field_code='remarks', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL,
is_delete=0, block=1, sort_num=13, url=NULL WHERE sequence_nbr=112;
UPDATE `jc_alert_form` SET alert_type_code='242', field_value_code=NULL, field_name='保障类别',
field_code='securityCategory', field_type='selectDelay', rec_user_name=NULL, rec_user_id=NULL,
rec_date=NULL, is_delete=0, block=0, sort_num=2, url='data-dictionary/gwmcDataDictionary/YGCJ' WHERE
sequence_nbr=124;
UPDATE `jc_alert_form` SET alert_type_code='242', field_value_code=NULL, field_name='事件概述',
field_code='eventOverview', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL,
is_delete=0, block=1, sort_num=3, url=NULL WHERE sequence_nbr=125;
UPDATE `jc_alert_form` SET alert_type_code='242', field_value_code=NULL, field_name='备注',
field_code='remarks', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL,
is_delete=0, block=1, sort_num=4, url=NULL WHERE sequence_nbr=126;
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="chenhao" id="2021-09-02-chenhao-1"> <changeSet author="chenhao" id="2021-09-02-chenhao-1">
...@@ -236,7 +467,8 @@ ...@@ -236,7 +467,8 @@
<comment>update data jc_alert_form</comment> <comment>update data jc_alert_form</comment>
<sql> <sql>
update jc_alert_form set field_name ='燃油量(吨)' where alert_type_code ='230' and field_code='fuelQuantity'; update jc_alert_form set field_name ='燃油量(吨)' where alert_type_code ='230' and field_code='fuelQuantity';
update jc_alert_form set field_name ='载客量(人)' where alert_type_code ='230' and field_code='passengerCapacity'; update jc_alert_form set field_name ='载客量(人)' where alert_type_code ='230' and
field_code='passengerCapacity';
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="chenhao" id="2021-09-02-chenhao-3"> <changeSet author="chenhao" id="2021-09-02-chenhao-3">
...@@ -278,17 +510,22 @@ ...@@ -278,17 +510,22 @@
</changeSet> </changeSet>
<changeSet author="chenhao" id="2021-09-06-chenhao-1"> <changeSet author="chenhao" id="2021-09-06-chenhao-1">
<preConditions onFail="MARK_RAN"> <preConditions onFail="MARK_RAN">
<tableExists tableName="cb_data_dictionary" /> <tableExists tableName="cb_data_dictionary"/>
<not>
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
</not>
</preConditions> </preConditions>
<comment>insert data cb_data_dictionary</comment> <comment>insert data cb_data_dictionary</comment>
<sql> <sql>
INSERT INTO cb_data_dictionary (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1168', '1168', '环状管网', 'XFJSGW', NULL, NULL, NULL, NULL, NULL, '\0', '1'); INSERT INTO cb_data_dictionary (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`,
INSERT INTO cb_data_dictionary (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1169', '1169', '环支状管网', 'XFJSGW', NULL, NULL, NULL, NULL, NULL, '\0', '1'); `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1168', '1168', '环状管网',
INSERT INTO cb_data_dictionary (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1170', '1170', '可用', 'SYZT', NULL, NULL, NULL, NULL, NULL, '\0', '1'); 'XFJSGW', NULL, NULL, NULL, NULL, NULL, '\0', '1');
INSERT INTO cb_data_dictionary (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1171', '1171', '不可用', 'SYZT', NULL, NULL, NULL, NULL, NULL, '\0', '1'); INSERT INTO cb_data_dictionary (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`,
`rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1169', '1169', '环支状管网',
'XFJSGW', NULL, NULL, NULL, NULL, NULL, '\0', '1');
INSERT INTO cb_data_dictionary (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`,
`rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1170', '1170', '可用', 'SYZT',
NULL, NULL, NULL, NULL, NULL, '\0', '1');
INSERT INTO cb_data_dictionary (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`,
`rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1171', '1171', '不可用', 'SYZT',
NULL, NULL, NULL, NULL, NULL, '\0', '1');
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="tb" id="2021-09-08-tb-1"> <changeSet author="tb" id="2021-09-08-tb-1">
...@@ -346,7 +583,7 @@ ...@@ -346,7 +583,7 @@
<changeSet author="chenzhao" id="2021-09-07-chenzhao"> <changeSet author="chenzhao" id="2021-09-07-chenzhao">
<preConditions onFail="MARK_RAN"> <preConditions onFail="MARK_RAN">
<tableExists tableName="cb_data_dictionary" /> <tableExists tableName="cb_data_dictionary"/>
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/> <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
...@@ -354,29 +591,45 @@ ...@@ -354,29 +591,45 @@
<comment>add data cb_data_dictionary</comment> <comment>add data cb_data_dictionary</comment>
<sql> <sql>
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1173,'394','GTC屋顶','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/GTCWD_BASE_ZLXY/MapServer'); INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1174,'386','T1航站楼二层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T1F2_BASE_ZLXY1/MapServer'); (1173,'394','GTC屋顶','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/GTCWD_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1175,'397','T1航站楼一层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T1F1_BASE_ZLXY1/MapServer'); INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1176,'387','T2航站楼二层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T2F2_BASE_ZLXY/MapServer'); (1174,'386','T1航站楼二层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T1F2_BASE_ZLXY1/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1177,'398','T2航站楼地下一层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T2B1_BASE_ZLXY/MapServer'); INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1178,'399','T2航站楼一层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T2F1_BASE_ZLXY/MapServer'); (1175,'397','T1航站楼一层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T1F1_BASE_ZLXY1/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1179,'400','T2航站楼一层夹层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T2F1J_BASE_ZLXY/MapServer'); INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1180,'965','南指廊二层夹层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/NZLF2J_BASE_ZLXY/MapServer'); (1176,'387','T2航站楼二层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T2F2_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1181,'389','南指廊二层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/NZLF2_BASE_ZLXY/MapServer'); INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1182,'867','南指廊一层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/NZLF1_BASE_ZLXY/MapServer'); (1177,'398','T2航站楼地下一层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T2B1_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1183,'412','T3航站楼二层夹层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T3F2J_BASE_LT/MapServer'); INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1184,'411','T3航站楼二层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T3F2_BASE_ZLXY1/MapServer'); (1178,'399','T2航站楼一层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T2F1_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1185,'410','T3航站楼一层夹层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T3F1J_BASE_ZLXY/MapServer'); INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1186,'409','T3航站楼一层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T3F1_BASE_ZLXY1/MapServer'); (1179,'400','T2航站楼一层夹层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T2F1J_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1187,'407','T3航站楼地下一层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T3B1_BASE_ZLXY/MapServer'); INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1188,'408','T3航站楼地下二层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T3B2_BASE_ZLXY/MapServer'); (1180,'965','南指廊二层夹层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/NZLF2J_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
(1181,'389','南指廊二层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/NZLF2_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
(1182,'867','南指廊一层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/NZLF1_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
(1183,'412','T3航站楼二层夹层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T3F2J_BASE_LT/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
(1184,'411','T3航站楼二层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T3F2_BASE_ZLXY1/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
(1185,'410','T3航站楼一层夹层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T3F1J_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
(1186,'409','T3航站楼一层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T3F1_BASE_ZLXY1/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
(1187,'407','T3航站楼地下一层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T3B1_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
(1188,'408','T3航站楼地下二层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T3B2_BASE_ZLXY/MapServer');
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="chenzhao" id="2021-09-08-chenzhao"> <changeSet author="chenzhao" id="2021-09-08-chenzhao">
<preConditions onFail="MARK_RAN"> <preConditions onFail="MARK_RAN">
<tableExists tableName="cb_data_dictionary" /> <tableExists tableName="cb_data_dictionary"/>
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/> <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
...@@ -416,45 +669,84 @@ ...@@ -416,45 +669,84 @@
<changeSet author="chenzhao" id="2021-09-13-chenzhao"> <changeSet author="chenzhao" id="2021-09-13-chenzhao">
<preConditions onFail="MARK_RAN"> <preConditions onFail="MARK_RAN">
<tableExists tableName="cb_data_dictionary" /> <tableExists tableName="cb_data_dictionary"/>
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/> <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
</preConditions> </preConditions>
<comment>add data cb_data_dictionary</comment> <comment>add data cb_data_dictionary</comment>
<sql> <sql>
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1192,'1192',' 8T 吊车','JYZBLX','救援装备类型'); INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1192,'1192',' 8T
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1193,'1193',' 16T 吊车','JYZBLX','救援装备类型'); 吊车','JYZBLX','救援装备类型');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1194,'1194',' 50T 吊车','JYZBLX','救援装备类型'); INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1193,'1193',' 16T
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1195,'1195',' 70T 吊车','JYZBLX','救援装备类型'); 吊车','JYZBLX','救援装备类型');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1196,'1196',' 100T 吊车','JYZBLX','救援装备类型'); INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1194,'1194',' 50T
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1197,'1197',' 130T 吊车','JYZBLX','救援装备类型'); 吊车','JYZBLX','救援装备类型');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1198,'1198',' 180T 吊车','JYZBLX','救援装备类型'); INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1195,'1195',' 70T
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1199,'1199',' 260T 吊车','JYZBLX','救援装备类型'); 吊车','JYZBLX','救援装备类型');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1200,'1200',' 300T 吊车','JYZBLX','救援装备类型'); INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1196,'1196',' 100T
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1201,'1201',' 350T 吊车','JYZBLX','救援装备类型'); 吊车','JYZBLX','救援装备类型');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1197,'1197',' 130T
吊车','JYZBLX','救援装备类型');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1198,'1198',' 180T
吊车','JYZBLX','救援装备类型');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1199,'1199',' 260T
吊车','JYZBLX','救援装备类型');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1200,'1200',' 300T
吊车','JYZBLX','救援装备类型');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1201,'1201',' 350T
吊车','JYZBLX','救援装备类型');
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="chenzhao" id="2021-09-13-chenzhao-2"> <changeSet author="chenzhao" id="2021-09-13-chenzhao-2">
<preConditions onFail="MARK_RAN"> <preConditions onFail="MARK_RAN">
<tableExists tableName="cb_data_dictionary" /> <tableExists tableName="cb_data_dictionary"/>
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
</preConditions>
<comment>add data cb_data_dictionary</comment>
<sql>
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
(1202,'1202','副支队长','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
(1203,'1203','党支部副书记','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
(1204,'1204','大队长','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
(1205,'1205','支队长助理','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
(1206,'1206','班组长','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1207,'1207','中队长
','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1208,'1208','代理大队长
','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1209,'1209','代理副大队长
','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
(1210,'1210','指挥员','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1211,'1211','副中队长
','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
(1212,'1212','内勤','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES
(1213,'1213','支队长','XFRYGW','消防人员岗位');
</sql>
</changeSet>
<changeSet author="chenzhao" id="2021-09-23-chenzhao">
<preConditions onFail="MARK_RAN">
<not>
<tableExists tableName="cb_data_dictionary"/>
</not>
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/> <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
</preConditions> </preConditions>
<comment>add data cb_data_dictionary</comment> <comment>add data cb_data_dictionary</comment>
<sql> <sql>
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1202,'1202','副支队长','XFRYGW','消防人员岗位'); INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,parent) VALUES (1237,'1237','河流','TRSYLX',389);
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1203,'1203','党支部副书记','XFRYGW','消防人员岗位'); INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,parent) VALUES (1238,'1238','湖泊','TRSYLX',389);
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1204,'1204','大队长','XFRYGW','消防人员岗位'); INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,parent) VALUES (1239,'1239','海洋','TRSYLX',389);
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1205,'1205','支队长助理','XFRYGW','消防人员岗位'); INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,parent) VALUES (1240,'1240','水库','TRSYLX',389);
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1206,'1206','班组长','XFRYGW','消防人员岗位'); INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,parent) VALUES (1241,'1241','其他','TRSYLX',389);
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1207,'1207','中队长 ','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1208,'1208','代理大队长 ','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1209,'1209','代理副大队长 ','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1210,'1210','指挥员','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1211,'1211','副中队长 ','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1212,'1212','内勤','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1213,'1213','支队长','XFRYGW','消防人员岗位');
</sql> </sql>
</changeSet> </changeSet>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment