Skip to content

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

Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

parents ad77ba58 d4aa92c2
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 16 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/ShiftChangeDto.java
View file @ abbd92de
...@@ -36,4 +36,7 @@ public class ShiftChangeDto extends BaseDto { ...@@ -36,4 +36,7 @@ public class ShiftChangeDto extends BaseDto {
@ApiModelProperty(value = "操作人名称") @ApiModelProperty(value = "操作人名称")
private String recUserName; private String recUserName;
@ApiModelProperty(value = "日常工作")
private String dutyWork;
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/ShiftChange.java
View file @ abbd92de
...@@ -43,4 +43,10 @@ public class ShiftChange extends BaseEntity { ...@@ -43,4 +43,10 @@ public class ShiftChange extends BaseEntity {
*/ */
@TableField("remark") @TableField("remark")
private String remark; private String remark;
/**
* 日常工作
*/
@TableField("duty_work")
private String dutyWork;
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml
View file @ abbd92de
...@@ -129,7 +129,9 @@ ...@@ -129,7 +129,9 @@
a.rescue_grid, a.rescue_grid,
a.coordinate_x, a.coordinate_x,
a.coordinate_y, a.coordinate_y,
a.response_level a.response_level,
a.system_source,
a.system_source_code
FROM FROM
jc_alert_called a jc_alert_called a
<where> <where>
......
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ abbd92de
...@@ -1814,13 +1814,13 @@ ...@@ -1814,13 +1814,13 @@
<comment>add data cb_data_dictionary</comment> <comment>add data cb_data_dictionary</comment>
<sql> <sql>
INSERT INTO `amos-jcs-biz`.`cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1330, '2', '出动', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 2); 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 (1330, '2', '出动', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 2);
INSERT INTO `amos-jcs-biz`.`cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1331, '3', '途中', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 3); 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 (1331, '3', '途中', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 3);
INSERT INTO `amos-jcs-biz`.`cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1332, '4', '到场', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 4); 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 (1332, '4', '到场', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 4);
INSERT INTO `amos-jcs-biz`.`cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1333, '5', '出水', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 5); 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 (1333, '5', '出水', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 5);
INSERT INTO `amos-jcs-biz`.`cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1334, '6', '停水', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 6); 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 (1334, '6', '停水', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 6);
INSERT INTO `amos-jcs-biz`.`cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1335, '7', '驻防', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 7); 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 (1335, '7', '驻防', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 7);
INSERT INTO `amos-jcs-biz`.`cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1336, '8', '返队', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 8); 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 (1336, '8', '返队', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 8);
</sql> </sql>
</changeSet> </changeSet>
...@@ -1833,10 +1833,10 @@ ...@@ -1833,10 +1833,10 @@
<comment>add data cb_data_dictionary</comment> <comment>add data cb_data_dictionary</comment>
<sql> <sql>
INSERT INTO `amos-jcs-biz`.`cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1339, '9', '训练', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 9); 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 (1339, '9', '训练', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 9);
INSERT INTO `amos-jcs-biz`.`cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1340, '10', '演练', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 10); 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 (1340, '10', '演练', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 10);
INSERT INTO `amos-jcs-biz`.`cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1341, '11', '加油', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 11); 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 (1341, '11', '加油', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 11);
INSERT INTO `amos-jcs-biz`.`cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1342, '12', '试车', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 12); 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 (1342, '12', '试车', 'CARSTATE', NULL, NULL, NULL, NULL, NULL, b'0', 12);
</sql> </sql>
</changeSet> </changeSet>
...@@ -1869,17 +1869,16 @@ ...@@ -1869,17 +1869,16 @@
<changeSet author="chenzhao" id="2021-10-19-1"> <changeSet author="chenzhao" id="2021-10-19-1">
<preConditions onFail="MARK_RAN"> <preConditions onFail="MARK_RAN">
<tableExists tableName="jc_template" /> <tableExists tableName="jc_template" />
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="jc_template"/> <primaryKeyExists primaryKeyName="sequence_nbr" tableName="jc_template"/>
</preConditions> </preConditions>
<comment>add data jc_template</comment> <comment>add data jc_template</comment>
<sql> <sql>
INSERT INTO `amos-jcs-biz`.`jc_template`(`sequence_nbr`, `trpe_code`, `type`, `content`, `format`) VALUES (23, 'JJQK-1214', '接警情况', '【120救援】时间：callTime；地址：address；保障类别：securityCategory；事件概述：eventOverview；备注：remarks；警情阶段：alertStage'); INSERT INTO `jc_template`(`sequence_nbr`, `trpe_code`, `type`, `content`, `format`) VALUES (23, 'JJQK-1214', '接警情况', '【120救援】时间：callTime；地址：address；保障类别：securityCategory；事件概述：eventOverview；备注：remarks；警情阶段：alertStage');
INSERT INTO `amos-jcs-biz`.`jc_template`(`sequence_nbr`, `trpe_code`, `type`, `content`, `format`) VALUES (24, '1214', '120救援', '【力量调派】调派你部车辆type 车牌号resourcesNum 赶往rescueGrid 位置。 INSERT INTO `jc_template`(`sequence_nbr`, `trpe_code`, `type`, `content`, `format`) VALUES (24, '1214', '120救援', '【力量调派】调派你部车辆type 车牌号resourcesNum 赶往rescueGrid 位置。
相关警情：【120救援】时间：callTime 地址：address；单位名称：unit_involved；被困人数：trapped_num；伤亡人数：casualties_num；性别：gender；年龄段(岁)：ageGroup；患者现状：patientStatus；情况说明：situation；备注：remarks。 相关警情：【120救援】时间：callTime 地址：address；单位名称：unit_involved；被困人数：trapped_num；伤亡人数：casualties_num；性别：gender；年龄段(岁)：ageGroup；患者现状：patientStatus；情况说明：situation；备注：remarks。
发送单位：companyName'); 发送单位：companyName');
<![CDATA[ INSERT INTO `amos-jcs-biz`.`jc_template`(`sequence_nbr`, `trpe_code`, `type`, `content`, `format`) VALUES (25, '1214 ', '120救援', '<p>【120救援】时间：<span contenteditable="true" data-name="callTimeStr" data-type="input"></span> 地址：<span contenteditable="true" data-name="address" data-type="input"></span>；单位名称：<span contenteditable="true" data-name="unitInvolved" data-type="input"></span>；被困人数：<span contenteditable="true" data-name="trappedNum" data-type="input"></span>trapped_num；伤亡人数：<span contenteditable="true" data-name="casualtiesNum" data-type="input"></span>casualties_num；性别：<span contenteditable="true" data-name="gender" data-type="input"></span>gender；年龄段(岁)：<span contenteditable="true" data-name="ageGroup" data-type="input"></span>ageGroup；。 </p><p>发送单位：<span contenteditable="true" data-name="companyName" data-type="input"></span></p>');]]> <![CDATA[ INSERT INTO `jc_template`(`sequence_nbr`, `trpe_code`, `type`, `content`, `format`) VALUES (25, '1214 ', '120救援', '<p>【120救援】时间：<span contenteditable="true" data-name="callTimeStr" data-type="input"></span> 地址：<span contenteditable="true" data-name="address" data-type="input"></span>；单位名称：<span contenteditable="true" data-name="unitInvolved" data-type="input"></span>；被困人数：<span contenteditable="true" data-name="trappedNum" data-type="input"></span>trapped_num；伤亡人数：<span contenteditable="true" data-name="casualtiesNum" data-type="input"></span>casualties_num；性别：<span contenteditable="true" data-name="gender" data-type="input"></span>gender；年龄段(岁)：<span contenteditable="true" data-name="ageGroup" data-type="input"></span>ageGroup；。 </p><p>发送单位：<span contenteditable="true" data-name="companyName" data-type="input"></span></p>');]]>
</sql> </sql>
</changeSet> </changeSet>
...@@ -1915,8 +1914,26 @@ ...@@ -1915,8 +1914,26 @@
ALTER TABLE jc_alert_submitted MODIFY COLUMN sender varchar(50) DEFAULT NULL COMMENT '发送人'; ALTER TABLE jc_alert_submitted MODIFY COLUMN sender varchar(50) DEFAULT NULL COMMENT '发送人';
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="ltw" id="2021-10-26-1">
<preConditions onFail="MARK_RAN">
<tableExists tableName="jc_shift_change"/>
</preConditions>
<comment>119值班交接班填报新增工作日常字段</comment>
<sql>
ALTER TABLE `jc_shift_change` ADD duty_work varchar(4000) NULL COMMENT '日常工作';
</sql>
</changeSet>
<changeSet author="tw" id="2021-10-26-1">
<preConditions onFail="MARK_RAN">
<tableExists tableName="cb_dynamic_form_column"/>
</preConditions>
<comment>修改岗位类型</comment>
<sql>
UPDATE cb_dynamic_form_column SET field_type='treeSelect' WHERE field_code='positionType';
</sql>
</changeSet>
</databaseChangeLog> </databaseChangeLog>
......
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