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 11:49:54 +08:00
parent e8b6852391
commit e26205e270
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonServiceImpl.java
View File

@ -68,7 +68,7 @@ public class IotCommonServiceImpl {
List<SurvDeviceDeploy> deploys = new ArrayList<>(); List<SurvDeviceDeploy> deploys = new ArrayList<>();
if(voSurvIntegrateParam.getDeployIds() !=null && !voSurvIntegrateParam.getDeployIds().isEmpty()){ if(voSurvIntegrateParam.getDeployIds() !=null && !voSurvIntegrateParam.getDeployIds().isEmpty()){
deploys = fDeviceDeployService.listByIds(voSurvIntegrateParam.getDeployIds()); deploys = fDeviceDeployService.listByIds(voSurvIntegrateParam.getDeployIds());
}else if(voSurvIntegrateParam.getStationCode()!=null && StringUtils.isNotBlank(voSurvIntegrateParam.getStationCode())){ }else{
deploys = fDeviceDeployService.getAllDevice(voSurvIntegrateParam.getStationCode(),deployTypes); deploys = fDeviceDeployService.getAllDevice(voSurvIntegrateParam.getStationCode(),deployTypes);
} }
@ -98,7 +98,7 @@ public class IotCommonServiceImpl {
List<SurvDeviceDeploy> deploys = new ArrayList<>(); List<SurvDeviceDeploy> deploys = new ArrayList<>();
if(voSurvIntegrateParam.getDeployIds() !=null && !voSurvIntegrateParam.getDeployIds().isEmpty()){ if(voSurvIntegrateParam.getDeployIds() !=null && !voSurvIntegrateParam.getDeployIds().isEmpty()){
deploys = fDeviceDeployService.listByIds(voSurvIntegrateParam.getDeployIds()); deploys = fDeviceDeployService.listByIds(voSurvIntegrateParam.getDeployIds());
}else if(voSurvIntegrateParam.getStationCode()!=null && StringUtils.isNotBlank(voSurvIntegrateParam.getStationCode())){ }else {
deploys = fDeviceDeployService.getAllDevice(voSurvIntegrateParam.getStationCode(),deployTypes); deploys = fDeviceDeployService.getAllDevice(voSurvIntegrateParam.getStationCode(),deployTypes);
} }
VOIntegrateStatistic voIntegrateStatistic = new VOIntegrateStatistic(); VOIntegrateStatistic voIntegrateStatistic = new VOIntegrateStatistic();
@ -563,7 +563,7 @@ public class IotCommonServiceImpl {
if(!dataMap.isEmpty()){ if(!dataMap.isEmpty()){
for (String s : dataMap.keySet()) { for (String s : dataMap.keySet()) {
if (s.startsWith("data")) { if (s.startsWith("data")) {
PollutionEnum pollutionEnum = PollutionEnum.catchMessage(s); PollutionEnum pollutionEnum = PollutionEnum.catchPollution(s);
String iconFinalName = pollutionEnum.getIconName(); String iconFinalName = pollutionEnum.getIconName();
String itemFinalName = pollutionEnum.getDescription(); String itemFinalName = pollutionEnum.getDescription();
String bsIcon = pollutionEnum.getBsIcon(); String bsIcon = pollutionEnum.getBsIcon();
@ -1117,7 +1117,7 @@ public class IotCommonServiceImpl {
if(!dataMap.isEmpty()){ if(!dataMap.isEmpty()){
for (String s : dataMap.keySet()) { for (String s : dataMap.keySet()) {
if (s.startsWith("data")) { if (s.startsWith("data")) {
PollutionEnum pollutionEnum = PollutionEnum.catchMessage(s); PollutionEnum pollutionEnum = PollutionEnum.catchPollution(s);
String iconFinalName = pollutionEnum.getIconName(); String iconFinalName = pollutionEnum.getIconName();
String itemFinalName = pollutionEnum.getDescription(); String itemFinalName = pollutionEnum.getDescription();
String bsIcon = pollutionEnum.getBsIcon(); String bsIcon = pollutionEnum.getBsIcon();

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

@ -112,7 +112,6 @@ public class SurvDeviceDeployController {
@PostMapping(value = "/waterIntegrateStatistic") @PostMapping(value = "/waterIntegrateStatistic")
public R<VOIntegrateStatistic> waterIntegrateStatistic(@RequestBody VOWaterSurvIntegrateParam waterSurvIntegrateParam) { public R<VOIntegrateStatistic> waterIntegrateStatistic(@RequestBody VOWaterSurvIntegrateParam waterSurvIntegrateParam) {
Result<VOIntegrateStatistic> job = zhAdminFeignClient.waterIntegrateStatistic(waterSurvIntegrateParam); Result<VOIntegrateStatistic> job = zhAdminFeignClient.waterIntegrateStatistic(waterSurvIntegrateParam);
VOIntegrateStatistic voIntegrateStatistic = job.getResult(); return R.ok(job.getResult());
return R.ok(voIntegrateStatistic);
} }
} }