From dfa4fd206b390a3afee9769fe1953b692a1eac9a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 21 十一月 2022 07:35:06 +0800
Subject: [PATCH] 数据检索：添加查询文件、删除文件
---
src/main/java/com/lf/server/mapper/sys/AttachMapper.java | 9 +++
src/main/java/com/lf/server/controller/data/DataQueryController.java | 78 +++++++++++++++++++++++++
src/main/java/com/lf/server/controller/data/StyleController.java | 2
src/main/java/com/lf/server/helper/PathHelper.java | 2
src/main/java/com/lf/server/service/sys/AttachService.java | 5 +
data/db_fn.sql | 2
src/main/java/com/lf/server/service/data/DataQueryService.java | 19 ++++++
src/main/resources/mapper/sys/AttachMapper.xml | 4 +
src/main/java/com/lf/server/service/data/DataLoaderService.java | 2
src/main/java/com/lf/server/controller/sys/ResController.java | 2
10 files changed, 117 insertions(+), 8 deletions(-)
diff --git a/data/db_fn.sql b/data/db_fn.sql
index 8c09b24..3fed0a6 100644
--- a/data/db_fn.sql
+++ b/data/db_fn.sql
@@ -307,7 +307,7 @@
select count(*) from bd.dlg_25w_resa;
select ST_AsText(geom) from bd.dlg_25w_resa limit 1;
-
+select * from lf.sys_attach where tab = 'lf.sys_style' and guid = 'fa25979a5ef8b43ba82a0be35b3fb0d4'
diff --git a/src/main/java/com/lf/server/controller/data/DataQueryController.java b/src/main/java/com/lf/server/controller/data/DataQueryController.java
index 3f5be37..f9f3f00 100644
--- a/src/main/java/com/lf/server/controller/data/DataQueryController.java
+++ b/src/main/java/com/lf/server/controller/data/DataQueryController.java
@@ -1,9 +1,22 @@
package com.lf.server.controller.data;
+import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseQueryController;
+import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.sys.AttachEntity;
+import com.lf.server.helper.StringHelper;
+import com.lf.server.service.data.DataQueryService;
+import com.lf.server.service.sys.AttachService;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* 鏁版嵁妫�绱�
@@ -13,4 +26,65 @@
@RestController
@RequestMapping("/dataQuery")
public class DataQueryController extends BaseQueryController {
+ @Autowired
+ AttachService attachService;
+
+ @Autowired
+ DataQueryService dataQueryService;
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鏂囦欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "tabName", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "lf.sys_style"),
+ @ApiImplicitParam(name = "eventid", value = "涓婚敭", dataType = "String", paramType = "query", example = "fa25979a5ef8b43ba82a0be35b3fb0d4")
+ })
+ @GetMapping(value = "/selectFiles")
+ public ResponseMsg<List<AttachEntity>> selectFiles(String tabName, String eventid) {
+ try {
+ if (StringHelper.isEmpty(tabName) || StringHelper.isEmpty(eventid)) {
+ return fail("鍙傛暟涓嶈兘涓虹┖", null);
+ }
+
+ List<AttachEntity> list = attachService.selectByTab(tabName, eventid);
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鍒犻櫎鏂囦欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "tabName", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "bd.b_pac_frozensoil"),
+ @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1,2")
+ })
+ @GetMapping(value = "/deletes")
+ public ResponseMsg<Integer> deleteFiles(@RequestParam List<Integer> ids) {
+ try {
+ if (ids == null || ids.isEmpty()) {
+ return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
+ }
+
+ int rows = attachService.deletes(ids);
+
+ return success(rows);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), 0);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "涓婁紶鏂囦欢")
+ @ResponseBody
+ @PostMapping(value = "/uploadFiles")
+ public ResponseMsg<Integer> uploadFiles(@RequestParam("file") MultipartFile[] files, HttpServletRequest req) {
+ try {
+ Integer count = dataQueryService.uploadFiles(files, req);
+
+ return success(count);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), 0);
+ }
+ }
}
diff --git a/src/main/java/com/lf/server/controller/data/StyleController.java b/src/main/java/com/lf/server/controller/data/StyleController.java
index d9dfb35..1db909f 100644
--- a/src/main/java/com/lf/server/controller/data/StyleController.java
+++ b/src/main/java/com/lf/server/controller/data/StyleController.java
@@ -38,7 +38,7 @@
@Autowired
UploadAttachService uploadAttachService;
- private final static String TAB_NAME = "sys_style";
+ private final static String TAB_NAME = "lf.sys_style";
@SysLog()
@ApiOperation(value = "鏌ヨ璁板綍鏁�")
diff --git a/src/main/java/com/lf/server/controller/sys/ResController.java b/src/main/java/com/lf/server/controller/sys/ResController.java
index f7a6058..6d858e4 100644
--- a/src/main/java/com/lf/server/controller/sys/ResController.java
+++ b/src/main/java/com/lf/server/controller/sys/ResController.java
@@ -42,7 +42,7 @@
@Autowired
PermsService permsService;
- private final static String TAB_NAME = "sys_res";
+ private final static String TAB_NAME = "lf.sys_res";
@SysLog()
@ApiOperation(value = "鏌ヨ璁板綍鏁�")
diff --git a/src/main/java/com/lf/server/helper/PathHelper.java b/src/main/java/com/lf/server/helper/PathHelper.java
index c22ca9f..4b2d717 100644
--- a/src/main/java/com/lf/server/helper/PathHelper.java
+++ b/src/main/java/com/lf/server/helper/PathHelper.java
@@ -167,7 +167,7 @@
File[] files = file.listFiles();
for (File f : files) {
- if (f.getPath().indexOf(str) > -1) {
+ if (f.getPath().contains(str)) {
continue;
}
diff --git a/src/main/java/com/lf/server/mapper/sys/AttachMapper.java b/src/main/java/com/lf/server/mapper/sys/AttachMapper.java
index e1519a9..cef0a4c 100644
--- a/src/main/java/com/lf/server/mapper/sys/AttachMapper.java
+++ b/src/main/java/com/lf/server/mapper/sys/AttachMapper.java
@@ -55,6 +55,15 @@
public AttachEntity selectByGuid(String guid);
/**
+ * 鏍规嵁琛ㄥ拰GUID鏌ヨ
+ *
+ * @param tab
+ * @param guid
+ * @return
+ */
+ public List<AttachEntity> selectByTab(String tab, String guid);
+
+ /**
* 鎻掑叆涓�鏉�
*
* @param entity
diff --git a/src/main/java/com/lf/server/service/data/DataLoaderService.java b/src/main/java/com/lf/server/service/data/DataLoaderService.java
index 63dfc19..5846fce 100644
--- a/src/main/java/com/lf/server/service/data/DataLoaderService.java
+++ b/src/main/java/com/lf/server/service/data/DataLoaderService.java
@@ -1,6 +1,5 @@
package com.lf.server.service.data;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.lf.server.entity.all.BaseEntity;
import com.lf.server.entity.ctrl.TabMapperEntity;
@@ -17,7 +16,6 @@
import java.io.File;
import java.lang.reflect.Field;
-import java.sql.Timestamp;
import java.util.List;
/**
diff --git a/src/main/java/com/lf/server/service/data/DataQueryService.java b/src/main/java/com/lf/server/service/data/DataQueryService.java
new file mode 100644
index 0000000..fa9fa56
--- /dev/null
+++ b/src/main/java/com/lf/server/service/data/DataQueryService.java
@@ -0,0 +1,19 @@
+package com.lf.server.service.data;
+
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 鏁版嵁妫�绱㈡湇鍔�
+ * @author WWW
+ */
+@Service
+public class DataQueryService {
+ public Integer uploadFiles(MultipartFile[] files, HttpServletRequest req) {
+
+
+ return 0;
+ }
+}
diff --git a/src/main/java/com/lf/server/service/sys/AttachService.java b/src/main/java/com/lf/server/service/sys/AttachService.java
index ea045b0..4115841 100644
--- a/src/main/java/com/lf/server/service/sys/AttachService.java
+++ b/src/main/java/com/lf/server/service/sys/AttachService.java
@@ -47,6 +47,11 @@
}
@Override
+ public List<AttachEntity> selectByTab(String tab, String guid) {
+ return attachMapper.selectByTab(tab, guid);
+ }
+
+ @Override
public Integer insert(AttachEntity entity) {
return attachMapper.insert(entity);
}
diff --git a/src/main/resources/mapper/sys/AttachMapper.xml b/src/main/resources/mapper/sys/AttachMapper.xml
index 6aeea6f..358e358 100644
--- a/src/main/resources/mapper/sys/AttachMapper.xml
+++ b/src/main/resources/mapper/sys/AttachMapper.xml
@@ -33,6 +33,10 @@
select * from lf.sys_attach where guid = #{guid} limit 1
</select>
+ <select id="selectByTab" resultType="com.lf.server.entity.sys.AttachEntity">
+ select * from lf.sys_attach where tab = #{tab} and guid = #{guid}
+ </select>
+
<insert id="insert" parameterType="com.lf.server.entity.sys.AttachEntity">
insert into lf.sys_attach
(name,tab,tab_guid,guid,path,sizes,create_user,create_time)
--
Gitblit v1.9.3