设备状态判断更新

jinpengyong

2021-07-23 f62ce761a5c2dd1f281acbf72a66fd752af3d75d

设备状态判断更新

 screen-api/src/main/java/com/moral/api/controller/WebController.java

@@ -24,6 +24,11 @@
import com.moral.constant.ResultMessage;
import com.moral.util.WebUtils;

/**
 * web端接口
 * @author  moral
 * @version  v1.0
 * */
@Slf4j
@Api(tags = {"web端接口"})
@RestController
@@ -45,6 +50,10 @@
    @Autowired
    private SysAreaService sysAreaService;

    /**
     * @param request 请求信息
     * @return 返回请求成功后的对象信息
     * */
    @GetMapping("getHourlyAqi")
    @ApiOperation(value = "获取一小时AQI", notes = "获取一小时AQI")
    @ApiImplicitParams(value = {
@@ -56,10 +65,14 @@
        if (!params.containsKey("mac")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        Map<String, Object> result = historyHourlyService.getHourlyAqiByMac(params.get("mac").toString());
        return ResultMessage.ok(result);
        Map<String, Object> response = historyHourlyService.getHourlyAqiByMac(params.get("mac").toString());
        return ResultMessage.ok(response);
    }

    /**
     * @param request 请求信息
     * @return 返回请求成功后的对象信息
     * */
    @GetMapping("getMonthAvg")
    @ApiOperation(value = "获取某设备某因子本月均值", notes = "获取某设备某因子本月均值")
    @ApiImplicitParams(value = {
@@ -72,10 +85,14 @@
        if (!params.containsKey("mac") || !params.containsKey("sensorCode")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        Map<String, Object> result = historyDailyService.getMonthAvg(params);
        return ResultMessage.ok(result);
        Map<String, Object> response = historyDailyService.getMonthAvg(params);
        return ResultMessage.ok(response);
    }

    /**
     * @param request 请求信息
     * @return 返回请求成功后的对象信息
     * */
    @GetMapping("getWindData")
    @ApiOperation(value = "获取风场数据", notes = "获取风场数据")
    @ApiImplicitParams(value = {
@@ -89,10 +106,14 @@
        }
        String[] monitorPointIds = params.remove("monitorPointIds").toString().split(",");
        params.put("monitorPointIds", monitorPointIds);
        List<Object> result = historyFiveMinutelyService.getAreaWindData(params);
        return ResultMessage.ok(result);
        List<Object> response = historyFiveMinutelyService.getAreaWindData(params);
        return ResultMessage.ok(response);
    }

    /**
     * @param request 请求信息
     * @return 返回请求成功后的对象信息
     * */
    @GetMapping("getMacSensors")
    @ApiOperation(value = "根据mac获取对应所有因子", notes = "根据mac获取对应所有因子")
    @ApiImplicitParams(value = {
@@ -104,10 +125,14 @@
        if (!params.containsKey("mac")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        Map<String, Object> sensorsInfo = deviceService.getSensorsByMac(params.get("mac").toString());
        return ResultMessage.ok(sensorsInfo);
        Map<String, Object> response = deviceService.getSensorsByMac(params.get("mac").toString());
        return ResultMessage.ok(response);
    }

    /**
     * @param request 请求信息
     * @return 返回请求成功后的对象信息
     * */
    @GetMapping("getTrendChartData")
    @ApiOperation(value = "获取监测因子趋势图数据", notes = "获取监测因子趋势图数据")
    @ApiImplicitParams(value = {
@@ -122,10 +147,14 @@
        if (!params.containsKey("mac") || !params.containsKey("sensorCode") || !params.containsKey("type") || !params.containsKey("time")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        List<Map<String, Object>> sensorsInfo = deviceService.getTrendChartData(params);
        return ResultMessage.ok(sensorsInfo);
        List<Map<String, Object>> response = deviceService.getTrendChartData(params);
        return ResultMessage.ok(response);
    }

    /**
     * @param request 请求信息
     * @return 返回请求成功后的对象信息
     * */
    @GetMapping("getMapPath")
    @ApiOperation(value = "获取当前用户地图权限", notes = "获取当前用户地图权限")
    @ApiImplicitParams(value = {
@@ -137,8 +166,8 @@
        if (!params.containsKey("organizationId")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        List<Map<String, Object>> result = sysAreaService.getMapPath(Integer.parseInt(params.get("organizationId").toString()));
        return ResultMessage.ok(result);
        List<Map<String, Object>> response = sysAreaService.getMapPath(Integer.parseInt(params.get("organizationId").toString()));
        return ResultMessage.ok(response);
    }

}

 screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java

@@ -483,7 +483,7 @@
        for (int i = levels.size() - 1; i >= 0; i--) {
            Double level = Double.parseDouble(levels.get(i).toString());
            if (data >= level) {
                state = i + 2;
                state = i + 1;
                break;
            }
        }