whyclxw
2025-04-18 73664fba9c0803fdb14451986e82bb0e79cdd8df
告警实时推送和日志修改
6个文件已修改
1个文件已添加
132 ■■■■■ 已修改文件
src/main/java/com/whyc/controller/LockCtlLogController.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/dto/LocklogDto.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/LockCtlLogMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/plus_lock_alarm/LockAlarm.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/plus_lock_ram/LockCtlLog.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/LockCtlLogService.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/LockCtlLogMapper.xml 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/LockCtlLogController.java
@@ -1,7 +1,13 @@
package com.whyc.controller;
import com.whyc.dto.LockAlmDto;
import com.whyc.dto.LocklogDto;
import com.whyc.dto.Response;
import com.whyc.pojo.plus_user.UserInf;
import com.whyc.service.LockCtlLogService;
import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -12,4 +18,14 @@
    @Autowired
    private LockCtlLogService service;
    @ApiOperation("查询开锁日志")
    @PostMapping("getLockLog")
    public Response getLockLog(@RequestBody LocklogDto logDto) {
        UserInf uinf= ActionUtil.getUser();
        logDto.setUid(uinf.getUid());
        Response res=service.getLockLog(logDto);
        return res;
    }
}
src/main/java/com/whyc/dto/LocklogDto.java
New file
@@ -0,0 +1,19 @@
package com.whyc.dto;
import lombok.Data;
import java.util.Date;
@Data
public class LocklogDto {
    private String stationName1;
    private String stationName2;
    private String stationName3;
    private String stationName4;
    private Date startTime;
    private Date endTime;
    private String lockName;
    private Integer pageNum;
    private Integer pageSize;
    private Integer uid;
}
src/main/java/com/whyc/mapper/LockCtlLogMapper.java
@@ -1,6 +1,7 @@
package com.whyc.mapper;
import com.whyc.dto.HomeCtlGroupDto;
import com.whyc.dto.LocklogDto;
import com.whyc.pojo.plus_lock_ram.LockCtlLog;
import org.apache.ibatis.annotations.Param;
@@ -14,4 +15,6 @@
    //首页分组统计前10开锁次数
    List<HomeCtlGroupDto> getGroupCtlCount(@Param("uid") int uid);
    //查询开锁日志
    List<LockCtlLog> getLockLog(@Param("logDto")LocklogDto logDto);
}
src/main/java/com/whyc/pojo/plus_lock_alarm/LockAlarm.java
@@ -66,4 +66,28 @@
    @TableField(exist = false)
    private StationInf sinf;
    @ApiModelProperty(value = "锁具名称")
    @TableField(exist = false)
    private String lockName;
    @ApiModelProperty(value = "总机房名")
    @TableField(exist = false)
    private String stationName;
    @ApiModelProperty(value = "省")
    @TableField(exist = false)
    private String stationName1;
    @ApiModelProperty(value = "市")
    @TableField(exist = false)
    private String stationName2;
    @ApiModelProperty(value = "区县")
    @TableField(exist = false)
    private String stationName3;
    @ApiModelProperty(value = "机房名")
    @TableField(exist = false)
    private String stationName4;
}
src/main/java/com/whyc/pojo/plus_lock_ram/LockCtlLog.java
@@ -69,6 +69,26 @@
    @TableField(exist = false)
    private String lockName;
    @ApiModelProperty(value = "总机房名")
    @TableField(exist = false)
    private String stationName;
    @ApiModelProperty(value = "省")
    @TableField(exist = false)
    private String stationName1;
    @ApiModelProperty(value = "市")
    @TableField(exist = false)
    private String stationName2;
    @ApiModelProperty(value = "区县")
    @TableField(exist = false)
    private String stationName3;
    @ApiModelProperty(value = "机房名")
    @TableField(exist = false)
    private String stationName4;
src/main/java/com/whyc/service/LockCtlLogService.java
@@ -1,5 +1,9 @@
package com.whyc.service;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.LocklogDto;
import com.whyc.dto.Response;
import com.whyc.mapper.LockCtlLogMapper;
import com.whyc.pojo.plus_lock_ram.LockCtlLog;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,4 +39,11 @@
        log.setCtlUname(uname);
        mapper.insert(log);
    }
    //查询开锁日志
    public Response getLockLog(LocklogDto logDto) {
        PageHelper.startPage(logDto.getPageNum(),logDto.getPageSize());
        List<LockCtlLog> list=mapper.getLockLog(logDto);
        PageInfo pageInfo=new PageInfo(list);
        return new Response().setII(1,list!=null,pageInfo,"查询开锁日志");
    }
}
src/main/resources/mapper/LockCtlLogMapper.xml
@@ -42,4 +42,43 @@
        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.*
        from plus_lock_ram.tb_lock_ctl_log,plus_inf.tb_lock_inf,plus_inf.tb_station_inf
        <where>
            tb_lock_ctl_log.lock_id=tb_lock_inf.lock_id
            and tb_lock_inf.station_id=tb_station_inf.station_id
            <if test="logDto.stationName1!=null">
                and tb_station_inf.station_name1 like concat('%',#{logDto.stationName1},'%')
            </if>
            <if test="logDto.stationName2!=null">
                and tb_station_inf.station_name2 like concat('%',#{logDto.stationName2},'%')
            </if>
            <if test="logDto.stationName3!=null">
                and tb_station_inf.station_name3 like concat('%',#{logDto.stationName3},'%')
            </if>
            <if test="logDto.stationName4!=null">
                and tb_station_inf.station_name4 like concat('%',#{logDto.stationName4},'%')
            </if>
            <if test="logDto.lockName!=null">
                and tb_lock_inf.lock_name like concat('%',#{logDto.lockName},'%')
            </if>
            <if test="logDto.startTime!=null">
                and tb_lock_ctl_log.ctl_time>=#{logDto.startTime}
            </if>
            <if test="logDto.endTime!=null">
                and tb_lock_ctl_log.ctl_time&lt;=#{logDto.endTime}
            </if>
            and tb_lock_ctl_log.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
                <if test="logDto.uid>100">
                    and tb_baojigroup_usr.uid=#{logDto.uid}
                </if>
            </where>
            )
        </where>
    </select>
</mapper>