From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java | 55 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 25 deletions(-)
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..26d83a3 100644
--- a/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java
+++ b/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java
@@ -11,7 +11,7 @@
/**
* 浠诲姟鍚嶇О
*/
- public String name;
+ public String names;
/**
* 椤圭洰鍚嶇О
@@ -19,9 +19,14 @@
public String xmmc;
/**
- * 鏁版嵁涓撲笟锛氭祴閲忎笓涓� | 鍕樺療涓撲笟 | 鍦扮伨涓撲笟 | 娲炲簱涓撲笟
+ * 鏁版嵁涓撲笟锛氭祴閲忎笓涓� | 鍕樺療涓撲笟 | 鍦扮伨涓撲笟 | 娲炲簱涓撲笟 | 绾胯矾涓撲笟
*/
public String sjzy;
+
+ /**
+ * 鏁版嵁鍒嗙被锛氭暟瀛楀寲鎴愭灉 | 鏁版嵁搴撴垚鏋� | 鍕樺療淇℃伅琛� | 琛ㄦ牸鎴愭灉
+ */
+ public String sjfl;
/**
* 寰呮鍘嬬缉鍖�
@@ -34,12 +39,12 @@
public String wbsPath;
/**
- * 鏄�/鍚︿负鍦扮伨鏁版嵁锛歒ES|NO
+ * 鏄�/鍚︿负鍦扮伨鏁版嵁锛歒ES | NO
*/
public String isDiZai;
/**
- * 鍦扮伨鏁版嵁绫诲瀷锛氬穿濉屾不鐞� | 涓嶇ǔ瀹氭枩鍧℃不鐞� | 鍦伴潰濉岄櫡娌荤悊 | 楂橀櫋杈瑰潯娌荤悊 | 娉ョ煶娴佹不鐞� | 姘存瘉娌荤悊 | 婊戝潯娌荤悊 | NO
+ * 鍦扮伨鏁版嵁绫诲瀷锛氾紙宕╁娌荤悊 | 涓嶇ǔ瀹氭枩鍧℃不鐞� | 鍦伴潰濉岄櫡娌荤悊 | 楂橀櫋杈瑰潯娌荤悊 | 娉ョ煶娴佹不鐞� | 姘存瘉娌荤悊 | 婊戝潯娌荤悊锛� | NO
*/
public String diZaiType;
@@ -54,42 +59,42 @@
public double imgResolution = 0.2;
/**
- * 鏂囦欢娓呭崟
+ * 闈�/绾�/鐐归噸鍙犲宸�
*/
- public String xlsList;
-
- /**
- * 闈㈤噸鍙犲宸�
- */
- public double polyTolerance = 0.001;
-
- /**
- * 绾块噸鍙犲宸�
- */
- public double lineTolerance = 0.001;
-
- /**
- * 鐐归噸鍙犲宸紙榛樿0.2m锛�
- */
- public double pointTolerance = 0.001;
+ public double tolerance = 0.001;
/**
* 楂樼▼鐐归棿璺濅笂闄�
*/
- 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;
+
+ /**
+ * 鐐逛簯瀵嗗害锛堥粯璁�1/m3锛�
+ */
+ public double lazDensity = 1;
}
--
Gitblit v1.9.3