From e8b6852391a19ba278681a77ac8b5ead47a967b4 Mon Sep 17 00:00:00 2001 From: zy <82248909@qq.com> Date: Mon, 24 Nov 2025 10:34:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B0=B4=E4=BA=94=E5=B8=B8?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applet/controller/SurvDeviceDeployController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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); } }