fg重构项目
parent: 12fbaa2d | 补丁 | 提交 | ignore whitespace
whyclxw
2021-12-01 786d541b5966028d1471b8743ada769f379d748f 
设备告警修改
4个文件已添加
4个文件已修改
144 ■■■■■ 已修改文件
src/main/java/com/whyc/controller/BattalarmDataController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/DevalarmDataController.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/DevalarmDataMapper.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/DevalarmData.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BattalarmDataHistoryService.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BattalarmDataService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/DevalarmDataService.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/DevalarmDataMapper.xml 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 src/main/java/com/whyc/controller/BattalarmDataController.java


@@ -16,7 +16,7 @@




import java.util.List;




@Api(tags = "电池告警")


@Api(tags = "电池实时告警")


@RestController


@RequestMapping("/Battalarm_dataAction")


public class BattalarmDataController {




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


New file


@@ -0,0 +1,28 @@


package com.whyc.controller;




import com.whyc.dto.Response;


import com.whyc.dto.paramter.AlarmPar;


import com.whyc.service.DevalarmDataService;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;




@RestController


@RequestMapping("/DevalarmDataAction")


@Api(tags = "设备实时告警")


public class DevalarmDataController {




    @Autowired


    private DevalarmDataService service;




    //设备告警实时查询


    //@ApiOperation(value = "设备告警实时查询")


    @PostMapping("/serchByInfo")


    public Response serchByInfo(@RequestBody  AlarmPar par){


        return  service.serchByInfo(par);


    }


}




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


New file


@@ -0,0 +1,11 @@


package com.whyc.mapper;




import com.whyc.dto.paramter.AlarmPar;


import com.whyc.pojo.DevalarmData;




import java.util.List;




public interface DevalarmDataMapper extends CustomMapper<DevalarmData>{


    //设备告警实时查询


    List serchByInfo(AlarmPar par);


}




 src/main/java/com/whyc/pojo/DevalarmData.java


@@ -5,8 +5,7 @@


import com.baomidou.mybatisplus.annotation.TableId;


import com.baomidou.mybatisplus.annotation.TableName;


import io.swagger.annotations.ApiModel;


import lombok.Data;


import lombok.EqualsAndHashCode;


import lombok.*;


import lombok.experimental.Accessors;




import java.io.Serializable;


@@ -21,10 +20,11 @@


 * @since 2021-11-29


 */


@Data


@EqualsAndHashCode(callSuper = false)


@Accessors(chain = true)


@TableName("tb_devalarm_data")


@ApiModel(value="DevalarmData对象", description="")


@AllArgsConstructor


@NoArgsConstructor


@ToString


@TableName(schema = "db_alarm",value = "tb_devalarm_data")


@ApiModel(value="DevalarmData对象", description="设备告警实时")


public class DevalarmData implements Serializable {




    private static final long serialVersionUID = 1L;




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


@@ -8,6 +8,8 @@


import com.whyc.dto.result.AlarmRes;


import com.whyc.mapper.BattalarmDataHistoryMapper;


import com.whyc.pojo.BattalarmDataHistory;


import com.whyc.pojo.UserInf;


import com.whyc.util.ActionUtil;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




@@ -24,6 +26,8 @@


    public Response serchByInfo(AlarmPar par){


        //分页信息


        PageHelper.startPage(par.getPage().getPageCurr(), par.getPage().getPageSize());


        UserInf uinf= ActionUtil.getUser();


        par.setUId(uinf.getUId().intValue());


        List<AlarmRes> list=mapper.serchByInfo(par);


        PageInfo<AlarmRes> pinfo=new PageInfo<AlarmRes>(list);


        return new Response().set(1,pinfo);




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


@@ -15,7 +15,9 @@


import com.whyc.dto.result.AlarmNumberRes;


import com.whyc.mapper.BattalarmDataMapper;


import com.whyc.pojo.BattalarmData;


import com.whyc.pojo.UserInf;


import com.whyc.pojo.WorkflowAlarm;


import com.whyc.util.ActionUtil;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




@@ -56,6 +58,8 @@


    public Response serchByCondition(AlarmPar par) {


        //分页信息


        PageHelper.startPage(par.getPage().getPageCurr(), par.getPage().getPageSize());


        UserInf uinf= ActionUtil.getUser();


        par.setUId(uinf.getUId().intValue());


        List<AlarmRes> list=mapper.serchByCondition(par);


        PageInfo<AlarmRes> pinfo=new PageInfo<AlarmRes>(list);


        return new Response().set(1,pinfo);


@@ -64,6 +68,8 @@


    public Response<List<AlarmRes>> serchByInfo(AlarmPar par) {


        //分页信息


        PageHelper.startPage(par.getPage().getPageCurr(), par.getPage().getPageSize());


        UserInf uinf= ActionUtil.getUser();


        par.setUId(uinf.getUId().intValue());


        List<AlarmRes> list=mapper.serchByInfo(par);


        PageInfo<AlarmRes> pinfo=new PageInfo<AlarmRes>(list);


        return new Response<List<AlarmRes>>().set(1,list,String.valueOf(pinfo.getPages()));




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


New file


@@ -0,0 +1,29 @@


package com.whyc.service;




import com.github.pagehelper.PageHelper;


import com.github.pagehelper.PageInfo;


import com.whyc.dto.Response;


import com.whyc.dto.paramter.AlarmPar;


import com.whyc.mapper.DevalarmDataMapper;


import com.whyc.pojo.UserInf;


import com.whyc.util.ActionUtil;


import org.springframework.stereotype.Service;




import javax.annotation.Resource;


import java.util.List;




@Service


public class DevalarmDataService {




    @Resource


    private DevalarmDataMapper mapper;


    //设备告警实时查询


    public Response serchByInfo(AlarmPar par) {


        PageHelper.startPage(par.getPage().getPageCurr(),par.getPage().getPageSize());


        UserInf uinf= ActionUtil.getUser();


        par.setUId(uinf.getUId().intValue());


        List list=mapper.serchByInfo(par);


        PageInfo pageInfo=new PageInfo(list);


        return  new Response().set(1,pageInfo);


    }


}




 src/main/resources/mapper/DevalarmDataMapper.xml


New file


@@ -0,0 +1,52 @@


<?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.whyc.mapper.DevalarmDataMapper" >


    <resultMap id="alarmRes" type="AlarmRes">


        <result property="BattGroupId" column="BattGroupId"></result>


        <result property="StationName" column="stationname"></result>


        <result property="BattGroupName" column="battgroupname"></result>


        <collection property="adataHs" ofType="com.whyc.pojo.BattalarmDataHistory">


            <id property="num" column="num"></id>


            <result property="BattGroupId" column="BattGroupId"></result>


            <result property="almSignalId" column="alm_signal_id"></result>


            <result property="MonNum" column="monnum"></result>


            <result property="almValue" column="alm_value" ></result>


            <result property="almLevel" column="alm_level" ></result>


            <result property="almIsConfirmed" column="alm_is_confirmed" ></result>


            <result property="almConfirmedTime" column="alm_confirmed_time" ></result>


            <result property="almStartTime" column="alm_start_time" ></result>


            <result property="almEndTime" column="alm_end_time" ></result>


        </collection>




    </resultMap>




    <select id="serchByInfo" resultMap="alarmRes">


        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>


            db_alarm.tb_battalarm_data_history.battgroupid=db_battinf.tb_battinf.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})


            and alm_start_time>=#{almStartTime} and alm_start_time &lt;=#{almStartTime1}


            and db_battinf.tb_battinf.stationname1 like '%${stationname1}%'


            and db_battinf.tb_battinf.stationname like '%${stationname}%'


            <if test="battGroupId==0">


                and db_battinf.tb_battinf.battgroupid!=#{battGroupId}


            </if>


            <if test="battGroupId!=0">


                and db_battinf.tb_battinf.battgroupid=#{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=#{uId} )


        </where>


        order by db_alarm.tb_battalarm_data_history.alm_start_time desc,db_alarm.tb_battalarm_data_history.monnum asc


    </select>








</mapper>