whycxzp
2021-03-19 b5209278c6bd519a52f5ae6b1c4d61d99e907f6d
更新电源状态告警
2个文件已修改
39 ■■■■■ 已修改文件
src/main/java/com/whyc/controller/PowerAlarmController.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/PowerAlarmService.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/PowerAlarmController.java
@@ -8,6 +8,7 @@
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 javax.servlet.http.HttpServletRequest;
@@ -27,16 +28,14 @@
    @GetMapping("acInput")
    @ApiOperation(value = "交流输入")
    public Response<Map> getACInputAnalysis(HttpServletRequest request){
        int userId = CommonUtil.getUser(request).getId();
    public Response<Map> getACInputAnalysis(@RequestParam Integer userId){
        Response<Map> response = service.getACInputAnalysis(userId);
        return response;
    }
    @GetMapping("error")
    @ApiOperation(value = "故障")
    public Response<Map> getErrorAnalysis(HttpServletRequest request){
        int userId = CommonUtil.getUser(request).getId();
    public Response<Map> getErrorAnalysis(@RequestParam Integer userId){
        Response<Map> response = service.getErrorAnalysis(userId);
        return response;
    }
@@ -47,40 +46,35 @@
     */
    @GetMapping("acABC")
    @ApiOperation(value = "交流ABC")
    public Response<Map> getAcABCAnalysis(HttpServletRequest request){
        int userId = CommonUtil.getUser(request).getId();
    public Response<Map> getAcABCAnalysis(@RequestParam Integer userId){
        Response<Map> response = service.getAcABCAnalysis(userId);
        return response;
    }
    @GetMapping("rectifier")
    @ApiOperation(value = "整流器")
    public Response<Map> getRectifierAnalysis(HttpServletRequest request){
        int userId = CommonUtil.getUser(request).getId();
    public Response<Map> getRectifierAnalysis(@RequestParam Integer userId){
        Response<Map> response = service.getRectifierAnalysis(userId);
        return response;
    }
    @GetMapping("status")
    @ApiOperation(value = "电源状态")
    public Response<Map> getStatus(HttpServletRequest request){
        int userId = CommonUtil.getUser(request).getId();
    @ApiOperation(value = "电源状态告警")
    public Response<Map> getStatus(@RequestParam Integer userId){
        Response<Map> response = service.getStatus(userId);
        return response;
    }
    @GetMapping("batteryGroup")
    @ApiOperation(value = "电池组")
    public Response<Map> getBatteryGroupAnalysis(HttpServletRequest request){
        int userId = CommonUtil.getUser(request).getId();
    public Response<Map> getBatteryGroupAnalysis(@RequestParam Integer userId){
        Response<Map> response = service.getBatteryGroupAnalysis(userId);
        return response;
    }
    @GetMapping("stationCount")
    @ApiOperation(value = "故障机房数量")
    public Response<List> getAlarmStationCount(HttpServletRequest request){
        int userId = CommonUtil.getUser(request).getId();
    public Response<List> getAlarmStationCount(@RequestParam Integer userId){
        Response<List> response = service.getAlarmStationCount(userId);
        return response;
    }
src/main/java/com/whyc/service/PowerAlarmService.java
@@ -5,6 +5,7 @@
import com.whyc.mapper.PowerAlarmMapper;
import com.whyc.mapper.PowerInfoMapper;
import com.whyc.pojo.PowerAlarm;
import com.whyc.util.MathUtil;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestParam;
@@ -394,7 +395,7 @@
        //状态-直流电压异常,
        //状态-负载熔断,
        //状态-直流过流
        Map<String,Integer> resultMap = new HashMap<>();
        Map<String,Object> resultMap = new HashMap<>();
        resultMap.put("交流停电",0);
        resultMap.put("直流电压异常",0);
        resultMap.put("负载熔断",0);
@@ -417,7 +418,7 @@
                    break;
                case AlarmConstant.dcOut_over_vol:
                case AlarmConstant.dcOut_under_vol:
                    resultMap.put("直流电压异常",resultMap.get("直流电压异常")+data.get(i).getNum().intValue());
                    resultMap.put("直流电压异常",(Integer)resultMap.get("直流电压异常")+data.get(i).getNum().intValue());
                    break;
                case AlarmConstant.loader_fuse:
                    resultMap.put("负载熔断",data.get(i).getNum().intValue());
@@ -431,6 +432,16 @@
        }
        /*======获取电源告警机房数和比例======*/
        //告警机房数
        int alarmStationCount = mapper.getAlarmStationCount(userId);
        //总机房数
        int stationCount = infoMapper.getStationCount(userId);
        //比例
        String alarmStationRate = MathUtil.divide(alarmStationCount, stationCount);
        resultMap.put("告警机房数",alarmStationCount);
        resultMap.put("告警机房比例",alarmStationRate);
        return new Response<Map>().set(1,resultMap);
    }