From 6447eaa2078e765398996b1ba2c3cae5c1d50729 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Thu, 15 Jun 2023 08:56:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E8=AE=A1=E7=AE=97=E7=BB=8F?= =?UTF-8?q?=E7=BA=AC=E5=BA=A6=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF?= =?UTF-8?q?w=E6=88=96s=E7=BB=93=E5=B0=BE=E8=AE=A1=E7=AE=97=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E9=9C=80=E8=A6=81=E4=B9=98-1=20=E5=8F=B0=E7=AB=99/?= =?UTF-8?q?=E6=A0=B8=E8=AE=BE=E6=96=BD=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=86=85=E5=AE=B9=EF=BC=8C=E6=B5=B7=E6=8B=94?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8D=95=E4=BD=8D=E4=BF=A1=E6=81=AF=20?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E8=87=AA=E5=8A=A8=E5=A4=84?= =?UTF-8?q?=E7=90=86=E7=BB=93=E6=9E=9C=EF=BC=8C=E5=88=86=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BA=BA=E5=B7=A5=E4=BA=A4=E4=BA=92=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=B3=A8=E8=A7=A3=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=B0=E7=AB=99=E6=A0=91=E5=BD=A2=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/jeecg/common/PointUtil.java | 3 +++ .../jeecg/modules/controller/StationOperationController.java | 2 ++ .../modules/service/impl/StationOperationServiceImpl.java | 2 +- .../org/jeecg/modules/controller/RadionuclideController.java | 3 +++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/common/PointUtil.java b/jeecg-module-station-operation/src/main/java/org/jeecg/common/PointUtil.java index 38289024..379bfa94 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/common/PointUtil.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/common/PointUtil.java @@ -25,6 +25,9 @@ public class PointUtil { } if (Objects.nonNull(Degrees) || Objects.nonNull(minutes) || Objects.nonNull(seconds)){ Double result = Degrees + minutes/60+seconds/3600; + if (pointValue.indexOf("W")>0 || pointValue.indexOf("S")>0){ + result = -1 * result; + } pointValue = String.valueOf(result); } } diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/StationOperationController.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/StationOperationController.java index 765820f2..2e4503ea 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/StationOperationController.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/StationOperationController.java @@ -13,6 +13,7 @@ import org.jeecg.modules.system.entity.GardsNuclearfacility; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.util.List; @RestController @@ -38,6 +39,7 @@ public class StationOperationController { } @GetMapping("findTree") + @ApiOperation(value = "查询台站树形结构", notes = "查询台站树形结构") public Result findTree(){ Result result = stationOperationService.findTree(); return result; diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java index 101396cc..9b89643e 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java @@ -50,7 +50,7 @@ public class StationOperationServiceImpl extends ServiceImpl