From b07cdf03ec1754aefa231b3199171e0b11bc99f8 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 18 二月 2023 12:25:21 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/sys/TokenService.java | 4 ++++
src/main/java/com/lf/server/controller/data/ProjectController.java | 12 ++++++------
src/main/java/com/lf/server/mapper/data/DirMapper.java | 7 +++++++
src/main/resources/mapper/data/DirMapper.xml | 4 ++++
src/main/java/com/lf/server/controller/all/FmeItController.java | 13 +++++++++++++
data/db_fn.sql | 2 ++
data/db_tab.sql | 2 +-
src/main/java/com/lf/server/service/data/DirService.java | 5 +++++
8 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/data/db_fn.sql b/data/db_fn.sql
index 80e8faf..4a3a54f 100644
--- a/data/db_fn.sql
+++ b/data/db_fn.sql
@@ -341,6 +341,8 @@
select * from lf.sys_dir where pid = 0 order by id;
/*insert into lf.sys_dir (pid,name,level,order_num) values (0,'鏂扮洰褰�',1,6);
delete from lf.sys_dir where pid = 0 and id > 309;*/
+
+
----------------------------------------------------------------------------------------------------- 16.璺緞鍒嗘瀽
-- 鍒犻櫎宸插瓨鍦ㄧ殑鍑芥暟
-- drop function pgr_fromAtoB(varchar, double precision, double precision, double precision, double precision);
diff --git a/data/db_tab.sql b/data/db_tab.sql
index 5eaa9e0..c5d46d5 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -780,7 +780,7 @@
comment on table lf.sys_download is '涓嬭浇璁板綍琛�';
comment on column lf.sys_download.id is '涓婚敭ID';
comment on column lf.sys_download.name is '鍚嶇О';
-comment on column lf.sys_download.type is '绫诲瀷锛�1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡';
+comment on column lf.sys_download.type is '绫诲瀷锛�1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-婧愭暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡';
comment on column lf.sys_download.depid is '鍗曚綅ID';
comment on column lf.sys_download.sizes is '鏂囦欢澶у皬锛氬崟浣峂B';
comment on column lf.sys_download.dcount is '涓嬭浇娆℃暟';
diff --git a/src/main/java/com/lf/server/controller/all/FmeItController.java b/src/main/java/com/lf/server/controller/all/FmeItController.java
index 47f7edb..f0f054e 100644
--- a/src/main/java/com/lf/server/controller/all/FmeItController.java
+++ b/src/main/java/com/lf/server/controller/all/FmeItController.java
@@ -258,4 +258,17 @@
return fail(ex.getMessage(), null);
}
}
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ椤圭洰")
+ @GetMapping(value = "/selectProject")
+ public ResponseMsg<List<DirEntity>> selectProject() {
+ try {
+ List<DirEntity> list = dirService.selectProject();
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
}
diff --git a/src/main/java/com/lf/server/controller/data/ProjectController.java b/src/main/java/com/lf/server/controller/data/ProjectController.java
index 28e8fe7..4528200 100644
--- a/src/main/java/com/lf/server/controller/data/ProjectController.java
+++ b/src/main/java/com/lf/server/controller/data/ProjectController.java
@@ -66,11 +66,11 @@
}
@SysLog()
- @ApiOperation(value = "鏌ヨ鏍圭洰褰�")
- @GetMapping(value = "/selectDirRoot")
- public ResponseMsg<List<DirEntity>> selectDirRoot() {
+ @ApiOperation(value = "鏌ヨ椤圭洰")
+ @GetMapping(value = "/selectProject")
+ public ResponseMsg<List<DirEntity>> selectProject() {
try {
- List<DirEntity> list = dirService.selectDirRoot();
+ List<DirEntity> list = dirService.selectProject();
return success(list);
} catch (Exception ex) {
@@ -81,12 +81,12 @@
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
- @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "String", paramType = "query", example = "1"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<Object> selectByPageAndCount(Integer dirid, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<Object> selectByPageAndCount(String dirid, Integer pageSize, Integer pageIndex) {
try {
QueryWrapper<BsprojectEntity> wrapper = new QueryWrapper<>();
wrapper.select("ST_AsText(geom) as geom, *");
diff --git a/src/main/java/com/lf/server/mapper/data/DirMapper.java b/src/main/java/com/lf/server/mapper/data/DirMapper.java
index 628f8ac..255e6d5 100644
--- a/src/main/java/com/lf/server/mapper/data/DirMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/DirMapper.java
@@ -86,6 +86,13 @@
public List<DirEntity> selectDirRoot();
/**
+ * 鏌ヨ椤圭洰
+ *
+ * @return
+ */
+ public List<DirEntity> selectProject();
+
+ /**
* 閫掑綊鏌ヨ
*
* @param name
diff --git a/src/main/java/com/lf/server/service/data/DirService.java b/src/main/java/com/lf/server/service/data/DirService.java
index 3f3a08d..37686af 100644
--- a/src/main/java/com/lf/server/service/data/DirService.java
+++ b/src/main/java/com/lf/server/service/data/DirService.java
@@ -64,6 +64,11 @@
}
@Override
+ public List<DirEntity> selectProject() {
+ return dirMapper.selectProject();
+ }
+
+ @Override
public List<DirEntity> selectDirRecursive(String name) {
return dirMapper.selectDirRecursive(name);
}
diff --git a/src/main/java/com/lf/server/service/sys/TokenService.java b/src/main/java/com/lf/server/service/sys/TokenService.java
index a1e2dee..2763157 100644
--- a/src/main/java/com/lf/server/service/sys/TokenService.java
+++ b/src/main/java/com/lf/server/service/sys/TokenService.java
@@ -40,11 +40,15 @@
@Override
public Integer selectCount(String name, Integer type) {
+ name = StringHelper.getLikeStr(name);
+
return tokenMapper.selectCount(name, type);
}
@Override
public List<TokenEntity> selectByPage(String name, Integer type, Integer limit, Integer offset) {
+ name = StringHelper.getLikeStr(name);
+
return tokenMapper.selectByPage(name, type, limit, offset);
}
diff --git a/src/main/resources/mapper/data/DirMapper.xml b/src/main/resources/mapper/data/DirMapper.xml
index c06654b..5de7d96 100644
--- a/src/main/resources/mapper/data/DirMapper.xml
+++ b/src/main/resources/mapper/data/DirMapper.xml
@@ -13,6 +13,10 @@
select a.*, fn_get_fullname(a.code, 2) fullName from lf.sys_dir a where pid = 0 order by order_num;
</select>
+ <select id="selectProject" resultType="com.lf.server.entity.data.DirEntity">
+ select a.*, fn_get_fullname(a.code, 2) fullName from lf.sys_dir a where pid = 0 and id > 1 order by order_num;
+ </select>
+
<select id="selectDirRecursive" resultType="com.lf.server.entity.data.DirEntity">
with recursive rs as(
select a.*, fn_get_fullname(a.code, 2) fullName from lf.sys_dir a where name = #{name}
--
Gitblit v1.9.3