whyclxw
2021-12-13 5aeb6f8cc236232b4d5acd6b8330f96f19c1bf2c
设备告警修改
5个文件已修改
72 ■■■■■ 已修改文件
src/main/java/com/whyc/controller/PwrdevAlarmController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/PwrdevAlarmMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/PwrdevAlarmService.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/config/application.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/PwrdevAlarmMapper.xml 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/PwrdevAlarmController.java
@@ -48,4 +48,11 @@
    public Response getAlarmNum(){
        return service.getAlarmNum();
    }
    //通信电源告警--认证送检-配电柜专用
    @ApiOperation(value = "通信电源告警",notes="almTypes,almLevels,page,stationName1,stationName2,stationName3,stationName5,usrId,almSource")
    @PostMapping("/getAllPage2")
    public Response getAllPage2(@RequestBody PwrdevAlarm pwrdevAlarm){
        return service.getAllPage2(pwrdevAlarm);
    }
}
src/main/java/com/whyc/mapper/PwrdevAlarmMapper.java
@@ -9,4 +9,6 @@
    List getAllPage(PwrdevAlarm pwrdevAlarm);
    //电源告警个数
    int getAlarmNum(int intValue);
    //通信电源告警--认证送检-配电柜专用
    List<PwrdevAlarm> getAllPage2(PwrdevAlarm pwrdevAlarm);
}
src/main/java/com/whyc/service/PwrdevAlarmService.java
@@ -69,4 +69,19 @@
        int powerAlarmNum=mapper.getAlarmNum(uinf.getUId().intValue());
        return  new Response().set(1,powerAlarmNum);
    }
    //通信电源告警--认证送检-配电柜专用
    public Response getAllPage2(PwrdevAlarm pwrdevAlarm) {
        //分页信息
        PageHelper.startPage(pwrdevAlarm.getPage().getPageCurr(), pwrdevAlarm.getPage().getPageSize());
        pwrdevAlarm.setUsrId(ActionUtil.getUser().getUId().intValue());
        List<PwrdevAlarm> list=mapper.getAllPage2(pwrdevAlarm);
        for (PwrdevAlarm p:list) {
            p.setAlarmName(AlarmDaoFactory.getAllAlarmName(p.getAlmType()));
            if(p.getAlmIndex()!=0){
                p.setAlarmName(p.getAlarmName().replace("N","第"+p.getAlmIndex()+"路"));
            }
        }
        PageInfo pageInfo=new PageInfo(list);
        return new Response().set(1,pageInfo);
    }
}
src/main/resources/config/application.yml
@@ -20,6 +20,8 @@
    initialPoolSize: 2
    minPoolSize: 2
    maxPoolSize: 500
  jackson:
    time-zone: GMT+8
mybatis-plus:
  typeAliasesPackage: com.whyc.pojo,com.whyc.dto
  mapper-locations: classpath:mapper/**/*Mapper.xml
@@ -79,5 +81,3 @@
  #告警工单
  alarm:
    task.switch: off
src/main/resources/mapper/PwrdevAlarmMapper.xml
@@ -60,5 +60,47 @@
        and db_user.tb_user_inf.uid=#{uid} ) ;
    </select>
    <select id="getAllPage2" resultType="PwrdevAlarm">
        select  alarm.*,inf.StationName from db_pwrdev_alarm.tb_pwrdev_alarm alarm,db_pwrdev_inf.tb_pwrdev_inf inf
        <where>
            alarm.PowerDeviceId = inf.PowerDeviceId
            <if test="stationName1!=null ">
                and stationName1 like '%${stationName1}%'
            </if>
            <if test="stationName2!=null ">
                and stationName2 like '%${stationName2}%'
            </if>
            <if test="stationName5!=null ">
                and stationName5 like '%${stationName5}%'
            </if>
            <if test="stationName3!=null ">
                and stationName3 like '%${stationName3}%'
            </if>
            <if test="almSource==0">
                and alm_source!=#{almSource}
            </if>
            <if test="almSource!=0">
                and alm_source=#{almSource}
            </if>
            <if test="almTypes!=null and almTypes.size>0">
                <foreach collection="almTypes" item="almType" open="and alm_type in (" close=")" separator=",">
                    #{almType}
                </foreach>
            </if>
            <if test="almLevels!=null and almLevels.size>0">
                <foreach collection="almLevels" item="almLevel" open="and alm_level in (" close=")" separator=",">
                    #{almLevel}
                </foreach>
            </if>
            and StationId in ( select distinct inf.StationId from
            (select StationId from db_battinf.tb_battinf union select StationId from db_pwrdev_inf.tb_pwrdev_inf ) inf,
            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.StationId=inf.StationId
            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=#{usrId} )
        </where>
    </select>
</mapper>