From e08f52f0269439072b9fbf9dcc6ae51f537d8aaf Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 16 五月 2023 10:19:50 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java | 8 +-------
src/main/java/com/yssh/service/impl/CommonServiceImpl.java | 4 +++-
src/main/java/com/yssh/controller/SuYuanController.java | 18 +++++++++++++++++-
3 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/yssh/controller/SuYuanController.java b/src/main/java/com/yssh/controller/SuYuanController.java
index 7adc24c..a1f4d56 100644
--- a/src/main/java/com/yssh/controller/SuYuanController.java
+++ b/src/main/java/com/yssh/controller/SuYuanController.java
@@ -1,5 +1,8 @@
package com.yssh.controller;
+import com.yssh.entity.MonitorPointPosition;
+import com.yssh.service.ICommonService;
+import com.yssh.utils.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -21,6 +24,8 @@
import com.yssh.service.ISuYuanService;
import com.yssh.utils.Result;
+import javax.annotation.Resource;
+
/**
* @author lishijia
* @ClassName Yssh2dreliController
@@ -33,6 +38,8 @@
@RequestMapping("/suYuan")
@SuppressWarnings("rawtypes")
public class SuYuanController {
+ @Resource
+ private ICommonService commonService;
@Autowired
private ISuYuanService suYuanService;
@@ -105,7 +112,7 @@
}
@ApiOperation(value = "鏇存柊Vocs鍚嶇О", notes = "鏇存柊Vocs鍚嶇О")
- @ApiOperationSupport(order = 7)
+ @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,
@@ -113,4 +120,13 @@
) {
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);
+ }
}
diff --git a/src/main/java/com/yssh/service/impl/CommonServiceImpl.java b/src/main/java/com/yssh/service/impl/CommonServiceImpl.java
index fc74cdb..d7c2591 100644
--- a/src/main/java/com/yssh/service/impl/CommonServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/CommonServiceImpl.java
@@ -105,8 +105,10 @@
try {
z = new Double(Math.round(Integer.parseInt(f3d[2]) * 1.0/10)).intValue();
} catch (Exception e) {
+ System.out.println(e.getStackTrace());
}
- if (x <= 699 && y <= 699) {
+ if (count3d > 46) break;
+ { //if (x <= 699 && y <= 699) {
MonitorPointPosition monitorPointPosition = new MonitorPointPosition();
monitorPointPosition.setId(x + "_" + y + "_" + z);
monitorPointPosition.setName("AI-" + (count3d < 10 ? "0" + count3d : count3d + ""));
diff --git a/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java b/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java
index 8e57d66..bb159ca 100644
--- a/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java
@@ -10,11 +10,9 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
+import com.yssh.utils.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@@ -33,10 +31,6 @@
import com.yssh.service.IAsyncService;
import com.yssh.service.ICommonService;
import com.yssh.service.ISuYuanService;
-import com.yssh.utils.CalculateUtils;
-import com.yssh.utils.DateUtils;
-import com.yssh.utils.StringUtils;
-import com.yssh.utils.TableStrategy;
import javax.annotation.Resource;
--
Gitblit v1.9.3