From 1b5179ade02f483bda7cae00e4242d6218bd6cba Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 07 一月 2023 10:22:23 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/upload/CheckController.java | 24 +++++++++++++++++++++++-
data/ts.sql | 3 +--
src/main/java/com/lf/server/service/data/FmeService.java | 13 ++++++++++---
3 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/data/ts.sql b/data/ts.sql
index a40f232..1654278 100644
--- a/data/ts.sql
+++ b/data/ts.sql
@@ -143,9 +143,8 @@
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 ('椤圭洰WBS瀵煎嚭.xlsx',57);
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);
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 4ee5c57..a63763a 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
@@ -43,7 +43,29 @@
}
@SysLog()
- @ApiOperation(value = "鏌ヨ鍏ュ簱璐ㄦ鎬�")
+ @ApiOperation(value = "鏌ヨ鍏冩暟鎹鏌�")
+ @GetMapping(value = "/selectCheckMeta")
+ public ResponseMsg<Object> selectCheckMeta(HttpServletRequest req) {
+ try {
+ 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.checkMeta(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 {
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 d47c870..5596069 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -100,12 +100,19 @@
/**
* 11.鍏冩暟鎹鏌ワ細*鍏冩暟鎹�*.xls/.xlsx
*/
- public void checkMeta() {
-
+ public String checkMeta(FmeReqEntity fme, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/B5鍏ュ簱璐ㄦ_鍏冩暟鎹鏌�", 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));
+
+ return RestHelper.postForRest(url, list);
}
/**
- * 12.鍏ュ簱璐ㄦ鎬伙細.zip/.7z + .xls/.xlsx
+ * 12.鎬昏川妫�锛�.zip/.7z + .xls/.xlsx
*/
public String checkMain(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/B0鍏ュ簱璐ㄦ__鎬�", req);
--
Gitblit v1.9.3