cjl
2023-08-16 dfaf7c908dfd78ff95af7848de411ca7d02a3c70
feat:页面组织增加在线状态
2 files modified
32 ■■■■ changed files
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java 17 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/vo/monitorPoint/MonitorPointsVO.java 15 ●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
@@ -62,7 +62,22 @@
        List<MonitorPoint> monitorPoints = monitorPointService.queryByOrgIdAndRegionCode(form);
        //转换前端参数
        MonitorPointsVO vo = MonitorPointsVO.convert(monitorPoints);
        MonitorPointsVO vo = MonitorPointsVO.convert(monitorPoints,false);
        return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
    }
    @GetMapping("queryMonitorPointsState")
    public ResultMessage queryMonitorPointsState(MonitorPointQueryForm form) {
        //判断是否缺少参数
        if (!form.valid())
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        //处理查询业务
        List<MonitorPoint> monitorPoints = monitorPointService.queryByOrgIdAndRegionCode(form);
        //转换前端参数
        MonitorPointsVO vo = MonitorPointsVO.convert(monitorPoints,true);
        return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
    }
screen-api/src/main/java/com/moral/api/pojo/vo/monitorPoint/MonitorPointsVO.java
@@ -7,6 +7,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
 * @ClassName MonitorPointsVO
@@ -20,7 +21,7 @@
    private List<MonitorPointVO> monitorPoints;
    public static MonitorPointsVO convert(List<MonitorPoint> monitorPoints){
    public static MonitorPointsVO convert(List<MonitorPoint> monitorPoints,boolean type){
        MonitorPointsVO monitorPointsVO = new MonitorPointsVO();
        List<MonitorPointVO> monitorPointVOS = new ArrayList<>();
        for (MonitorPoint monitorPoint : monitorPoints) {
@@ -31,14 +32,22 @@
                DeviceVO deviceVO = deviceConvert(device);
                deviceVOS.add(deviceVO);
            }
            List<Device> resultState = devices.stream().filter(it->!it.getState().equals("0")).collect(Collectors.toList());
            monitorPointVO.setId(monitorPoint.getId());
            monitorPointVO.setName(monitorPoint.getName());
            StringBuffer stringBuffer = new StringBuffer(monitorPoint.getName());
            if(type){
                stringBuffer.append("(");
                stringBuffer.append("在线:").append(resultState.size()+"台;");
                stringBuffer.append("总:").append(devices.size()+"台");
                stringBuffer.append(")");
            }
            monitorPointVO.setName(stringBuffer.toString());
            monitorPointVO.setLatitude(monitorPoint.getLatitude());
            monitorPointVO.setLongitude(monitorPoint.getLongitude());
            monitorPointVO.setDevices(deviceVOS);
            monitorPointVOS.add(monitorPointVO);
        }
        monitorPointsVO.setMonitorPoints(monitorPointVOS);
            monitorPointsVO.setMonitorPoints(monitorPointVOS);
        return monitorPointsVO;
    }