删除锁时不删除标记为1

whyclxw

2025-04-25 ecec7bc4d8e15fbb44a06af507cd919bf018d288

删除锁时不删除标记为1

 src/main/java/com/whyc/pojo/plus_inf/LockInf.java

@@ -98,6 +98,9 @@
    @ApiModelProperty(value = "锁的蓝牙状态(0：关闭，1：开启)")
    private Integer blState;

    @ApiModelProperty(value = "删除的标记(0：未删除，1：删除)")
    private Integer delFlag;

    @ApiModelProperty(value = "总机房名")
    @TableField(exist = false)
    private String stationName;

 src/main/java/com/whyc/service/LockInfService.java

@@ -208,7 +208,8 @@
    public Response delLock(Integer lockId) {
        UpdateWrapper wrapper=new UpdateWrapper();
        wrapper.eq("lock_id",lockId);
        int flag=mapper.delete(wrapper);
        wrapper.set("del_flag",1);//删除时标记为1
        int flag=mapper.update((LockInf) ActionUtil.objeNull,wrapper);
        if(flag==1){
            //删除包机组下记录
            UpdateWrapper wrapper1=new UpdateWrapper();

 src/main/resources/mapper/LockInfMapper.xml

@@ -32,6 +32,7 @@
            <if test="dto.lockState!=null">
                and tb_lock_inf.lock_state=#{dto.lockState}
            </if>
            and tb_lock_inf.del_flag=0
            and tb_lock_inf.lock_id in(
            select distinct lock_id from plus_user.tb_baojigroup_lock,plus_user.tb_baojigroup_usr
            <where>
@@ -51,6 +52,7 @@
        from plus_inf.tb_lock_inf,plus_inf.tb_station_inf
        <where>
            tb_lock_inf.station_id=tb_station_inf.station_id
            and tb_lock_inf.del_flag=0
            <if test="lockIdList!=null">
                and tb_lock_inf.lock_id in
                <foreach collection="lockIdList" item="id" open="(" separator="," close=")">
@@ -65,6 +67,7 @@
        ,tb_station_inf.station_name,tb_station_inf.station_name1,tb_station_inf.station_name2,tb_station_inf.station_name3,tb_station_inf.station_name4
        from plus_inf.tb_lock_inf,plus_inf.tb_station_inf
        <where>
            and tb_lock_inf.del_flag=0
            tb_lock_inf.station_id=tb_station_inf.station_id
            and lock_id=#{lockId}
        </where>
@@ -73,7 +76,8 @@
    <select id="getScreenType" resultType="java.lang.String">
        select distinct screen_box_type from plus_inf.tb_lock_inf
        <where>
            tb_lock_inf.lock_id in(
            tb_lock_inf.del_flag=0
            and tb_lock_inf.lock_id in(
            select distinct lock_id from plus_user.tb_baojigroup_lock,plus_user.tb_baojigroup_usr
            <where>
                tb_baojigroup_lock.baoji_id=tb_baojigroup_usr.baoji_id
@@ -87,7 +91,8 @@
    <select id="getScreenProduct" resultType="java.lang.String">
        select distinct screen_box_product from plus_inf.tb_lock_inf
        <where>
            tb_lock_inf.lock_id in(
            tb_lock_inf.del_flag=0
            and tb_lock_inf.lock_id in(
            select distinct lock_id from plus_user.tb_baojigroup_lock,plus_user.tb_baojigroup_usr
            <where>
                tb_baojigroup_lock.baoji_id=tb_baojigroup_usr.baoji_id
@@ -119,6 +124,7 @@
            <if test="dto.lockName!=null">
                and tb_lock_inf.lock_name  LIKE CONCAT('%',#{dto.lockName},'%')
            </if>
            and tb_lock_inf.del_flag=0
            and tb_lock_inf.lock_id in(
            select distinct lock_id from plus_user.tb_baojigroup_lock,plus_user.tb_baojigroup_usr
            <where>
@@ -135,6 +141,7 @@
        select tb_lock_inf.*,tb_station_inf.station_name
        from plus_inf.tb_lock_inf,plus_inf.tb_station_inf
        where tb_lock_inf.station_id=tb_station_inf.station_id
        and tb_lock_inf.del_flag=0
        order by tb_lock_inf.num asc
    </select>