From 7bf80c057f8e17fd37f1936e5b8dc1e1efad4bea Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 11 七月 2024 20:32:14 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitSv.java | 31 +++++++++++++++++++++++++------ 1 files changed, 25 insertions(+), 6 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitSv.java index 620ae40..3ad9207 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateUnit/IrrigateUnitSv.java @@ -1,15 +1,13 @@ package com.dy.pipIrrIrrigate.irrigateUnit; import com.dy.common.webUtil.QueryResultVo; +import com.dy.pipIrrGlobal.daoIr.IrGroupUnitMapper; import com.dy.pipIrrGlobal.daoIr.IrIrrigateUnitMapper; -import com.dy.pipIrrGlobal.daoIr.IrProjectMapper; +import com.dy.pipIrrGlobal.daoIr.IrUnitClientMapper; import com.dy.pipIrrGlobal.pojoIr.IrIrrigateUnit; -import com.dy.pipIrrGlobal.pojoIr.IrProject; -import com.dy.pipIrrGlobal.voIr.VoProject; -import com.dy.pipIrrGlobal.voIr.VoProjectOne; +import com.dy.pipIrrGlobal.pojoIr.IrUnitClient; import com.dy.pipIrrGlobal.voIr.VoUnit; import com.dy.pipIrrGlobal.voIr.VoUnitOne; -import com.dy.pipIrrIrrigate.irrigateUnit.QueryVo; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.common.utils.PojoUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -28,9 +26,13 @@ @Slf4j @Service public class IrrigateUnitSv { - @Autowired private IrIrrigateUnitMapper irIrrigateUnitMapper; + @Autowired + private IrGroupUnitMapper irGroupUnitMapper; + + @Autowired + private IrUnitClientMapper irUnitClientMapper; /** * 鍒涘缓鐏屾簤鍗曞厓 @@ -55,6 +57,7 @@ */ public Integer deleteUnit(Long id) { int rows = irIrrigateUnitMapper.deleteLogicById(id); + irGroupUnitMapper.deleteByUnitId(id); if (rows == 0) { return 0; } @@ -101,4 +104,20 @@ rsVo.obj = irIrrigateUnitMapper.getUnits(params); return rsVo; } + + //鐏屾簤鍗曞厓鍒嗛厤锛堝啘鎴风鍦帮級 + public Long addUnitClient(IrUnitClient po) { + irUnitClientMapper.insert(po); + return po.getId(); + } + + /** + * 鍒犻櫎鐏屾簤鍗曞厓涓庡啘鎴峰叧鑱� + * @param id + * @return + */ + public Integer deleteUnitClient(Long id) { + return irUnitClientMapper.deleteByPrimaryKey(id); + } + } -- Gitblit v1.8.0