From 5fe2a582e57d9ce35dbfb32c6e1c2227f35268f6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 08 七月 2025 14:23:05 +0800
Subject: [PATCH] 修改资源相关的操作

---
 se-system/src/main/java/com/terra/system/controller/sys/ResController.java |  165 ++++++++++++++++++++++++++----------------------------
 1 files changed, 80 insertions(+), 85 deletions(-)

diff --git a/se-system/src/main/java/com/terra/system/controller/sys/ResController.java b/se-system/src/main/java/com/terra/system/controller/sys/ResController.java
index 27c4e63..957414f 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/ResController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/ResController.java
@@ -5,9 +5,9 @@
 import com.terra.system.entity.all.ResponseMsg;
 import com.terra.system.entity.sys.ResEntity;
 import com.terra.system.entity.sys.UserEntity;
+import com.terra.system.helper.StringHelper;
 import com.terra.system.service.all.PermsService;
 import com.terra.system.service.all.UploadAttachService;
-import com.terra.system.service.data.DownloadService;
 import com.terra.system.service.sys.ResService;
 import com.terra.system.service.sys.TokenService;
 import io.swagger.annotations.Api;
@@ -41,70 +41,35 @@
     PermsService permsService;
 
     @Resource
-    DownloadService downloadService;
-
-    @Resource
     UploadAttachService uploadAttachService;
 
     private final static String TAB_NAME = "lf.sys_res";
 
     @SysLog()
-    @ApiOperation(value = "鏌ヨ璁板綍鏁�")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", required = false, example = "sys_res")
-    })
-    @GetMapping({"/selectCount"})
-    public ResponseMsg<Integer> selectCount(String name) {
-        try {
-            int count = resService.selectCount(name);
-
-            return success(count);
-        } catch (Exception ex) {
-            return fail(ex, -1);
-        }
-    }
-
-    @SysLog()
-    @ApiOperation(value = "鍒嗛〉鏌ヨ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "sys_res"),
-            @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
-            @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
-    })
-    @GetMapping(value = "/selectByPage")
-    public ResponseMsg<List<ResEntity>> selectByPage(String name, Integer pageSize, Integer pageIndex) {
-        try {
-            if (pageSize < 1 || pageIndex < 1) {
-                return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
-            }
-
-            List<ResEntity> rs = resService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
-
-            return success(rs);
-        } catch (Exception ex) {
-            return fail(ex, null);
-        }
-    }
-
-    @SysLog()
     @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "sys_res"),
+            @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
+            @ApiImplicitParam(name = "status", value = "鐘舵��", dataType = "Integer", paramType = "query", example = ""),
+            @ApiImplicitParam(name = "category", value = "鏈嶅姟绫诲埆", dataType = "Integer", paramType = "query", example = ""),
+            @ApiImplicitParam(name = "type", value = "鏈嶅姟绫诲瀷", dataType = "Integer", paramType = "query", example = ""),
+            @ApiImplicitParam(name = "data", value = "鏁版嵁绫诲瀷", dataType = "Integer", paramType = "query", example = ""),
             @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<List<ResEntity>> selectByPageAndCount(String name, Integer pageSize, Integer pageIndex) {
+    public ResponseMsg<List<ResEntity>> selectByPageAndCount(String name, Integer status, Integer category, Integer type, Integer data, Integer pageSize, Integer pageIndex) {
         try {
             if (pageSize < 1 || pageIndex < 1) {
                 return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
             }
 
-            int count = resService.selectCount(name);
+            int count = resService.selectCount(name, status, category, type, data);
             if (count == 0) {
                 return success(0, null);
             }
-            List<ResEntity> rs = resService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
+
+            List<ResEntity> rs = resService.selectByPage(name, status, category, type, data, pageSize, pageSize * (pageIndex - 1));
+
             return success(count, rs);
         } catch (Exception ex) {
             return fail(ex, null);
@@ -139,20 +104,50 @@
     }
 
     @SysLog()
+    @ApiOperation(value = "鏌ヨ鎵�鏈�")
+    @GetMapping(value = "/selectAll")
+    public ResponseMsg<List<ResEntity>> selectAll() {
+        try {
+            List<ResEntity> list = resService.selectAll();
+
+            return success(list);
+        } catch (Exception ex) {
+            return fail(ex, null);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "鏍规嵁ID鏌ヨ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "ID", dataType = "int", paramType = "query", example = "1")
+    })
+    @GetMapping(value = "/selectById")
+    public ResponseMsg<ResEntity> selectById(int id) {
+        try {
+            ResEntity entity = resService.selectById(id);
+
+            return success(entity);
+        } catch (Exception ex) {
+            return fail(ex, null);
+        }
+    }
+
+    @SysLog()
     @ApiOperation(value = "鎻掑叆涓�鏉�")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.terra.system.entity.sys.ResEntity", paramType = "body", example = "")
+            @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "ResEntity", paramType = "body")
     })
-    @PostMapping(value = "/insertRes", produces = "application/json; charset=UTF-8")
-    public ResponseMsg<Integer> insertRes(@RequestBody ResEntity entity, HttpServletRequest req) {
+    @PostMapping(value = "/insert", produces = "application/json; charset=UTF-8")
+    public ResponseMsg<Integer> insert(@RequestBody ResEntity entity, HttpServletRequest req) {
         try {
             UserEntity ue = tokenService.getCurrentUser(req);
             if (ue != null) {
                 entity.setCreateUser(ue.getId());
+                entity.setDepid(ue.getDepcode());
             }
 
             permsService.clearPermsCache();
-            int count = resService.insertRes(entity);
+            int count = resService.insert(entity);
 
             return success(count);
         } catch (Exception ex) {
@@ -163,20 +158,21 @@
     @SysLog()
     @ApiOperation(value = "鎻掑叆澶氭潯")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "List<ResEntity>", paramType = "body", example = "")
+            @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "ResEntity", paramType = "body")
     })
-    @PostMapping(value = "/insertRess", produces = "application/json; charset=UTF-8")
-    public ResponseMsg<Integer> insertRess(@RequestBody List<ResEntity> list, HttpServletRequest req) {
+    @PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8")
+    public ResponseMsg<Integer> inserts(@RequestBody List<ResEntity> list, HttpServletRequest req) {
         try {
             UserEntity ue = tokenService.getCurrentUser(req);
             if (ue != null) {
                 for (ResEntity entity : list) {
                     entity.setCreateUser(ue.getId());
+                    entity.setDepid(ue.getDepcode());
                 }
             }
 
             permsService.clearPermsCache();
-            int count = resService.insertRess(list);
+            int count = resService.inserts(list);
 
             return success(count);
         } catch (Exception ex) {
@@ -189,11 +185,11 @@
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
     })
-    @GetMapping(value = "/deleteRes")
-    public ResponseMsg<Integer> deleteRes(int id) {
+    @GetMapping(value = "/delete")
+    public ResponseMsg<Integer> delete(int id) {
         try {
             permsService.clearPermsCache();
-            int count = resService.deleteRes(id);
+            int count = resService.delete(id);
 
             return success(count);
         } catch (Exception ex) {
@@ -204,17 +200,18 @@
     @SysLog()
     @ApiOperation(value = "鍒犻櫎澶氭潯")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "List<Integer>", paramType = "query", example = "1,2")
+            @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1,2")
     })
-    @GetMapping(value = "/deleteRess")
-    public ResponseMsg<Integer> deleteRess(@RequestParam List<Integer> ids) {
+    @GetMapping(value = "/deletes")
+    public ResponseMsg<Integer> deletes(@RequestParam List<Integer> ids) {
         try {
             if (ids == null || ids.isEmpty()) {
                 return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
             }
 
             permsService.clearPermsCache();
-            int count = resService.deleteRess(ids);
+            String strs = StringHelper.join(ids, ",");
+            int count = resService.deletes(strs);
 
             return success(count);
         } catch (Exception ex) {
@@ -225,19 +222,20 @@
     @SysLog()
     @ApiOperation(value = "鏇存柊涓�鏉�")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "ResEntity", paramType = "body", example = "")
+            @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "ResEntity", paramType = "body")
     })
     @ResponseBody
-    @PostMapping(value = "/updateRes", produces = "application/json; charset=UTF-8")
-    public ResponseMsg<Integer> updateRes(@RequestBody ResEntity entity, HttpServletRequest req) {
+    @PostMapping(value = "/update", produces = "application/json; charset=UTF-8")
+    public ResponseMsg<Integer> update(@RequestBody ResEntity entity, HttpServletRequest req) {
         try {
             UserEntity ue = tokenService.getCurrentUser(req);
             if (ue != null) {
                 entity.setUpdateUser(ue.getId());
+                entity.setDepid(ue.getDepcode());
             }
 
             permsService.clearPermsCache();
-            int count = resService.updateRes(entity);
+            int count = resService.update(entity);
 
             return success(count);
         } catch (Exception ex) {
@@ -246,31 +244,28 @@
     }
 
     @SysLog()
-    @ApiOperation(value = "鏍规嵁ID鏌ヨ")
+    @ApiOperation(value = "鏇存柊澶氭潯")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
+            @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "ResEntity", paramType = "body")
     })
-    @GetMapping(value = "/selectRes")
-    public ResponseMsg<ResEntity> selectRes(int id) {
+    @ResponseBody
+    @PostMapping(value = "/updates", produces = "application/json; charset=UTF-8")
+    public ResponseMsg<Integer> updates(@RequestBody List<ResEntity> list, HttpServletRequest req) {
         try {
-            ResEntity resEntity = resService.selectRes(id);
+            UserEntity ue = tokenService.getCurrentUser(req);
+            if (ue != null) {
+                for (ResEntity entity : list) {
+                    entity.setUpdateUser(ue.getId());
+                    entity.setDepid(ue.getDepcode());
+                }
+            }
 
-            return success(resEntity);
+            permsService.clearPermsCache();
+            int count = resService.updates(list);
+
+            return success(count);
         } catch (Exception ex) {
-            return fail(ex, null);
-        }
-    }
-
-    @SysLog()
-    @ApiOperation(value = "鏌ヨ鎵�鏈�")
-    @GetMapping(value = "/selectResAll")
-    public ResponseMsg<List<ResEntity>> selectResAll() {
-        try {
-            List<ResEntity> list = resService.selectResAll();
-
-            return success(list);
-        } catch (Exception ex) {
-            return fail(ex, null);
+            return fail(ex, -1);
         }
     }
 

--
Gitblit v1.9.3