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
aa2cf5f1
Commit
aa2cf5f1
authored
May 08, 2024
by
刘林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(JG):气瓶导入功能开发Bug修改
parent
f9a0bf4b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
PressureVesselListener.java
...mos/boot/module/jg/biz/config/PressureVesselListener.java
+3
-1
RemoteSecurityService.java
.../com/yeejoin/amos/patrol/feign/RemoteSecurityService.java
+1
-2
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/config/PressureVesselListener.java
View file @
aa2cf5f1
...
@@ -80,7 +80,9 @@ public class PressureVesselListener extends AnalysisEventListener<EquipInfoCylin
...
@@ -80,7 +80,9 @@ public class PressureVesselListener extends AnalysisEventListener<EquipInfoCylin
}
}
checkNotBlank
(
data
.
getWhetherVehicleCylinder
(),
"是否车用气瓶不能为空"
);
checkNotBlank
(
data
.
getWhetherVehicleCylinder
(),
"是否车用气瓶不能为空"
);
checkNotBlank
(
data
.
getEquCodeType
(),
"是否有设备代码不能为空"
);
checkNotBlank
(
data
.
getEquCodeType
(),
"是否有设备代码不能为空"
);
checkNotBlank
(
data
.
getEquCode
(),
"设备代码不能为空"
);
if
(
"1"
.
equals
(
data
.
getEquCodeType
()))
{
checkNotBlank
(
data
.
getEquCode
(),
"设备代码不能为空"
);
}
if
(
"1"
.
equals
(
data
.
getEquCodeType
())
&&
equCodeList
.
contains
(
data
.
getEquCode
()))
{
if
(
"1"
.
equals
(
data
.
getEquCodeType
())
&&
equCodeList
.
contains
(
data
.
getEquCode
()))
{
result
.
append
(
"设备代码不能重复;"
);
result
.
append
(
"设备代码不能重复;"
);
}
}
...
...
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/feign/RemoteSecurityService.java
View file @
aa2cf5f1
...
@@ -640,9 +640,8 @@ public class RemoteSecurityService {
...
@@ -640,9 +640,8 @@ public class RemoteSecurityService {
List
<
PermissionModel
>
dictionarieModel
=
null
;
List
<
PermissionModel
>
dictionarieModel
=
null
;
FeignClientResult
feignClientResult
;
FeignClientResult
feignClientResult
;
try
{
try
{
feignClientResult
=
Privilege
.
permissionClient
.
treeByRole
(
id
,
appType
,
null
,
null
);
feignClientResult
=
Privilege
.
permissionClient
.
treeByRole
(
id
,
appType
,
null
,
null
,
RequestContext
.
getAppKey
()
);
dictionarieModel
=
(
List
<
PermissionModel
>)
feignClientResult
.
getResult
();
dictionarieModel
=
(
List
<
PermissionModel
>)
feignClientResult
.
getResult
();
}
catch
(
InnerInvokException
e
)
{
}
catch
(
InnerInvokException
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
...
...
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