From 2929692585407909e95676b0651a9310bb228f48 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 08 七月 2025 14:59:32 +0800 Subject: [PATCH] 前端系统开发部署后,结合真实设备数据,进行测试,修改发现的bug. --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/soil/SoilCtrl.java | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/soil/SoilCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/soil/SoilCtrl.java index 0877929..e3e2cb6 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/soil/SoilCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/soil/SoilCtrl.java @@ -104,6 +104,7 @@ if(qo.soilId == null){ return BaseResponseUtils.buildFail("澧掓儏绔檌d涓嶈兘涓虹┖") ; } + qo.completionTime(); return BaseResponseUtils.buildSuccess(sv.someDay(qo)); } catch (Exception e) { return BaseResponseUtils.buildException(e.getMessage()) ; @@ -142,15 +143,18 @@ /** * 鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍 - * @param soilId + * @param qo * @return */ @GetMapping(path = "oneHistory") @SsoAop() - public BaseResponse<QueryResultVo<List<VoSoil>>> oneHistory(Long soilId){ + public BaseResponse<QueryResultVo<List<VoSoil>>> oneHistory(SoilQo qo){ try { - - return BaseResponseUtils.buildSuccess(sv.oneHistory(soilId)); + if(qo.soilId == null){ + return BaseResponseUtils.buildFail("澧掓儏绔檌d涓嶈兘涓虹┖") ; + } + qo.completionTime(); + return BaseResponseUtils.buildSuccess(sv.oneHistory(qo)); } catch (Exception e) { return BaseResponseUtils.buildException(e.getMessage()) ; } @@ -166,6 +170,7 @@ @SsoAop() public BaseResponse<QueryResultVo<List<VoSoil>>> someLast(SoilQo qo){ try { + qo.completionTime(); return BaseResponseUtils.buildSuccess(sv.someLast(qo)); } catch (Exception e) { return BaseResponseUtils.buildException(e.getMessage()) ; @@ -181,6 +186,7 @@ @SsoAop() public BaseResponse<QueryResultVo<List<VoSoil>>> someHistory(SoilQo qo){ try { + qo.completionTime(); return BaseResponseUtils.buildSuccess(sv.someHistory(qo)); } catch (Exception e) { return BaseResponseUtils.buildException(e.getMessage()) ; -- Gitblit v1.8.0