From d5be1b8fad7c7a4455d89a3e14e3496dcd93ac33 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 08 一月 2023 14:47:07 +0800
Subject: [PATCH] 1.8.2
---
src/main/java/com/lf/server/controller/data/upload/CheckController.java | 6 -
data/ts.sql | 23 -------
src/main/java/com/lf/server/service/data/UploadService.java | 6 ++
data/update.sql | 49 ++++++++++++++++
src/main/java/com/lf/server/mapper/data/UploadMapper.java | 8 ++
src/main/resources/mapper/data/UploadMapper.xml | 4 +
src/main/java/com/lf/server/controller/data/upload/QueryController.java | 14 ++++
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 46 +++++++--------
8 files changed, 103 insertions(+), 53 deletions(-)
diff --git a/data/ts.sql b/data/ts.sql
index 9ed9b3f..5527803 100644
--- a/data/ts.sql
+++ b/data/ts.sql
@@ -142,29 +142,6 @@
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) 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;
-
-with rs as (select id from lf.sys_dir where name='瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�')
-select fn_rec_query(a.dirid,'dir'),a.* from lf.sys_meta_new a where dirid = ANY(fn_rec_array((select id from rs), 'dir'));
-
diff --git a/data/update.sql b/data/update.sql
index c182b3a..e4edc2e 100644
--- a/data/update.sql
+++ b/data/update.sql
@@ -49,8 +49,38 @@
select * from lf.sys_menu where cn_name = '璧勬簮瀹℃牳';
update lf.sys_menu set url = 'http://10.7.0.186:88/resm/#/resapproval?embed=true&token=' where cn_name = '璧勬簮瀹℃牳';
------------------------------------------------------
-select * from lf.sys_menu order by id;
+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;
+
+insert into lf.sys_meta_new (name,dirid) values ('S318 娲涢檿绾跨┛瓒婂伐绋嬪湴璐ㄥ墫闈㈠浘.dwg',80);
+insert into lf.sys_meta_new (name,dirid) values ('鍦拌川鍓栭潰鍥剧储寮曡〃.xlsx',80);
+insert into lf.sys_meta_new (name,dirid) values ('鍦拌川璧勬枡琛�.xlsx',80);
+insert into lf.sys_meta_new (name,dirid) values ('鍕樻帰鐐瑰潗鏍囪〃.xlsx',80);
+insert into lf.sys_meta_new (name,dirid) values ('鍦熷￥鐢甸樆鐜囪〃.xlsx',80);
+
+update lf.sys_meta_new set depid=1,type='file',path='2\'||name,sizes=1 where path is null;
+
+with rs as (select id from lf.sys_dir where name='瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�')
+select fn_rec_query(a.dirid,'dir'),a.* from lf.sys_meta_new a where dirid = ANY(fn_rec_array((select id from rs), 'dir'));
+
+select * from lf.sys_meta_new where substr(path,1,2) = '2\';
+------------------------------------------------------
+select * from lf.sys_menu order by id;
select gid from md.md_u_special_evaluation_report;
select dd from md.md_s_hole_column_diagram;
@@ -79,3 +109,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 db8ef0f..298321d 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
@@ -2,8 +2,6 @@
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.ApiImplicitParam;
@@ -60,7 +58,7 @@
}
}
- @SysLog()
+ /*@SysLog()
@ApiOperation(value = "鏌ヨOSGB妫�鏌�")
@GetMapping(value = "/selectCheckOsgb")
public ResponseMsg<Object> selectCheckOsgb(HttpServletRequest req) {
@@ -333,5 +331,5 @@
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
- }
+ }*/
}
diff --git a/src/main/java/com/lf/server/controller/data/upload/QueryController.java b/src/main/java/com/lf/server/controller/data/upload/QueryController.java
index 2e20aa2..0d7a3ff 100644
--- a/src/main/java/com/lf/server/controller/data/upload/QueryController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/QueryController.java
@@ -7,6 +7,7 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.all.StaticData;
+import com.lf.server.entity.ctrl.IdNameEntity;
import com.lf.server.entity.ctrl.TabEntity;
import com.lf.server.entity.data.*;
import com.lf.server.entity.sys.DepEntity;
@@ -119,6 +120,19 @@
}
@SysLog()
+ @ApiOperation(value = "鏌ヨ椤圭洰鍚嶇О")
+ @GetMapping(value = "/selectProject")
+ public ResponseMsg<Object> selectProject() {
+ try {
+ List<IdNameEntity> list = uploadService.selectProject();
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
@ApiOperation(value = "鏌ヨ鎵�鏈夎〃")
@GetMapping(value = "/selectTabs")
public ResponseMsg<List<TabEntity>> selectTabs() {
diff --git a/src/main/java/com/lf/server/controller/data/upload/UploadController.java b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
index 2a888f0..e2a5abe 100644
--- a/src/main/java/com/lf/server/controller/data/upload/UploadController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
@@ -56,6 +56,27 @@
}
@SysLog()
+ @ApiOperation(value = "涓婁紶鏂囦欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query")
+ })
+ @ResponseBody
+ @PostMapping(value = "/uploadFiles")
+ public ResponseMsg<Object> uploadFiles(String path, HttpServletRequest req, HttpServletResponse res) {
+ try {
+ List<MetaEntity> list = baseUploadService.uploadData(null, path, req, res);
+ if (null == list || list.isEmpty()) {
+ return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
+ }
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+
+ @SysLog()
@ApiOperation(value = "鏌ヨ鏄犲皠")
@ApiImplicitParams({
@ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query")
@@ -166,31 +187,6 @@
dataLoaderService.insertFiles(me, entity.getFileEntities(), entity.getTabEntities());
return success("鎴愬姛", entity.getTabEntities());
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "涓婁紶鏂囦欢")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query")
- })
- @ResponseBody
- @PostMapping(value = "/uploadFiles")
- public ResponseMsg<Object> uploadFiles(String path, HttpServletRequest req, HttpServletResponse res) {
- try {
- UserEntity ue = tokenService.getCurrentUser(req);
- if (ue == null) {
- return fail("鐢ㄦ埛鏈櫥褰�", null);
- }
-
- List<MetaEntity> list = baseUploadService.uploadData(null, path, req, res);
- if (null == list || list.isEmpty()) {
- return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
- }
-
- return success(list);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
diff --git a/src/main/java/com/lf/server/mapper/data/UploadMapper.java b/src/main/java/com/lf/server/mapper/data/UploadMapper.java
index 635ae07..47bf330 100644
--- a/src/main/java/com/lf/server/mapper/data/UploadMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/UploadMapper.java
@@ -1,5 +1,6 @@
package com.lf.server.mapper.data;
+import com.lf.server.entity.ctrl.IdNameEntity;
import com.lf.server.entity.data.CoordEntity;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -20,4 +21,11 @@
* @return
*/
public List<CoordEntity> selectCoords(String zoning);
+
+ /**
+ * 鏌ヨ椤圭洰鍚嶇О
+ *
+ * @return
+ */
+ public List<IdNameEntity> selectProject();
}
diff --git a/src/main/java/com/lf/server/service/data/UploadService.java b/src/main/java/com/lf/server/service/data/UploadService.java
index 528bd33..f4f5377 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -1,5 +1,6 @@
package com.lf.server.service.data;
+import com.lf.server.entity.ctrl.IdNameEntity;
import com.lf.server.entity.data.CoordEntity;
import com.lf.server.mapper.data.UploadMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,4 +21,9 @@
public List<CoordEntity> selectCoords(String zoning) {
return uploadMapper.selectCoords(zoning);
}
+
+ @Override
+ public List<IdNameEntity> selectProject() {
+ return uploadMapper.selectProject();
+ }
}
diff --git a/src/main/resources/mapper/data/UploadMapper.xml b/src/main/resources/mapper/data/UploadMapper.xml
index 1c09870..ebc76d9 100644
--- a/src/main/resources/mapper/data/UploadMapper.xml
+++ b/src/main/resources/mapper/data/UploadMapper.xml
@@ -11,4 +11,8 @@
</where>
order by id
</select>
+
+ <select id="selectProject" resultType="com.lf.server.entity.ctrl.IdNameEntity">
+ select id, name from lf.sys_dir where pid = 0 and id > 0
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3