删除锁时不删除标记为1

whyclxw

2025-04-25 06380d2e9f54d219122e2ff5fc2c172f0e778316

删除锁时不删除标记为1

 src/main/java/com/whyc/mapper/LockCtlLogMapper.java

@@ -13,8 +13,6 @@
    //获取开锁日志
    List<LockCtlLog> getAllLog(@Param("lockIds")List<Integer> lockIds);

    //首页分组统计前10开锁次数
    List<HomeCtlGroupDto> getGroupCtlCount(@Param("uid") int uid);
    //查询开锁日志
    List<LockCtlLog> getLockLog(@Param("logDto")LocklogDto logDto);
}

 src/main/resources/mapper/BaojigroupLockMapper.xml

@@ -14,6 +14,7 @@
        where
              tb_baojigroup_lock.station_id=tb_station_inf.station_id
              and tb_baojigroup_lock.lock_id=tb_lock_inf.lock_id
              and tb_lock_inf.del_flag=0
              and baoji_id=#{id}
        order by tb_baojigroup_lock.baoji_id asc ,tb_baojigroup_lock.station_id asc,tb_baojigroup_lock.lock_id asc
    </select>

 src/main/resources/mapper/LockAlarmMapper.xml

@@ -32,6 +32,7 @@
                     #{almId}
                 </foreach>
             </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>

 src/main/resources/mapper/LockBlMapper.xml

@@ -32,6 +32,7 @@
            <if test="dto.type!=null">
                and tb_lock_bl.type=#{type}
            </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>

 src/main/resources/mapper/LockCtlLogMapper.xml

@@ -15,6 +15,7 @@
       <where>
           tb_lock_ctl_log.lock_id=tb_lock_inf.lock_id
           and  ctl_result=0
           and tb_lock_inf.del_flag=0
           <if test="lockIds!=null">
               and tb_lock_ctl_log.lock_id in
               <foreach collection="lockIds" item="lockId" open="(" separator="," close=")">
@@ -28,6 +29,7 @@
        select tb_lock_ctl_log.*,tb_lock_inf.lock_name from plus_lock_ram.tb_lock_ctl_log,plus_inf.tb_lock_inf
        <where>
            tb_lock_ctl_log.lock_id=tb_lock_inf.lock_id
            and tb_lock_inf.del_flag=0
            <if test="lockIds!=null">
                and tb_lock_ctl_log.lock_id in
                <foreach collection="lockIds" item="lockId" open="(" separator="," close=")">
@@ -36,11 +38,6 @@
            </if>
        </where>
        order  by ctl_time desc
    </select>
    <select id="getGroupCtlCount" resultType="com.whyc.dto.HomeCtlGroupDto">
        SELECT lock_id, COUNT(lock_id) AS lock_id_count
        FROM plus_lock_ram.tb_lock_ctl_log
        GROUP BY lock_id;
    </select>
    <select id="getLockLog" resultType="com.whyc.pojo.plus_lock_ram.LockCtlLog">
        SELECT tb_lock_ctl_log.*,tb_lock_inf.*,tb_station_inf.*
@@ -69,6 +66,7 @@
            <if test="logDto.endTime!=null">
                and tb_lock_ctl_log.ctl_time&lt;=#{logDto.endTime}
            </if>
            and tb_lock_inf.del_flag=0
            and tb_lock_ctl_log.lock_id in(
            select distinct lock_id from plus_user.tb_baojigroup_lock,plus_user.tb_baojigroup_usr
            <where>

 src/main/resources/mapper/LockReportMapper.xml

@@ -6,6 +6,7 @@
        select tb_lock_report.*, tb_lock_inf.lock_name from plus_lock_ram.tb_lock_report,plus_inf.tb_lock_inf
        <where>
            tb_lock_report.lock_id = tb_lock_inf.lock_id
            and tb_lock_inf.del_flag=0
            <if test="lockIds != null and lockIds.size() > 0">
                and tb_lock_inf.lock_id in
                <foreach collection="lockIds" item="id" open="(" separator="," close=")">