whyclxw
2021-12-03 20ea033d1c2cccaef0bc13a0a63dbd84509a8300
设备告警修改
3个文件已修改
28 ■■■■ 已修改文件
src/main/java/com/whyc/controller/BattalarmDataController.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/BattalarmDataMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BattalarmDataService.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/BattalarmDataController.java
@@ -56,14 +56,14 @@
        return service.serchAlm(par);
    }
    @PostMapping("/cancelalarm")
    @ApiOperation(value = "取消告警",notes = "record_id,num")
    public Response cancelalarm(@RequestBody BattalarmData adata){
        return service.cancelalarm(adata);
    @ApiOperation(value = "取消告警",notes = "num")
    public Response cancelalarm(@RequestBody Integer num){
        return service.cancelalarm(num);
    }
    @PostMapping("/cancelalarmPro")
    @ApiOperation(value = "批量取消告警",notes = "record_id,num")
    public Response cancelalarmPro(@RequestBody List<BattalarmData> list){
    @ApiOperation(value = "批量取消告警",notes = "num")
    public Response cancelalarmPro(@RequestBody List<Integer> list){
        return service.cancelalarmPro(list);
    }
src/main/java/com/whyc/mapper/BattalarmDataMapper.java
@@ -23,10 +23,10 @@
    List<AlarmStaticRes> serchAlm(AlarmPar par);
    //根据num取消告警
    int cancelalarm(BattalarmData battalarmData);
    int cancelalarm(int num);
    //根据num取消告警(多条记录)
    int cancelalarmPro(List<BattalarmData> list);
    int cancelalarmPro(List<Integer> list);
    //实时告警记录总数查询
    int serchRealTime(int uId);
src/main/java/com/whyc/service/BattalarmDataService.java
@@ -155,30 +155,30 @@
    }
    //根据num取消告警
    public Response cancelalarm(BattalarmData adata) {
    public Response cancelalarm(int num) {
        UpdateWrapper wrapper = new UpdateWrapper<>();
        //修改的属性
        wrapper.set("record_id",adata.getRecordId());
        //wrapper.set("record_id",adata.getRecordId());
        wrapper.set("alm_end_time", new SimpleDateFormat(ActionUtil.time_yyyyMMddHHmmss).format(new Date()));
        wrapper.set("alm_cleared_type",2);
        // 通过num修改
        wrapper.eq("num",adata.getNum());
        wrapper.eq("num",num);
        int flag=mapper.update(null,wrapper);
        return  new Response().set(flag);
    }
    //根据num取消告警(多条记录)
    @Transactional
    public Response cancelalarmPro(List<BattalarmData> list) {
    public Response cancelalarmPro(List<Integer> list) {
        int flag=0;
        for (BattalarmData adata:list) {
        for (Integer num:list) {
            //修改的属性
            UpdateWrapper wrapper = new UpdateWrapper<>();
            wrapper.set("record_id",adata.getRecordId());
            //wrapper.set("record_id",adata.getRecordId());
            wrapper.set("alm_end_time",new SimpleDateFormat(ActionUtil.time_yyyyMMddHHmmss).format(new Date()));
            wrapper.set("alm_cleared_type",2);
            // 通过num修改
            wrapper.eq("num",adata.getNum());
            wrapper.eq("num",num);
            flag=mapper.update(null,wrapper);
        }
        return  new Response().set(flag);