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
60b325e5
Commit
60b325e5
authored
Jul 09, 2024
by
刘林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):record添加跳转链接
parent
a96fd127
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
1 deletion
+22
-1
JgCertificateChangeRecordDto.java
.../boot/module/jg/api/dto/JgCertificateChangeRecordDto.java
+3
-0
JgCertificateChangeRecord.java
.../boot/module/jg/api/entity/JgCertificateChangeRecord.java
+6
-0
JgInstallationNoticeServiceImpl.java
.../jg/biz/service/impl/JgInstallationNoticeServiceImpl.java
+13
-1
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgCertificateChangeRecordDto.java
View file @
60b325e5
...
...
@@ -62,4 +62,7 @@ public class JgCertificateChangeRecordDto extends BaseModel {
@ApiModelProperty
(
value
=
"设备类别"
)
private
String
equCategory
;
@ApiModelProperty
(
value
=
"跳转路径"
)
private
String
routePath
;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgCertificateChangeRecord.java
View file @
60b325e5
...
...
@@ -106,4 +106,10 @@ public class JgCertificateChangeRecord extends BaseEntity {
@TableField
(
"EQU_CATEGORY"
)
private
String
equCategory
;
/**
* 跳转路径
*/
@TableField
(
"route_path"
)
private
String
routePath
;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java
View file @
60b325e5
...
...
@@ -292,6 +292,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
if
(
Objects
.
isNull
(
noticeDto
)
||
StringUtils
.
isEmpty
(
submitType
))
{
throw
new
IllegalArgumentException
(
"参数不能为空"
);
}
try
{
// 字段转换
this
.
convertField
(
noticeDto
);
JgInstallationNotice
notice
=
this
.
getById
(
noticeDto
.
getSequenceNbr
());
...
...
@@ -397,6 +398,17 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
this
.
updateById
(
bean
);
}
return
noticeDto
;
}
catch
(
BadRequest
|
LocalBadRequest
e
)
{
log
.
error
(
e
.
getMessage
(),
e
);
this
.
rollBackForDelRedisData
();
throw
e
;
}
catch
(
Exception
e
)
{
log
.
error
(
e
.
getMessage
(),
e
);
this
.
rollBackForDelRedisData
();
throw
new
BadRequest
(
"安装告知保存失败!"
);
}
finally
{
FlowingEquipRedisContext
.
clean
();
}
}
private
void
checkRepeatUsed
(
String
submitType
,
JgInstallationNotice
jgInstallationNotice
)
{
...
...
@@ -455,7 +467,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
for
(
Long
sequenceNbr
:
sequenceNbrs
)
{
// 删除待办 + 中止流程
JgInstallationNotice
jgInstallationNotice
=
this
.
baseMapper
.
selectById
(
sequenceNbr
);
commonService
.
deleteTaskModel
(
String
.
valueOf
(
sequenceNbr
),
jgInstallationNotice
.
getInstanceId
());
commonService
.
deleteTaskModel
(
String
.
valueOf
(
sequenceNbr
),
jgInstallationNotice
.
getInstanceId
());
// 删除业务单
jgInstallationNotice
.
setIsDelete
(
true
);
this
.
getBaseMapper
().
deleteById
(
sequenceNbr
);
...
...
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