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
0e747853
Commit
0e747853
authored
Oct 28, 2021
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
3423fc85
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
4 deletions
+11
-4
MetaHandler.java
...in/java/com/yeejoin/amos/boot/biz/config/MetaHandler.java
+3
-2
AlertCalledZhDto.java
...eejoin/amos/boot/module/jcs/api/dto/AlertCalledZhDto.java
+3
-0
AlertCalledMapper.xml
...e-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml
+1
-0
AlertCalledServiceImpl.java
...t/module/jcs/biz/service/impl/AlertCalledServiceImpl.java
+4
-2
No files found.
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MetaHandler.java
View file @
0e747853
...
...
@@ -71,8 +71,9 @@ public class MetaHandler implements MetaObjectHandler {
Date
currentDate
=
new
Date
();
this
.
setFieldValByName
(
"recDate"
,
currentDate
,
metaObject
);
}
// if (isExistField("companyCode", entity)) {
// this.setFieldValByName("companyCode", reginParams.getDepartment().getOrgCode(), metaObject);
// if (isExistField("updateTime", entity)) {
// Date currentDate = new Date();
// this.setFieldValByName("updateTime", currentDate, metaObject);
// }
// if (isExistField("companyName", entity)) {
// this.setFieldValByName("companyName", reginParams.getDepartment().getDepartmentName(), metaObject);
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCalledZhDto.java
View file @
0e747853
...
...
@@ -61,4 +61,7 @@ public class AlertCalledZhDto {
@ApiModelProperty
(
value
=
"响应级别字典code 为了过滤用(只有航空器故障有)"
)
private
String
responseLevelCode
;
@ApiModelProperty
(
value
=
"警情修改时间"
)
private
Date
updateTime
;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml
View file @
0e747853
...
...
@@ -24,6 +24,7 @@
a.sequence_nbr sequenceNbr,
a.alert_stage alertStage,
a.call_time callTime,
a.update_time updateTime,
a.rescue_grid rescueGrid,
CONCAT(a.alert_type,' ',IFNULL((select field_value from jc_alert_form_value where jc_alert_form_value.alert_called_id =a.sequence_nbr and jc_alert_form_value.field_code='remark'),"")) alertType,
a.alert_type_code alarmTypeCode,
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java
View file @
0e747853
...
...
@@ -289,6 +289,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
alertCalled
.
setAlertStage
(
AlertStageEnums
.
JQJB
.
getValue
());
alertCalled
.
setAlarmType
(
AlertStageEnums
.
JQGB
.
getValue
());
alertCalled
.
setAlarmTypeCode
(
AlertStageEnums
.
JQGB
.
getCode
());
alertCalled
.
setUpdateTime
(
new
Date
());
this
.
save
(
alertCalled
);
// 填充警情主键
...
...
@@ -348,16 +349,17 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
alertCalledMapper
.
update
(
null
,
new
UpdateWrapper
<
AlertCalled
>().
eq
(
"sequence_nbr"
,
id
).
set
(
"alert_status"
,
1
)
.
set
(
"alert_stage"
,
AlertStageEnums
.
ZBQJ
.
getValue
())
.
set
(
"update_time"
,
new
Date
())
.
set
(
"alarm_type"
,
AlertStageEnums
.
FJQ
.
getValue
())
.
set
(
"alarm_type_code"
,
AlertStageEnums
.
FJQ
.
getCode
()));
break
;
case
"315"
:
alertCalledMapper
.
update
(
null
,
new
UpdateWrapper
<
AlertCalled
>().
eq
(
"sequence_nbr"
,
id
)
.
set
(
"alert_status"
,
1
).
set
(
"alert_stage"
,
AlertStageEnums
.
CZJS
.
getValue
()));
.
set
(
"alert_status"
,
1
).
set
(
"
update_time"
,
new
Date
()).
set
(
"
alert_stage"
,
AlertStageEnums
.
CZJS
.
getValue
()));
break
;
default
:
alertCalledMapper
.
update
(
null
,
new
UpdateWrapper
<
AlertCalled
>().
eq
(
"sequence_nbr"
,
id
)
.
set
(
"alert_stage"
,
AlertStageEnums
.
CZGZ
.
getValue
()));
.
set
(
"
update_time"
,
new
Date
()).
set
(
"
alert_stage"
,
AlertStageEnums
.
CZGZ
.
getValue
()));
break
;
}
...
...
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