From 427bee04bfacf44abe5d595e2dad976747d83dba Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 08 一月 2023 15:48:48 +0800
Subject: [PATCH] 1.8.5
---
src/main/java/com/lf/server/service/data/FmeService.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
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 46027d5..877acc5 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -3,12 +3,14 @@
import com.lf.server.entity.ctrl.FmeReqEntity;
import com.lf.server.entity.ctrl.NameValueEntity;
import com.lf.server.helper.RestHelper;
+import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -42,7 +44,7 @@
public String checkOsgb(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/A8鎴愭灉璐ㄦ_OSGB妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("OSGB妫�鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
list.add(new NameValueEntity("DMYX_FBL", fme.imgResolution));
@@ -56,7 +58,7 @@
public String checkXls(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/A3鎴愭灉璐ㄦ_琛ㄦ牸鏁版嵁妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("琛ㄦ牸鏁版嵁妫�鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("SJZY", fme.sjzy));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
@@ -70,7 +72,7 @@
public String checkLaz(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/A9鎴愭灉璐ㄦ_鐐逛簯妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("鐐逛簯妫�鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
list.add(new NameValueEntity("LAZ_MD", fme.lazDensity));
@@ -84,7 +86,7 @@
public String checkDem(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/A6鎴愭灉璐ㄦ_楂樼▼妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("楂樼▼妫�鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
list.add(new NameValueEntity("GCZWC", fme.demTolerance));
@@ -99,7 +101,7 @@
public String checkAttrs(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/A5鎴愭灉璐ㄦ_灞炴�ф鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("灞炴�ф鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("SJZY", fme.sjzy));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
@@ -113,7 +115,7 @@
public String checkTopology(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/A4鎴愭灉璐ㄦ_鎷撴墤妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("鎷撴墤妫�鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
list.add(new NameValueEntity("S_MCDRC", fme.polyTolerance));
@@ -133,7 +135,7 @@
public String checkDecorate(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/A10鎴愭灉璐ㄦ_鍥鹃潰鏁撮グ妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("鍥鹃潰鏁撮グ妫�鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
list.add(new NameValueEntity("S_XLS2", fme.xlsList));
@@ -148,7 +150,7 @@
public String checkOrigin(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/A11鎴愭灉璐ㄦ_鍘熺偣妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("鍘熺偣妫�鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
@@ -161,7 +163,7 @@
public String checkDom(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/A7鎴愭灉璐ㄦ_鏍呮牸妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("鏍呮牸妫�鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("SJZY", fme.sjzy));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
@@ -177,7 +179,7 @@
public String checkMath(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/B1鍏ュ簱璐ㄦ_鏁板鍩虹妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("鏁板鍩虹妫�鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("SJZY", fme.sjzy));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
@@ -191,7 +193,7 @@
public String checkMeta(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/B5鍏ュ簱璐ㄦ_鍏冩暟鎹鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("鍏冩暟鎹鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("SJZY", fme.sjzy));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
@@ -205,7 +207,7 @@
public String checkMain(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/B0鍏ュ簱璐ㄦ__鎬�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("鎬昏川妫�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("SJZY", fme.sjzy));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
@@ -228,9 +230,9 @@
/**
* 鑾峰彇鍚嶇О鍊煎闆嗗悎
*/
- public List<NameValueEntity> getKeyValues(String guid) {
+ public List<NameValueEntity> getKeyValues(String name) {
List<NameValueEntity> list = new ArrayList<>();
- list.add(new NameValueEntity("_name", guid));
+ list.add(new NameValueEntity("_name", String.format("%s_%s", name, StringHelper.YMDHMS2_FORMAT.format(new Date()))));
list.add(new NameValueEntity("_priority", 100));
list.add(new NameValueEntity("_terminate_on_error", false));
list.add(new NameValueEntity("IID", ""));
--
Gitblit v1.9.3