jinpengyong
2022-10-13 f2f153d71b37f0998e979de889fcb986f356a54f
screen-api/src/main/java/com/moral/api/controller/HistoryFiveMinutelyController.java
@@ -34,13 +34,20 @@
    @Autowired
    HistoryFiveMinutelyService historyFiveMinutelyService;
    /**
    * @Description: 查询组织区域对应的设备以及对应因子的五分钟数据
            * @Param: [form]
            * @return: com.moral.constant.ResultMessage
            * @Author: 陈凯裕
            * @Date: 2022/3/10
            */
    @GetMapping("queryDeviceAndData")
    public ResultMessage queryDeviceAndData(QueryDeviceAndFiveMinuteDataForm form){
        //18 110100
        //判断是否缺少参数
        if (!form.valid())
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        //处理查询业务
        List<DeviceAndFiveMinuteDataDTO> dto = historyFiveMinutelyService.queryDeviceAndFiveMinuteData(form);
@@ -49,6 +56,18 @@
        return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
    }
    /**
    * @Description: 查询弹窗五分钟数据接口
            * @Param: [mac]
            * @return: com.moral.constant.ResultMessage
            * @Author: 陈凯裕
            * @Date: 2022/3/10
            */
    @GetMapping("queryPopDataByMac")
    public ResultMessage queryPopDataByMac(String mac){
        return  ResultMessage.ok(historyFiveMinutelyService.getPopDataByMac(mac));
    }
}