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
d0b253eb
Commit
d0b253eb
authored
Dec 04, 2023
by
李秀明
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(消防视图): 换流站区域下面点击设备未打开设备信息卡且接口报错
【web端】站端3711:全景监控>消防视图>换流站区域下面点击设备未打开设备信息卡且接口报错 Closes
http://113.142.68.105:5080/zentao/task-view-21172.html
parent
a5438d12
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
PointTreeVo.java
...com/yeejoin/equipmanage/common/entity/vo/PointTreeVo.java
+5
-0
EquipmentDetailController.java
...oin/equipmanage/controller/EquipmentDetailController.java
+7
-3
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/PointTreeVo.java
View file @
d0b253eb
...
@@ -151,4 +151,9 @@ public class PointTreeVo {
...
@@ -151,4 +151,9 @@ public class PointTreeVo {
private
String
code
;
private
String
code
;
//建筑类型
//建筑类型
private
String
groupType
;
private
String
groupType
;
/**
* 画布id
*/
private
String
bizOrgCode
;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java
View file @
d0b253eb
...
@@ -53,6 +53,7 @@ import javax.servlet.http.HttpServletRequest;
...
@@ -53,6 +53,7 @@ import javax.servlet.http.HttpServletRequest;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.text.SimpleDateFormat
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
java.util.*
;
import
java.util.concurrent.atomic.AtomicReference
;
/**
/**
...
@@ -256,10 +257,13 @@ public class EquipmentDetailController extends AbstractBaseController {
...
@@ -256,10 +257,13 @@ public class EquipmentDetailController extends AbstractBaseController {
}
}
FireFightingSystemEntity
fightingSystemEntity
=
new
FireFightingSystemEntity
();
FireFightingSystemEntity
fightingSystemEntity
=
new
FireFightingSystemEntity
();
if
(!
ObjectUtils
.
isEmpty
(
equipmentSpecific
.
getSystemId
())){
if
(!
ObjectUtils
.
isEmpty
(
equipmentSpecific
.
getSystemId
())){
fightingSystemEntity
=
fireFightingSystemService
.
getOneById
(
Long
.
valueOf
(
equipmentSpecific
.
getSystemId
()));
String
ids
=
equipmentSpecific
.
getSystemId
();
equipmentSpecific
.
setSystemId
(
fightingSystemEntity
.
getName
());
String
[]
idArray
=
ids
.
split
(
","
);
AtomicReference
<
String
>
name
=
new
AtomicReference
<>(
""
);
fireFightingSystemService
.
listByIds
(
Arrays
.
asList
(
idArray
)).
forEach
(
x
->
name
.
set
(
name
.
get
()
+
x
.
getName
()
+
","
));
fightingSystemEntity
.
setName
(
name
.
get
().
substring
(
0
,
name
.
get
().
length
()
-
1
));
}
else
{
}
else
{
equipmentSpecific
.
setSystem
Id
(
""
);
equipmentSpecific
.
setSystem
Name
(
""
);
}
}
equipmentSpecific
.
setSystemId
(
fightingSystemEntity
.
getName
());
equipmentSpecific
.
setSystemId
(
fightingSystemEntity
.
getName
());
equipmentSpecific
.
setFullqrCode
(
"01#"
+
equipmentSpecific
.
getQrCode
());
equipmentSpecific
.
setFullqrCode
(
"01#"
+
equipmentSpecific
.
getQrCode
());
...
...
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