From dcfdd146be994c80d5ac6ec2d2ab06247ec38b42 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 07 一月 2023 13:25:39 +0800
Subject: [PATCH] 1.7.5
---
src/main/java/com/lf/server/controller/data/upload/CheckController.java | 23 +++++++++++++++++++++++
src/main/java/com/lf/server/service/data/FmeService.java | 10 +++++++++-
src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java | 18 ++++++++++++++----
3 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/upload/CheckController.java b/src/main/java/com/lf/server/controller/data/upload/CheckController.java
index fc3b367..73bb5a1 100644
--- a/src/main/java/com/lf/server/controller/data/upload/CheckController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/CheckController.java
@@ -21,6 +21,29 @@
protected FmeService fmeService;
@SysLog()
+ @ApiOperation(value = "鏌ヨ楂樼▼妫�鏌�")
+ @GetMapping(value = "/selectCheckDem")
+ public ResponseMsg<Object> selectCheckDem(HttpServletRequest req) {
+ try {
+ FmeReqEntity fme = new FmeReqEntity();
+ fme.name = StringHelper.getGuid();
+ fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
+ fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\楂樼▼妫�鏌�.zip";
+ fme.demTolerance = 5;
+ fme.demChangeRate = 200;
+
+ String rs = fmeService.checkDem(fme, req);
+ if (StringHelper.isEmpty(rs)) {
+ return fail("妫�鏌ュけ璐�");
+ }
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
@ApiOperation(value = "鏌ヨ灞炴�ф鏌�")
@GetMapping(value = "/selectCheckAttrs")
public ResponseMsg<Object> selectCheckAttrs(HttpServletRequest req) {
diff --git a/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java b/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java
index 5c5439e..d1a2d56 100644
--- a/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java
+++ b/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java
@@ -76,20 +76,30 @@
/**
* 楂樼▼鐐归棿璺濅笂闄�
*/
- public double gcdOffset=20;
+ public double gcdOffset = 20;
/**
* 鎺у埗鐐归棿璺濅笂闄�
*/
- public double kzdOffset=100;
+ public double kzdOffset = 100;
/**
* 娴嬪尯鑼冨洿锛堢背锛�
*/
- public double rangeOffset=200;
+ public double rangeOffset = 200;
/**
* 鎮寕绾挎渶澶ц窛绂�
*/
- public double xgMax=0.005;
+ public double xgMax = 0.005;
+
+ /**
+ * 楂樼▼涓宸紙m锛�
+ */
+ public double demTolerance = 5;
+
+ /**
+ * 楂樼▼鍊肩獊鍙樼巼(榛樿鍊�200)
+ */
+ public double demChangeRate = 200;
}
diff --git a/src/main/java/com/lf/server/service/data/FmeService.java b/src/main/java/com/lf/server/service/data/FmeService.java
index 9795881..fe7a280 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -44,8 +44,16 @@
/**
* 4.楂樼▼妫�鏌ワ細.tif/.prj/.tfw/.tif.ovr + *鍦板舰鍥�*.dwg
*/
- public void checkDem(FmeReqEntity fme, HttpServletRequest req) {
+ public String checkDem(FmeReqEntity fme, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/A6鎴愭灉璐ㄦ_楂樼▼妫�鏌�", req);
+ List<NameValueEntity> list = getKeyValues(fme.name);
+ list.add(new NameValueEntity("XMMC", fme.xmmc));
+ list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
+ list.add(new NameValueEntity("GCZWC", fme.demTolerance));
+ list.add(new NameValueEntity("ChangeRate", fme.demChangeRate));
+
+ return RestHelper.postForRest(url, list);
}
/**
--
Gitblit v1.9.3