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
e073bd4b
Commit
e073bd4b
authored
Nov 12, 2024
by
tianbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:隐患详情、企业详情二维码改为图片
parent
29cd3843
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
5 deletions
+22
-5
DPSubServiceImpl.java
...t/module/statistcs/biz/service/impl/DPSubServiceImpl.java
+6
-1
company.json
...odule-statistics-biz/src/main/resources/json/company.json
+8
-2
problem.json
...odule-statistics-biz/src/main/resources/json/problem.json
+8
-2
No files found.
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/DPSubServiceImpl.java
View file @
e073bd4b
...
@@ -523,7 +523,7 @@ public class DPSubServiceImpl {
...
@@ -523,7 +523,7 @@ public class DPSubServiceImpl {
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
}
}
String
color
=
null
;
String
color
=
"grey"
;
if
(!
ValidationUtil
.
isEmpty
(
problemTime
))
{
if
(!
ValidationUtil
.
isEmpty
(
problemTime
))
{
try
{
try
{
qrcode
.
put
(
"text"
,
DateUtil
.
formatDate
(
DateUtil
.
smartFormat
(
problemTime
),
"yyyy-MM-dd"
));
qrcode
.
put
(
"text"
,
DateUtil
.
formatDate
(
DateUtil
.
smartFormat
(
problemTime
),
"yyyy-MM-dd"
));
...
@@ -537,6 +537,11 @@ public class DPSubServiceImpl {
...
@@ -537,6 +537,11 @@ public class DPSubServiceImpl {
}
else
if
(
"异常"
.
equals
(
problemStatus
)
||
"未处理"
.
equals
(
problemStatus
))
{
}
else
if
(
"异常"
.
equals
(
problemStatus
)
||
"未处理"
.
equals
(
problemStatus
))
{
color
=
"red"
;
color
=
"red"
;
}
}
// 处理隐患和企业详情码:改为固定图片。后期待定义二维码及页面内容后再改为二维码
if
(!
ValidationUtil
.
isEmpty
(
qrcode
.
getString
(
"picUrl"
)))
{
JSONObject
picUrls
=
qrcode
.
getJSONObject
(
"picUrl"
);
qrcode
.
put
(
"url"
,
picUrls
.
getString
(
color
));
}
qrcode
.
put
(
"value"
,
!
ValidationUtil
.
isEmpty
(
result
.
get
(
"SUPERVISORY_CODE"
))
?
supervisionCodePrefix
+
result
.
get
(
"SUPERVISORY_CODE"
)
:
result
.
get
(
"USE_ORG_CODE"
));
qrcode
.
put
(
"value"
,
!
ValidationUtil
.
isEmpty
(
result
.
get
(
"SUPERVISORY_CODE"
))
?
supervisionCodePrefix
+
result
.
get
(
"SUPERVISORY_CODE"
)
:
result
.
get
(
"USE_ORG_CODE"
));
qrcode
.
put
(
"status"
,
problemStatus
);
qrcode
.
put
(
"status"
,
problemStatus
);
qrcode
.
put
(
"color"
,
color
);
qrcode
.
put
(
"color"
,
color
);
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/company.json
View file @
e073bd4b
...
@@ -78,8 +78,14 @@
...
@@ -78,8 +78,14 @@
"title"
:
"{useUnit}"
,
"title"
:
"{useUnit}"
,
"status"
:
[],
"status"
:
[],
"qrcode"
:
{
"qrcode"
:
{
"title"
:
"企业二维码"
,
"title"
:
""
,
"problem"
:
[]
"problem"
:
[],
"picUrl"
:
{
"red"
:
"/upload/tzs/dpscreen/images/安全守护-红.png"
,
"grey"
:
"/upload/tzs/dpscreen/images/安全守护-灰.png"
,
"orange"
:
"/upload/tzs/dpscreen/images/安全守护-橙.png"
,
"green"
:
"/upload/tzs/dpscreen/images/安全守护-绿.png"
}
},
},
"keyParams"
:
[
"keyParams"
:
[
{
"key"
:
"unitType"
,
"label"
:
"单位类型"
},
{
"key"
:
"unitType"
,
"label"
:
"单位类型"
},
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/problem.json
View file @
e073bd4b
...
@@ -78,8 +78,14 @@
...
@@ -78,8 +78,14 @@
"keyinfo"
:
{
"keyinfo"
:
{
"title"
:
"{principalUnit}"
,
"title"
:
"{principalUnit}"
,
"qrcode"
:
{
"qrcode"
:
{
"title"
:
"监管码"
,
"title"
:
""
,
"problem"
:
[]
"problem"
:
[],
"picUrl"
:
{
"red"
:
"/upload/tzs/dpscreen/images/安全守护-红.png"
,
"grey"
:
"/upload/tzs/dpscreen/images/安全守护-灰.png"
,
"orange"
:
"/upload/tzs/dpscreen/images/安全守护-橙.png"
,
"green"
:
"/upload/tzs/dpscreen/images/安全守护-绿.png"
}
},
},
"keyParams"
:
[
"keyParams"
:
[
{
"key"
:
"sourceType"
,
"label"
:
"隐患主体类型"
},
{
"key"
:
"sourceType"
,
"label"
:
"隐患主体类型"
},
...
...
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