Skip to content

A
amos-boot-zx-biz
Commit 0f2eff66 authored by wujiang's avatar wujiang
Browse files
Options

Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

parents f8d574a8 41372463
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TDBigScreenAnalyseController.java
View file @ 0f2eff66
...@@ -867,7 +867,7 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl ...@@ -867,7 +867,7 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
private Page<Map<String, Object>> subSystemPointInfo(String subSystem, String stationId, String equipmentName) { private Page<Map<String, Object>> subSystemPointInfo(String subSystem, String stationId, String equipmentName) {
StationBasic stationBasic = stationBasicMapper.selectById(stationId); StationBasic stationBasic = stationBasicMapper.selectById(stationId);
equipmentName = StrUtil.isNotEmpty(equipmentName) ? "%" + equipmentName + "风机%" : equipmentName; equipmentName = StrUtil.isNotEmpty(equipmentName) && !equipmentName.equals("升压站") ? "%" + equipmentName + "风机%" : equipmentName;
List<Map<String, Object>> healthListInfo = idxBizFanHealthIndexMapper.getHealthInfoBySubSystem(subSystem, List<Map<String, Object>> healthListInfo = idxBizFanHealthIndexMapper.getHealthInfoBySubSystem(subSystem,
stationBasic.getFanGatewayId(), equipmentName,stationBasic.getBoosterGatewayId()); stationBasic.getFanGatewayId(), equipmentName,stationBasic.getBoosterGatewayId());
......
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