更新告警手动消除

whycxzp

2023-08-17 97077ac44fd580ff783d3c5a7567a29cc060dda7

更新告警手动消除

 src/main/java/com/whyc/controller/BattAlarmDataVerifyController.java

@@ -2,15 +2,13 @@

import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.dto.paramter.AlarmPar;
import com.whyc.pojo.BattAlarmDataVerify;
import com.whyc.service.BattAlarmDataVerifyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping("battAlarmDataVerify")
@@ -20,10 +18,10 @@
    @Autowired
    private BattAlarmDataVerifyService service;

    @GetMapping("page")
    @PostMapping("page")
    @ApiOperation("查询分页")
    public Response<Object> getPage(@RequestParam int pageNum,@RequestParam int pageSize){
        return service.getPage(pageNum,pageSize);
    public Response<Object> getPage(@RequestBody AlarmPar param){
        return service.getPage(param);
    }

}

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

@@ -1,11 +1,12 @@
package com.whyc.mapper;

import com.whyc.dto.paramter.AlarmPar;
import com.whyc.pojo.BattAlarmDataVerify;
import org.apache.ibatis.annotations.Param;

import java.util.List;

public interface BattAlarmDataVerifyMapper extends CustomMapper<BattAlarmDataVerify>{
    List<BattAlarmDataVerify> getList(@Param("userId") int userId);
    List<BattAlarmDataVerify> getList(AlarmPar param);

}

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

@@ -1,7 +1,5 @@
package com.whyc.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.AlarmDaoFactory;
@@ -23,10 +21,10 @@
    private BattAlarmDataVerifyMapper mapper;


    public Response<Object> getPage(int pageNum, int pageSize) {
        int userId = ActionUtil.getUser().getUId().intValue();
        PageHelper.startPage(pageNum,pageSize);
        List<BattAlarmDataVerify> list = mapper.getList(userId);
    public Response<Object> getPage(AlarmPar param) {
        //int userId = ActionUtil.getUser().getUId().intValue();
        PageHelper.startPage(param.getPage().getPageCurr(),param.getPage().getPageSize());
        List<BattAlarmDataVerify> list = mapper.getList(param);
        list.stream().forEach(data -> {
            data.setAlarmName(AlarmDaoFactory.getAllAlarmName(data.getAlmSignalId()));
        });
@@ -44,9 +42,8 @@

    public Response getPageOfWebSocket(AlarmPar alarmPar, String lang) {
        try {
            int userId = alarmPar.getUId();
            PageHelper.startPage(alarmPar.getPage().getPageCurr(), alarmPar.getPage().getPageSize());
            List<BattAlarmDataVerify> list = mapper.getList(userId);
            List<BattAlarmDataVerify> list = mapper.getList(alarmPar);
            list.stream().forEach(data -> {
                data.setAlarmName(MessageUtils.getMessageSocket(AlarmDaoFactory.getAlarmName(data.getAlmSignalId()), lang));
            });

 src/main/resources/mapper/BattAlarmDataVerifyMapper.xml

@@ -6,6 +6,19 @@
    <select id="getList" resultType="com.whyc.pojo.BattAlarmDataVerify">
        select * from db_alarm.tb_battalarm_data_verify v,db_battinf.tb_battinf b where
        v.BattGroupId = b.BattGroupId

        and alm_id in(#{almIdOne},#{almIdTwo},#{almIdThree},#{almIdFour},#{almIdFive},#{almIdSix},#{almIdSeven},#{almIdEight})
        and alm_signal_id%2 in(#{almSignalIdOne},#{almSignalIdTwo})
        and alm_level in(#{almLevelOne},#{almLevelTwo},#{almLevelThree},#{almLevelFour})
        <if test="stationname1 !=''">
            and b.stationname1 like '%${stationname1}%'
        </if>
        <if test="stationname !=''">
            and b.stationname like '%${stationname}%'
        </if>
        <if test="battGroupId!=0">
            and b.battgroupid=#{battGroupId}
        </if>
        and b.StationId in (select distinct stationId
        from db_user.tb_user_battgroup_baojigroup_battgroup
        , db_user.tb_user_battgroup_baojigroup_usr