From dae3ec560008c8ab9f765a92443ead6d5a068fef Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:49:54 +0800
Subject: [PATCH] fix:实测补偿修复
---
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java b/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
index 190bc4e..f796ba8 100644
--- a/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
@@ -1,5 +1,6 @@
package com.moral.api.controller;
+import com.moral.api.dto.MonitoringStationDTO;
import com.moral.api.entity.MonitorPoint;
import com.moral.api.pojo.form.device.MonitorPointQueryForm;
import com.moral.api.pojo.vo.monitorPoint.MonitorPointsVO;
@@ -11,20 +12,13 @@
import com.moral.constant.ResultMessage;
import com.moral.util.WebUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
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.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.stream.Collectors;
@@ -204,4 +198,14 @@
}
}
+ @PostMapping("listMonitoring")
+ public ResultMessage listMonitoring(@RequestBody Map<String, Object> params) {
+
+ /*@RequestParam @ApiParam(value = "mac",name = "mac���") List<String> mac,
+ @RequestParam @ApiParam(value = "startTime",name = "������������") String startTime,
+ @RequestParam @ApiParam(value = "reportType",name = "type") int reportType,
+ @RequestParam @ApiParam(value = "endTime",name = "������������") String endTime*/
+ List<MonitoringStationDTO> resList = monitorPointService.listMonitoringStationDTO(params,Integer.parseInt(params.get("reportType").toString()),params.get("startTime").toString(),params.get("endTime").toString());
+ return ResultMessage.ok(resList);
+ }
}
--
Gitblit v1.8.0