From aa86cb57b09c5300db3c33d75d91d8b51a4b636f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 16 六月 2023 09:27:45 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/controller/SuYuanController.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/yssh/controller/SuYuanController.java b/src/main/java/com/yssh/controller/SuYuanController.java
index a1f4d56..d95bf0c 100644
--- a/src/main/java/com/yssh/controller/SuYuanController.java
+++ b/src/main/java/com/yssh/controller/SuYuanController.java
@@ -1,11 +1,13 @@
package com.yssh.controller;
-import com.yssh.entity.MonitorPointPosition;
+import com.yssh.entity.*;
import com.yssh.service.ICommonService;
+import com.yssh.service.VocValsService;
import com.yssh.utils.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -18,9 +20,6 @@
import org.springframework.web.bind.annotation.RestController;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.yssh.entity.SuYuan2d;
-import com.yssh.entity.SuYuan3d;
-import com.yssh.entity.SuYuanMonitorData;
import com.yssh.service.ISuYuanService;
import com.yssh.utils.Result;
@@ -41,8 +40,13 @@
@Resource
private ICommonService commonService;
- @Autowired
+ @Resource
private ISuYuanService suYuanService;
+
+ @Resource
+ private VocValsService vocValsService;
+
+ private final static SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHH");
@ApiOperation(value = "鏌ヨ2d鐑姏鍥炬暟鎹�", notes = "鏍规嵁鏃堕棿鏌ヨ2d鐑姏鍥炬暟鎹�")
@ApiOperationSupport(order = 1)
@@ -129,4 +133,29 @@
return Result.OK(point);
}
+
+ @ApiOperation(value = "鏍规嵁Qxsh鍊�", notes = "鏍规嵁Qxsh鍊�")
+ @ApiOperationSupport(order = 10)
+ @GetMapping("/queryQxsh")
+ public Result queryQxsh(@RequestParam(value = "date", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date) {
+ List<Qxsh> list = suYuanService.queryQxsh(date);
+
+ return Result.OK(list);
+ }
+
+ @ApiOperation(value = "鏍规嵁鏃堕棿鏌ヨVoc鍊�", notes = "鏍规嵁鏃堕棿鏌ヨVoc鍊�")
+ @ApiOperationSupport(order = 11)
+ @GetMapping("/selectVocByTime")
+ public Result selectVocByTime(@RequestParam(value = "date", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date) {
+ List<VocVals> list = vocValsService.selectByTime(format.format(date));
+
+ return Result.OK(list);
+ }
+
+ @ApiOperation(value = "鏍规嵁X锛孻鍊兼煡璇㈠湴鍧�", notes = "鏍规嵁X锛孻鍊兼煡璇㈠湴鍧�")
+ @ApiOperationSupport(order = 12)
+ @GetMapping("/selectCoords")
+ public Result selectVocByTime(@RequestParam(value = "x", required = false) Integer x, @RequestParam(value = "y", required = false) Integer y) {
+ return Result.OK(vocValsService.selectCoords(x, y));
+ }
}
--
Gitblit v1.9.3