From c3d51f9ba3300b60261d13a5b0b4f7402bba0ee0 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期三, 02 四月 2025 08:30:00 +0800 Subject: [PATCH] 修改轮灌组接口、分页获取轮灌组接口、获取全部轮灌组接口、获取轮灌组详情接口 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmCommandHistoryMapper.java | 53 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 44 insertions(+), 9 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmCommandHistoryMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmCommandHistoryMapper.java index 243d928..183454d 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmCommandHistoryMapper.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmCommandHistoryMapper.java @@ -2,9 +2,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory; +import com.dy.pipIrrGlobal.voRm.VoCommand; +import com.dy.pipIrrGlobal.voRm.VoRtuAndVc; import com.dy.pipIrrGlobal.voRm.VoUnclosedParam; import com.dy.pipIrrGlobal.voRm.VoUnclosedValve; -import com.dy.pipIrrGlobal.voRm.VoCommand; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -13,32 +14,48 @@ /** * @author ZhuBaoMin - * @date 2024-05-24 10:46 - * @LastEditTime 2024-05-24 10:46 + * @date 2024-07-17 10:31 + * @LastEditTime 2024-07-17 10:31 * @Description */ @Mapper public interface RmCommandHistoryMapper extends BaseMapper<RmCommandHistory> { - int deleteByPrimaryKey(Long id); + int deleteByPrimaryKey(Long comId); int insert(RmCommandHistory record); int insertSelective(RmCommandHistory record); - RmCommandHistory selectByPrimaryKey(Long id); + RmCommandHistory selectByPrimaryKey(Long comId); int updateByPrimaryKeySelective(RmCommandHistory record); int updateByPrimaryKey(RmCommandHistory record); + /** - * 鏍规嵁鎿嶄綔鍛業D鑾峰彇鏈叧闃�璁板綍锛堝寘鍚湪绾挎儏鍐碉級 - * @param onLineMap + * 鏍规嵁operator鑾峰彇鏈叧闃�鐨凴TU鍦板潃鍙婅櫄鎷熷崱缂栧彿鏁版嵁瀵癸紝鑾峰彇鏈叧闃�璁板綍浣跨敤 * @param operator * @return */ - List<VoUnclosedValve> getUnclosedValves(@Param("onLineMap") String onLineMap, @Param("operator") Long operator); + List<VoRtuAndVc> getUnclosedRtus(Long operator); + + /** + * 鏍规嵁RTU鍦板潃鍜岃櫄鎷熷崱缂栧彿鑾峰彇鎴愬姛寮�闃�鐨勬渶鍚庝竴鏉¤褰曪紝鑾峰彇鏈叧闃�璁板綍浣跨敤 + * @param rtuAddr + * @param vcNum + * @return + */ + Long getLastComId(@Param("rtuAddr")String rtuAddr, @Param("vcNum")String vcNum); + + /** + * 鏍规嵁鍛戒护鏃ュ織缂栧彿闆嗗悎鑾峰彇鏈叧闃�璁板綍 + * @param onLineMap + * @param comIds + * @return + */ + List<VoUnclosedValve> getUnclosedValves(@Param("onLineMap") String onLineMap, @Param("comIds") String comIds); /** * 鏍规嵁鍙栨按鍙D鑾峰彇璇ュ彇姘村彛鏈叧闃�鍙傛暟锛屽钩鍙伴�夋嫨鍙栨按鍙e叧闃�浣跨敤 @@ -47,6 +64,24 @@ */ VoUnclosedParam getUncloseParam(@Param("onLineMap") String onLineMap, @Param("intakeId")Long intakeId); - //鑾峰彇鍛戒护鍘嗗彶璁板綍 + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍛戒护鏃ュ織鍘嗗彶璁板綍鎬绘暟 + * @param params + * @return + */ + Long getCommandHistoriesCount(Map<?, ?> params); + + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍛戒护鏃ュ織鍘嗗彶璁板綍 + * @param params + * @return + */ List<VoCommand> getCommandHistories(Map<?, ?> params); + + /** + * 鏍规嵁鍛戒护鏃ュ織ID鑾峰彇棰勭害鏃堕棿锛屽悜铏氭嫙鍗″啓寮�闃�鏃堕棿鐢� + * @param commId + * @return + */ + String getTimeByCommId(Long commId); } \ No newline at end of file -- Gitblit v1.8.0