From 2f55cebbad3dea187a5f91d16ec80a9677dab699 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 13 十一月 2024 11:16:53 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/controller/SuYuanController.java | 213 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 168 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/yssh/controller/SuYuanController.java b/src/main/java/com/yssh/controller/SuYuanController.java
index b0d4e91..7cb6246 100644
--- a/src/main/java/com/yssh/controller/SuYuanController.java
+++ b/src/main/java/com/yssh/controller/SuYuanController.java
@@ -1,12 +1,19 @@
package com.yssh.controller;
+import cn.hutool.core.date.DateTime;
+import com.yssh.entity.*;
+import com.yssh.service.CommonService;
+import com.yssh.service.SocketService;
+import com.yssh.service.VocValsService;
+import com.yssh.utils.DateUtils;
+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;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -15,92 +22,208 @@
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.service.SuYuanService;
import com.yssh.utils.Result;
-/**
- * @author lishijia
- * @ClassName Yssh2dreliController
- * @Description Yssh2dreliController
- * @date 2022/12/3 21:21
- * @Version 1.0
- */
+import javax.annotation.Resource;
+
@Api(tags="婧簮淇℃伅")
@RestController
@RequestMapping("/suYuan")
@SuppressWarnings("rawtypes")
public class SuYuanController {
-
- @Autowired
- private ISuYuanService suYuanService;
+ @Resource
+ private CommonService commonService;
+
+ @Resource
+ private SuYuanService suYuanService;
+
+ @Resource
+ private VocValsService vocValsService;
+
+ @Resource
+ private SocketService socketService;
+
+ private final static SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHH");
@ApiOperation(value = "鏌ヨ2d鐑姏鍥炬暟鎹�", notes = "鏍规嵁鏃堕棿鏌ヨ2d鐑姏鍥炬暟鎹�")
@ApiOperationSupport(order = 1)
@GetMapping("/get2d")
public Result get2d(
- @RequestParam(value = "date", required = true)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date){
- List<SuYuan2d> list = suYuanService.selectSuYuan2d(date);
- return Result.OK(list);
+ @RequestParam(value = "date", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date) {
+ List<SuYuan2d> list = suYuanService.selectSuYuan2d(date);
+ return Result.OK(list);
}
-
+
@ApiOperation(value = "鏌ヨ3d鐑姏鍥炬暟鎹�", notes = "鏍规嵁鏃堕棿鏌ヨ3d鐑姏鍥炬暟鎹�")
@ApiOperationSupport(order = 2)
@GetMapping("/get3d")
public Result get3d(
- @RequestParam(value = "name", required = true) String name,
- @RequestParam(value = "date", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date){
- List<SuYuan3d> list = suYuanService.selectSuYuan3d(name, date);
- return Result.OK(list);
+ @RequestParam(value = "name", required = true) String name,
+ @RequestParam(value = "date", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date) {
+ List<SuYuan3d> list = suYuanService.selectSuYuan3d(name, date);
+ return Result.OK(list);
}
-
+
@ApiOperation(value = "鏌ヨ婧簮100鐑姏鍥炬暟鎹�", notes = "鏍规嵁鏃堕棿鏌ヨ婧簮100鐑姏鍥炬暟鎹紝result杩斿洖鍊间腑data瀵瑰簲鍊间负鐑姏鍥炬暟鎹紝feedbackId涓哄弽棣堜富閿紪鍙凤紝鍦ㄨ繘琛屽弽棣堜腑闇�瑕佷紶閫�")
@ApiOperationSupport(order = 3)
@GetMapping("/get100")
public Result get100(
- @RequestParam(value = "name", required = true) String name,
- @RequestParam(value = "date", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date
- ){
- return Result.OK(suYuanService.selectSuYuan100(name, date));
+ @RequestParam(value = "name", required = true) String name,
+ @RequestParam(value = "date", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date
+ ) {
+ return Result.OK(suYuanService.selectSuYuan100(name, date));
}
@ApiOperation(value = "鏌ヨ婧簮200鐑姏鍥炬暟鎹�", notes = "鏍规嵁鏃堕棿鏌ヨ婧簮200鐑姏鍥炬暟鎹紝result杩斿洖鍊间腑data瀵瑰簲鍊间负鐑姏鍥炬暟鎹紝feedbackId涓哄弽棣堜富閿紪鍙凤紝鍦ㄨ繘琛屽弽棣堜腑闇�瑕佷紶閫�")
@ApiOperationSupport(order = 4)
@GetMapping("/get200")
public Result get200(
- @RequestParam(value = "name", required = true) String name,
- @RequestParam(value = "date", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date
- ){
- return Result.OK(suYuanService.selectSuYuan200(name, date));
+ @RequestParam(value = "name", required = true) String name,
+ @RequestParam(value = "date", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date
+ ) {
+ return Result.OK(suYuanService.selectSuYuan200(name, date));
}
-
+
@ApiOperation(value = "鏌ヨ婧簮300鐑姏鍥炬暟鎹�", notes = "鏍规嵁鏃堕棿鏌ヨ婧簮300鐑姏鍥炬暟鎹紝result杩斿洖鍊间腑data瀵瑰簲鍊间负鐑姏鍥炬暟鎹紝feedbackId涓哄弽棣堜富閿紪鍙凤紝鍦ㄨ繘琛屽弽棣堜腑闇�瑕佷紶閫�")
@ApiOperationSupport(order = 5)
@GetMapping("/get300")
public Result get300(
- @RequestParam(value = "name", required = true) String name,
- @RequestParam(value = "date", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date
- ){
- return Result.OK(suYuanService.selectSuYuan300(name, date));
+ @RequestParam(value = "name", required = true) String name,
+ @RequestParam(value = "date", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date
+ ) {
+ return Result.OK(suYuanService.selectSuYuan300(name, date));
}
@ApiOperation(value = "鏌ヨ婧簮500鐑姏鍥炬暟鎹�", notes = "鏍规嵁鏃堕棿鏌ヨ婧簮500鐑姏鍥炬暟鎹紝result杩斿洖鍊间腑data瀵瑰簲鍊间负鐑姏鍥炬暟鎹紝feedbackId涓哄弽棣堜富閿紪鍙凤紝鍦ㄨ繘琛屽弽棣堜腑闇�瑕佷紶閫�")
@ApiOperationSupport(order = 6)
@GetMapping("/get500")
public Result get500(
- @RequestParam(value = "name", required = true) String name,
- @RequestParam(value = "date", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date
- ){
- return Result.OK(suYuanService.selectSuYuan500(name, date));
+ @RequestParam(value = "name", required = true) String name,
+ @RequestParam(value = "date", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date
+ ) {
+ return Result.OK(suYuanService.selectSuYuan500(name, date));
}
-
+
@ApiOperation(value = "鑾峰彇鎵�鏈夌洃娴嬫暟鎹�", notes = "鑾峰彇鎵�鏈夌洃娴嬫暟鎹�")
@ApiOperationSupport(order = 7)
@GetMapping("/query/{name}")
- public Result getMonitorData(@PathVariable("name") String name){
- List<SuYuanMonitorData> list = suYuanService.getMonitorData(name);
- return Result.OK(list);
+ public Result getMonitorData(@PathVariable("name") String name) {
+ List<SuYuanMonitorData> list = suYuanService.getMonitorData(name);
+ return Result.OK(list);
+ }
+
+ @ApiOperation(value = "鏇存柊Vocs鍚嶇О", notes = "鏇存柊Vocs鍚嶇О")
+ @ApiOperationSupport(order = 8)
+ @GetMapping("/updateVocsName")
+ public Result updateVocsName(@RequestParam(value = "date", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date,
+ @RequestParam(value = "id", required = true) String id,
+ @RequestParam(value = "vocsName", required = true) String vocsName
+ ) {
+ return Result.OK(suYuanService.updateVocsName(date, id, vocsName));
+ }
+
+ @ApiOperation(value = "鏍规嵁鍚嶇О鑾峰彇鍧愭爣鍊�", notes = "鏍规嵁鍚嶇О鑾峰彇鍧愭爣鍊�")
+ @ApiOperationSupport(order = 9)
+ @GetMapping("/getCoordByName/{name}")
+ public Result getCoordByName(@PathVariable("name") String name) {
+ MonitorPointPosition point = StringUtils.isEmpty(name) ? null : commonService.select3dCheckPointByName(name);
+
+ 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) {
+ String time = DateUtils.getYyyyMmDdHhMmSs(date);
+ List<VocVals> list = vocValsService.selectByTime(time);
+
+ return Result.OK(list);
+ }
+
+ @ApiOperation(value = "鏍规嵁ID鍜屾棩鏈熸煡璇㈡函婧�46琛�", notes = "鏍规嵁ID鍜屾棩鏈熸煡璇㈡函婧�46琛�")
+ @ApiOperationSupport(order = 12)
+ @GetMapping("/selectSuYuan46ById")
+ public Result selectSuYuan46ById(@RequestParam(value = "id", required = true) String id, @RequestParam(value = "date", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date) {
+ return Result.OK(suYuanService.selectSuYuan46ById(id, date));
+ }
+
+ @ApiOperation(value = "鏍规嵁ID鍜屾棩鏈熸煡璇㈡函婧�700琛�", notes = "鏍规嵁ID鍜屾棩鏈熸煡璇㈡函婧�700琛�")
+ @ApiOperationSupport(order = 13)
+ @GetMapping("/selectSuYuan700ById")
+ public Result selectSuYuan700ById(@RequestParam(value = "id", required = true) String id, @RequestParam(value = "date", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date) {
+ return Result.OK(suYuanService.selectSuYuan700ById(id, date));
+ }
+
+ @ApiOperation(value = "鏍规嵁X锛孻鍊兼煡璇㈠湴鍧�", notes = "鏍规嵁X锛孻鍊兼煡璇㈠湴鍧�")
+ @ApiOperationSupport(order = 14)
+ @GetMapping("/selectCoords")
+ public Result selectCoords(@RequestParam(value = "x") Integer x, @RequestParam(value = "y") Integer y, @RequestParam(value = "isSuYuan") Integer isSuYuan) {
+ if (isSuYuan < 1) {
+ x = x / 10;
+ y = y / 10;
+ }
+
+ return Result.OK(vocValsService.selectCoords(x, y));
+ }
+
+ @ApiOperation(value = "鏍规嵁缁忕含搴︽煡璇㈠湴鍚�", notes = "鏍规嵁缁忕含搴︽煡璇㈠湴鍚�")
+ @ApiOperationSupport(order = 15)
+ @GetMapping("/selectAddrByXY")
+ public Result selectAddrByXY(@RequestParam(value = "x", required = true) double x, @RequestParam(value = "y", required = true) double y) {
+ return Result.OK(suYuanService.selectAddrByXY(x, y));
+ }
+
+ @ApiOperation(value = "鏍规嵁X銆乊鍊兼煡璇㈢煩褰㈡", notes = "鏍规嵁X銆乊鍊兼煡璇㈢煩褰㈡")
+ @ApiOperationSupport(order = 16)
+ @GetMapping("/selectRects")
+ public Result selectRects(@RequestParam(value = "x[]", required = true) Double[] x, @RequestParam(value = "y[]", required = true) Double[] y) {
+ if (null == x || null == y || x.length == 0 || x.length != y.length) return Result.OK(null);
+
+ return Result.OK(suYuanService.selectRects(x, y));
+ }
+
+ @ApiOperation(value = "鏍规嵁鍚嶇О鏌ヨ婧簮ID", notes = "鏍规嵁鍚嶇О鏌ヨ婧簮ID")
+ @ApiOperationSupport(order = 17)
+ @GetMapping("/selectSuYuanIdByName")
+ public Result selectSuYuanIdByName(@RequestParam(value = "name") String name) {
+ if (null == name || name.length() == 0) return Result.OK(null);
+
+ return Result.OK(suYuanService.selectSuYuanIdByName(name));
+ }
+
+ @ApiOperation(value = "鏍规嵁ID鏌ヨ蹇�熸函婧�")
+ @ApiOperationSupport(order = 18)
+ @GetMapping("/selectFastById")
+ public Result selectFastById(@RequestParam(value = "id") String id, @RequestParam(value = "date", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date) {
+ if (StringUtils.isEmpty(id)) return Result.OK(null);
+ if (null == date) date = DateTime.now();
+
+ return Result.OK(suYuanService.selectFastById(id, date));
+ }
+
+ @ApiOperation(value = "鍙戦�佹秷鎭�")
+ @ApiOperationSupport(order = 19)
+ @GetMapping("/sendMsg")
+ public Result sendMsg(@RequestParam(value = "msg") String msg) {
+ if (StringUtils.isEmpty(msg)) return Result.error("娑堟伅涓嶈兘涓虹┖");
+
+ try {
+ String rs = socketService.sendMsg(msg);
+
+ return Result.OK(rs);
+ } catch (Exception ex) {
+ return Result.error(ex.getMessage());
+ }
}
}
--
Gitblit v1.9.3