blame | history | patch | commit | commitdiff | ignore whitespace
jinpengyong
2023-10-27 b98b5196f073725fca743f8ad5be57d1f0b8cbd7 
 screen-api/src/main/java/com/moral/api/controller/HistoryFiveMinutelyController.java


@@ -1,22 +1,28 @@


package com.moral.api.controller;




import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;


import com.moral.api.pojo.dto.historyFiveMinutely.DeviceAndFiveMinuteDataDTO;


import com.moral.api.pojo.form.historyFiveMinutely.QueryDeviceAndFiveMinuteDataForm;


import com.moral.api.pojo.vo.historyFiveMinutely.DeviceAndFiveMinuteDataVO;


import com.moral.api.pojo.vo.historyFiveMinutely.QueryFiveDataByMacVO;


import com.moral.api.service.HistoryFiveMinutelyService;


import com.moral.constant.ResponseCodeEnum;


import com.moral.constant.ResultMessage;


import com.moral.util.WebUtils;




import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import io.swagger.annotations.ApiParam;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.web.bind.annotation.CrossOrigin;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RequestParam;


import org.springframework.web.bind.annotation.RestController;




import java.util.HashMap;


import java.util.List;


import java.util.Map;




@@ -55,12 +61,13 @@


                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());




        //处理查询业务


        List<DeviceAndFiveMinuteDataDTO> dto = historyFiveMinutelyService.queryDeviceAndFiveMinuteData(form);




        List<Map<String, Object>> dto = historyFiveMinutelyService.queryDeviceAndFiveMinuteData(form);


        Map<String,List<Map<String, Object>>> dtoResult = new HashMap<>();


        dtoResult.put("devices",dto);


        //转换前端参数


        DeviceAndFiveMinuteDataVO vo = DeviceAndFiveMinuteDataVO.convert(dto);


        //DeviceAndFiveMinuteDataVO vo = DeviceAndFiveMinuteDataVO.convert(dto);




        return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);


        return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), dtoResult);


    }




    /**


@@ -79,6 +86,23 @@


        }


        return  ResultMessage.ok(popDataByMac);


    }






    @GetMapping("queryFiveDataByMac")


    @ApiOperation("新五分钟数据弹框")


    public ResultMessage queryFiveDataByMac(@RequestParam @ApiParam(value = "mac",name = "mac号") String mac,


                                            @RequestParam @ApiParam(value = "chooseTime",name = "选取历史数据") String chooseTime,


                                            @RequestParam @ApiParam(value = "time",name = "时间") String time){


        QueryFiveDataByMacVO queryFiveDataByMacVO = historyFiveMinutelyService.queryFiveDataByMac(mac, chooseTime, time);


        if (ObjectUtils.isEmpty(queryFiveDataByMacVO)){


            return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());


        }


        return  ResultMessage.ok(queryFiveDataByMacVO);


    }








}