第三方接口调整以及battAlarmFootSocket电源告警暂时注释

whyczh

2022-07-05 c9e4006f626199e587044726064c01c445eb036e

第三方接口调整以及battAlarmFootSocket电源告警暂时注释

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

@@ -33,7 +33,7 @@
        return service.getBattAlarm(interfaceParam.getBattgroupIds());
    }

    @GetMapping("/getDevAlarm")
    @PostMapping("/getDevAlarm")
    @ApiOperation("获取设备告警数据")
    public Response getDevAlarm(@RequestBody InterfaceParam interfaceParam){
        return service.getDevAlarm(interfaceParam.getDeviceIds());

 src/main/java/com/whyc/filter/AccessFilter.java

@@ -12,8 +12,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;

import static ch.qos.logback.classic.ClassicConstants.REQUEST_METHOD;

/**
 * 防重放功能
 */
@@ -82,10 +80,10 @@
                        || requestURI.contains("station3D/byDeviceId")
                        || requestURI.contains("battMapInformation/multAmout")
                        //对外接口-外部
                        || requestURI.contains("interface/getBattInf")
                        || requestURI.contains("interface/getBattAlarm")
                        || requestURI.contains("interface/getPowerInf")
                        || requestURI.contains("interface/getPowerAlarm")
                        || requestURI.contains("interface/")
//                        || requestURI.contains("interface/getBattAlarm")
//                        || requestURI.contains("interface/getPowerInf")
//                        || requestURI.contains("interface/getPowerAlarm")
                        //↑================此处与签名和无需登录放行保持一致===============↑/
                        //静态资源
                        || requestURI.contains(".")
@@ -118,10 +116,11 @@
                                    || requestURI.contains("station3D/byDeviceId")
                                    || requestURI.contains("battMapInformation/multAmout")
                                    //对外接口-外部
                                    || requestURI.contains("interface/getBattInf")
                                    || requestURI.contains("interface/getBattAlarm")
                                    || requestURI.contains("interface/getPowerInf")
                                    || requestURI.contains("interface/getPowerAlarm")
                                    || requestURI.contains("interface/")
//                                    || requestURI.contains("interface/getBattInf")
//                                    || requestURI.contains("interface/getBattAlarm")
//                                    || requestURI.contains("interface/getPowerInf")
//                                    || requestURI.contains("interface/getPowerAlarm")
                                    //↑================此处与签名和无需登录放行保持一致===============↑/
                                    //登录页面接口
                                    || requestURI.contains("User_infAction!searchSnIdByUId") //TODO 免登陆v2待开发

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

@@ -344,21 +344,22 @@
                lista.add(data);
            }
        }
        List<PwrdevAlarm> pwrAlarmList = pwrdevAlarmMapper.getRealAlarmFoot(yesterday,uId);
        if (pwrAlarmList!=null && pwrAlarmList.size()>0){
            for (PwrdevAlarm pAlarm:pwrAlarmList ) {
                BattalarmData data=new BattalarmData();
                data.setAlarmType("2");//2表示电源告警
                data.setAlmId(pAlarm.getAlmType());
                data.setStationName(pAlarm.getStationName());
                data.setStationName3(pAlarm.getStationName3());
                data.setAlmLevel(pAlarm.getAlmLevel());
                data.setNum(pAlarm.getNum());
                data.setAlmStartTime(pAlarm.getAlmStartTime());
                data.setAlarmName(AlarmDaoFactory.getAllAlarmName(pAlarm.getAlmType()));
                lista.add(data);
            }
        }
        //添加电源告警
//        List<PwrdevAlarm> pwrAlarmList = pwrdevAlarmMapper.getRealAlarmFoot(yesterday,uId);
//        if (pwrAlarmList!=null && pwrAlarmList.size()>0){
//            for (PwrdevAlarm pAlarm:pwrAlarmList ) {
//                BattalarmData data=new BattalarmData();
//                data.setAlarmType("2");//2表示电源告警
//                data.setAlmId(pAlarm.getAlmType());
//                data.setStationName(pAlarm.getStationName());
//                data.setStationName3(pAlarm.getStationName3());
//                data.setAlmLevel(pAlarm.getAlmLevel());
//                data.setNum(pAlarm.getNum());
//                data.setAlmStartTime(pAlarm.getAlmStartTime());
//                data.setAlarmName(AlarmDaoFactory.getAllAlarmName(pAlarm.getAlmType()));
//                lista.add(data);
//            }
//        }
        //排序,按照时间或者说是num
        lista.sort(Comparator.comparing(BattalarmData::getAlmStartTime).reversed());
        return new Response().set(1,lista,"查询成功");