From b6dcef04330829868060b0cf2d0c479e2f73994f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 07 一月 2023 11:10:13 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/upload/CheckController.java | 24 ++++++++++++
data/ts.sql | 42 ++++++++-------------
src/main/java/com/lf/server/service/data/FmeService.java | 29 +++++++++-----
src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java | 10 +++++
4 files changed, 69 insertions(+), 36 deletions(-)
diff --git a/data/ts.sql b/data/ts.sql
index 1654278..52e802a 100644
--- a/data/ts.sql
+++ b/data/ts.sql
@@ -144,33 +144,23 @@
select * from lf.sys_dir;
select * from lf.sys_meta_new;
-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);
-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);
+insert into lf.sys_meta_new (name,dirid) values ('椤圭洰WBS瀵煎嚭.xlsx',57);
+insert into lf.sys_meta_new (name,dirid) values ('00116BT02-CR001#ESV-DW-0101 灏侀潰.docx',62);
+insert into lf.sys_meta_new (name,dirid) values ('00116BT02-CR001#ESV-DW-0101锛堝ぇ娌虫部娌崇┛瓒婂湴褰㈠浘锛�0.dwg',62);
+insert into lf.sys_meta_new (name,dirid) values ('00116BT02-CR001#ESV-DW-0101锛堝ぇ娌虫部娌崇┛瓒婂湴褰㈠浘锛�0.dwl',62);
+insert into lf.sys_meta_new (name,dirid) values ('00116BT02-CR001#ESV-DW-0101锛堝ぇ娌虫部娌崇┛瓒婂湴褰㈠浘锛�0.dwl2',62);
+insert into lf.sys_meta_new (name,dirid) values ('00116BT02-CR001#ESV-DW-0101锛堝ぇ娌虫部娌崇┛瓒婄旱鏂潰鍥撅級0.dwg',62);
+insert into lf.sys_meta_new (name,dirid) values ('00116BT02-CR001#ESV-IN-0101锛堣祫鏂欏浘绾哥洰褰曪級.doc',62);
+insert into lf.sys_meta_new (name,dirid) values ('1绫�.gdb.zip',74);
+insert into lf.sys_meta_new (name,dirid) values ('2绫�.gdb.zip',74);
+insert into lf.sys_meta_new (name,dirid) values ('鏄撶噧鏄撶垎.gdb.zip',74);
+insert into lf.sys_meta_new (name,dirid) values ('鍦伴潰绾�.xlsx',64);
+insert into lf.sys_meta_new (name,dirid) values ('鎺у埗鐐�.xlsx',64);
+insert into lf.sys_meta_new (name,dirid) values ('绂绘暎鐐�.xlsx',64);
+insert into lf.sys_meta_new (name,dirid) values ('骞抽潰鍥剧储寮曟枃浠�.xlsx',64);
+insert into lf.sys_meta_new (name,dirid) values ('涓嚎鎴愭灉琛�.xlsx',64);
+update lf.sys_meta_new set depid=1,type='file',path='2\'||name,sizes=1;
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 a63763a..78063c0 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,30 @@
protected FmeService fmeService;
@SysLog()
+ @ApiOperation(value = "鏌ヨ鏍呮牸妫�鏌�")
+ @GetMapping(value = "/selectCheckDom")
+ public ResponseMsg<Object> selectCheckDom(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";
+ fme.coordinateSystem = "CGCS2000/GK3d-93E_FME";
+ fme.imgResolution = 0.2;
+
+ String rs = fmeService.checkDom(fme, req);
+ if (StringHelper.isEmpty(rs)) {
+ return fail("妫�鏌ュけ璐�");
+ }
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
@ApiOperation(value = "鏌ヨ鏁板鍩虹妫�鏌�")
@GetMapping(value = "/selectCheckMath")
public ResponseMsg<Object> selectCheckMath(HttpServletRequest req) {
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 91b782e..80def8a 100644
--- a/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java
+++ b/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java
@@ -42,4 +42,14 @@
* 鍦扮伨鏁版嵁绫诲瀷锛氬穿濉屾不鐞� | 涓嶇ǔ瀹氭枩鍧℃不鐞� | 鍦伴潰濉岄櫡娌荤悊 | 楂橀櫋杈瑰潯娌荤悊 | 娉ョ煶娴佹不鐞� | 姘存瘉娌荤悊 | 婊戝潯娌荤悊 | NO
*/
public String diZaiType;
+
+ /**
+ * 鍧愭爣绯伙細EPSG:4326
+ */
+ public String coordinateSystem;
+
+ /**
+ * 褰卞儚鍒嗚鲸鐜囷紙榛樿0.2m锛�
+ */
+ public double imgResolution = 0.2;
}
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 5596069..1562e88 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -23,64 +23,73 @@
/**
* 1.OSGB妫�鏌ワ細.osgb + *鍊炬枩鎽勫奖*.xls/.xlsx
*/
- public void checkOsgb(String path) {
+ public void checkOsgb(FmeReqEntity fme, HttpServletRequest req) {
}
/**
* 2.琛ㄦ牸鏁版嵁妫�鏌ワ細.xls/.xlsx锛堟帓闄ゅ厓鏁版嵁锛�
*/
- public void checkXls() {
+ public void checkXls(FmeReqEntity fme, HttpServletRequest req) {
}
/**
* 3.鐐逛簯妫�鏌ワ細.laz + *婵�鍏夌偣浜�*.xls/.xlsx
*/
- public void checkLaz() {
+ public void checkLaz(FmeReqEntity fme, HttpServletRequest req) {
}
/**
* 4.楂樼▼妫�鏌ワ細.tif/.prj/.tfw/.tif.ovr + *鍦板舰鍥�*.dwg
*/
- public void checkDem() {
+ public void checkDem(FmeReqEntity fme, HttpServletRequest req) {
}
/**
* 5.灞炴�ф鏌ワ細*dlg*.gdb + *鍦板舰鍥�*.dwg
*/
- public void checkAttrs() {
+ public void checkAttrs(FmeReqEntity fme, HttpServletRequest req) {
}
/**
* 6.鎷撴墤妫�鏌ワ細*鍦板舰鍥�*.dwg
*/
- public void checkTopology() {
+ public void checkTopology(FmeReqEntity fme, HttpServletRequest req) {
}
/**
* 7.鍥鹃潰鏁撮グ妫�鏌ワ細.dwg
*/
- public void checkDecorate() {
+ public void checkDecorate(FmeReqEntity fme, HttpServletRequest req) {
}
/**
* 8.鍘熺偣妫�鏌ワ細*鍓栭潰鍥�*.dwg
*/
- public void checkOrigin() {
+ public void checkOrigin(FmeReqEntity fme, HttpServletRequest req) {
}
/**
* 9.鏍呮牸妫�鏌ワ細.tif/.prj/.tfw/.tif.ovr + .xls/.xlsx
*/
- public void checkDom() {
+ public String checkDom(FmeReqEntity fme, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/A7鎴愭灉璐ㄦ_鏍呮牸妫�鏌�", 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_CoordinateSystem", fme.coordinateSystem));
+ list.add(new NameValueEntity("DMYX_FBL", fme.imgResolution));
+
+ return RestHelper.postForRest(url, list);
}
/**
@@ -144,7 +153,7 @@
List<NameValueEntity> list = new ArrayList<>();
list.add(new NameValueEntity("_name", guid));
list.add(new NameValueEntity("_priority", 100));
- list.add(new NameValueEntity("_terminate_on_error", true));
+ 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"));
--
Gitblit v1.9.3