diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java index 38b9cc6..91d5e17 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java @@ -14,6 +14,7 @@ import org.jeecg.common.iot.common.VOIntegrateStatistic; import org.jeecg.common.iot.common.VOSurvIntegrateParam; import org.jeecg.common.iot.common.VOWaterSurvIntegrateParam; 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.client.ZhAdminFeignClient; import org.jeecg.system.applet.service.ISurvDeviceDeployService; @@ -102,16 +103,16 @@ public class SurvDeviceDeployController { @ApiOperation(value = "站点/设备空气土壤监测综合数据统计", notes = "") @PostMapping(value = "/survIntegrateStatistic") public R survIntegrateStatistic(@RequestBody VOSurvIntegrateParam voSurvIntegrateParam) { - JSONObject job = zhAdminFeignClient.survIntegrateStatistic(voSurvIntegrateParam); - VOIntegrateStatistic voIntegrateStatistic = job.getObject("result",VOIntegrateStatistic.class); + Result job = zhAdminFeignClient.survIntegrateStatistic(voSurvIntegrateParam); + VOIntegrateStatistic voIntegrateStatistic = job.getResult(); return R.ok(voIntegrateStatistic); } @ApiOperation(value = "站点/设备面源畜禽监测综合数据统计", notes = "") @PostMapping(value = "/waterIntegrateStatistic") public R waterIntegrateStatistic(@RequestBody VOWaterSurvIntegrateParam waterSurvIntegrateParam) { - JSONObject job = zhAdminFeignClient.waterIntegrateStatistic(waterSurvIntegrateParam); - VOIntegrateStatistic voIntegrateStatistic = job.getObject("result",VOIntegrateStatistic.class); + Result job = zhAdminFeignClient.waterIntegrateStatistic(waterSurvIntegrateParam); + VOIntegrateStatistic voIntegrateStatistic = job.getResult(); return R.ok(voIntegrateStatistic); } }