From 47c0f2c756b93d111135cc88ea15143084c08341 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 07 一月 2023 14:31:33 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/upload/CheckController.java | 46 ++++++++++++++++++++++
src/main/java/com/lf/server/service/data/FmeService.java | 24 +++++++++--
data/update.sql | 21 +++++-----
3 files changed, 75 insertions(+), 16 deletions(-)
diff --git a/data/update.sql b/data/update.sql
index 663157b..e7a7763 100644
--- a/data/update.sql
+++ b/data/update.sql
@@ -5,18 +5,19 @@
select * from lf.sys_user; -- Admin@1234_lf
-- update lf.sys_user set pwd = 'd4d25475a81ef4db4b28ce4034500f896169f15c0c68da5d';
--- update lf.sys_menu set url = 'http://172.16.200.14:88/dataxdi/#/schema/list?tags=鍏ュ簱璐ㄦ&embed=true&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiI1YmJjMGI2MC02NmU1LTRlYmMtOTU1OS02NDNmYjQ2MDMyMDAiLCJleHAiOjE2NzA0ODg4NTgsImFjY291bnQiOiJhZG1pbiJ9.kUq7hVIagV6n5ShdVb4IIT5tR-2Xn2xvgaf_yQOqUwY' where cn_name = '鍏ュ簱璐ㄦ';
--- update lf.sys_menu set url = 'http://172.16.200.14:88/dataxdi/#/schema/list?tags=鎴愭灉璐ㄦ&embed=true&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiI1YmJjMGI2MC02NmU1LTRlYmMtOTU1OS02NDNmYjQ2MDMyMDAiLCJleHAiOjE2NzA0ODg4NTgsImFjY291bnQiOiJhZG1pbiJ9.kUq7hVIagV6n5ShdVb4IIT5tR-2Xn2xvgaf_yQOqUwY' where cn_name = '鎴愭灉璐ㄦ';
--- update lf.sys_menu set url = 'http://172.16.200.14:88/dataxdi/#/task/list?embed=true&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiI1YmJjMGI2MC02NmU1LTRlYmMtOTU1OS02NDNmYjQ2MDMyMDAiLCJleHAiOjE2NzA0ODg4NTgsImFjY291bnQiOiJhZG1pbiJ9.kUq7hVIagV6n5ShdVb4IIT5tR-2Xn2xvgaf_yQOqUwY' where cn_name = '浠诲姟鐘舵��' and id = 69;
+select * from lf.sys_menu order by id;
+update lf.sys_menu set url = 'http://pipe.cppe.com:88/dataxdi/#/schema/list?tags=鍏ュ簱璐ㄦ&embed=true&token=' where cn_name = '鍏ュ簱璐ㄦ';
+update lf.sys_menu set url = 'http://pipe.cppe.com:88/dataxdi/#/schema/list?tags=鎴愭灉璐ㄦ&embed=true&token=' where cn_name = '鎴愭灉璐ㄦ';
+update lf.sys_menu set url = 'http://pipe.cppe.com:88/dataxdi/#/task/list?embed=true&token=' where cn_name = '浠诲姟鐘舵��' and id = 69;
--- update lf.sys_menu set url = 'http://172.16.200.14:88/dataxdi/#/schema/list?tags=鏁版嵁浜ゆ崲&embed=true&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiI1YmJjMGI2MC02NmU1LTRlYmMtOTU1OS02NDNmYjQ2MDMyMDAiLCJleHAiOjE2NzA0ODg4NTgsImFjY291bnQiOiJhZG1pbiJ9.kUq7hVIagV6n5ShdVb4IIT5tR-2Xn2xvgaf_yQOqUwY' where cn_name = '鏍煎紡杞崲';
--- update lf.sys_menu set url = 'http://172.16.200.14:88/dataxdi/#/schema/list?tags=鍧愭爣杞崲&embed=true&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiI1YmJjMGI2MC02NmU1LTRlYmMtOTU1OS02NDNmYjQ2MDMyMDAiLCJleHAiOjE2NzA0ODg4NTgsImFjY291bnQiOiJhZG1pbiJ9.kUq7hVIagV6n5ShdVb4IIT5tR-2Xn2xvgaf_yQOqUwY' where cn_name = '鍧愭爣杞崲';
--- update lf.sys_menu set url = 'http://172.16.200.14:88/dataxdi/#/schema/list?tags=鏁版嵁鍒嗗彂&embed=true&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiI1YmJjMGI2MC02NmU1LTRlYmMtOTU1OS02NDNmYjQ2MDMyMDAiLCJleHAiOjE2NzA0ODg4NTgsImFjY291bnQiOiJhZG1pbiJ9.kUq7hVIagV6n5ShdVb4IIT5tR-2Xn2xvgaf_yQOqUwY' where cn_name = '鏁版嵁鍒嗗彂';
--- update lf.sys_menu set url = 'http://172.16.200.14:88/dataxdi/#/schema/list?tags=鏁版嵁娌荤悊&embed=true&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiI1YmJjMGI2MC02NmU1LTRlYmMtOTU1OS02NDNmYjQ2MDMyMDAiLCJleHAiOjE2NzA0ODg4NTgsImFjY291bnQiOiJhZG1pbiJ9.kUq7hVIagV6n5ShdVb4IIT5tR-2Xn2xvgaf_yQOqUwY' where cn_name = '鏁版嵁娌荤悊';
--- update lf.sys_menu set url = 'http://172.16.200.14:88/dataxdi/#/task/list?embed=true&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiI1YmJjMGI2MC02NmU1LTRlYmMtOTU1OS02NDNmYjQ2MDMyMDAiLCJleHAiOjE2NzA0ODg4NTgsImFjY291bnQiOiJhZG1pbiJ9.kUq7hVIagV6n5ShdVb4IIT5tR-2Xn2xvgaf_yQOqUwY' where cn_name = '浠诲姟鐘舵��' and id = 74;
+update lf.sys_menu set url = 'http://pipe.cppe.com:88/dataxdi/#/schema/list?tags=鏁版嵁浜ゆ崲&embed=true&token=' where cn_name = '鏍煎紡杞崲';
+update lf.sys_menu set url = 'http://pipe.cppe.com:88/dataxdi/#/schema/list?tags=鍧愭爣杞崲&embed=true&token=' where cn_name = '鍧愭爣杞崲';
+update lf.sys_menu set url = 'http://pipe.cppe.com:88/dataxdi/#/schema/list?tags=鏁版嵁鍒嗗彂&embed=true&token=' where cn_name = '鏁版嵁鍒嗗彂';
+update lf.sys_menu set url = 'http://pipe.cppe.com:88/dataxdi/#/schema/list?tags=鏁版嵁娌荤悊&embed=true&token=' where cn_name = '鏁版嵁娌荤悊';
+update lf.sys_menu set url = 'http://pipe.cppe.com:88/dataxdi/#/task/list?embed=true&token=' where cn_name = '浠诲姟鐘舵��' and id = 74;
--- update lf.sys_menu set url = 'http://172.16.200.14:88/resm/#/resourceManage?embed=true&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiI1YmJjMGI2MC02NmU1LTRlYmMtOTU1OS02NDNmYjQ2MDMyMDAiLCJleHAiOjE2NzA0ODg4NTgsImFjY291bnQiOiJhZG1pbiJ9.kUq7hVIagV6n5ShdVb4IIT5tR-2Xn2xvgaf_yQOqUwY' where cn_name = '鎴戠殑璧勬簮';
--- update lf.sys_menu set url = 'http://172.16.200.14:88/resm/#/resapproval?embed=true&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiI1YmJjMGI2MC02NmU1LTRlYmMtOTU1OS02NDNmYjQ2MDMyMDAiLCJleHAiOjE2NzA0ODg4NTgsImFjY291bnQiOiJhZG1pbiJ9.kUq7hVIagV6n5ShdVb4IIT5tR-2Xn2xvgaf_yQOqUwY' where cn_name = '璧勬簮瀹℃牳';
+update lf.sys_menu set url = 'http://pipe.cppe.com:88/resm/#/resourceManage?embed=true&token=' where cn_name = '鎴戠殑璧勬簮';
+update lf.sys_menu set url = 'http://pipe.cppe.com:88/resm/#/resapproval?embed=true&token=' where cn_name = '璧勬簮瀹℃牳';
------------------------------------------------------ FME_鏁版嵁璐ㄦ
select * from lf.sys_menu where cn_name = '鍏ュ簱璐ㄦ';
update lf.sys_menu set url = 'http://10.7.0.186:88/dataxdi/#/schema/list?tags=鍏ュ簱璐ㄦ&embed=true&token=' where cn_name = '鍏ュ簱璐ㄦ';
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 04a0426..3b4b703 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,50 @@
protected FmeService fmeService;
@SysLog()
+ @ApiOperation(value = "鏌ヨOSGB妫�鏌�")
+ @GetMapping(value = "/selectCheckOsgb")
+ public ResponseMsg<Object> selectCheckOsgb(HttpServletRequest req) {
+ try {
+ FmeReqEntity fme = new FmeReqEntity();
+ fme.name = StringHelper.getGuid();
+ fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
+ fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\OSGB妫�鏌�.zip";
+ fme.imgResolution = 0.2;
+
+ String rs = fmeService.checkOsgb(fme, req);
+ if (StringHelper.isEmpty(rs)) {
+ return fail("妫�鏌ュけ璐�");
+ }
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ琛ㄦ牸鏁版嵁妫�鏌�")
+ @GetMapping(value = "/selectCheckXls")
+ public ResponseMsg<Object> selectCheckXls(HttpServletRequest req) {
+ try {
+ FmeReqEntity fme = new FmeReqEntity();
+ fme.name = StringHelper.getGuid();
+ fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
+ fme.sjzy = "娴嬮噺涓撲笟";
+ fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\琛ㄦ牸鏁版嵁妫�鏌�.zip";
+
+ String rs = fmeService.checkXls(fme, req);
+ if (StringHelper.isEmpty(rs)) {
+ return fail("妫�鏌ュけ璐�");
+ }
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
@ApiOperation(value = "鏌ヨ鐐逛簯妫�鏌�")
@GetMapping(value = "/selectCheckLaz")
public ResponseMsg<Object> selectCheckLaz(HttpServletRequest req) {
@@ -28,7 +72,7 @@
FmeReqEntity fme = new FmeReqEntity();
fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
- fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\楂樼▼妫�鏌�.zip";
+ fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\鐐逛簯妫�鏌�.zip";
fme.lazDensity = 1;
String rs = fmeService.checkLaz(fme, req);
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 5dd1afa..139aad6 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -23,15 +23,29 @@
/**
* 1.OSGB妫�鏌ワ細.osgb + *鍊炬枩鎽勫奖*.xls/.xlsx
*/
- public void checkOsgb(FmeReqEntity fme, HttpServletRequest req) {
+ public String checkOsgb(FmeReqEntity fme, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/A8鎴愭灉璐ㄦ_OSGB妫�鏌�", 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("DMYX_FBL", fme.imgResolution));
+
+ return RestHelper.postForRest(url, list);
}
/**
* 2.琛ㄦ牸鏁版嵁妫�鏌ワ細.xls/.xlsx锛堟帓闄ゅ厓鏁版嵁锛�
*/
- public void checkXls(FmeReqEntity fme, HttpServletRequest req) {
+ public String checkXls(FmeReqEntity fme, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/A3鎴愭灉璐ㄦ_琛ㄦ牸鏁版嵁妫�鏌�", 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);
}
/**
@@ -205,9 +219,9 @@
list.add(new NameValueEntity("_terminate_on_error", false));
list.add(new NameValueEntity("IID", ""));
list.add(new NameValueEntity("FANOUT_DIR", "$(OrgResultStorage)"));
- list.add(new NameValueEntity("IID_JL", "$(OrgUserStorage)\\璐ㄦ閰嶇疆鏂囦欢\\IID璁板綍琛�.xlsx"));
- list.add(new NameValueEntity("S_ZJXZ", "$(OrgUserStorage)\\璐ㄦ閰嶇疆鏂囦欢\\璐ㄦ缁嗗垯鎬�.xlsx"));
- list.add(new NameValueEntity("S_BZPZB", "$(OrgUserStorage)\\璐ㄦ閰嶇疆鏂囦欢\\璐ㄦ閰嶇疆琛ㄦ��.xlsx"));
+ list.add(new NameValueEntity("IID_JL", "$(ZJPZWJ)\\IID璁板綍琛�.xlsx"));
+ list.add(new NameValueEntity("S_ZJXZ", "$(ZJPZWJ)\\璐ㄦ缁嗗垯鎬�.xlsx"));
+ list.add(new NameValueEntity("S_BZPZB", "$(ZJPZWJ)\\璐ㄦ閰嶇疆琛ㄦ��.xlsx"));
return list;
}
--
Gitblit v1.9.3