whyclxw
2025-02-17 70f6a8d6b295e8149e209b9ca9add886c57a4e11
告警操作
4个文件已修改
33 ■■■■ 已修改文件
src/main/java/com/whyc/controller/LockAlarmHisController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_lock_alarm/LockAlarmHis.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/LockAlarmHisService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/SubTableService.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/LockAlarmHisController.java
@@ -21,9 +21,9 @@
    private LockAlarmHisService service;
    @ApiOperation("查询锁告警的历史状态")
    @GetMapping("getLockAlmHis")
    public Response getLockAlmHis(@RequestParam(required = false) Integer areaId,@RequestParam(required = false) Integer almId, @RequestParam String startTime, @RequestParam String endTime
    public Response getLockAlmHis(@RequestParam(required = false) Integer areaId,@RequestParam(required = false) String almIds, @RequestParam String startTime, @RequestParam String endTime
            , @RequestParam int pageNum, @RequestParam int pageSize) throws ParseException, InterruptedException {
        Response res=service.getLockAlmHis(areaId,almId,startTime,endTime,pageNum,pageSize);
        Response res=service.getLockAlmHis(areaId,almIds,startTime,endTime,pageNum,pageSize);
        return res;
    }
}
src/main/java/com/whyc/pojo/db_lock_alarm/LockAlarmHis.java
@@ -39,6 +39,9 @@
    @ApiModelProperty(value = "告警类型")
    private Integer almId;
    @TableField(exist = false)
    private String almIds;
    @ApiModelProperty(value = "告警来源[1-平台触发  2-手机APP触发  3-锁具触发]")
    private Integer almSource;
src/main/java/com/whyc/service/LockAlarmHisService.java
@@ -30,7 +30,7 @@
    //查询锁告警的历史状态
    public Response getLockAlmHis(Integer areaId, Integer almId,String startTime, String endTime, int pageNum, int pageSize) throws ParseException {
    public Response getLockAlmHis(Integer areaId, String almIds,String startTime, String endTime, int pageNum, int pageSize) throws ParseException {
        LockAlarmHis his=new LockAlarmHis();
        if(areaId!=null){
            List<Integer> areaList=new ArrayList();
@@ -47,7 +47,7 @@
                his.setLids(lockIdList);
            }
        }
        his.setAlmId(almId);
        his.setAlmIds(almIds);
        PageInfo pageInfo=util.getPageInfo(pageNum,pageSize, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1)
                ,"db_lock_alarm","tb_lock_alarm",his);
        return new Response().setII(1,pageInfo.getList()!=null,pageInfo,"查询锁告警的历史状态");
src/main/java/com/whyc/service/SubTableService.java
@@ -129,6 +129,17 @@
        if(his.getEndTime()!=null){
            sql+=" and alm_start_time  <='"+ThreadLocalUtil.format(his.getEndTime(),1)+"' ";
        }
        if(his.getAlmIds()!=null){
            String[] almId=his.getAlmIds().split(",");
            sql+=" and  history.alm_id in (";
            for (int i=0;i<almId.length;i++) {
                if(i==almId.length-1){
                    sql=sql+almId[i]+") ";
                }else{
                    sql=sql+almId[i]+",";
                }
            }
        }
        List list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
            @Override
            public List getResults(ResultSet rs) throws SQLException {
@@ -169,6 +180,17 @@
        if(his.getEndTime()!=null){
            sql+=" and alm_start_time  <='"+ThreadLocalUtil.format(his.getEndTime(),1)+"' ";
        }
        if(his.getAlmIds()!=null){
            String[] almId=his.getAlmIds().split(",");
            sql+=" and  history.alm_id in (";
            for (int i=0;i<almId.length;i++) {
                if(i==almId.length-1){
                    sql=sql+almId[i]+") ";
                }else{
                    sql=sql+almId[i]+",";
                }
            }
        }
        sql+="  ORDER BY alm_start_time asc  limit "+ his.getLimitStart()+","+ his.getLimitEnd()+" ";
        List<LockAlarmHis> list=sqlExecuteService.executeQuery_call(sql, new CallBack() {
            @Override