From c38942417e15141f9a03d11bb518195ecca44b42 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 26 Aug 2023 13:39:44 +0800
Subject: [PATCH] fix:小时数据丢失问题修复
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 107 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
index 55caf5b..4e852a2 100644
--- a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
@@ -1,11 +1,13 @@
package com.moral.api.controller;
+import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserResultDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
@@ -16,13 +18,17 @@
import org.springframework.web.multipart.MultipartHttpServletRequest;
import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
+import com.moral.api.entity.Dustld;
import com.moral.api.pojo.bo.ExcelBO;
import com.moral.api.pojo.vo.excel.DailyVo;
+import com.moral.api.service.DustldService;
import com.moral.api.service.SpecialDeviceService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
@@ -75,17 +81,39 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
@ApiImplicitParam(name = "mac", value = "������mac", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "time", value = "���������2021-08-18", required = true, paramType = "query", dataType = "String")
+ @ApiImplicitParam(name = "time1", value = "���������2021-08-18", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time2", value = "���������2021-08-18", required = true, paramType = "query", dataType = "String")
})
public ResultMessage carTrajectory(HttpServletRequest request) {
Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
if (!params.containsKey("mac") || !params.containsKey("time1")|| !params.containsKey("time2")) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- List<Map<String, Object>> response = specialDeviceService.carTrajectory(params);
+ List<Map<String, Object>> response = specialDeviceService.carTrajectory(params,true);
return ObjectUtils.isEmpty(response) ? ResultMessage.ok() : ResultMessage.ok(response);
}
+ @GetMapping("carTrajectoryNewAvg")
+ @ApiOperation(value = "���������������", notes = "���������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "mac", value = "������mac", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time1", value = "���������2021-08-18", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time2", value = "���������2021-08-18", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "type", value = "������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "range", value = "������", required = true, paramType = "query", dataType = "int")
+ })
+ public ResultMessage carTrajectoryNewAvg(HttpServletRequest request) {
+ Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+ if (!params.containsKey("mac") || !params.containsKey("time1")||!params.containsKey("range")|| !params.containsKey("type")|| !params.containsKey("time2")) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ List<HistorySecondCruiserResultDTO> response = specialDeviceService.carTrajectoryNewAvg(params);
+ //������������������
+
+ return ObjectUtils.isEmpty(response) ? ResultMessage.ok() : ResultMessage.ok(response);
+
+ }
/**
* ���������������
@@ -146,5 +174,82 @@
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),excelBOS);
}
+ @Autowired
+ private DustldService dustldService;
+
+ /**
+ * ���������������
+ * @param request
+ * @return
+ */
+ @PostMapping("getDailyDustld")
+ public ResultMessage getDailyDustld(HttpServletRequest request) {
+ Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+ if (!params.containsKey("mac") || !params.containsKey("road") || !params.containsKey("table")){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ MultipartFile file = ((MultipartHttpServletRequest) request).getFile("files");
+
+ Integer dailyDustld = null;
+ try {
+ dailyDustld = dustldService.getDailyDustld(params,file);
+ } catch (ParseException e) {
+ log.error("{������}"+e.getMessage());
+ }
+ if (ObjectUtils.isEmpty(dailyDustld)){
+ return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
+ }
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(),ResponseCodeEnum.SUCCESS.getMsg(),dailyDustld);
+ }
+
+ /**
+ * ���������������������
+ * @return
+ */
+ @PostMapping("dailyDustld")
+ public ResultMessage dailyDustld(HttpServletRequest request,Integer id){
+ List<MultipartFile> files = ((MultipartHttpServletRequest) request).getFiles("files");
+
+ Map<String, Object> map = dustldService.dailyDustld(id,files);
+ if (ObjectUtils.isEmpty(map)){
+ return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
+ }
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(),ResponseCodeEnum.SUCCESS.getMsg(),map);
+ }
+
+ /**
+ * ������������������
+ * @param id
+ * @return
+ */
+ @GetMapping("selectDust")
+ public ResultMessage selectDust(Integer id){
+ Map<String, Object> map = null;
+ try {
+ map = dustldService.selectDust(id);
+ } catch (Exception e) {
+ log.error("{������}"+e.getMessage());
+ }
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(),ResponseCodeEnum.SUCCESS.getMsg(),map);
+ }
+
+ /**
+ * ���������������������������������
+ * @param request
+ * @return
+ */
+ @GetMapping("selectAll")
+ public ResultMessage selectAll(HttpServletRequest request){
+ Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+ List<Dustld> dustlds = null;
+ try {
+ dustlds = dustldService.selectAll(params);
+ } catch (Exception e) {
+ log.error("{������}"+e.getMessage());
+ }
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(),ResponseCodeEnum.SUCCESS.getMsg(),dustlds);
+
+ }
+
}
--
Gitblit v1.8.0