From aa36d81e83b27c52d126af07a186bf8a9cc9a4f6 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 26 六月 2025 14:36:55 +0800 Subject: [PATCH] 1、增加墒情日数据查询功能; 2、完善代码。 --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureCtrl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 44 insertions(+), 8 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureCtrl.java index 1b6f71b..b441754 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureCtrl.java @@ -35,15 +35,36 @@ } /** - * 鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍 - * @param qo + * 鏍规嵁鎸囧畾鏉′欢鏌ヨ鏈�鏂拌褰� + * @param manureId * @return */ - @GetMapping(path = "history") + @GetMapping(path = "oneLast") @SsoAop() - public BaseResponse<QueryResultVo<List<VoManure>>> selectHistory(ManureQo qo){ + public BaseResponse<VoManure> oneLast(Long manureId){ try { - return BaseResponseUtils.buildSuccess(sv.selectHistory(qo)); + if(manureId == null){ + return BaseResponseUtils.buildFail("姘磋偉鏈篿d涓嶈兘涓虹┖") ; + } + return BaseResponseUtils.buildSuccess(sv.oneLast(manureId)); + } catch (Exception e) { + return BaseResponseUtils.buildException(e.getMessage()) ; + } + } + + /** + * 鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍 + * @param manureId + * @return + */ + @GetMapping(path = "oneHistory") + @SsoAop() + public BaseResponse<QueryResultVo<List<VoManure>>> oneHistory(Long manureId){ + try { + if(manureId == null){ + return BaseResponseUtils.buildFail("姘磋偉鏈篿d涓嶈兘涓虹┖") ; + } + return BaseResponseUtils.buildSuccess(sv.oneHistory(manureId)); } catch (Exception e) { return BaseResponseUtils.buildException(e.getMessage()) ; } @@ -54,11 +75,26 @@ * @param qo * @return */ - @GetMapping(path = "last") + @GetMapping(path = "someLast") @SsoAop() - public BaseResponse<QueryResultVo<List<VoManure>>> selectLast(ManureQo qo){ + public BaseResponse<QueryResultVo<List<VoManure>>> someLast(ManureQo qo){ try { - return BaseResponseUtils.buildSuccess(sv.selectLast(qo)); + return BaseResponseUtils.buildSuccess(sv.someLast(qo)); + } catch (Exception e) { + return BaseResponseUtils.buildException(e.getMessage()) ; + } + } + + /** + * 鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍 + * @param qo + * @return + */ + @GetMapping(path = "someHistory") + @SsoAop() + public BaseResponse<QueryResultVo<List<VoManure>>> someHistory(ManureQo qo){ + try { + return BaseResponseUtils.buildSuccess(sv.someHistory(qo)); } catch (Exception e) { return BaseResponseUtils.buildException(e.getMessage()) ; } -- Gitblit v1.8.0