From 3372ad6e59c7da5abf28e65447c7b428e5793326 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 07 一月 2023 09:54:30 +0800
Subject: [PATCH] 1.7
---
src/main/java/com/lf/server/controller/data/upload/CheckController.java | 44 +++++++++++---
data/ts.sql | 35 +++++++++--
src/main/java/com/lf/server/service/data/FmeService.java | 34 ++++++++---
data/db_tab.sql | 6 +-
src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java | 45 +++++++++++++++
5 files changed, 136 insertions(+), 28 deletions(-)
diff --git a/data/db_tab.sql b/data/db_tab.sql
index 08f23f2..eedc3ce 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -1100,7 +1100,7 @@
select * from lf.sys_flow;
----------------------------------------------------------------------------------------------------- 16.鍏冩暟鎹〃-New
-- DROP TABLE IF EXISTS lf.sys_meta; DROP TABLE IF EXISTS lf.sys_meta_file;
-create table lf.sys_meta (
+create table lf.sys_meta_new (
id serial primary key,
eventid varchar(38) default new_guid(),
metaid integer default 0,
@@ -1124,7 +1124,7 @@
geom geometry(MultiPolygon, 4490)
);
-- drop index index_sys_meta_geom;
-create index index_sys_meta_geom on lf.sys_meta using GIST (geom);
+create index index_sys_meta_geom on lf.sys_meta_new using GIST (geom);
comment on table lf.sys_meta is '鍏冩暟鎹〃';
comment on column lf.sys_meta.id is '涓婚敭ID';
comment on column lf.sys_meta.eventid is 'GUID';
@@ -1149,7 +1149,7 @@
comment on column lf.sys_meta.geom is '绌洪棿浣嶇疆';
-- insert into lf.sys_meta(dirid,depid,geom,sizes,name,path) values (1,1,ST_PolygonFromText('MultiPolygon (((100 0,120 0,120 20,100 20,100 0)))', 4490),0.001,'a.jpg','c:\a.jpg');
-select * from lf.sys_meta; select a.*,st_astext(geom) from lf.sys_meta a;
+select * from lf.sys_meta_new; select a.*,st_astext(geom) from lf.sys_meta a;
----------------------------------------------------------------------------------------------------- 鍏冩暟鎹祴璇曡〃 *
-- drop table if exists md.md_zxcg;
create table md.md_zxcg(
diff --git a/data/ts.sql b/data/ts.sql
index f23a40a..a40f232 100644
--- a/data/ts.sql
+++ b/data/ts.sql
@@ -142,14 +142,35 @@
delete from lf.sys_meta where id > 150;
delete from lf.sys_meta_file where metaid > 150;
+select * from lf.sys_dir;
-
-
-
-
-
-
-
+select * from lf.sys_meta_new;
+insert into lf.sys_meta_new (name,dirid) value ('椤圭洰WBS瀵煎嚭.xlsx',57,'file');
+insert into lf.sys_meta_new (name,dirid) value ('00116BT02-CR001#ESV-DW-0001 灏侀潰.pdf',63);
+insert into lf.sys_meta_new (name,dirid) value ('00116BT02-CR001#ESV-DW-0001锛堝ぇ娌虫部娌崇┛瓒婂湴褰㈠浘锛�.pdf',63);
+insert into lf.sys_meta_new (name,dirid) value ('00116BT02-CR001#ESV-IN-0001锛堣祫鏂欏浘绾哥洰褰曪級.pdf',63);
+insert into lf.sys_meta_new (name,dirid) value ('1绫�.gdb.zip',74);
+insert into lf.sys_meta_new (name,dirid) value ('2绫�.gdb.zip',74);
+insert into lf.sys_meta_new (name,dirid) value ('鏄撶噧鏄撶垎.gdb.zip',74);
+insert into lf.sys_meta_new (name,dirid) value ('',63);
+insert into lf.sys_meta_new (name,dirid) value ('',63);
+insert into lf.sys_meta_new (name,dirid) value ('',63);
+insert into lf.sys_meta_new (name,dirid) value ('',63);
+insert into lf.sys_meta_new (name,dirid) value ('',63);
+insert into lf.sys_meta_new (name,dirid) value ('',63);
+insert into lf.sys_meta_new (name,dirid) value ('',63);
+insert into lf.sys_meta_new (name,dirid) value ('',63);
+insert into lf.sys_meta_new (name,dirid) value ('',63);
+insert into lf.sys_meta_new (name,dirid) value ('',63);
+insert into lf.sys_meta_new (name,dirid) value ('',63);
+insert into lf.sys_meta_new (name,dirid) value ('',63);
+insert into lf.sys_meta_new (name,dirid) value ('',63);
+insert into lf.sys_meta_new (name,dirid) value ('',63);
+insert into lf.sys_meta_new (name,dirid) value ('',63);
+insert into lf.sys_meta_new (name,dirid) value ('',63);
+insert into lf.sys_meta_new (name,dirid) value ('',63);
+insert into lf.sys_meta_new (name,dirid) value ('',63);
+insert into lf.sys_meta_new (name,dirid) value ('',63);
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 e81c5e2..4ee5c57 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
@@ -3,6 +3,7 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.ctrl.FmeReqEntity;
import com.lf.server.helper.StringHelper;
import com.lf.server.service.data.FmeService;
import io.swagger.annotations.ApiOperation;
@@ -20,17 +21,42 @@
protected FmeService fmeService;
@SysLog()
- @ApiOperation(value = "鏌ヨ鏁版嵁鏈夋晥鎬�")
- @GetMapping(value = "/selectDataValid")
- public ResponseMsg<Object> selectDataValid(HttpServletRequest req) {
+ @ApiOperation(value = "鏌ヨ鏁板鍩虹妫�鏌�")
+ @GetMapping(value = "/selectCheckMath")
+ public ResponseMsg<Object> selectCheckMath(HttpServletRequest req) {
try {
- String taskGuid = StringHelper.getGuid();
- String xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
- // 娴嬮噺涓撲笟|鍕樺療涓撲笟|鍦扮伨涓撲笟|娲炲簱涓撲笟
- String sjzy = "娴嬮噺涓撲笟";
- String filePath = "D:\\Project\\Data\\LF\\temp\\20230106135746\\鏁板鍩虹妫�鏌�.zip";
+ FmeReqEntity fme = new FmeReqEntity();
+ fme.name = StringHelper.getGuid();
+ fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
+ fme.sjzy = "娴嬮噺涓撲笟";
+ fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230106135746\\鏁板鍩虹妫�鏌�.zip";
- String rs = fmeService.checkMath(taskGuid, xmmc, sjzy, filePath, req);
+ String rs = fmeService.checkMath(fme, req);
+ if (StringHelper.isEmpty(rs)) {
+ return fail("妫�鏌ュけ璐�");
+ }
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鍏ュ簱璐ㄦ鎬�")
+ @GetMapping(value = "/selectCheckMain")
+ public ResponseMsg<Object> selectCheckMain(HttpServletRequest req) {
+ try {
+ FmeReqEntity fme = new FmeReqEntity();
+ fme.name = StringHelper.getGuid();
+ fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
+ fme.sjzy = "娴嬮噺涓撲笟";
+ fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230106135746\\瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�.7z";
+ fme.wbsPath = "D:\\Project\\Data\\LF\\temp\\20230106135746\\椤圭洰WBS瀵煎嚭.xlsx";
+ fme.isDiZai = "NO";
+ fme.diZaiType = "NO";
+
+ String rs = fmeService.checkMain(fme, req);
if (StringHelper.isEmpty(rs)) {
return fail("妫�鏌ュけ璐�");
}
diff --git a/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java b/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java
new file mode 100644
index 0000000..91b782e
--- /dev/null
+++ b/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java
@@ -0,0 +1,45 @@
+package com.lf.server.entity.ctrl;
+
+/**
+ * FME璇锋眰瀹炰綋绫�
+ * @author WWW
+ */
+public class FmeReqEntity {
+ public FmeReqEntity() {
+ }
+
+ /**
+ * 浠诲姟鍚嶇О
+ */
+ public String name;
+
+ /**
+ * 椤圭洰鍚嶇О
+ */
+ public String xmmc;
+
+ /**
+ * 鏁版嵁涓撲笟锛氭祴閲忎笓涓� | 鍕樺療涓撲笟 | 鍦扮伨涓撲笟 | 娲炲簱涓撲笟
+ */
+ public String sjzy;
+
+ /**
+ * 寰呮鍘嬬缉鍖�
+ */
+ public String zipPath;
+
+ /**
+ * WBS琛ㄦ牸
+ */
+ public String wbsPath;
+
+ /**
+ * 鏄�/鍚︿负鍦扮伨鏁版嵁锛歒ES|NO
+ */
+ public String isDiZai;
+
+ /**
+ * 鍦扮伨鏁版嵁绫诲瀷锛氬穿濉屾不鐞� | 涓嶇ǔ瀹氭枩鍧℃不鐞� | 鍦伴潰濉岄櫡娌荤悊 | 楂橀櫋杈瑰潯娌荤悊 | 娉ョ煶娴佹不鐞� | 姘存瘉娌荤悊 | 婊戝潯娌荤悊 | NO
+ */
+ public String diZaiType;
+}
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 69f9df0..d47c870 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -1,5 +1,6 @@
package com.lf.server.service.data;
+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.WebHelper;
@@ -85,13 +86,13 @@
/**
* 10.鏁板鍩虹妫�鏌ワ細.shp, .gdb, *鍏冩暟鎹�*.xls/.xlsx
*/
- public String checkMath(String taskGuid, String xmmc, String sjzy, String filePath, HttpServletRequest req) {
+ public String checkMath(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/B1鍏ュ簱璐ㄦ_鏁板鍩虹妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(taskGuid);
- list.add(new NameValueEntity("XMMC", xmmc));
- list.add(new NameValueEntity("SJZY", sjzy));
- list.add(new NameValueEntity("GCXMYSB", filePath));
+ List<NameValueEntity> list = getKeyValues(fme.name);
+ list.add(new NameValueEntity("XMMC", fme.xmmc));
+ list.add(new NameValueEntity("SJZY", fme.sjzy));
+ list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
return RestHelper.postForRest(url, list);
}
@@ -100,7 +101,24 @@
* 11.鍏冩暟鎹鏌ワ細*鍏冩暟鎹�*.xls/.xlsx
*/
public void checkMeta() {
+
+ }
+ /**
+ * 12.鍏ュ簱璐ㄦ鎬伙細.zip/.7z + .xls/.xlsx
+ */
+ public String checkMain(FmeReqEntity fme, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/B0鍏ュ簱璐ㄦ__鎬�", req);
+
+ List<NameValueEntity> list = getKeyValues(fme.name);
+ list.add(new NameValueEntity("XMMC", fme.xmmc));
+ list.add(new NameValueEntity("SJZY", fme.sjzy));
+ list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
+ list.add(new NameValueEntity("S_WBSBG", fme.wbsPath));
+ list.add(new NameValueEntity("S_DZDK", fme.isDiZai));
+ list.add(new NameValueEntity("DZ_ZLLX", fme.diZaiType));
+
+ return RestHelper.postForRest(url, list);
}
/**
@@ -114,12 +132,10 @@
/**
* 鑾峰彇鍚嶇О鍊煎闆嗗悎
- *
- * @return 鍚嶇О鍊煎闆嗗悎
*/
- public List<NameValueEntity> getKeyValues(String taskGuid) {
+ public List<NameValueEntity> getKeyValues(String guid) {
List<NameValueEntity> list = new ArrayList<>();
- list.add(new NameValueEntity("_name", taskGuid));
+ list.add(new NameValueEntity("_name", guid));
list.add(new NameValueEntity("_priority", 100));
list.add(new NameValueEntity("_terminate_on_error", true));
list.add(new NameValueEntity("IID", ""));
--
Gitblit v1.9.3