From d730e2a289b38356e28a04b35a0cb2e7b4c6c282 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期四, 03 七月 2025 10:27:56 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/soil/SoilCtrl.java | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 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 90468c2..0877929 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 @@ -63,6 +63,36 @@ } /** + * 鏍规嵁鎸囧畾鏉′欢鏌ヨ鏌愭皵璞$珯鏌愪竴鏃ヨ褰� + * @param soilId + * @param yyyy_MM + * @return + */ + @GetMapping(path = "oneDayByMonth") + @SsoAop() + public BaseResponse<List<VoSoilDay>> oneDayByMonth(Long soilId, String yyyy_MM){ + try { + if(soilId == null){ + return BaseResponseUtils.buildFail("澧掓儏绔檌d涓嶈兘涓虹┖") ; + } + if(yyyy_MM == null || yyyy_MM.trim().equals("")){ + return BaseResponseUtils.buildFail("鏌ヨ鏈堜唤涓嶈兘涓虹┖") ; + } + String ymdStr = yyyy_MM.replaceAll("-", "") ; + if(!NumUtil.isPlusIntNumber(ymdStr)){ + return BaseResponseUtils.buildFail("鏌ヨ鏃ユ湡鏍煎紡涓嶆纭紝鏍煎紡瑙勫畾涓簓yyy-MM-dd") ; + } + Integer ymStart = Integer.parseInt(ymdStr) * 100; + Integer ymEnd = Integer.parseInt(ymdStr) * 100 + 31; + return BaseResponseUtils.buildSuccess(sv.oneDayByMonth(soilId, ymStart, ymEnd)); + } catch (Exception e) { + return BaseResponseUtils.buildException(e.getMessage()) ; + } + } + + + + /** * 鏍规嵁鎸囧畾鏉′欢鏌ヨ鏌愭皵璞$珯涓�浜涙棩璁板綍 * @param qo * @return -- Gitblit v1.8.0