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
baf2ddf2
Commit
baf2ddf2
authored
Mar 22, 2023
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
0966861c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
EquipmentSpecificVo.java
...oin/equipmanage/common/entity/vo/EquipmentSpecificVo.java
+1
-1
ESeqServiceImpl.java
...com/yeejoin/equipmanage/service/impl/ESeqServiceImpl.java
+1
-1
EquipmentSpecificMapper.xml
...uip/src/main/resources/mapper/EquipmentSpecificMapper.xml
+3
-2
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/EquipmentSpecificVo.java
View file @
baf2ddf2
...
@@ -34,7 +34,7 @@ public class EquipmentSpecificVo implements Serializable {
...
@@ -34,7 +34,7 @@ public class EquipmentSpecificVo implements Serializable {
private
int
single
;
private
int
single
;
@ApiModelProperty
(
value
=
"所属系统"
)
@ApiModelProperty
(
value
=
"所属系统"
)
private
Lo
ng
systemId
;
private
Stri
ng
systemId
;
@ApiModelProperty
(
value
=
"物联code"
)
@ApiModelProperty
(
value
=
"物联code"
)
private
String
iotCode
;
private
String
iotCode
;
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ESeqServiceImpl.java
View file @
baf2ddf2
...
@@ -79,7 +79,7 @@ public class ESeqServiceImpl implements IESeqService {
...
@@ -79,7 +79,7 @@ public class ESeqServiceImpl implements IESeqService {
NativeSearchQueryBuilder
queryBuilder
=
new
NativeSearchQueryBuilder
()
NativeSearchQueryBuilder
queryBuilder
=
new
NativeSearchQueryBuilder
()
.
withQuery
(
.
withQuery
(
QueryBuilders
.
boolQuery
()
QueryBuilders
.
boolQuery
()
.
must
(
QueryBuilders
.
term
Query
(
"systemId"
,
systemId
))
.
must
(
QueryBuilders
.
fuzzy
Query
(
"systemId"
,
systemId
))
.
must
(
QueryBuilders
.
termQuery
(
"isAlarm"
,
0
))
.
must
(
QueryBuilders
.
termQuery
(
"isAlarm"
,
0
))
.
must
(
QueryBuilders
.
rangeQuery
(
"time"
).
gte
(
startTime
).
lte
(
endTime
))
.
must
(
QueryBuilders
.
rangeQuery
(
"time"
).
gte
(
startTime
).
lte
(
endTime
))
)
)
...
...
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml
View file @
baf2ddf2
...
@@ -162,8 +162,9 @@
...
@@ -162,8 +162,9 @@
`wes`.`system_id`
`wes`.`system_id`
)) AS `code`,
)) AS `code`,
wes.system_id systemId,
wes.system_id systemId,
(SELECT fs.name FROM f_fire_fighting_system fs WHERE `wes`.`system_id`=fs.id) AS systemName
( SELECT GROUP_CONCAT(fs.name) FROM f_fire_fighting_system fs WHERE `wes`.`system_id` like CONCAT("%",fs.id,'%') ) AS systemName
FROM
FROM
wl_equipment_specific AS wes
wl_equipment_specific AS wes
where TRIM(wes.iot_code) != '' AND wes.iot_code IS NOT NULL
where TRIM(wes.iot_code) != '' AND wes.iot_code IS NOT NULL
UNION ALL
UNION ALL
...
...
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