Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
7a3f199b
Commit
7a3f199b
authored
Nov 24, 2021
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
d3f37a65
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
0 deletions
+31
-0
AlertSubmittedServiceImpl.java
...odule/jcs/biz/service/impl/AlertSubmittedServiceImpl.java
+1
-0
jcs-1.0.0.0.xml
...ystem-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
+30
-0
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java
View file @
7a3f199b
...
@@ -701,6 +701,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
...
@@ -701,6 +701,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
definitions
.
put
(
"$callTime"
,
DateUtils
.
dateTimeToDateString
(
alertCalled
.
getCallTime
()));
definitions
.
put
(
"$callTime"
,
DateUtils
.
dateTimeToDateString
(
alertCalled
.
getCallTime
()));
definitions
.
put
(
"$replaceContent"
,
replaceContent
);
definitions
.
put
(
"$replaceContent"
,
replaceContent
);
definitions
.
put
(
"$address"
,
alertCalled
.
getAddress
());
definitions
.
put
(
"$address"
,
alertCalled
.
getAddress
());
definitions
.
put
(
"$recDate"
,
DateUtils
.
getDateNowString
());
String
content
=
getTaskInformation
(
template
.
getContent
(),
definitions
);
String
content
=
getTaskInformation
(
template
.
getContent
(),
definitions
);
template
.
setContent
(
content
);
template
.
setContent
(
content
);
TemplateDto
templateDto
=
new
TemplateDto
();
TemplateDto
templateDto
=
new
TemplateDto
();
...
...
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @
7a3f199b
...
@@ -2233,6 +2233,36 @@
...
@@ -2233,6 +2233,36 @@
</changeSet>
</changeSet>
<changeSet
author=
"chenzhao"
id=
"2021-11-24-1"
>
<preConditions
onFail=
"MARK_RAN"
>
<tableExists
tableName=
"jc_template"
/>
</preConditions>
<comment>
update data jc_template
</comment>
<sql>
update
jc_template jc
set
content ='
<![CDATA[<p>【非警情确认】根据现场反馈信息、视频监控信息和消防物联监控信息,判断 【时间:$callTime 地点: $address 发生$type 警情 $replaceContent ;被困人数:<span contenteditable="true" data-name="trappedNum" data-type="input"></span>;伤亡人数:<span contenteditable="true" data-name="casualtiesNum" data-type="input"></span>; 】 为非警情,请各单位、部门尽快 进行恢复到日常执勤状态。</p><p>发送单位:<span contenteditable="true" data-name="companyName" data-type="input"></span></p> ]]>
'
where
jc.type_code = '314'
</sql>
</changeSet>
<changeSet
author=
"chenzhao"
id=
"2021-11-24-2"
>
<preConditions
onFail=
"MARK_RAN"
>
<tableExists
tableName=
"jc_template"
/>
</preConditions>
<comment>
update data jc_template
</comment>
<sql>
update
jc_template jc
set
content ='
<![CDATA[<p>【警情结案】当前警情已于$recDate已经结案。</p>相关警情:时间:$callTime 地点: $address 发生$type 警情 $replaceContent;被困人数:<span contenteditable="true" data-name="trappedNum" data-type="input"></span>;伤亡人数:<span contenteditable="true" data-name="casualtiesNum" data-type="input"></span>;<p>发送单位:<span contentEditable data-name="companyName" data-type="input"></span></p>]]>
'
where
jc.type_code = '315'
</sql>
</changeSet>
<!-- insert 模板
<!-- insert 模板
<changeSet author="chenzhao" id="2021-11-16-1">
<changeSet author="chenzhao" id="2021-11-16-1">
<preConditions onFail="MARK_RAN">
<preConditions onFail="MARK_RAN">
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment