From c61573b7222a99a69ff381fac53f4af831030830 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 09 一月 2023 13:46:30 +0800
Subject: [PATCH] 2
---
src/main/resources/mapper/data/DirMapper.xml | 27 +++------
src/main/java/com/lf/server/service/data/FmeService.java | 1
src/main/java/com/lf/server/entity/data/DirEntity.java | 10 +++
src/main/java/com/lf/server/entity/all/StaticData.java | 9 ++
src/main/java/com/lf/server/service/data/UploadService.java | 5 +
data/update.sql | 12 ++-
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/UploadController.java | 54 +++++++++++------
9 files changed, 85 insertions(+), 45 deletions(-)
diff --git a/data/update.sql b/data/update.sql
index 71ccaa6..3aedf7b 100644
--- a/data/update.sql
+++ b/data/update.sql
@@ -105,11 +105,15 @@
select zoning from lf.sys_coord group by zoning;
select id, name from lf.sys_dir where pid = 0 and id > 1;
+select * from lf.sys_coord where epsgcode = 'EPSG:4490';
+select * from lf.sys_operate;
-
-
-
-
+with recursive rs as(
+ select a.*, fullName from lf.sys_dir a where name=#{name}
+union
+ select a.* from lf.sys_dir a, rs b where a.pid=b.id
+)
+select * from rs order by order_num;
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 8395029..f14d592 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
@@ -2,15 +2,19 @@
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.TabMapperEntity;
import com.lf.server.entity.ctrl.UploadEntity;
+import com.lf.server.entity.data.DirEntity;
import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
import com.lf.server.service.all.BaseUploadService;
import com.lf.server.service.data.DataLoaderService;
import com.lf.server.service.data.DataUploadService;
+import com.lf.server.service.data.DirService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -84,13 +88,29 @@
@GetMapping(value = "/selectFiles")
public ResponseMsg<List<MetaFileEntity>> selectFiles(String path) {
try {
- List<MetaFileEntity> list = baseUploadService.selectFiles(path, EXT_LIST);
+ List<MetaFileEntity> list = baseUploadService.selectFiles(path, StaticData.ALL_EXTENSION);
return success(list);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
}
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鏂囦欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query")
+ })
+ @GetMapping(value = "/selectFiles2")
+ public ResponseMsg<List<MetaFileEntity>> selectFiles2(String path) {
+ try {
+ List<MetaFileEntity> list = baseUploadService.selectFiles(path, null);
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
@SysLog()
@ApiOperation(value = "鍒犻櫎鏂囦欢")
@@ -121,30 +141,24 @@
@ApiOperation(value = "鏌ヨ鏄犲皠")
@ApiImplicitParams({
@ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query", example = "20230109010101"),
- @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "1")
+ @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "epsgCode", value = "鍧愭爣缂栫爜", dataType = "String", paramType = "query", example = "EPSG:4490")
})
@GetMapping(value = "/selectMappers")
- public ResponseMsg<List<TabMapperEntity>> selectMappers(String path, Integer dirid) {
+ public ResponseMsg<Object> selectMappers(String path, Integer dirid, String epsgCode) {
try {
-
+ if (StringHelper.isEmpty(path) || StringHelper.isEmpty(epsgCode) || null == dirid) {
+ return fail("璺緞銆佺洰褰旾D鍜屽潗鏍囩紪鐮佷笉鑳戒负绌�");
+ }
+ if (1 > uploadService.selectCount4Coord(epsgCode)) {
+ return fail("鍧愭爣缂栫爜" + epsgCode + "涓嶅瓨鍦�");
+ }
+ DirEntity dir = dirService.selectDir(dirid);
+ if (null == dir) {
+ return fail("鐩綍ID=" + dirid + "涓嶅瓨鍦�");
+ }
List<TabMapperEntity> list = dataLoaderService.selectMappers(path);
-
- return success(list);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鏌ヨ鏂囦欢")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query")
- })
- @GetMapping(value = "/selectFiles2")
- public ResponseMsg<List<MetaFileEntity>> selectFiles2(String path) {
- try {
- List<MetaFileEntity> list = baseUploadService.selectFiles(path, null);
return success(list);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/entity/all/StaticData.java b/src/main/java/com/lf/server/entity/all/StaticData.java
index 953432f..56673e5 100644
--- a/src/main/java/com/lf/server/entity/all/StaticData.java
+++ b/src/main/java/com/lf/server/entity/all/StaticData.java
@@ -142,7 +142,12 @@
/**
* TIF鏂囦欢鎵╁睍鍚�
*/
- public final static List<String> TIF_EXTENSION = new ArrayList<>(Arrays.asList(".tif", ".prj", ".tfw", ".tfw", ".tif.ovr", ".tif.aux.xml", ".tif.enp", ".tif.xml"));
+ public final static List<String> TIF_EXTENSION = new ArrayList<>(Arrays.asList(".tif", ".prj", ".tfw", ".tif.ovr", ".tif.aux.xml", ".tif.enp", ".tif.xml"));
+
+ /**
+ * TIFF鏂囦欢鎵╁睍鍚�
+ */
+ public final static List<String> TIFF_EXTENSION = new ArrayList<>(Arrays.asList(".tiff", ".prj", ".tfw", ".tiff.ovr", ".tiff.aux.xml", ".tiff.enp", ".tiff.xml"));
/**
* SHP鏂囦欢鎵╁睍鍚�
@@ -152,7 +157,7 @@
/**
* 鎵�鏈夋枃浠舵墿灞曞悕
*/
- public final static List<String> ALL_EXTENSION = new ArrayList<>(Arrays.asList(".txt", ".xml", ".pdf", ".xls", ".xlsx", ".doc", ".docx", ".ppt", ".pptx", ".shp", ".gdb", ".mdb", ".dwg", ".las", ".laz", ".cpt", ".mpt", ".fly", ".efb", ".g3d", ".fbx", ".obj", ".3dm", ".3dml", ".osgb", ".rvt", ".ifc", ".jpg", ".png", ".img", ".tif", ".bmp", ".gif", ".rmvb", ".rm", ".mp3", ".mp4", ".avi", ".wma", ".wmv", ".7z", ".rar", ".zip"));
+ public final static List<String> ALL_EXTENSION = new ArrayList<>(Arrays.asList(".txt", ".xml", ".pdf", ".xls", ".xlsx", ".doc", ".docx", ".ppt", ".pptx", ".shp", ".gdb", ".mdb", ".dwg", ".las", ".laz", ".cpt", ".mpt", ".fly", ".efb", ".g3d", ".fbx", ".obj", ".3dm", ".3dml", ".osgb", ".rvt", ".ifc", ".jpg", ".png", ".img", ".tif", ".tiff", ".bmp", ".gif", ".rmvb", ".rm", ".mp3", ".mp4", ".avi", ".wma", ".wmv", ".7z", ".rar", ".zip"));
/**
* 鎻掑叆鎺掗櫎瀛楁
diff --git a/src/main/java/com/lf/server/entity/data/DirEntity.java b/src/main/java/com/lf/server/entity/data/DirEntity.java
index 6aebcc6..9d658ec 100644
--- a/src/main/java/com/lf/server/entity/data/DirEntity.java
+++ b/src/main/java/com/lf/server/entity/data/DirEntity.java
@@ -43,6 +43,8 @@
private String bak;
+ private String fullName;
+
public int getId() {
return id;
}
@@ -138,4 +140,12 @@
public void setBak(String bak) {
this.bak = bak;
}
+
+ public String getFullName() {
+ return fullName;
+ }
+
+ public void setFullName(String fullName) {
+ this.fullName = fullName;
+ }
}
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 380517a..573863b 100644
--- a/src/main/java/com/lf/server/mapper/data/UploadMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/UploadMapper.java
@@ -24,6 +24,14 @@
public List<CoordEntity> selectCoords(String zoning);
/**
+ * 鏍规嵁EPSG缂栫爜缁熻
+ *
+ * @param epsgCode
+ * @return
+ */
+ public Integer selectCount4Coord(String epsgCode);
+
+ /**
* 鏌ヨ椤圭洰鍚嶇О
*
* @return
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 da6f0ef..e334464 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -2,7 +2,6 @@
import com.lf.server.entity.ctrl.FmeReqEntity;
import com.lf.server.entity.ctrl.NameValueEntity;
-import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.helper.RestHelper;
import com.lf.server.helper.StringHelper;
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 eb001b4..487ca89 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -24,6 +24,11 @@
}
@Override
+ public Integer selectCount4Coord(String epsgCode) {
+ return uploadMapper.selectCount4Coord(epsgCode);
+ }
+
+ @Override
public List<DirEntity> selectProject() {
return uploadMapper.selectProject();
}
diff --git a/src/main/resources/mapper/data/DirMapper.xml b/src/main/resources/mapper/data/DirMapper.xml
index a4b6bf9..074165b 100644
--- a/src/main/resources/mapper/data/DirMapper.xml
+++ b/src/main/resources/mapper/data/DirMapper.xml
@@ -1,34 +1,25 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.lf.server.mapper.data.DirMapper">
- <resultMap id="resultMap" type="com.lf.server.entity.data.DirEntity">
- <id property="id" column="id"></id>
- <result property="orderNum" column="order_num"></result>
- <result property="createUser" column="create_user"></result>
- <result property="createTime" column="create_time"></result>
- <result property="updateUser" column="update_user"></result>
- <result property="updateTime" column="update_time"></result>
- </resultMap>
-
- <select id="selectDir" resultMap="resultMap" resultType="com.lf.server.entity.data.DirEntity">
- select * from lf.sys_dir where id = #{id}
+ <select id="selectDir" resultType="com.lf.server.entity.data.DirEntity">
+ select a.*, fn_rec_query(a.id, 'dir') fullName from lf.sys_dir a where id = #{id}
</select>
- <select id="selectDirAll" resultMap="resultMap" resultType="com.lf.server.entity.data.DirEntity">
- select * from lf.sys_dir order by order_num;
+ <select id="selectDirAll" resultType="com.lf.server.entity.data.DirEntity">
+ select a.*, fn_rec_query(a.id, 'dir') fullName from lf.sys_dir a order by order_num;
</select>
<select id="selectDirRoot" resultType="com.lf.server.entity.data.DirEntity">
- select * from lf.sys_dir where pid=0 order by order_num;
+ select a.*, fn_rec_query(a.id, 'dir') fullName from lf.sys_dir a where pid=0 order by order_num;
</select>
- <select id="selectDirRecursive" resultMap="resultMap" resultType="com.lf.server.entity.data.DirEntity">
+ <select id="selectDirRecursive" resultType="com.lf.server.entity.data.DirEntity">
with recursive rs as(
- select * from lf.sys_dir where name=#{name}
+ select a.*, fn_rec_query(a.id, 'dir') fullName from lf.sys_dir a where name = #{name}
union
- select a.* from lf.sys_dir a, rs b where a.pid=b.id
+ select b.*, fn_rec_query(b.id, 'dir') fullName from lf.sys_dir b, rs c where b.pid = c.id
)
- select * FROM rs order by order_num;
+ select * from rs order by order_num;
</select>
<insert id="insertDir" parameterType="com.lf.server.entity.data.DirEntity">
diff --git a/src/main/resources/mapper/data/UploadMapper.xml b/src/main/resources/mapper/data/UploadMapper.xml
index 2fa130d..93b7776 100644
--- a/src/main/resources/mapper/data/UploadMapper.xml
+++ b/src/main/resources/mapper/data/UploadMapper.xml
@@ -12,6 +12,10 @@
order by id
</select>
+ <select id="selectCount4Coord" resultType="java.lang.Integer">
+ select count(*) from lf.sys_coord where epsgcode = #{epsgCode}
+ </select>
+
<select id="selectProject" resultType="com.lf.server.entity.data.DirEntity">
select * from lf.sys_dir where pid = 0 and id > 1
</select>
--
Gitblit v1.9.3