Commit baf2ddf2 authored by tangwei's avatar tangwei

修改bug

parent 0966861c
...@@ -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 Long systemId; private String systemId;
@ApiModelProperty(value = "物联code") @ApiModelProperty(value = "物联code")
private String iotCode; private String iotCode;
......
...@@ -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.termQuery("systemId", systemId)) .must(QueryBuilders.fuzzyQuery("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))
) )
......
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment