pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrGroupUnitMapper.java
@@ -5,6 +5,8 @@ import com.dy.pipIrrGlobal.pojoIr.IrIrrigateGroup; import org.apache.ibatis.annotations.Mapper; import java.util.List; /** * @author :WuZeYu * @Date :2024/5/22 13:41 @@ -16,8 +18,7 @@ //增 int insertSelective(IrGroupUnit record); //删 int deleteLogicById(Long id); //删by unitId groupId int deleteByUnitIdGroupId(IrGroupUnit record); @@ -25,4 +26,7 @@ int deleteByUnitId(Long unitId); //删by groupId int deleteByGroupId(Long groupId); //查一个轮灌组绑定的灌溉单元id List<Long> getGroupBindUnits(Long groupId); } pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrGroupUnit.java
@@ -69,9 +69,5 @@ private Date operateDt; /** * 逻辑删除标识;0-未删除，1-删除 */ @Schema(description = "删除标识", requiredMode = Schema.RequiredMode.NOT_REQUIRED) private Byte deleted; } pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrGroupUnitMapper.xml
@@ -9,12 +9,11 @@ <result column="unit_id" jdbcType="BIGINT" property="unitId" /> <result column="operator" jdbcType="BIGINT" property="operator" /> <result column="operate_time" jdbcType="TIMESTAMP" property="operateDt" /> <result column="deleted" jdbcType="TINYINT" property="deleted" /> </resultMap> <sql id="Base_Column_List"> <!--@mbg.generated--> id, group_id, unit_id, `operator`, operate_time, deleted operate_time </sql> <!--添加--> @@ -37,9 +36,7 @@ <if test="operateDt != null"> operate_time, </if> <if test="deleted != null"> deleted, </if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="id != null"> @@ -57,35 +54,29 @@ <if test="operateDt != null"> #{operateDt,jdbcType=TIMESTAMP}, </if> <if test="deleted != null"> #{deleted,jdbcType=TINYINT}, </if> </trim> </insert> <!--逻辑删除--> <delete id="deleteLogicById" parameterType="java.lang.Long"> <!--@mbg.generated--> update ir_group_unit set deleted = 1 where id = #{id,jdbcType=BIGINT} </delete> <delete id="deleteByUnitIdGroupId" parameterType="com.dy.pipIrrGlobal.pojoIr.IrGroupUnit"> update ir_group_unit set deleted = 1,operator = #{operator,jdbcType=BIGINT},operate_time = #{operateDt,jdbcType=TIMESTAMP} delete from ir_group_unit where group_id = #{groupId,jdbcType=BIGINT} and unit_id = #{unitId,jdbcType=BIGINT} </delete> <delete id="deleteByUnitId"> update ir_group_unit set deleted = 1 delete from ir_group_unit where unit_id = #{unitId,jdbcType=BIGINT} </delete> <delete id="deleteByGroupId"> update ir_group_unit set deleted = 1 delete from ir_group_unit where group_id = #{groupId,jdbcType=BIGINT} </delete> <!-- //查一个轮灌组绑定的灌溉单元id--> <select id="getGroupBindUnits" parameterType="Long" resultType="java.lang.Long"> SELECT unit_id AS unitId FROM `ir_group_unit`WHERE group_id = #{groupId,jdbcType=BIGINT} </select> </mapper> pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
@@ -119,7 +119,7 @@ left join ir_project pro on pro.id = gro.project_id left join se_client cli on cli.id = gro.operator left join ir_group_unit gu on gu.group_id = gro.id where gro.id = #{id,jdbcType=BIGINT} and gro.deleted = 0 and gu.deleted = 0 and pro.deleted = 0 where gro.id = #{id,jdbcType=BIGINT} and gro.deleted = 0 and pro.deleted != 1 </select> <!--分页查轮灌组--> @@ -139,7 +139,7 @@ left join se_client cli on cli.id = gro.operator left join ir_group_unit gu on gu.group_id = gro.id <where> gro.deleted = 0 and gu.deleted = 0 and pro.deleted = 0 gro.deleted = 0 and pro.deleted != 1 <if test="projectName != null and projectName != ''"> AND pro.project_name LIKE CONCAT('%', #{projectName}, '%') </if> @@ -147,6 +147,7 @@ AND gro.group_code = #{groupCode} </if> </where> GROUP BY gro.id ORDER BY gro.operate_time DESC <if test="pageCurr != null and pageSize != null"> LIMIT ${(pageCurr-1)*pageSize}, ${pageSize} @@ -154,13 +155,14 @@ </select> <!--分页查轮灌组记录数--> <select id="getRecordCount" resultType="java.lang.Long"> SELECT COUNT(*) AS recordCount SELECT COUNT(*) FROM( SELECT COUNT(*),gro.id AS recordCount from ir_irrigate_group gro left join ir_project pro on pro.id = gro.project_id left join se_client cli on cli.id = gro.operator left join ir_group_unit gu on gu.group_id = gro.id <where> gro.deleted = 0 and gu.deleted = 0 and pro.deleted = 0 gro.deleted = 0 and pro.deleted != 1 <if test="projectName != null and projectName != ''"> AND pro.project_name LIKE CONCAT('%', #{projectName}, '%') </if> @@ -168,5 +170,7 @@ AND gro.group_code = #{groupCode} </if> </where> GROUP BY gro.id ) a </select> </mapper> pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupSv.java
@@ -110,7 +110,6 @@ */ public Integer addGroupUnit(IrGroupUnit po) { po.setOperateDt(new Date()); po.setDeleted((byte) 0); int rows = irGroupUnitMapper.insertSelective(po); if (rows == 0) { return 0; @@ -125,11 +124,20 @@ * @return */ public Integer deleteGroupUnit(IrGroupUnit po) { po.setOperateDt(new Date()); int rows = irGroupUnitMapper.deleteByUnitIdGroupId(po); if (rows == 0) { return 0; } return 1; } /** * 查一个轮灌组绑定的灌溉单元id * @param groupId * @return */ public List<Long> getGroupBindUnits(Long groupId) { List<Long> groupBindUnits = irGroupUnitMapper.getGroupBindUnits(groupId); return groupBindUnits; } }
