Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YeeAmosFireAutoSysRoot
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
station
YeeAmosFireAutoSysRoot
Commits
6b552ae4
Commit
6b552ae4
authored
Oct 24, 2022
by
高建强
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
item:应急处置执行推送优化
parent
415a36f2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
11 deletions
+3
-11
ContingencyAction.java
...m/yeejoin/amos/fas/business/action/ContingencyAction.java
+2
-10
PlanVisual3dServiceImpl.java
...os/fas/business/service/impl/PlanVisual3dServiceImpl.java
+1
-1
No files found.
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java
View file @
6b552ae4
...
@@ -25,8 +25,6 @@ import com.yeejoin.amos.fas.business.dao.repository.IPlanOperationRecordDao;
...
@@ -25,8 +25,6 @@ import com.yeejoin.amos.fas.business.dao.repository.IPlanOperationRecordDao;
import
com.yeejoin.amos.fas.business.feign.IDutyModeServer
;
import
com.yeejoin.amos.fas.business.feign.IDutyModeServer
;
import
com.yeejoin.amos.fas.business.feign.JcsFeign
;
import
com.yeejoin.amos.fas.business.feign.JcsFeign
;
import
com.yeejoin.amos.fas.business.feign.RemoteSecurityService
;
import
com.yeejoin.amos.fas.business.feign.RemoteSecurityService
;
import
com.yeejoin.amos.fas.business.jpush.JPushTypeEnum
;
import
com.yeejoin.amos.fas.business.jpush.PushMsgParam
;
import
com.yeejoin.amos.fas.business.service.impl.RuleRunigSnapshotServiceImpl
;
import
com.yeejoin.amos.fas.business.service.impl.RuleRunigSnapshotServiceImpl
;
import
com.yeejoin.amos.fas.business.service.intfc.*
;
import
com.yeejoin.amos.fas.business.service.intfc.*
;
import
com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus
;
import
com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus
;
...
@@ -502,16 +500,10 @@ public class ContingencyAction implements CustomerAction {
...
@@ -502,16 +500,10 @@ public class ContingencyAction implements CustomerAction {
ContingencyPlanInstance
planInstance
=
contingencyInstance
.
updateExtendColumn
(
instance
);
ContingencyPlanInstance
planInstance
=
contingencyInstance
.
updateExtendColumn
(
instance
);
contingencyPlanInstanceMapper
.
updateMessageById
(
planInstance
);
contingencyPlanInstanceMapper
.
updateMessageById
(
planInstance
);
}
}
//极光推送
// iPlanVisual3dService.sendMessage(buttonCode, null);
// PushMsgParam pushMsgParam = new PushMsgParam();
// pushMsgParam.setSubject("应急处置执行任务提醒");
// pushMsgParam.setContent("【" + actionName + "】- " + DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
// pushMsgParam.setType(JPushTypeEnum.TAG.getCode());
MessageVO
messageVO
=
new
MessageVO
();
MessageVO
messageVO
=
new
MessageVO
();
messageVO
.
setTitle
(
"应急处置
执行任务
提醒"
);
messageVO
.
setTitle
(
"应急处置
事项
提醒"
);
messageVO
.
setBody
(
"【"
+
actionName
+
"】
- 【已完成】-
"
+
DateFormatUtils
.
format
(
new
Date
(),
"yyyy-MM-dd HH:mm:ss"
));
messageVO
.
setBody
(
"【"
+
actionName
+
"】"
+
DateFormatUtils
.
format
(
new
Date
(),
"yyyy-MM-dd HH:mm:ss"
));
messageVO
.
setMsgType
(
"emergencyPlan"
);
messageVO
.
setMsgType
(
"emergencyPlan"
);
messageVO
.
setCategory
(
1
);
messageVO
.
setCategory
(
1
);
messageVO
.
setIsSendApp
(
true
);
messageVO
.
setIsSendApp
(
true
);
...
...
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/PlanVisual3dServiceImpl.java
View file @
6b552ae4
...
@@ -453,7 +453,7 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
...
@@ -453,7 +453,7 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
dto
.
setContent
(
StringUtil
.
isNotEmpty
(
dto
.
getContent
())
?
dto
.
getContent
()
:
""
);
dto
.
setContent
(
StringUtil
.
isNotEmpty
(
dto
.
getContent
())
?
dto
.
getContent
()
:
""
);
repository
.
save
(
dto
);
repository
.
save
(
dto
);
String
topic
=
String
.
format
(
"/%s/%s/%s"
,
serviceName
,
stationName
,
"plan"
);
String
topic
=
String
.
format
(
"/%s/%s/%s"
,
serviceName
,
stationName
,
"plan"
);
webMqttComponent
.
publish
(
topic
,
"{
'msgType':'REPLYMESSAGE'
}"
);
webMqttComponent
.
publish
(
topic
,
"{
\"msgType\":\"replayMessage\"
}"
);
return
dto
;
return
dto
;
}
}
...
...
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