update

whycrzg

2021-01-29 b421fde8f3499b638c117cc2cb9a49f260fb3481

update

 src/main/java/com/fgkj/controller/Battalarm_dataController.java

@@ -3,65 +3,72 @@
import com.fgkj.dto.*;
import com.fgkj.services.Battalarm_dataService;
import com.fgkj.util.*;
import com.google.gson.Gson;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Date;
import java.util.List;

import javax.annotation.Resource;
import javax.annotation.security.PermitAll;

@RequestMapping("battAlarmData")
@RestController
@Api(tags = "battAlarmData接口")
public class Battalarm_dataController{
public class Battalarm_dataController {

    @Resource
    private Battalarm_dataService service=new Battalarm_dataService();
    @Resource
    private Battalarm_dataService service;

    // private Batt_Maint_Dealarm bmd;
    // private String bads;
	
    //3.1电池告警实时查询
    @GetMapping("byCondition")
    @ApiOperation(notes = "",value="电池告警实时查询")
    public ServiceModel serchByCondition(@RequestBody Batt_Maint_Dealarm bmd){
        User_inf uinf=(User_inf) ActionUtil.getUser();
        bmd.setUinf(uinf);
        ServiceModel model=service.serchByCondition(bmd);
        return model;
    }
	
    //3.2电池告警历史记录查询
    @GetMapping("byInfo")
    @ApiOperation(notes = "",value="电池告警历史记录查询")
    public ServiceModel serchByInfo(@RequestBody Batt_Maint_Dealarm bmd){
        // bmd = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result, Batt_Maint_Dealarm.class);
        User_inf uinf=(User_inf) ActionUtil.getUser();
        bmd.setUinf(uinf);
        ServiceModel model=service.serchByInfo(bmd);
        return model;
    }
	
    //0.5查询实时告警数
    @GetMapping("alm")
    @ApiOperation(notes = "",value="查询实时告警数")
    public ServiceModel serchAlm(@RequestBody Batt_Maint_Dealarm bmd){
        User_inf uinf=(User_inf) ActionUtil.getUser();
        bmd.setUinf(uinf);
        ServiceModel model=service.serchAlm(bmd);
        return model;
    }
	
    //0.10实时告警记录总数查询
    @GetMapping("realTime")
    @ApiOperation(notes = "",value="实时告警记录总数查询")
    public ServiceModel serchRealTime(){
        User_inf uinf=(User_inf) ActionUtil.getUser();
        ServiceModel model=service.serchRealTime(uinf);
        return model;
    }
    // private Batt_Maint_Dealarm bmd;
    // private String bads;

    //3.1电池告警实时查询
    @PostMapping("byCondition")
    @ApiOperation(notes = "binf.stationName1&binf.stationName 模糊查询 { \"binf\": { \"stationName\": \"\", \"stationName1\": \"\", \"battGroupId\": 0 },\"mainf\": { \"num\": 0, \"battGroupId\": 0, \"uname\": \"\", \"fault_level\": 0, \"fault_type_id\": 0, \"record_uid\": 0, \"maint_type_id\": 0, \"maint_done\": 0, \"maint_close\": 0, \"master_audit\": 0, \"appoint_uid\": 0 },\"pageBean\": { \"pageSize\": 10, \"pageNum\": 0 },\"adata\": { \"alm_id\": 0, \"alm_signal_id\": 0, \"alm_start_time\": \"2021-01-29 09:40:11\", \"alm_start_time1\": \"2021-01-29 09:40:11\" } }", value = "电池告警实时查询")
    public ServiceModel serchByCondition(@RequestBody Batt_Maint_Dealarm bmd) {
        User_inf uinf = (User_inf) ActionUtil.getUser();
        bmd.setUinf(uinf);
        ServiceModel model = service.serchByCondition(bmd);
        return model;
    }

    //3.2电池告警历史记录查询
    @PostMapping("byInfo")
    @ApiOperation(notes = "binf.stationName1&binf.stationName 模糊查询 { \"binf\": { \"stationName\": \"\", \"stationName1\": \"\", \"battGroupId\": 0 },\"mainf\": { \"num\": 0, \"battGroupId\": 0, \"fault_level\": 0, \"fault_type_id\": 0, \"record_uid\": 0, \"maint_type_id\": 0, \"maint_done\": 0, \"maint_close\": 0, \"master_audit\": 0, \"appoint_uid\": 0 },\"pageBean\": { \"pageSize\": 10, \"pageNum\": 0 },\"adata\": { \"alm_id\": 0, \"alm_signal_id\": 0, \"alm_start_time\": \"2021-01-29 09:40:11\", \"alm_start_time1\": \"2021-01-29 09:40:11\" } }", value = "电池告警历史记录查询")
    public ServiceModel serchByInfo(@RequestBody Batt_Maint_Dealarm bmd) {
        // bmd = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result, Batt_Maint_Dealarm.class);
        User_inf uinf = (User_inf) ActionUtil.getUser();
        bmd.setUinf(uinf);
        ServiceModel model = service.serchByInfo(bmd);
        return model;
    }

    //0.5查询实时告警数
    @PostMapping("alm")
    @ApiOperation(notes = "", value = "查询实时告警数")
    public ServiceModel serchAlm(@ApiParam(value = "binf.stationName", required = true) @RequestParam String stationName) {
        Batt_Maint_Dealarm bmd = new Batt_Maint_Dealarm();
        User_inf uinf = (User_inf) ActionUtil.getUser();
        bmd.setUinf(uinf);
        bmd.setBinf(new BattInf());
        bmd.getBinf().setStationName(stationName);
        ServiceModel model = service.serchAlm(bmd);
        return model;
    }

    //0.10实时告警记录总数查询
    @GetMapping("realTime")
    @ApiOperation(notes = "", value = "实时告警记录总数查询")
    public ServiceModelOnce serchRealTime() {
        User_inf uinf = (User_inf) ActionUtil.getUser();
        ServiceModelOnce model = service.serchRealTime(uinf);
        return model;
    }
    
    /*// 3.1电池告警实时查询(确认告警)
    public ServiceModel update() {
@@ -74,18 +81,20 @@
        result=ActionUtil.tojson(model);
        return model;
    }*/
    // 3.1电池告警实时查询(确认告警)
    @PutMapping("/")
    @ApiOperation(notes = "",value="电池告警实时查询(确认告警)")
    public ServiceModel update(@RequestBody List<Battalarm_data> list) {
        /*if(bads!=null && bads.length()>0){
            Gson gson=new Gson();
            List<Battalarm_data> list=gson.fromJson(bads, new TypeToken<List<Battalarm_data>>(){}.getType());
            model=service.updatePro(list);
        }*/
        ServiceModel model=service.updatePro(list);
        return model;
    }


    // 3.1电池告警实时查询(确认告警)
    @PutMapping("/")
    @ApiOperation(notes = "[{ \"num\": 1902, \"alm_is_confirmed\": 0, \"alm_confirmed_time\": \"2021-01-29 09:40:11\", \"stationname\": \"st\", \"note\": \"t\" }]", value = "电池告警实时查询(确认告警)")
    public ServiceModel update(@RequestBody List<Battalarm_data> list) {
        ServiceModel model = new ServiceModel();
        if (list != null && list.size() > 0) {
            model = service.updatePro(list);
        } else {
            model.setCode(0);
        }
        return model;
    }
    /*// 3.1电池告警实时查询(取消告警)
    public ServiceModel cancelalarm() {
        ServiceModel model=new ServiceModel();
@@ -97,112 +106,121 @@
        result=ActionUtil.tojson(model);
        return model;
    }*/
    // 3.1电池告警实时查询(取消告警)
    @PutMapping("/cancel")
    @ApiOperation(notes = "",value="电池告警实时查询(取消告警)")
    public ServiceModel cancelalarm(@RequestBody List<Battalarm_data> list) {
        /*ServiceModel model=new ServiceModel();
        if(bads!=null && bads.length()>0){
            Gson gson=new Gson();
            List<Battalarm_data> list=gson.fromJson(bads, new TypeToken<List<Battalarm_data>>(){}.getType());
            model=service.cancelalarmPro(list);
        }*/
        ServiceModel model=service.cancelalarmPro(list);
        return model;
    }
    //3.1/3.2电池告警查询(删除记录)
    @DeleteMapping("/")
    @ApiOperation(notes = "",value="电池告警查询(删除记录)")
    public ServiceModel delete(@RequestBody List<Battalarm_data> list) {
        /*ServiceModel model=new ServiceModel();
        if(bads!=null && bads.length()>0){
            Gson gson=new Gson();
            List<Battalarm_data> list=gson.fromJson(bads, new TypeToken<List<Battalarm_data>>(){}.getType());
            model=service.delete(list);
        }*/
        ServiceModel model=service.delete(list);
        return model;
    }
	
    //饼状图电池单体健康率
    @GetMapping("healthRate")
    @ApiOperation(notes = "",value="饼状图电池单体健康率")
    public ServiceModel serchGood(){
        User_inf uinf=(User_inf) ActionUtil.getUser();
        ServiceModel model = service.serchGood(uinf);//单体容量告警和单体告警告警
        return model;
    }
     //项目下方的滚动，查询最新电池告警(电池告警和设备告警筛选出最新的一条)(旧版本)
    @GetMapping("topAlm")
    @ApiOperation(notes = "",value="项目下方的滚动，查询最新电池告警(电池告警和设备告警筛选出最新的一条)(旧版本)")
    public ServiceModel serchTopAlm(){
        ServiceModel model=service.serchTopAlm();
        return model;
    }
	
     //项目下方的滚动，查询最新电池告警(电池告警和设备告警筛选出最新的五条)
    @GetMapping("topAlmTen")
    @ApiOperation(notes = "",value="项目下方的滚动，查询最新电池告警(电池告警和设备告警筛选出最新的五条)")
    public ServiceModel serchTopAlmTen(){
        User_inf uinf=(User_inf) ActionUtil.getUser();
        ServiceModel model=service.serchTopAlmTen(uinf);
        return model;
    }
	
    //点击项目下方的滚动，查询该条告警的实时信息
    @GetMapping("battAlarm")
    @ApiOperation(notes = "",value="点击项目下方的滚动，查询该条告警的实时信息")
    public ServiceModel serchBatt_alarm(@RequestBody Battalarm_data data){
        // Battalarm_data adata=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Battalarm_data.class);
        ServiceModel model=service.serchBatt_alarm(data);
        return model;
    }
    //3.1电池告警实时查询<***********跨域专用**************>
    @GetMapping("byCondition_ky")
    @ApiOperation(tags = "跨域", notes = "",value="电池告警实时查询 跨域访问")
    public ServiceModel serchByCondition_ky(@RequestBody BattInf binf){
        // BattInf binf=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
        ServiceModel model=service.serchByCondition_ky(binf);
        return model;
    }
    // 3.1电池告警实时查询(确认告警)<***********跨域专用**************>
    @PutMapping("/ky")
    @ApiOperation(tags = "跨域", notes = "",value="电池告警实时查询(确认告警) 跨域专用")
    public ServiceModel update_ky(@RequestBody List<Battalarm_data> list) {
        /*ServiceModel model=new ServiceModel();
        if(bads!=null && bads.length()>0){
            Gson gson=new Gson();
            List<Battalarm_data> list=gson.fromJson(bads, new TypeToken<List<Battalarm_data>>(){}.getType());
            model=service.updatePro(list);
        }*/
        ServiceModel model=service.updatePro(list);
        return model;
    }
    // 3.1电池告警实时查询(取消告警)<***********跨域专用**************>
    @PutMapping("/cancelAlarm_ky")
    @ApiOperation(tags = "跨域", notes = "",value="电池告警实时查询(取消告警) 跨域专用")
    public ServiceModel cancelalarm_ky(@RequestBody List<Battalarm_data> list) {
        /*ServiceModel model=new ServiceModel();
        if(bads!=null && bads.length()>0){
            Gson gson=new Gson();
            List<Battalarm_data> list=gson.fromJson(bads, new TypeToken<List<Battalarm_data>>(){}.getType());
            model=service.cancelalarmPro(list);
        }*/
        ServiceModel model=service.cancelalarmPro(list);
        return model;
    }
    //3.1/3.2电池告警查询(删除记录)<***********跨域专用**************>
    @DeleteMapping("/ky")
    @ApiOperation(tags = "跨域", notes = "",value="电池告警查询(删除记录) 跨域专用")
    public ServiceModel delete_ky(@RequestBody List<Battalarm_data> list) {
        /*ServiceModel model=new ServiceModel();
        if(bads!=null && bads.length()>0){
            Gson gson=new Gson();
            List<Battalarm_data> list=gson.fromJson(bads, new TypeToken<List<Battalarm_data>>(){}.getType());
            model=service.delete(list);
        }*/
        ServiceModel model=service.delete(list);
        return model;
    }


    // 3.1电池告警实时查询(取消告警)
    @PutMapping("/cancel")
    @ApiOperation(notes = "[{ \"num\": 1902, \"record_Id\": 0, \"alm_end_time\": \"2021-01-29 09:40:11\", \"alm_cleared_type\": 0, \"stationname\": \"st\", \"note\": \"t\" }]", value = "电池告警实时查询(取消告警)")
    public ServiceModel cancelalarm(@RequestBody List<Battalarm_data> list) {
        ServiceModel model = new ServiceModel();
        if (list != null && list.size() > 0) {
            model = service.cancelalarmPro(list);
        } else {
            model.setCode(0);
        }
        return model;
    }

    //3.1/3.2电池告警查询(删除记录)
    @DeleteMapping("/")
    @ApiOperation(notes = "[{ \"num\": 1902, \"stationname\": \"\", \"note\": \"\" }]", value = "电池告警查询(删除记录)")
    public ServiceModel delete(@RequestBody List<Battalarm_data> list) {
        ServiceModel model = new ServiceModel();
        if (list != null && list.size() > 0) {
            model = service.delete(list);
        } else {
            model.setCode(0);
        }
        return model;
    }

    //饼状图电池单体健康率
    @GetMapping("healthRate")
    @ApiOperation(notes = "sum:总单体数 data:单体容量告警和单体告警告警", value = "饼状图电池单体健康率")
    public ServiceModelOnce serchGood() {
        User_inf uinf = (User_inf) ActionUtil.getUser();
        ServiceModelOnce model = service.serchGood(uinf);//单体容量告警和单体告警告警
        return model;
    }

    //项目下方的滚动，查询最新电池告警(电池告警和设备告警筛选出最新的一条)(旧版本)
    @GetMapping("topAlm")
    @Deprecated
    @ApiOperation(notes = "Deprecated(旧版本)", value = "项目下方的滚动，查询最新电池告警(电池告警和设备告警筛选出最新的一条)(旧版本)")
    public ServiceModelOnce serchTopAlm() {
//        ServiceModelOnce model=service.serchTopAlm();
        return new ServiceModelOnce();
    }

    //项目下方的滚动，查询最新电池告警(电池告警和设备告警筛选出最新的五条)
    @GetMapping("topAlmTen")
    @ApiOperation(notes = "", value = "项目下方的滚动，查询最新电池告警(电池告警和设备告警筛选出最新的五条)")
    public ServiceModel serchTopAlmTen() {
        User_inf uinf = (User_inf) ActionUtil.getUser();
        ServiceModel model = service.serchTopAlmTen(uinf);
        return model;
    }

    //点击项目下方的滚动，查询该条告警的实时信息
    @PostMapping("battAlarm")
    @ApiOperation(notes = "", value = "点击项目下方的滚动，查询该条告警的实时信息")
    public ServiceModel serchBatt_alarm(@ApiParam(value = "battGroupId", required = true) @RequestParam Integer battGroupId, @ApiParam(value = "monNum", required = true) @RequestParam Integer monNum, @ApiParam(value = "alm_id", required = true) @RequestParam Integer alm_id, @ApiParam(value = "告警开始时间 格式2021/01/1 09:40:11", required = true) @RequestParam Date alm_start_time) {
        Battalarm_data data = new Battalarm_data();
        data.setBattGroupId(battGroupId);
        data.setMonNum(monNum);
        data.setAlm_id(alm_id);
        data.setAlm_start_time(alm_start_time);
        ServiceModel model = service.serchBatt_alarm(data);
        return model;
    }

    //3.1电池告警实时查询<***********跨域专用**************>
    @PostMapping("byCondition_ky")
    @ApiOperation(tags = "跨域", notes = "", value = "电池告警实时查询 跨域专用")
    public ServiceModel serchByCondition_ky(@RequestParam Integer battGroupId) {
        BattInf binf = new BattInf();
        binf.setBattGroupId(battGroupId);
        ServiceModel model = service.serchByCondition_ky(binf);
        return model;
    }

    // 3.1电池告警实时查询(确认告警)<***********跨域专用**************>
    @PutMapping("/ky")
    @ApiOperation(tags = "跨域", notes = "[{ \"num\": 1902, \"alm_is_confirmed\": 0, \"alm_confirmed_time\": \"2021-01-29 09:40:11\", \"stationname\": \"st\", \"note\": \"t\" }]", value = "电池告警实时查询(确认告警) 跨域专用")
    public ServiceModel update_ky(@RequestBody List<Battalarm_data> list) {
        ServiceModel model = new ServiceModel();
        if (list != null && list.size() > 0) {
            model = service.updatePro(list);//和update 共用
        } else {
            model.setCode(0);
        }
        return model;
    }

    // 3.1电池告警实时查询(取消告警)<***********跨域专用**************>
    @PutMapping("/cancelAlarm_ky")
    @ApiOperation(tags = "跨域", notes = "[{ \"num\": 1902, \"record_Id\": 0, \"alm_end_time\": \"2021-01-29 09:40:11\", \"alm_cleared_type\": 0, \"stationname\": \"st\", \"note\": \"t\" }]", value = "电池告警实时查询(取消告警) 跨域专用")
    public ServiceModel cancelalarm_ky(@RequestBody List<Battalarm_data> list) {
        ServiceModel model = new ServiceModel();
        if (list != null && list.size() > 0) {
            model = service.cancelalarmPro(list);
        } else {
            model.setCode(0);
        }
        return model;
    }

    //3.1/3.2电池告警查询(删除记录)<***********跨域专用**************>
    @DeleteMapping("/ky")
    @ApiOperation(tags = "跨域", notes = "[{ \"num\": 1902, \"stationname\": \"\", \"note\": \"\" }]", value = "电池告警查询(删除记录) 跨域专用")
    public ServiceModel delete_ky(@RequestBody List<Battalarm_data> list) {
        ServiceModel model = new ServiceModel();
        if (list != null && list.size() > 0) {
            model = service.delete(list);
        } else {
            model.setCode(0);
        }
        return model;
    }

}

 src/main/java/com/fgkj/controller/Battalarm_data_historyController.java

@@ -26,17 +26,16 @@

    //3.2电池告警查询(删除记录)
    @DeleteMapping("/")
    @ApiOperation(notes = "",value="电池告警查询(删除记录)")
    @ApiOperation(notes = "[{ \"num\": 1816, \"stationname\": \"\", \"note\": \"\" }]",value="电池告警查询(删除记录)")
    public ServiceModel delete(@RequestBody List<Battalarm_data_history> list) {
        // List<Battalarm_data_history> list=getGson().fromJson(json, new TypeToken<List<Battalarm_data_history>>(){}.getType());
        ServiceModel model=service.delete(list);
        ServiceModel model = service.delete(list);
        return model;
    }

    //3.2电池告警历史记录查询
    @GetMapping("byInfo")
    @ApiOperation(notes = "",value="电池告警历史记录查询")
    @PostMapping("byInfo")
    @ApiOperation(notes = "binf.stationName1&binf.stationName 模糊查询 { \"binf\": { \"stationName\": \"\", \"stationName1\": \"\", \"battGroupId\": 0 },\"mainf\": { \"num\": 0, \"battGroupId\": 0, \"uname\": \"\", \"fault_level\": 0, \"fault_type_id\": 0, \"record_uid\": 0, \"maint_type_id\": 0, \"maint_done\": 0, \"maint_close\": 0, \"master_audit\": 0, \"appoint_uid\": 0 },\"pageBean\": { \"pageSize\": 10, \"pageNum\": 0 },\"adata_H\": { \"alm_id\": 0, \"alm_signal_id\": 0, \"alm_start_time\": \"2021-01-29 09:40:11\", \"alm_start_time1\": \"2021-01-29 09:40:11\" } }",value="电池告警历史记录查询")
    public ServiceModel serchByInfo(@RequestBody Batt_Maint_Dealarm bmd){
        // Batt_Maint_Dealarm bmd = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_Maint_Dealarm.class);
        User_inf uinf=(User_inf) ActionUtil.getUser();
        bmd.setUinf(uinf);
        ServiceModel model=service.serchByInfo(bmd);

 src/main/java/com/fgkj/mapper/impl/BattInfMapper.java

@@ -909,7 +909,15 @@
        return moncounts;
        
    }*/
    public int serchMonAll(Object obj);

    @Select("select sum(moncount) as moncounts " +
            " from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf   " +
            " where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId   " +
            " and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id  " +
            " and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid  " +
            " and db_user.tb_user_inf.uid=#{uId}" +
            "  limit 1")
    public Integer serchMonAll(User_inf obj);

    //测试
    public List searchStationId(Object obj);

 src/main/java/com/fgkj/mapper/impl/Batt_devalarm_dataMapper.java

@@ -36,7 +36,19 @@
    public List serchTopAlmInDev();
   
    //项目下方的滚动，查询最新设备告警
    public List serchTopDevTen(Object obj);
    @Select("select distinct db_alarm.tb_devalarm_data.dev_id,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.fbsdevicename,dev_ip,alm_type,alm_start_time " +
            "  from db_alarm.tb_devalarm_data,db_battinf.tb_battinf" +
            "  where alm_cleared_type=0 " +
            "  and db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.fbsdeviceid " +
            "  and  db_alarm.tb_devalarm_data.dev_id  in (select distinct db_battinf.tb_battinf.FbsDeviceId " +
            " from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf   " +
            " where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId   " +
            " and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id  " +
            " and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid  " +
            " and db_user.tb_user_inf.uid=#{uId})" +
            " order by alm_start_time desc " +
            "  limit 0,5")
    public List<Batt_devalarm_data> serchTopDevTen(User_inf obj);

    //项目下方的滚动，查询该设备告警的实时信息
    public List serchDev_alarm(Batt_devalarm_data ddata);

 src/main/java/com/fgkj/mapper/impl/Battalarm_dataMapper.java

@@ -1,10 +1,10 @@
package com.fgkj.mapper.impl;

import com.fgkj.dto.BattInf;
import com.fgkj.dto.BattMap_information;
import com.fgkj.dto.Battalarm_data;
import com.fgkj.dto.*;
import com.fgkj.mapper.AlarmDaoFactory;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;

import java.util.List;

@@ -14,15 +14,17 @@

    // 3.1电池告警实时查询(确认告警)
    public boolean update(Object obj);
	

    // 3.1电池告警实时查询(确认告警)(多条记录)
    public String updatePro(Object obj) ;
    @Update("update db_alarm.tb_battalarm_data set alm_is_confirmed=#{alm_is_confirmed},alm_confirmed_time=#{alm_confirmed_time} where num=#{num}")
    public int updatePro(Battalarm_data obj) ;

    //3.1/3.2电池告警查询(删除记录)
    public boolean del(Object obj);

    //3.1/3.2电池告警查询(删除记录)<多条记录删除>
    public String delPro(Object obj);
    @Delete("delete from db_alarm.tb_battalarm_data where num=#{num}")
    public int delPro(Battalarm_data obj);

    //当进程重启时,将实时数据修改为历史记录
    public boolean NowToHistory();
@@ -226,7 +228,7 @@
             * 当前告警 num:    选中为0 未选中100
             * 历史告警 monnum：选中为1 未选中100
             */
    public List serchByCondition(Object obj);
    public List serchByCondition(Batt_Maint_Dealarm obj);

    // 3.2电池告警
        /*
@@ -422,7 +424,7 @@
         * 全都不选:不选200
         
         */
    public List serchByInfo(Object obj);
    public List serchByInfo(Batt_Maint_Dealarm obj);

    // 3.2电池告警
    /*
@@ -494,7 +496,15 @@
        });
        return list;    
    }*/
    public List serchAlm(Object obj);
    @Select("select count(num) as number,alm_id from db_alarm.tb_battalarm_data  " +
            "where  alm_cleared_type=0 and tb_battalarm_data.BattGroupId in (select distinct db_battinf.tb_battinf.battgroupid " +
            " from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf   " +
            " where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId   " +
            " and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id  " +
            " and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid  " +
            " and db_user.tb_user_inf.uid=#{uinf.uId} and db_battinf.tb_battinf.stationname like '%${binf.stationName}%') " +
            " GROUP BY (alm_id) ")
    public List<Battalarm_data> serchAlm(Batt_Maint_Dealarm obj);

    //0.10实时告警记录总数查询
    /*public List serchRealTime(){
@@ -524,7 +534,19 @@
        });
        return list;    
    }*/
    public List serchRealTime(Object obj);

    @Select("select count(num) as num " +
            "from db_alarm.tb_battalarm_data  " +
            "where  " +
            "alm_cleared_type=0  " +
            "and alm_id not in('${@com.fgkj.mapper.AlarmDaoFactory@Alarm_CapAlarm}','${@com.fgkj.mapper.AlarmDaoFactory@Alarm_CapChange}','${@com.fgkj.mapper.AlarmDaoFactory@Alarm_res_Conn}','${@com.fgkj.mapper.AlarmDaoFactory@ALM_TYPE_DisChargeMonVol_ID}')"+
            "and db_alarm.tb_battalarm_data.BattGroupId  in (select distinct db_battinf.tb_battinf.battgroupid " +
            " from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf   " +
            " where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId   " +
            " and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id  " +
            " and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid  " +
            " and db_user.tb_user_inf.uid=#{uId})")
    public List<Battalarm_data> serchRealTime(User_inf obj);

    // 根据battgroupId和阈值查数据
    public List serchByBatt(Object obj);
@@ -534,9 +556,10 @@

    //根据num取消告警
    public boolean cancelalarm(Object obj);
	
//    "update db_alarm.tb_battalarm_data set record_id="+adata.getRecord_Id()+",alm_end_time='"+DAOHelper.sdf.format(adata.getAlm_end_time())+"',alm_cleared_type="+adata.getAlm_cleared_type()+" where num="+adata.getNum()
    //根据num取消告警(多条记录)
    public String cancelalarmPro(Object obj);
    @Update("update db_alarm.tb_battalarm_data set record_id=#{record_Id},alm_end_time=#{alm_end_time} ,alm_cleared_type=#{alm_cleared_type} where num=#{num}")
    public int cancelalarmPro(Battalarm_data obj);
    
    //7.2增加容量告警的数据
    public boolean addPro(Object obj);
@@ -594,7 +617,19 @@
        });
        return list;    
    }*/
    public List serchGood(Object obj);

    @Select("SELECT battgroupid,count(DISTINCT MonNum) as nums,alm_id " +
            " FROM db_alarm.tb_battalarm_data  " +
            " where BattGroupId in(select distinct db_battinf.tb_battinf.battgroupid " +
            " from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf   " +
            " where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId   " +
            " and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id  " +
            " and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid  " +
            " and db_user.tb_user_inf.uid=#{uId}) " +
            " and  alm_id in('&{@com.fgkj.mapper.AlarmDaoFactory@Alarm_CapAlarm}','${@com.fgkj.mapper.AlarmDaoFactory@Alarm_CapChange}') " +
            " and alm_cleared_type=0 " +
            " GROUP BY battgroupid,alm_id  ")
    public List<Alarm_param> serchGood(User_inf obj);

    //项目下方的滚动，查询最新电池告警(旧版本)
    public List serchTopAlmInBatt();
@@ -639,13 +674,31 @@
        });
        return list;
    }*/
    public List serchTopBattTen(Object obj);

    @Select("select distinct db_alarm.tb_battalarm_data.battgroupid,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationid,db_alarm.tb_battalarm_data.monnum,alm_id,alm_start_time,alm_signal_id " +
            "  from db_alarm.tb_battalarm_data,db_battinf.tb_battinf " +
            "  where alm_cleared_type=0  " +
            "  and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid " +
            "  and db_alarm.tb_battalarm_data.BattGroupId  in (select distinct db_battinf.tb_battinf.battgroupid " +
            " from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf   " +
            " where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId   " +
            " and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id  " +
            " and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid  " +
            " and db_user.tb_user_inf.uid=#{uId}  )" +
            "  and alm_id not in('${@com.fgkj.mapper.AlarmDaoFactory@Alarm_CapAlarm}','${@com.fgkj.mapper.AlarmDaoFactory@Alarm_CapChange}','%{@com.fgkj.mapper.AlarmDaoFactory@Alarm_res_Conn}','${@com.fgkj.mapper.AlarmDaoFactory@ALM_TYPE_DisChargeMonVol_ID}')"+
            "  order by alm_start_time desc " +
            "  limit 0,5")
    public List<Battalarm_data> serchTopBattTen(User_inf obj);

    //点击项目下方的滚动，查询该条告警的实时信息
    public List  serchBatt_alarm(Object obj);
    @Select("select distinct db_alarm.tb_battalarm_data.battgroupid,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationid,db_alarm.tb_battalarm_data.monnum,alm_id,alm_start_time,alm_signal_id,alm_cleared_type " +
            "  from db_alarm.tb_battalarm_data,db_battinf.tb_battinf " +
            "  where db_battinf.tb_battinf.battgroupid=db_alarm.tb_battalarm_data.battgroupid " +
            "  and db_alarm.tb_battalarm_data.battgroupid=#{battGroupId} and db_alarm.tb_battalarm_data.monnum=#{monNum} and alm_id=#{alm_id} and alm_start_time=#{alm_start_time} ")
    public List<Battalarm_data>  serchBatt_alarm(Battalarm_data obj);

    // 3.1电池告警实时查询<***********跨域专用**************>
    public List serchByCondition_ky(Object obj);
    public List serchByCondition_ky(BattInf obj);

    //查询电池组最近一次告警等级
    @Select("select alm_level from db_alarm.tb_battalarm_data where battgroupid=#{battGroupId} order by alm_start_time desc limit 1")

 src/main/java/com/fgkj/mapper/impl/Battalarm_data_historyMapper.java

@@ -2,13 +2,17 @@

import java.util.List;

import com.fgkj.dto.Batt_Maint_Dealarm;
import com.fgkj.dto.Battalarm_data_history;
import org.apache.ibatis.annotations.Delete;
import org.springframework.stereotype.Repository;

public interface Battalarm_data_historyMapper{


    //3.2电池告警查询(删除记录)<多条记录删除>
    public String delPro(Object obj);
    @Delete("delete from db_alarm.tb_battalarm_data_history where num=#{num}")
    public int delPro(Battalarm_data_history obj);

    // 3.2电池告警
    /*
@@ -42,9 +46,9 @@
     * 全都不选:不选200
     
     */
    public List serchByInfo(Object obj);
    public List serchByInfo(Batt_Maint_Dealarm obj);

    /*public static void main(String[] args) throws ParseException {
/*public static void main(String[] args) throws ParseException {
        Battalarm_data_historyImpl bimpl=new Battalarm_data_historyImpl();
        Page p = new Page();
        p.setPageCurr(1);

 src/main/java/com/fgkj/services/Battalarm_dataService.java

@@ -7,7 +7,13 @@
import com.fgkj.mapper.impl.BattInfMapper;
import com.fgkj.mapper.impl.Batt_devalarm_dataMapper;
import com.fgkj.mapper.impl.Battalarm_dataMapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.stereotype.Service;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;

import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -29,6 +35,12 @@
    
    @Resource
    private BattInfMapper battInfMapper;
    @Resource
    private User_logService uservice;
    @Autowired
    DataSourceTransactionManager dataSourceTransactionManager;
    @Autowired
    TransactionDefinition transactionDefinition;
    
    public ServiceModel add(Object obj) {
        
@@ -68,30 +80,32 @@
    }
    
    //3.1电池告警实时查询(确认告警)(多条记录)
    public ServiceModel updatePro(Object obj) {
        List<Battalarm_data> list=(List<Battalarm_data>) obj;
        ArrayList<String> str_sql=new ArrayList<String>();
        List<User_log> listU=new ArrayList<User_log>();//存放user_log
        if(list!=null&&list.size()>0){
            for(int i=0;i<list.size();i++){
                Battalarm_data adata=list.get(i);
                String updateSql=mapper.updatePro(adata);
                str_sql.add(updateSql);
    public ServiceModel updatePro(List<Battalarm_data> list) {
        ServiceModel model = new ServiceModel();
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        Boolean bl = true;
        if (list != null && list.size() > 0) {
            for (int i = 0; i < list.size(); i++) {
                Battalarm_data adata = list.get(i);
                if (!bl) {
                    continue;
                }
                if (!(mapper.updatePro(adata)>0)){
                    bl = false;
                }
                {                    //机房和电池组名称            //告警的类型
                    String msg="确认"+adata.getStationname()+"的"+adata.getNote()+"告警";
                    User_log ulog= UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
                    listU.add(ulog);
                 }
            }
                    String msg = "确认" + adata.getStationname() + "的" + adata.getNote() + "告警";
                    User_log ulog = UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
                    uservice.add(ulog);    //将用户的操作记录下来
                }
            }
        }
        //TODO perry待做
        Boolean bl= true;
        // Boolean bl= DateUtil.makeManualCommit(DBUtil.getConn(), str_sql);
        (new User_logService()).addPro(listU);//将用户的操作记录下来
        if(bl){
        if (bl) {
            dataSourceTransactionManager.commit(transactionStatus);
            model.setCode(1);
            model.setMsg("确认成功!");
        }else{
        } else {
            dataSourceTransactionManager.rollback(transactionStatus);
            model.setCode(0);
            model.setMsg("确认失败!");
        }
@@ -100,30 +114,30 @@
    
    
    //3.1/3.2电池告警查询(删除记录)
    public ServiceModel delete(Object obj) {
        List<Battalarm_data> list=(List<Battalarm_data>) obj;
        ArrayList<String> str_sql=new ArrayList<String>();
        List<User_log> listU=new ArrayList<User_log>();//存放user_log
        if(list!=null&&list.size()>0){
            for(int i=0;i<list.size();i++){
                Battalarm_data adata=list.get(i);
                String delSql=mapper.delPro(adata);
                str_sql.add(delSql);
                {
                    String msg="删除"+adata.getStationname()+"的"+adata.getNote()+"告警";
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
                    listU.add(ulog);
                 }
            }
    public ServiceModel delete(List<Battalarm_data> list) {
        ServiceModel model = new ServiceModel();
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        Boolean bl = true;
        if (list != null && list.size() > 0) {
            for (int i = 0; i < list.size(); i++) {
                Battalarm_data adata = list.get(i);
                if (!bl) continue;
                if (!(mapper.delPro(adata)>0)) {
                    bl = false;
                }
                {
                    String msg = "删除" + adata.getStationname() + "的" + adata.getNote() + "告警";
                    User_log ulog = UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
                    uservice.add(ulog);
                }
            }
        }
        //TODO perry待做
        // Boolean bl= DateUtil.makeManualCommit(DBUtil.getConn(), str_sql);
        Boolean bl= true;
        (new User_logService()).addPro(listU);//将用户的操作记录下来
        if(bl){
        if (bl) {
            dataSourceTransactionManager.commit(transactionStatus);
            model.setCode(1);
            model.setMsg("删除成功!");
        }else{
        } else {
            dataSourceTransactionManager.rollback(transactionStatus);
            model.setCode(0);
            model.setMsg("删除失败!");
        }
@@ -131,7 +145,7 @@
    }
    
    // 3.1电池容量告警实时查询
    public ServiceModel serchCapAlarm(Object obj){
    public ServiceModel serchCapAlarm(Batt_Maint_Dealarm obj){
        model=new ServiceModel();
        List<Batt_Maint_Dealarm> list=mapper.serchByCondition(obj);
        String name="未知";//存放告警名称
@@ -167,12 +181,26 @@
   

    //3.1电池告警实时查询
    public ServiceModel serchByCondition(Object obj){
        model=new ServiceModel();
        List<Batt_Maint_Dealarm> list=mapper.serchByCondition(obj);
    public ServiceModel serchByCondition(Batt_Maint_Dealarm bmd){
        ServiceModel model=new ServiceModel();
        PageBean pageBean = bmd.getPageBean();
        PageHelper.startPage(pageBean.getPageNum(),pageBean.getPageSize(),true);
        List<Batt_Maint_Dealarm> list=mapper.serchByCondition(bmd);
        if(list!=null && list.size()>1){
            for (int i = 0; i < list.size(); i++) {
                Battalarm_data adata = list.get(i).getAdata();
                String name="未知";            //存放告警名称
                String type="未知";            //存放告警等级
                //battinf中的StationName8，StationName9存放告警名称和等级
                name= AlarmDaoFactory.getAlarmName(adata.getAlm_signal_id());
                type=AlarmDaoFactory.getAlarmType(adata.getAlm_level());
                list.get(i).getBinf().setStationName8(name);
                list.get(i).getBinf().setStationName9(type);
//                System.out.println("StationName9 = " + list.get(i).getBinf().getStationName9());
            }
            PageInfo<Batt_Maint_Dealarm> pageInfo = new PageInfo<>(list);
            model.setCode(1);
            model.setData(list);
            model.setData(pageInfo);
        }else {
            model.setCode(0);
            model.setData(list);
@@ -181,11 +209,26 @@
    }     
   
    //3.2电池告警历史记录查询
    public ServiceModel serchByInfo(Object obj){
        List<Batt_Maint_Dealarm> list=mapper.serchByInfo(obj);	
    public ServiceModel serchByInfo(Batt_Maint_Dealarm bmd){
        ServiceModel model=new ServiceModel();
        PageBean pageBean = bmd.getPageBean();
        PageHelper.startPage(pageBean.getPageNum(),pageBean.getPageSize(),true);
        List<Batt_Maint_Dealarm> list=mapper.serchByInfo(bmd);
        if(list!=null && list.size()>0){
            for (int i = 0; i < list.size(); i++) {
                Battalarm_data adata = list.get(i).getAdata();
                String name="未知";            //存放告警名称
                String type="未知";            //存放告警等级
                //battinf中的StationName8，StationName9存放告警名称和等级
                name= AlarmDaoFactory.getAlarmName(adata.getAlm_signal_id());
                type=AlarmDaoFactory.getAlarmType(adata.getAlm_level());
                list.get(i).getBinf().setStationName8(name);
                list.get(i).getBinf().setStationName9(type);
                System.out.println("StationName9 = " + list.get(i).getBinf().getStationName9());
            }
            PageInfo<Batt_Maint_Dealarm> pageInfo = new PageInfo<>(list);
            model.setCode(1);
            model.setData(list);
            model.setData(pageInfo);
        }else{
            model.setCode(0);
            model.setMsg("查询失败!");
@@ -220,8 +263,8 @@
    }
    
    //0.5查询实时告警数
    public ServiceModel serchAlm(Object obj){
        Batt_Maint_Dealarm bmd=(Batt_Maint_Dealarm) obj;
    public ServiceModel serchAlm(Batt_Maint_Dealarm bmd){
        ServiceModel model=new ServiceModel();
        Battalarm_data adata=new Battalarm_data();
        adata.setNum(0);//实时告警总数
        adata.setBattGroupId(0);//容量告警告警数
@@ -288,12 +331,13 @@

    
    //0.10实时告警记录总数查询
    public ServiceModel serchRealTime(Object obj){
    public ServiceModelOnce serchRealTime(User_inf obj){
        ServiceModelOnce model = new ServiceModelOnce();
        List<Battalarm_data> list=mapper.serchRealTime(obj);
        if(list.size()>0&&list!=null){
            System.out.println("list.get(0) = " + list.get(0));
            model.setCode(1);
            //TODO perry
            // model.setSum(list.get(0).getNum());
             model.setSum(list.get(0).getNum());
        }else{
            model.setCode(0);
            model.setMsg("查询失败!");
@@ -311,14 +355,30 @@
        return model;
    } 
    //饼状图电池单体健康率
    public ServiceModel serchGood(Object obj){
        List list=mapper.serchGood(obj);//单体容量告警和单体告警告警
        int moncounts=(battInfMapper).serchMonAll(obj);//总单体数
    public ServiceModelOnce serchGood(User_inf obj) {
        ServiceModelOnce model = new ServiceModelOnce();
        List<Alarm_param> list = mapper.serchGood(obj);//单体容量告警和单体告警告警
        ArrayList<Integer> listlast = new ArrayList<>();
        if (null != list && list.size() > 0) {
            int capAlarm = 0;//告警告警总数
            int capChange = 0;//更换告警总数
            for (int i = 0; i < list.size(); i++) {
                Alarm_param alarm_param = list.get(i);
                int num = alarm_param.getNum();
                int alm_id = alarm_param.getAlm_id();
                if (alm_id == AlarmDaoFactory.Alarm_CapAlarm) {
                    capAlarm += num;
                } else if (alm_id == AlarmDaoFactory.Alarm_CapChange) {
                    capChange += num;
                }
            }
            listlast.add(capAlarm);
            listlast.add(capChange);
        }
        int moncounts = battInfMapper.serchMonAll(obj);//总单体数
        model.setCode(1);
        //TODO perry
        // model.setSum(moncounts);
        model.setData(list);
        //System.out.println(model);
        model.setSum(moncounts);
        model.setData(listlast);
        return model;
    }
    //取消告警
@@ -349,30 +409,30 @@
    }
    
    //取消告警(多条记录)
    public ServiceModel cancelalarmPro(Object obj) {
        List<Battalarm_data> list=(List<Battalarm_data>) obj;
        ArrayList<String> str_sql=new ArrayList<String>();
        List<User_log> listU=new ArrayList<User_log>();//存放user_log
        if(list!=null&&list.size()>0){
            for(int i=0;i<list.size();i++){
                Battalarm_data adata=list.get(i);
                String cancelSql=mapper.cancelalarmPro(adata);
                str_sql.add(cancelSql);
                {
                    String msg="取消"+adata.getStationname()+"的"+adata.getNote()+"告警";
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
                    listU.add(ulog);
                 }
            }
    public ServiceModel cancelalarmPro(List<Battalarm_data> list) {
        ServiceModel model = new ServiceModel();
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        Boolean bl = true;
        if (list != null && list.size() > 0) {
            for (int i = 0; i < list.size(); i++) {
                Battalarm_data adata = list.get(i);
                if (!bl) {
                    continue;
                }
                if (!(mapper.cancelalarmPro(adata)>0)) {
                    bl = false;
                }
                String msg = "取消" + adata.getStationname() + "的" + adata.getNote() + "告警";
                User_log ulog = UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
                uservice.add(ulog); //将用户的操作记录下来
            }
        }
        //TODO perry待做
        Boolean bl= true;
        //Boolean bl=DateUtil.makeManualCommit(DBUtil.getConn(), str_sql);
        (new User_logService()).addPro(listU);//将用户的操作记录下来
        if(bl){
        if (bl) {
            dataSourceTransactionManager.commit(transactionStatus);
            model.setCode(1);
            model.setMsg("取消成功!");
        }else{
        } else {
            dataSourceTransactionManager.rollback(transactionStatus);
            model.setCode(0);
            model.setMsg("取消失败!");
        }
@@ -380,7 +440,8 @@
    }
    
     //项目下方的滚动，查询最新电池告警(电池告警和设备告警筛选出最新的一条)(旧版本)
    public ServiceModel serchTopAlm(){
    public ServiceModelOnce serchTopAlm(){
        ServiceModelOnce model=new ServiceModelOnce();
        List<Battalarm_data> lista=mapper.serchTopAlmInBatt();
        List<Batt_devalarm_data> listd=battDevAlarmDataMapper.serchTopAlmInDev();
        String adataStr="";//最后的电池告警字符串
@@ -398,7 +459,7 @@
                        +"告警";
                model.setMsg(adataStr);
                //TODO perry
                // model.setSum(0);//0表示电池告警
                 model.setSum(0);//0表示电池告警
            }else{
                model.setData(ddata);
                ddataStr=""+ddata.getStationName()    // 机房名称
@@ -407,7 +468,7 @@
                        +"告警!";
                model.setMsg(ddataStr);
                //TODO perry
                // model.setSum(1);//1表示设备告警
                 model.setSum(1);//1表示设备告警
            }
        }else if(lista==null&&listd.size()>0&&listd!=null){
            Batt_devalarm_data ddata= listd.get(listd.size()-1);
@@ -418,7 +479,7 @@
                    +"告警!";
            model.setMsg(ddataStr);
            //TODO perry
            // model.setSum(1);//1表示设备告警
             model.setSum(1);//1表示设备告警
        }else if(listd==null&&lista.size()>0&&lista!=null){
            Battalarm_data adata=lista.get(lista.size()-1);
            model.setData(adata);
@@ -428,7 +489,7 @@
                    +"告警!";
            model.setMsg(adataStr);
            //TODO perry
            // model.setSum(0);//0表示电池告警
             model.setSum(0);//0表示电池告警
        }else{
            model.setCode(0);
            model.setMsg("没有最新的告警!");
@@ -437,10 +498,29 @@
    }
    
     //项目下方的滚动，查询最新电池告警(电池告警和设备告警筛选出最新的五条)
    public ServiceModel serchTopAlmTen(Object obj){
    public ServiceModel serchTopAlmTen(User_inf obj){
        ServiceModel model=new ServiceModel();
        List<Battalarm_data> lista=mapper.serchTopBattTen(obj);
        if(lista!=null&&lista.size()>0){
            for (int i = 0; i < lista.size(); i++) {
                String adataStr = lista.get(i).getStationname()
                        + "在" + ActionUtil.chageDateToString(lista.get(i).getAlm_start_time(), ActionUtil.time_yyyyMMddHHmmss)
                        + "出现了" + AlarmDaoFactory.getAlarmName(lista.get(i).getAlm_signal_id())
                        + "告警";
                lista.get(i).setNote(adataStr);
            }
        }


        List<Batt_devalarm_data> listd=battDevAlarmDataMapper.serchTopDevTen(obj);
        if(listd!=null&&listd.size()>0){
            for (int i = 0; i < lista.size(); i++) {
                String ddataStr=""+listd.get(i).getStationName()    // 机房名称
                        +"在"+ActionUtil.chageDateToString(listd.get(i).getAlm_start_time(), ActionUtil.time_yyyyMMddHHmmss)    // 告警开始时间
                        +"出现了"+AlarmDaoFactory.getdevName(listd.get(i).getAlm_type()) // 告警类型名称
                        +"告警!";
                listd.get(i).setNote(ddataStr);
            }
            for (Batt_devalarm_data ddata : listd) {
                Battalarm_data data=new Battalarm_data();
                data.setAlm_id(ddata.getDev_id());
@@ -463,7 +543,8 @@
    }
    
    //点击项目下方的滚动，查询该条告警的实时信息
    public ServiceModel  serchBatt_alarm(Object obj){
    public ServiceModel  serchBatt_alarm(Battalarm_data obj){
        ServiceModel model= new ServiceModel();
        List list=mapper.serchBatt_alarm(obj);
        if(list!=null && list.size()>0){
            model.setCode(1);
@@ -475,12 +556,22 @@
        }        
        return model;
    }
	

    //3.1电池告警实时查询<***********跨域专用**************>
    public ServiceModel serchByCondition_ky(Object obj){
        model=new ServiceModel();
        List list=mapper.serchByCondition_ky(obj);
        if(list!=null && list.size()>1){
    public ServiceModel serchByCondition_ky(BattInf obj){
        ServiceModel model=new ServiceModel();
        List<Battalarm_data> list=mapper.serchByCondition_ky(obj);
        if(list!=null && list.size()>1) {    //TODO
            for (int i = 0; i < list.size(); i++) {
                String name = "未知";            //存放告警名称
                String type = "未知";            //存放告警等级
                Battalarm_data bd = list.get(i);
                //battinf中的--
                name = AlarmDaoFactory.getAlarmName(bd.getAlm_signal_id());
                list.get(i).setAlarmname(name);
                type = AlarmDaoFactory.getAlarmType(bd.getAlm_level());
                list.get(i).setAlarmtype(type);
            }
            model.setCode(1);
            model.setData(list);
            model.setMsg("查询成功!");

 src/main/java/com/fgkj/services/Battalarm_data_historyService.java

@@ -1,13 +1,16 @@
package com.fgkj.services;

import com.fgkj.dto.Batt_Maint_Dealarm;
import com.fgkj.dto.Battalarm_data_history;
import com.fgkj.dto.ServiceModel;
import com.fgkj.dto.User_log;
import com.fgkj.dto.*;
import com.fgkj.mapper.AlarmDaoFactory;
import com.fgkj.mapper.UinfDaoFactory;
import com.fgkj.mapper.impl.Battalarm_data_historyMapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.stereotype.Service;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;

import java.util.ArrayList;
import java.util.List;
@@ -16,47 +19,68 @@
@Service
public class Battalarm_data_historyService {

    ServiceModel model = new ServiceModel();

    @Resource
    private Battalarm_data_historyMapper mapper;;
    @Resource
    private User_logService uservice;
    @Autowired
    DataSourceTransactionManager dataSourceTransactionManager;
    @Autowired
    TransactionDefinition transactionDefinition;
    
    //3.2电池告警查询(删除记录)
    public ServiceModel delete(Object obj) {
        List<Battalarm_data_history> list=(List<Battalarm_data_history>) obj;
        ArrayList<String> str_sql=new ArrayList<String>();
        List<User_log> listU=new ArrayList<User_log>();//存放user_log
        if(list!=null&&list.size()>0){
            for(int i=0;i<list.size();i++){
                Battalarm_data_history adata_H=list.get(i);
                String delSql=mapper.delPro(adata_H);
                str_sql.add(delSql);
                {
                    String msg="删除"+adata_H.getStationname()+"的"+adata_H.getNote()+"告警";
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
                    listU.add(ulog);
                 }
            }
        }
        //TODO perry待做
    public ServiceModel delete(List<Battalarm_data_history> list) {
        ServiceModel model = new ServiceModel();
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        Boolean bl= true;
        // Boolean bl=DateUtil.makeManualCommit(DBUtil.getConn(), str_sql);
        (new User_logService()).addPro(listU);//将用户的操作记录下来
        if(list!=null&&list.size()>0) {
            for (int i = 0; i < list.size(); i++) {
                Battalarm_data_history adata_H = list.get(i);
                if (!bl){
                    continue;
                }
                if (!(mapper.delPro(adata_H) > 0)) {
                    bl = false;
                }
                String msg = "删除" + adata_H.getStationname() + "的" + adata_H.getNote() + "告警";
                User_log ulog = UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
                uservice.add(ulog);//将用户的操作记录下来
            }
        }
        if(bl){
            dataSourceTransactionManager.commit(transactionStatus);
            model.setCode(1);
            model.setMsg("删除成功!");
        }else{
            dataSourceTransactionManager.rollback(transactionStatus);
            model.setCode(0);
            model.setMsg("删除失败!");
        }
        return model;
    }
    //3.2电池告警历史记录查询
    public ServiceModel serchByInfo(Object obj){
        List<Batt_Maint_Dealarm> list=mapper.serchByInfo(obj);
    public ServiceModel serchByInfo(Batt_Maint_Dealarm bmd){
        ServiceModel model = new ServiceModel();
        //分页
        PageBean pageBean = bmd.getPageBean();
        PageHelper.startPage(pageBean.getPageNum(),pageBean.getPageSize(),true);
        List<Batt_Maint_Dealarm> list=mapper.serchByInfo(bmd);
        if(list!=null && list.size()>0){
            for (int i = 0; i < list.size(); i++) {
//                System.out.println("getBinf = " + list.get(i).getBinf());
                Battalarm_data_history adata_H = list.get(i).getAdata_H();
                String name="未知";            //存放告警名称
                String type="未知";            //存放告警等级
                //battinf中的StationName8，StationName9存放告警名称和等级
                name= AlarmDaoFactory.getAlarmName(adata_H.getAlm_signal_id());
                type=AlarmDaoFactory.getAlarmType(adata_H.getAlm_level());
                list.get(i).getBinf().setStationName8(name);
                list.get(i).getBinf().setStationName9(type);
//                System.out.println("getBinf after = " + list.get(i).getBinf());
            }
            PageInfo<Batt_Maint_Dealarm> pageInfo = new PageInfo<>(list);
            model.setCode(1);
            model.setData(list);
            model.setData(pageInfo);
        }else{
            model.setCode(0);
            model.setMsg("查询失败!");

 src/main/resources/mapper/BattAlarmDataHistoryMapper.xml

@@ -1,7 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fgkj.mapper.impl.Battalarm_data_historyMapper" >

    <resultMap id="BaseResultMap" type="Batt_Maint_Dealarm">
        <association property="binf" javaType="BattInf">
            <result column="stationName" property="stationName"></result>
            <result column="battGroupName" property="battGroupName"></result>
        </association>
        <association property="adata_H" javaType="Battalarm_data_history">
            <result column="num" property="num"></result>
            <result column="battGroupId" property="battGroupId"></result>
            <result column="alm_signal_id" property="alm_signal_id"></result>
            <result column="monNum" property="monNum"></result>
            <result column="alm_value" property="alm_value"></result>
            <result column="alm_level" property="alm_level"></result>
            <result column="alm_is_confirmed" property="alm_is_confirmed"></result>
            <result column="alm_confirmed_time" property="alm_confirmed_time"></result>
            <result column="alm_start_time" property="alm_start_time"></result>
            <result column="alm_end_time" property="alm_end_time"></result>
        </association>
    </resultMap>
    <!--
    //3.2电池告警查询(删除记录)<多条记录删除>
    public String delPro(Object obj){
@@ -178,6 +195,41 @@
    }
    -->

    <delete id="delPro"></delete>
    <select id="serchByInfo" resultType="java.util.List"></select>
<!--    <delete id="delPro"></delete>-->
    <select id="serchByInfo" resultMap="BaseResultMap">
        select
        distinct(db_alarm.tb_battalarm_data_history.BattGroupId),db_alarm.tb_battalarm_data_history.num,alm_signal_id,db_alarm.tb_battalarm_data_history.monnum,alm_value,alm_level,alm_is_confirmed,alm_confirmed_time,alm_start_time,alm_end_time,
        stationname,battgroupname
        from db_alarm.tb_battalarm_data_history, db_battinf.tb_battinf
        where alm_id
        in (#{mainf.fault_type_id}
        , #{mainf.fault_level}
        , #{mainf.record_uid}
        , #{mainf.maint_type_id}
        , #{mainf.maint_done}
        , #{mainf.maint_close}
        , #{mainf.uname})
        and alm_signal_id%2 in (#{adata_H.alm_id}
        , #{adata_H.alm_signal_id})
        and alm_level in (#{mainf.num}
        , #{mainf.battGroupId}
        , #{mainf.master_audit}
        , #{mainf.appoint_uid})
        and alm_start_time>=#{adata_H.alm_start_time}
        and alm_start_time <![CDATA[<=]]> #{adata_H.alm_start_time1}
        and db_battinf.tb_battinf.stationname1 like '%${binf.stationName1}%'
        and db_battinf.tb_battinf.stationname like  '%${binf.stationName}%'
        <if test="binf.battGroupId==0">and db_battinf.tb_battinf.battgroupid!=#{binf.battGroupId} and
            db_alarm.tb_battalarm_data_history.battgroupid=db_battinf.tb_battinf.battgroupid
        </if>
        <if test="binf.battGroupId!=0">and db_battinf.tb_battinf.battgroupid=#{binf.battGroupId} and
            db_alarm.tb_battalarm_data_history.battgroupid=db_battinf.tb_battinf.battgroupid
        </if>
        and db_alarm.tb_battalarm_data_history.BattGroupId in(select distinct db_battinf.tb_battinf.battgroupid from
        db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf
        where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId and
        db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id
        and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid and db_user.tb_user_inf.uid=#{uinf.uId} )
        order by db_alarm.tb_battalarm_data_history.alm_start_time desc,db_alarm.tb_battalarm_data_history.monnum asc
    </select>
</mapper>

 src/main/resources/mapper/BattAlarmDataMapper.xml

@@ -1,7 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fgkj.mapper.impl.Battalarm_dataMapper" >

    <resultMap id="BaseResultMap" type="Batt_Maint_Dealarm">
        <association property="binf" javaType="BattInf">
            <result column="battGroupId" property="battGroupId"></result>
            <result column="stationName" property="stationName"></result>
            <result column="battGroupName" property="battGroupName"></result>
        </association>
        <association property="adata" javaType="Battalarm_data">
            <result column="num" property="num"></result>
            <result column="battGroupId" property="battGroupId"></result>
            <result column="alm_signal_id" property="alm_signal_id"></result>
            <result column="monNum" property="monNum"></result>
            <result column="alm_value" property="alm_value"></result>
            <result column="alm_level" property="alm_level"></result>
            <result column="alm_is_confirmed" property="alm_is_confirmed"></result>
            <result column="alm_confirmed_time" property="alm_confirmed_time"></result>
            <result column="alm_start_time" property="alm_start_time"></result>
            <result column="alm_end_time" property="alm_end_time"></result>
        </association>
    </resultMap>
    <resultMap id="BaseResultMap2" type="Batt_Maint_Dealarm">
        <association property="binf" javaType="BattInf">
            <result column="stationName" property="stationName"></result>
            <result column="battGroupName" property="battGroupName"></result>
        </association>
        <association property="adata" javaType="Battalarm_data">
            <result column="num" property="num"></result>
            <result column="battGroupId" property="battGroupId"></result>
            <result column="alm_signal_id" property="alm_signal_id"></result>
            <result column="monNum" property="monNum"></result>
            <result column="alm_value" property="alm_value"></result>
            <result column="alm_level" property="alm_level"></result>
            <result column="alm_is_confirmed" property="alm_is_confirmed"></result>
            <result column="alm_confirmed_time" property="alm_confirmed_time"></result>
            <result column="alm_start_time" property="alm_start_time"></result>
            <result column="alm_end_time" property="alm_end_time"></result>
        </association>
    </resultMap>
    <!--
    public List getResults(ResultSet rs) {
        List list = new ArrayList();
@@ -1976,29 +2012,135 @@
    <insert id="add"></insert>
    <insert id="addPro"></insert>
    <update id="update"></update>
    <update id="updatePro"></update>
<!--    <update id="updatePro"></update>-->
    <update id="NowToHistory"></update>
    <delete id="del"></delete>
    <delete id="delPro"></delete>
    <update id="cancelalarmPro"></update>
<!--    <delete id="delPro"></delete>-->
<!--    <update id="cancelalarmPro"></update>-->
    <update id="cancelalarm"></update>
    <update id="judge"></update>
    <select id="searchAll" resultType="java.util.List"></select>
    <select id="serchCapAlarm" resultType="java.util.List"></select>
    <select id="serchByCondition" resultType="java.util.List"></select>
    <select id="serchByInfo" resultType="java.util.List"></select>

    <select id="serchByCondition" resultMap="BaseResultMap">
        select distinct db_alarm.tb_battalarm_data.BattGroupId,
        db_alarm.tb_battalarm_data.num,
        alm_signal_id,
        db_alarm.tb_battalarm_data.monnum,
        alm_value,
        alm_level,
        alm_is_confirmed,
        alm_confirmed_time,
        alm_start_time,
        alm_end_time,
        stationname,
        battgroupname
        from db_alarm.tb_battalarm_data,
        db_battinf.tb_battinf
        where alm_id in (#{mainf.usr_id}, #{mainf.fault_type_id}, #{mainf.fault_level}, #{mainf.record_uid}, #{mainf.maint_type_id}, #{mainf.maint_done},
        #{mainf.maint_close}, #{mainf.master_id}, #{adata.monNum}, #{adata.record_Id}, #{mainf.uname})
        and alm_signal_id%2 in(#{adata.alm_id},#{adata.alm_signal_id}) and alm_level
        in(#{mainf.num},#{mainf.battGroupId},#{mainf.master_audit},#{mainf.appoint_uid}) and alm_cleared_type=0 and
        db_battinf.tb_battinf.stationname1 like '%${binf.stationName1}%' and db_battinf.tb_battinf.stationname like '%${binf.stationName}%'
        <if test="binf.battGroupId==0">
            and db_battinf.tb_battinf.battgroupid!=#{binf.battGroupId} and
            db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid
        </if>
        <if test="binf.battGroupId!=0">and db_battinf.tb_battinf.battgroupid=#{binf.battGroupId} and
            db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid
        </if>
        and db_alarm.tb_battalarm_data.BattGroupId in(select distinct db_battinf.tb_battinf.battgroupid from
        db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf
        where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId and
        db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id
        and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid and
        db_user.tb_user_inf.uid=#{uinf.uId} )
        order by db_alarm.tb_battalarm_data.BattGroupId,db_alarm.tb_battalarm_data.alm_start_time
        desc,db_alarm.tb_battalarm_data.monnum asc
    </select>


    <select id="serchByInfo" resultMap="BaseResultMap2">
        select
        distinct(db_alarm.tb_battalarm_data.BattGroupId),db_alarm.tb_battalarm_data.num,alm_signal_id,db_alarm.tb_battalarm_data.monnum,alm_value,alm_level,alm_is_confirmed,alm_confirmed_time,alm_start_time,alm_end_time,
        stationname,battgroupname from db_alarm.tb_battalarm_data,db_battinf.tb_battinf
        <!--where alm_id in(#{mainf.fault_type_id}, #{mainf.fault_level}, #{mainf.record_uid}, #{mainf.maint_type_id},
        #{mainf.maint_done},
        #{mainf.maint_close}) and
        alm_signal_id%2 in(#{adata.alm_id},#{adata.alm_signal_id}) and alm_level
        in(#{mainf.num},#{mainf.battGroupId},#{mainf.master_audit},#{mainf.appoint_uid}) and
        alm_start_time>=#{adata.alm_start_time} and alm_start_time <![CDATA[<=]]> #{adata.alm_start_time1} and
        db_battinf.tb_battinf.stationname1 like '%${binf.stationName1}%' and db_battinf.tb_battinf.stationname like
        '%${binf.stationName}%'
        <if test="adata.alm_cleared_type==0">
            and alm_cleared_type=#{adata.alm_cleared_type}
        </if>
        <if test="adata.alm_cleared_type==1">
            and alm_cleared_type in(#{adata.alm_cleared_type},1,2)
        </if>

        <if test="adata.alm_cleared_type==100">
            and alm_cleared_type in(#{adata.alm_cleared_type},0,1,2)
        </if>
        <if test="adata.alm_cleared_type==200">
            and alm_cleared_type=#{adata.alm_cleared_type}
        </if>
        <if test="binf.battGroupId==0">
            and db_battinf.tb_battinf.battgroupid!=#{binf.battGroupId} and
            db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid
        </if>
        <if test="adata.battGroupId!=0">
            and db_battinf.tb_battinf.battgroupid=#{binf.battGroupId} and
            db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid
        </if>
        and db_alarm.tb_battalarm_data.BattGroupId in(select distinct db_battinf.tb_battinf.battgroupid from
        db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf
        where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId and
        db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id
        and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid and db_user.tb_user_inf.uid=#{uinf.uId}
        )
        order by db_alarm.tb_battalarm_data.alm_start_time desc,db_alarm.tb_battalarm_data.monnum asc-->
    </select>

    <select id="serchByInfo1" resultType="java.util.List"></select>
    <select id="serchRealTime" resultType="java.util.List"></select>
<!--    <select id="serchRealTime" resultType="java.util.List"></select>-->
    <select id="serchByBatt" resultType="java.util.List"></select>
    <select id="serchByAlmType" resultType="java.util.List"></select>
<!--    <select id="serchByStationId" resultType="java.lang.Integer"></select>-->
    <select id="serchBystationName3" resultType="java.lang.Integer"></select>
<!--    <select id="serchMonAlarm" resultType="java.lang.String"></select>-->
    <select id="serchGood" resultType="java.util.List"></select>
<!--    <select id="serchGood" resultType="java.util.List"></select>-->
    <select id="serchTopAlmInBatt" resultType="java.util.List"></select>
    <select id="serchTopBattTen" resultType="java.util.List"></select>
    <select id="serchBatt_alarm" resultType="java.util.List"></select>
    <select id="serchByCondition_ky" resultType="java.util.List"></select>
<!--    <select id="serchTopBattTen" resultType="java.util.List"></select>-->
<!--    <select id="serchBatt_alarm" resultType="java.util.List"></select>-->

    <select id="serchByCondition_ky" resultType="java.util.List">
        select distinct db_alarm.tb_battalarm_data.BattGroupId,
        db_alarm.tb_battalarm_data.num,
        alm_signal_id,
        db_alarm.tb_battalarm_data.monnum,
        alm_value,
        alm_level,
        alm_is_confirmed,
        alm_confirmed_time,
        alm_start_time,
        alm_end_time,
        stationname,
        stationname5,
        battgroupname
        from db_alarm.tb_battalarm_data,
        db_battinf.tb_battinf
        where alm_cleared_type = 0
        <if test="battGroupId==0">and db_battinf.tb_battinf.battgroupid!=#{battGroupId} and
            db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid
        </if>
        <if test="battGroupId!=0">and db_battinf.tb_battinf.battgroupid=#{battGroupId} and
            db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid
        </if>
        order by db_alarm.tb_battalarm_data.BattGroupId,db_alarm.tb_battalarm_data.alm_start_time
        desc,db_alarm.tb_battalarm_data.monnum asc
    </select>

    <select id="seachStationAlarm" resultType="java.lang.Integer"></select>
    <select id="serchAlm" resultType="java.util.List"></select>
<!--    <select id="serchAlm" resultType="java.util.List"></select>-->
</mapper>

 src/main/resources/mapper/BattDevAlarmDataMapper.xml

@@ -118,7 +118,7 @@
            and db_user.tb_user_inf.uid=#{uId})
    </select>
    <select id="serchTopAlmInDev" resultType="java.util.List"></select>
    <select id="serchTopDevTen" resultType="java.util.List"></select>
<!--    <select id="serchTopDevTen" resultType="java.util.List"></select>-->
    <select id="serchDev_alarm" resultMap="Map_BattDevAlarmData2">
        select
            distinct db_alarm.tb_devalarm_data.dev_id,dev_ip,alm_type,alm_start_time,alm_cleared_type,

 src/main/resources/mapper/BattInfMapper.xml

@@ -4474,7 +4474,7 @@
<!--    <select id="serchMonNum" resultType="java.util.List"></select>-->
<!--    <select id="serchByStationid" resultType="java.util.List"></select>-->
    <select id="searchBattByStationId" resultType="java.util.List"></select>
    <select id="serchMonAll" resultType="java.lang.Integer"></select>
<!--    <select id="serchMonAll" resultType="java.lang.Integer"></select>-->
    <select id="searchStationId" resultType="java.util.List"></select>
    <select id="serchAllStation" resultType="java.util.List"></select>
    <select id="serchBattByStation" resultType="java.util.List"></select>