From d9437e8c8b95377fde98f5ed9f66e54d9d59e4c6 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期二, 08 四月 2025 17:27:22 +0800 Subject: [PATCH] 小程序获取项目列表取消分页功能 --- pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java | 72 ++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java index 06c4060..6761b72 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java @@ -1,6 +1,7 @@ package com.dy.pipIrrWechat.irrigatePlan; import com.dy.pipIrrGlobal.daoIr.*; +import com.dy.pipIrrGlobal.daoRm.RmCommandHistoryMapper; import com.dy.pipIrrGlobal.pojoIr.IrIrrigatePlan; import com.dy.pipIrrGlobal.pojoIr.IrIrrigateSchedule; import com.dy.pipIrrGlobal.pojoIr.IrPlanOperate; @@ -8,6 +9,8 @@ import com.dy.pipIrrGlobal.voIr.VoIrrigateSchedule; import com.dy.pipIrrGlobal.voIr.VoPlanSimple; import com.dy.pipIrrGlobal.voIr.VoPlans; +import com.dy.pipIrrGlobal.voIr.VoToTerminateIntakes; +import com.dy.pipIrrGlobal.voRm.VoIntakeVc; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -49,6 +52,12 @@ @Autowired private IrGroupIntakeMapper irGroupIntakeMapper; + @Autowired + private IrIntakeOperateMapper irIntakeOperateMapper; + + @Autowired + private RmCommandHistoryMapper rmdCommandHistoryMapper; + /** * 娣诲姞鐏屾簤璁″垝 * @param po @@ -57,6 +66,60 @@ public Long addIrrigatePlan(IrIrrigatePlan po) { irrigatePlanMapper.insert(po); return po.getId(); + } + + /** + * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈣鍒掔殑缁撴潫鏃堕棿锛氭湭鍒犻櫎銆佹湭缁堟銆佸凡鍙戝竷銆佸綋鍓嶆椂闂村皬浜庤鍒掔粨鏉熸椂闂� + * @param planId + * @return + */ + public Date getToTerminatePlan(Long planId) { + return irrigatePlanMapper.getToTerminatePlan(planId); + } + + /** + * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍙栨按鍙D锛堝凡鍙戝竷寮�鍙戝懡浠わ紝鏃犺鏄惁鎴愬姛锛� + * @param planId + * @return + */ + public List<Long> getToTerminateIntakeIds(Long planId) { + return irIntakeOperateMapper.getToTerminateIntakeIds(planId); + } + + /** + * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍛戒护ID鍒楄〃 + * @param planId + * @return + */ + public List<Long> getTerminateCommandIds(Long planId) { + return irIntakeOperateMapper.getTerminateCommandIds(planId); + } + + /** + * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍙栨按鍙e垪琛紙寮�闃�鎴愬姛鐨勶級 + * @param planId + * @return + */ + public List<VoToTerminateIntakes> getToTerminateIntakes(Long planId) { + return irIntakeOperateMapper.getToTerminateIntakes(planId); + } + + /** + * 鏍规嵁鍛戒护鏃ュ織ID鑾峰彇鍙栨按鍙e強铏氭嫙鍗′俊鎭紝缁堟鐏屾簤璁″垝鏃朵娇鐢紝鐢ㄦ潵鎵ц杩滅▼鍏抽榾 + * @param commandId + * @return + */ + public VoIntakeVc getValveOpen(Long commandId) { + return rmdCommandHistoryMapper.getValveOpen(commandId); + } + + /** + * 淇敼鐏屾簤璁″垝 + * @param po + * @return + */ + public Integer updatePlan(IrIrrigatePlan po) { + return irrigatePlanMapper.updateByPrimaryKeySelective(po); } /** @@ -124,6 +187,15 @@ } /** + * 鏍规嵁璁″垝ID缁堟鐏屾簤娆″簭锛屽皢鐏屾簤娆″簭鐨勫綋鍓嶇姸鎬佹敼涓哄凡缁堟 + * @param planId + * @return + */ + public Integer terminateSchedule(Long planId) { + return irIrrigateScheduleMapper.terminateSchedule(planId); + } + + /** * 鏍规嵁璁″垝ID鑾峰彇鐏屾簤娆″簭璁板綍 * @param planId * @return -- Gitblit v1.8.0