Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YeeAmosFireAutoSysRoot
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
station
YeeAmosFireAutoSysRoot
Commits
df2cb5ae
Commit
df2cb5ae
authored
Jun 16, 2022
by
maoying
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改三维初始化设备巡查状态显示问题
parent
4d5490cc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
RiskSourceServiceImpl.java
...amos/fas/business/service/impl/RiskSourceServiceImpl.java
+1
-0
dbTemplate_equipment_specific_index.xml
...sources/db/mapper/dbTemplate_equipment_specific_index.xml
+4
-2
dbTemplate_p_point.xml
...Start/src/main/resources/db/mapper/dbTemplate_p_point.xml
+1
-0
No files found.
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java
View file @
df2cb5ae
...
@@ -825,6 +825,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
...
@@ -825,6 +825,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
specificIndexVo
.
setName
(
name
);
specificIndexVo
.
setName
(
name
);
specificIndexVo
.
setCode
(
protalData
.
getPointNo
());
specificIndexVo
.
setCode
(
protalData
.
getPointNo
());
specificIndexVo
.
setType
(
"patrol"
);
specificIndexVo
.
setType
(
"patrol"
);
specificIndexVo
.
setTypeCode
(
"patrol"
);
specificIndexVo
.
setNameKey
(
"patrol"
);
specificIndexVo
.
setNameKey
(
"patrol"
);
if
(
"2"
.
equals
(
nodeState
)
||
"3"
.
equals
(
nodeState
))
{
if
(
"2"
.
equals
(
nodeState
)
||
"3"
.
equals
(
nodeState
))
{
specificIndexVo
.
setValue
(
"true"
);
specificIndexVo
.
setValue
(
"true"
);
...
...
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_equipment_specific_index.xml
View file @
df2cb5ae
...
@@ -70,10 +70,12 @@
...
@@ -70,10 +70,12 @@
wes.realtime_iot_index_key AS name_key,
wes.realtime_iot_index_key AS name_key,
wes.realtime_iot_index_name AS equipmentIndexName,
wes.realtime_iot_index_name AS equipmentIndexName,
wes.realtime_iot_index_value AS `value`,
wes.realtime_iot_index_value AS `value`,
'equip' AS type
'equip' AS type,
ei.type_code as typeCode,
wes.iot_code as iotCode
FROM
FROM
wl_equipment_specific wes
wl_equipment_specific wes
LEFT JOIN wl_equipment_index ei ON ei.id = wes.realtime_iot_
es_
index_id
LEFT JOIN wl_equipment_index ei ON ei.id = wes.realtime_iot_index_id
WHERE
WHERE
ei.is_iot = 1
ei.is_iot = 1
<if
test=
"value != null and value != ''"
>
<if
test=
"value != null and value != ''"
>
...
...
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_p_point.xml
View file @
df2cb5ae
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
p.point_no AS `code`,
p.point_no AS `code`,
'patrol' AS type,
'patrol' AS type,
'patrol' AS nameKey,
'patrol' AS nameKey,
'patrol' AS typeCode,
CASE
CASE
WHEN p.`status` = '2' THEN
WHEN p.`status` = '2' THEN
'true'
'true'
...
...
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