Administrator
/
FenXiNspJavaMain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

This commit is contained in:
zy 2025-11-24 12:23:25 +08:00
parent e26205e270
commit a26e53f053
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java
View File

@ -416,7 +416,7 @@ public class BigScreenController {
if(StringUtils.isNotBlank(dataMode)){ if(StringUtils.isNotBlank(dataMode)){
dataTypes = dataMode; dataTypes = dataMode;
} }
if(IotConstants.Data_Types_All.equals(dataMode) || IotConstants.Data_Types_Nsp.equals(dataMode)) { if(IotConstants.Data_Types_All.equals(dataTypes) || IotConstants.Data_Types_Nsp.equals(dataTypes)) {
if (orientList.size() > 0) {//面源 if (orientList.size() > 0) {//面源
SurvTransdataOrientwaterVo transdataOrientwaterVo = transdataOrientwaterService.getNewestDataWithStation(orientList); SurvTransdataOrientwaterVo transdataOrientwaterVo = transdataOrientwaterService.getNewestDataWithStation(orientList);
@ -543,7 +543,7 @@ public class BigScreenController {
} }
} }
if(IotConstants.Data_Types_All.equals(dataMode) || IotConstants.Data_Types_Water.equals(dataMode)) { if(IotConstants.Data_Types_All.equals(dataTypes) || IotConstants.Data_Types_Water.equals(dataTypes)) {
if (!waterList.isEmpty()) { //五常 if (!waterList.isEmpty()) { //五常
List<CommonDataTrans> commonDataTrans = CommonUtils.transData(waterList.get(0), false, null, null, null, null).getTransData(); List<CommonDataTrans> commonDataTrans = CommonUtils.transData(waterList.get(0), false, null, null, null, null).getTransData();
listFinal.addAll(commonDataTrans); listFinal.addAll(commonDataTrans);

4
zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/WxAppletController.java
View File

@ -186,7 +186,7 @@ public class WxAppletController {
if(StringUtils.isNotBlank(dataMode)){ if(StringUtils.isNotBlank(dataMode)){
dataTypes = dataMode; dataTypes = dataMode;
} }
if(IotConstants.Data_Types_All.equals(dataMode) || IotConstants.Data_Types_Nsp.equals(dataMode)) { if(IotConstants.Data_Types_All.equals(dataTypes) || IotConstants.Data_Types_Nsp.equals(dataTypes)) {
if (orientList.size() > 0) {//面源 if (orientList.size() > 0) {//面源
SurvTransdataOrientwaterVo transdataOrientwaterVo = orientwaterService.getNewestDataWithStation(orientList); SurvTransdataOrientwaterVo transdataOrientwaterVo = orientwaterService.getNewestDataWithStation(orientList);
if (transdataOrientwaterVo != null) { if (transdataOrientwaterVo != null) {
@ -307,7 +307,7 @@ public class WxAppletController {
} }
} }
} }
if(IotConstants.Data_Types_All.equals(dataMode) || IotConstants.Data_Types_Water.equals(dataMode)) { if(IotConstants.Data_Types_All.equals(dataTypes) || IotConstants.Data_Types_Water.equals(dataTypes)) {
if(!waterList.isEmpty()) {//五常 if(!waterList.isEmpty()) {//五常
VOTransData voTransData = zhAdminFeignClient.deviceNewestData(waterList.get(0)); VOTransData voTransData = zhAdminFeignClient.deviceNewestData(waterList.get(0));
if(voTransData!=null){ if(voTransData!=null){