From 2bfc1f7d89030434546832de57b31fec6943702e Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 19 十一月 2022 15:10:59 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/mapper/data/DirMapper.java | 9 +++
src/main/java/com/lf/server/mapper/data/VerMapper.java | 8 ++
data/db_fn.sql | 11 +++
data/db_tab.sql | 8 +-
src/main/java/com/lf/server/controller/sys/DepController.java | 4
src/main/java/com/lf/server/service/data/VerService.java | 5 +
src/main/resources/mapper/data/VerMapper.xml | 13 ++-
src/main/java/com/lf/server/controller/data/DataUploadController.java | 67 ++++++++++++++++++++++
8 files changed, 114 insertions(+), 11 deletions(-)
diff --git a/data/db_fn.sql b/data/db_fn.sql
index fcdcf8b..2d2dfb5 100644
--- a/data/db_fn.sql
+++ b/data/db_fn.sql
@@ -290,6 +290,17 @@
select distinct ns,tab,fn_get_entity(tab) entity,tab_desc,tabletype from lf.sys_dict order by tab;
select Distinct ns,tab,tab_desc from lf.sys_dict
+select * from lf.sys_meta;
+select * from lf.sys_meta_file;
+delete from lf.sys_meta;
+delete from lf.sys_meta_file;
+select * from lf.sys_ver order by id;
+
+
+
+
+
+
diff --git a/data/db_tab.sql b/data/db_tab.sql
index 27896bf..39af894 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -82,8 +82,9 @@
comment on column lf.sys_dep.update_user is '鏇存柊浜篒D';
comment on column lf.sys_dep.update_time is '鏇存柊鏃堕棿';
comment on column lf.sys_dep.bak is '澶囨敞';
---alter sequence lf.sys_dep_id_seq restart with 45;
---alter table lf.sys_dep rename short to sname; alter table lf.sys_dep alter column bak type varchar(1024);
+-- alter sequence lf.sys_dep_id_seq restart with 45;
+-- alter table lf.sys_dep rename short to sname; alter table lf.sys_dep alter column bak type varchar(1024);
+-- update lf.sys_dep set name='涓浗xxx宸ョ▼鏈夐檺鍏徃' where name='涓浗鐭虫补澶╃劧姘旂閬撳伐绋嬫湁闄愬叕鍙�';
select * from lf.sys_dep order by id;
----------------------------------------------------------------------------------------------------- 3.鐩綍琛�
@@ -668,9 +669,10 @@
comment on column lf.sys_ver.create_time is '鍒涘缓鏃堕棿';
comment on column lf.sys_ver.update_user is '鏇存柊浜篒D';
comment on column lf.sys_ver.update_time is '鏇存柊鏃堕棿';
+insert into lf.sys_ver (id,dirid,name) values (0,0,'榛樿');
--insert into lf.sys_ver (dirid,name) values (1003,'2020-02-01');
-select * from lf.sys_ver;
+select * from lf.sys_ver order by id;
----------------------------------------------------------------------------------------------------- 20.鏁版嵁瀛楀吀琛�
-- DROP TABLE IF EXISTS lf.sys_dict;
create table lf.sys_dict(
diff --git a/src/main/java/com/lf/server/controller/data/DataUploadController.java b/src/main/java/com/lf/server/controller/data/DataUploadController.java
index 6c662b2..a2a10c5 100644
--- a/src/main/java/com/lf/server/controller/data/DataUploadController.java
+++ b/src/main/java/com/lf/server/controller/data/DataUploadController.java
@@ -4,12 +4,18 @@
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
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.data.VerEntity;
+import com.lf.server.entity.sys.DepEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
import com.lf.server.service.data.DataUploadService;
+import com.lf.server.service.data.DirService;
+import com.lf.server.service.data.VerService;
+import com.lf.server.service.sys.DepService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -20,6 +26,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -32,13 +39,71 @@
@RequestMapping("/dataUpload")
public class DataUploadController extends BaseController {
@Autowired
+ DepService depService;
+
+ @Autowired
+ DirService dirService;
+
+ @Autowired
+ VerService verService;
+
+ @Autowired
TokenService tokenService;
@Autowired
DataUploadService dataUploadService;
@SysLog()
- @ApiOperation(value = "鏌ヨ鐩綍")
+ @ApiOperation(value = "鏌ヨ鎵�鏈夊崟浣�")
+ @GetMapping(value = "/selectDepAll")
+ public ResponseMsg<List<DepEntity>> selectDepAll() {
+ try {
+ List<DepEntity> list = depService.selectDepAll();
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鎵�鏈夌洰褰�")
+ @GetMapping(value = "/selectDirAll")
+ public ResponseMsg<List<DirEntity>> selectDirAll() {
+ try {
+ List<DirEntity> list = dirService.selectDirAll();
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁鐩綍ID鏌ヨ鐗堟湰鍒楄〃")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query")
+ })
+ @GetMapping(value = "/selectVerByDirid")
+ public ResponseMsg<List<VerEntity>> selectVerByDirid(Integer dirid) {
+ try {
+ if (null == dirid || dirid < 0) {
+ dirid = 0;
+ }
+
+ List<VerEntity> list = verService.selectByDirid(dirid);
+ if (null == list || list.isEmpty()) {
+ list = verService.selectByDirid(0);
+ }
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ璺緞")
@GetMapping(value = "/selectPath")
public ResponseMsg<String> selectPath() {
try {
diff --git a/src/main/java/com/lf/server/controller/sys/DepController.java b/src/main/java/com/lf/server/controller/sys/DepController.java
index 68a77e5..9edf95f 100644
--- a/src/main/java/com/lf/server/controller/sys/DepController.java
+++ b/src/main/java/com/lf/server/controller/sys/DepController.java
@@ -189,13 +189,13 @@
@SysLog()
@ApiOperation(value = "閫掑綊鏌ヨ")
@ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "鍗曚綅鍚嶇О", dataType = "String", paramType = "query", required = false, example = "涓浗鐭虫补澶╃劧姘旂閬撳伐绋嬫湁闄愬叕鍙�")
+ @ApiImplicitParam(name = "name", value = "鍗曚綅鍚嶇О", dataType = "String", paramType = "query", required = false, example = "涓浗xxx宸ョ▼鏈夐檺鍏徃")
})
@GetMapping(value = "/selectDepRecursive")
public ResponseMsg<List<DepEntity>> selectDepRecursive(String name) {
try {
if (StringHelper.isEmpty(name)) {
- name = "涓浗鐭虫补澶╃劧姘旂閬撳伐绋嬫湁闄愬叕鍙�";
+ name = "涓浗xxx宸ョ▼鏈夐檺鍏徃";
}
List<DepEntity> list = depService.selectDepRecursive(name);
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 cea6647..c1f986a 100644
--- a/src/main/java/com/lf/server/mapper/data/DirMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/DirMapper.java
@@ -17,6 +17,7 @@
public interface DirMapper {
/**
* 鎻掑叆涓�鏉�
+ *
* @param dirEntity
* @return
*/
@@ -24,6 +25,7 @@
/**
* 鎻掑叆澶氭潯
+ *
* @param list
* @return
*/
@@ -31,6 +33,7 @@
/**
* 鍒犻櫎涓�鏉�
+ *
* @param id
* @return
*/
@@ -38,6 +41,7 @@
/**
* 鍒犻櫎澶氭潯
+ *
* @param ids
* @return
*/
@@ -45,6 +49,7 @@
/**
* 鏇存柊涓�鏉�
+ *
* @param dirEntity
* @return
*/
@@ -52,6 +57,7 @@
/**
* 鏇存柊澶氭潯
+ *
* @param list
* @return
*/
@@ -59,6 +65,7 @@
/**
* 鏌ヨ鍗曟潯鏁版嵁
+ *
* @param id
* @return
*/
@@ -66,12 +73,14 @@
/**
* 鏌ヨ澶氭潯鏁版嵁
+ *
* @return
*/
public List<DirEntity> selectDirAll();
/**
* 閫掑綊鏌ヨ
+ *
* @param name
* @return
*/
diff --git a/src/main/java/com/lf/server/mapper/data/VerMapper.java b/src/main/java/com/lf/server/mapper/data/VerMapper.java
index 0b0cd15..52e8a39 100644
--- a/src/main/java/com/lf/server/mapper/data/VerMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/VerMapper.java
@@ -35,6 +35,14 @@
public List<VerEntity> selectByPage(String name, String depName, Integer limit, Integer offset);
/**
+ * 鏍规嵁鐩綍ID鏌ヨ鐗堟湰鍒楄〃
+ *
+ * @param dirid
+ * @return
+ */
+ public List<VerEntity> selectByDirid(Integer dirid);
+
+ /**
* 鎻掑叆涓�鏉�
*
* @param verEntity
diff --git a/src/main/java/com/lf/server/service/data/VerService.java b/src/main/java/com/lf/server/service/data/VerService.java
index c791afa..3ff8484 100644
--- a/src/main/java/com/lf/server/service/data/VerService.java
+++ b/src/main/java/com/lf/server/service/data/VerService.java
@@ -28,6 +28,11 @@
}
@Override
+ public List<VerEntity> selectByDirid(Integer dirid) {
+ return verMapper.selectByDirid(dirid);
+ }
+
+ @Override
public Integer insertVersion(VerEntity verEntity) {
return verMapper.insertVersion(verEntity);
}
diff --git a/src/main/resources/mapper/data/VerMapper.xml b/src/main/resources/mapper/data/VerMapper.xml
index 0c87772..94f2eef 100644
--- a/src/main/resources/mapper/data/VerMapper.xml
+++ b/src/main/resources/mapper/data/VerMapper.xml
@@ -37,7 +37,6 @@
limit #{limit} offset #{offset}
</select>
-
<select id="selectVersionAll" resultType="com.lf.server.entity.data.VerEntity">
select * from lf.sys_ver order by id;
</select>
@@ -46,14 +45,18 @@
select * from lf.sys_ver where id = #{id}
</select>
- <insert id="insertVersion" parameterType="com.lf.server.entity.data.VerEntity">
+ <select id="selectByDirid" resultType="com.lf.server.entity.data.VerEntity">
+ select * from lf.sys_ver where dirid = #{dirid}
+ </select>
+
+ <insert id="insertVersion" parameterType="com.lf.server.entity.data.VerEntity">
insert into lf.sys_ver
(dirid,name,descr,create_user,create_time)
values
(#{dirid},#{name},#{descr},#{createUser},now());
</insert>
- <insert id="insertVersions" >
+ <insert id="insertVersions">
insert into lf.sys_ver
(dirid,name,descr,create_user,create_time)
values
@@ -62,11 +65,11 @@
</foreach>
</insert>
- <delete id="deleteVersion" >
+ <delete id="deleteVersion">
delete from lf.sys_ver where id = #{id}
</delete>
- <delete id="deleteVersions" >
+ <delete id="deleteVersions">
delete from lf.sys_ver where id in
<foreach item="id" collection="ids" index="index" open="(" separator="," close=")">
#{id}
--
Gitblit v1.9.3