From a15f3a58184db586d4442fc51a545093dfc34a9f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 01 二月 2023 15:00:25 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/data/DirMapper.xml | 2 +-
src/main/java/com/lf/server/service/all/BaseQueryService.java | 7 ++++++-
src/main/resources/mapper/all/BaseQueryMapper.xml | 4 ++++
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 31 +++++++++++++++++++++++++++++++
src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java | 8 ++++++++
5 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/all/BaseQueryController.java b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
index acf4298..73025d7 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -10,6 +10,7 @@
import com.lf.server.entity.ctrl.IdNameEntity;
import com.lf.server.entity.ctrl.TabEntity;
import com.lf.server.entity.data.DictEntity;
+import com.lf.server.entity.data.DirEntity;
import com.lf.server.entity.data.DomainEntity;
import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.sys.AttachEntity;
@@ -21,6 +22,7 @@
import com.lf.server.mapper.all.GeomBaseMapper;
import com.lf.server.service.all.BaseQueryService;
import com.lf.server.service.data.DownloadService;
+import com.lf.server.service.data.UploadService;
import com.lf.server.service.show.DataLibService;
import com.lf.server.service.sys.AttachService;
import com.lf.server.service.sys.TokenService;
@@ -53,6 +55,9 @@
@Autowired
BaseQueryService baseQueryService;
+
+ @Autowired
+ UploadService uploadService;
@SysLog()
@ApiOperation(value = "鏌ヨ璁板綍鏁�")
@@ -459,4 +464,30 @@
return fail(ex.getMessage(), null);
}
}
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ椤圭洰鍚嶇О")
+ @GetMapping(value = "/selectProject")
+ public ResponseMsg<Object> selectProject() {
+ try {
+ List<DirEntity> list = uploadService.selectProject();
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鍩虹鍦扮悊绫诲埆")
+ @GetMapping(value = "/selectBaseType")
+ public ResponseMsg<Object> selectBaseType() {
+ try {
+ List<DirEntity> list = baseQueryService.selectBaseType();
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java b/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java
index e60be43..c815a24 100644
--- a/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java
+++ b/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java
@@ -4,6 +4,7 @@
import com.lf.server.entity.ctrl.KeyValueEntity;
import com.lf.server.entity.ctrl.TabEntity;
import com.lf.server.entity.data.DictEntity;
+import com.lf.server.entity.data.DirEntity;
import com.lf.server.entity.data.DomainEntity;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@@ -94,4 +95,11 @@
* @return 浣嶇疆
*/
public List<KeyValueEntity> selectLocation(String wkt);
+
+ /**
+ * 鏌ヨ鍩虹鍦扮悊绫诲埆
+ *
+ * @return
+ */
+ public List<DirEntity> selectBaseType();
}
diff --git a/src/main/java/com/lf/server/service/all/BaseQueryService.java b/src/main/java/com/lf/server/service/all/BaseQueryService.java
index 00a0234..c138848 100644
--- a/src/main/java/com/lf/server/service/all/BaseQueryService.java
+++ b/src/main/java/com/lf/server/service/all/BaseQueryService.java
@@ -7,6 +7,7 @@
import com.lf.server.entity.ctrl.KeyValueEntity;
import com.lf.server.entity.ctrl.TabEntity;
import com.lf.server.entity.data.DictEntity;
+import com.lf.server.entity.data.DirEntity;
import com.lf.server.entity.data.DomainEntity;
import com.lf.server.helper.AesHelper;
import com.lf.server.helper.ClassHelper;
@@ -14,7 +15,6 @@
import com.lf.server.mapper.all.BaseQueryMapper;
import com.lf.server.mapper.all.BasicMapper;
import com.lf.server.mapper.all.GeomBaseMapper;
-import io.netty.resolver.AbstractAddressResolver;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -261,4 +261,9 @@
public List<KeyValueEntity> selectLocation(String wkt) {
return baseQueryMapper.selectLocation(wkt);
}
+
+ @Override
+ public List<DirEntity> selectBaseType() {
+ return baseQueryMapper.selectBaseType();
+ }
}
diff --git a/src/main/resources/mapper/all/BaseQueryMapper.xml b/src/main/resources/mapper/all/BaseQueryMapper.xml
index 9aeb57c..4f20409 100644
--- a/src/main/resources/mapper/all/BaseQueryMapper.xml
+++ b/src/main/resources/mapper/all/BaseQueryMapper.xml
@@ -67,4 +67,8 @@
union all
select '鍘�' "key", cname "value" from bs.th_county_area where ST_Intersects(ST_PointFromText(#{wkt}, 4490), geom);
</select>
+
+ <select id="selectBaseType" resultType="com.lf.server.entity.data.DirEntity">
+ select * from lf.sys_dir where pid = 1
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/data/DirMapper.xml b/src/main/resources/mapper/data/DirMapper.xml
index 074165b..f6d40df 100644
--- a/src/main/resources/mapper/data/DirMapper.xml
+++ b/src/main/resources/mapper/data/DirMapper.xml
@@ -10,7 +10,7 @@
</select>
<select id="selectDirRoot" resultType="com.lf.server.entity.data.DirEntity">
- select a.*, fn_rec_query(a.id, 'dir') fullName from lf.sys_dir a 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" resultType="com.lf.server.entity.data.DirEntity">
--
Gitblit v1.9.3