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

增加水五常支持

This commit is contained in:
zy 2025-11-24 10:34:09 +08:00
parent 5367184917
commit e8b6852391
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ import org.jeecg.common.iot.common.VOIntegrateStatistic;
import org.jeecg.common.iot.common.VOSurvIntegrateParam; import org.jeecg.common.iot.common.VOSurvIntegrateParam;
import org.jeecg.common.iot.common.VOWaterSurvIntegrateParam; import org.jeecg.common.iot.common.VOWaterSurvIntegrateParam;
import org.jeecg.common.util.R; import org.jeecg.common.util.R;
import org.jeecg.common.vo.iot.common.Result;
import org.jeecg.system.applet.annotation.ApiLogin; import org.jeecg.system.applet.annotation.ApiLogin;
import org.jeecg.system.applet.client.ZhAdminFeignClient; import org.jeecg.system.applet.client.ZhAdminFeignClient;
import org.jeecg.system.applet.service.ISurvDeviceDeployService; import org.jeecg.system.applet.service.ISurvDeviceDeployService;
@ -102,16 +103,16 @@ public class SurvDeviceDeployController {
@ApiOperation(value = "站点/设备空气土壤监测综合数据统计", notes = "") @ApiOperation(value = "站点/设备空气土壤监测综合数据统计", notes = "")
@PostMapping(value = "/survIntegrateStatistic") @PostMapping(value = "/survIntegrateStatistic")
public R<VOIntegrateStatistic> survIntegrateStatistic(@RequestBody VOSurvIntegrateParam voSurvIntegrateParam) { public R<VOIntegrateStatistic> survIntegrateStatistic(@RequestBody VOSurvIntegrateParam voSurvIntegrateParam) {
JSONObject job = zhAdminFeignClient.survIntegrateStatistic(voSurvIntegrateParam); Result<VOIntegrateStatistic> job = zhAdminFeignClient.survIntegrateStatistic(voSurvIntegrateParam);
VOIntegrateStatistic voIntegrateStatistic = job.getObject("result",VOIntegrateStatistic.class); VOIntegrateStatistic voIntegrateStatistic = job.getResult();
return R.ok(voIntegrateStatistic); return R.ok(voIntegrateStatistic);
} }
@ApiOperation(value = "站点/设备面源畜禽监测综合数据统计", notes = "") @ApiOperation(value = "站点/设备面源畜禽监测综合数据统计", notes = "")
@PostMapping(value = "/waterIntegrateStatistic") @PostMapping(value = "/waterIntegrateStatistic")
public R<VOIntegrateStatistic> waterIntegrateStatistic(@RequestBody VOWaterSurvIntegrateParam waterSurvIntegrateParam) { public R<VOIntegrateStatistic> waterIntegrateStatistic(@RequestBody VOWaterSurvIntegrateParam waterSurvIntegrateParam) {
JSONObject job = zhAdminFeignClient.waterIntegrateStatistic(waterSurvIntegrateParam); Result<VOIntegrateStatistic> job = zhAdminFeignClient.waterIntegrateStatistic(waterSurvIntegrateParam);
VOIntegrateStatistic voIntegrateStatistic = job.getObject("result",VOIntegrateStatistic.class); VOIntegrateStatistic voIntegrateStatistic = job.getResult();
return R.ok(voIntegrateStatistic); return R.ok(voIntegrateStatistic);
} }
} }