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

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TDBigScreenAnalyseController.java

@@ -166,8 +166,8 @@ public class TDBigScreenAnalyseController extends BaseController {
 		wrapper.eq(FanHealthIndex::getAnalysisType, "按10分钟");
 		if (CharSequenceUtil.isNotEmpty(stationCode)) {
 			StationBasic stationBasic = stationBasicMapper.selectById(stationCode);
+			stationCode = stationBasic.getFanGatewayId();
 			if ("FDZ".equals(stationBasic.getStationType())) {
-				stationCode = stationBasic.getFanGatewayId();
 				wrapper.eq(FanHealthIndex::getAnalysisObjType, "场站");
 				wrapper.eq(FanHealthIndex::getGatewayId, stationCode);
 				FanHealthIndex fanHealthIndex = fanHealthIndexMapper.selectOne(wrapper);
@@ -351,7 +351,7 @@ public class TDBigScreenAnalyseController extends BaseController {
 			} else {
 				LambdaQueryWrapper<PvHealthIndex> pvwrapper = new LambdaQueryWrapper<PvHealthIndex>();
 				pvwrapper.eq(PvHealthIndex::getAnalysisObjType, "场站");
-				pvwrapper.eq(PvHealthIndex::getGatewayId, stationCode);
+				pvwrapper.eq(PvHealthIndex::getGatewayId, finalStationCode);
 				pvwrapper.orderByDesc(PvHealthIndex::getTs);
 				pvwrapper.last("limit 15");
 				List<PvHealthIndex> pvHealthIndexList = pvHealthIndexMapper.selectList(pvwrapper);