From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/sys/ResController.java | 165 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 134 insertions(+), 31 deletions(-)
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 1f04d17..fe7ae85 100644
--- a/src/main/java/com/lf/server/controller/sys/ResController.java
+++ b/src/main/java/com/lf/server/controller/sys/ResController.java
@@ -1,17 +1,25 @@
package com.lf.server.controller.sys;
-import com.lf.server.aspect.SysLog;
+import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.sys.ResEntity;
+import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.service.all.PermsService;
+import com.lf.server.service.all.UploadAttachService;
+import com.lf.server.service.data.DownloadService;
import com.lf.server.service.sys.ResService;
+import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
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 javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -22,9 +30,23 @@
@Api(tags = "杩愮淮绠＄悊\\璧勬簮绠＄悊")
@RestController
@RequestMapping("/res")
-public class ResController extends BaseController {
+public class ResController extends BaseController {
@Autowired
ResService resService;
+
+ @Autowired
+ TokenService tokenService;
+
+ @Autowired
+ PermsService permsService;
+
+ @Autowired
+ DownloadService downloadService;
+
+ @Autowired
+ UploadAttachService uploadAttachService;
+
+ private final static String TAB_NAME = "lf.sys_res";
@SysLog()
@ApiOperation(value = "鏌ヨ璁板綍鏁�")
@@ -38,7 +60,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -60,7 +82,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -85,62 +107,104 @@
List<ResEntity> rs = resService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "鎻掑叆瀛楀吀")
+ @ApiOperation(value = "鏍规嵁瑙掕壊鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
- @ApiImplicitParam(name = "resEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.ResEntity", paramType = "body", example = "")
+ @ApiImplicitParam(name = "roleid", value = "瑙掕壊ID", dataType = "Integer", 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 = "/selectByPageForRole")
+ public ResponseMsg<List<ResEntity>> selectByPageForRole(Integer roleid, Integer pageSize, Integer pageIndex) {
+ try {
+ if (pageSize < 1 || pageIndex < 1) {
+ return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
+ }
+
+ int count = resService.selectCountForRole(roleid);
+ if (count == 0) {
+ return success(0, null);
+ }
+
+ List<ResEntity> rs = resService.selectByPageForRole(roleid, pageSize, pageSize * (pageIndex - 1));
+
+ return success(count, rs);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鎻掑叆涓�鏉�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.sys.ResEntity", paramType = "body", example = "")
})
@PostMapping(value = "/insertRes", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> insertRes(@RequestBody ResEntity resEntity) {
+ public ResponseMsg<Integer> insertRes(@RequestBody ResEntity entity, HttpServletRequest req) {
try {
- int count = resService.insertRes(resEntity);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setCreateUser(ue.getId());
+ }
+
+ permsService.clearPermsCache();
+ int count = resService.insertRes(entity);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鎻掑叆澶氭潯瀛楀吀")
+ @ApiOperation(value = "鎻掑叆澶氭潯")
@ApiImplicitParams({
- @ApiImplicitParam(name = "resEntity", value = "瀛楀吀瀹炰綋绫婚泦鍚�", dataType = "List<ResEntity>", paramType = "body", example = "")
+ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "List<ResEntity>", paramType = "body", example = "")
})
@PostMapping(value = "/insertRess", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> insertRess(@RequestBody List<ResEntity> resEntity) {
+ public ResponseMsg<Integer> insertRess(@RequestBody List<ResEntity> list, HttpServletRequest req) {
try {
- int count = resService.insertRess(resEntity);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ for (ResEntity entity : list) {
+ entity.setCreateUser(ue.getId());
+ }
+ }
+
+ permsService.clearPermsCache();
+ int count = resService.insertRess(list);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鍒犻櫎涓�鏉″瓧鍏�")
+ @ApiOperation(value = "鍒犻櫎涓�鏉�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "瀛楀吀ID", dataType = "Integer", paramType = "query", example = "1")
+ @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/deleteRes")
public ResponseMsg<Integer> deleteRes(int id) {
try {
+ permsService.clearPermsCache();
int count = resService.deleteRes(id);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鍒犻櫎澶氭潯瀛楀吀")
+ @ApiOperation(value = "鍒犻櫎澶氭潯")
@ApiImplicitParams({
- @ApiImplicitParam(name = "ids", value = "瀛楀吀ID闆嗗悎", dataType = "List<Integer>", paramType = "query", example = "1,2")
+ @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "List<Integer>", paramType = "query", example = "1,2")
})
@GetMapping(value = "/deleteRess")
public ResponseMsg<Integer> deleteRess(@RequestParam List<Integer> ids) {
@@ -148,34 +212,43 @@
if (ids == null || ids.isEmpty()) {
return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
}
+
+ permsService.clearPermsCache();
int count = resService.deleteRess(ids);
+
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鏇存柊涓�鏉″瓧鍏�")
+ @ApiOperation(value = "鏇存柊涓�鏉�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "resEntity", value = "瀛楀吀ID闆嗗悎", dataType = "ResEntity", paramType = "body", example = "")
+ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "ResEntity", paramType = "body", example = "")
})
@ResponseBody
@PostMapping(value = "/updateRes", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> updateRes(@RequestBody ResEntity resEntity) {
+ public ResponseMsg<Integer> updateRes(@RequestBody ResEntity entity, HttpServletRequest req) {
try {
- int count = resService.updateRes(resEntity);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setUpdateUser(ue.getId());
+ }
+
+ permsService.clearPermsCache();
+ int count = resService.updateRes(entity);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鏍规嵁ID鏌ヨ瀛楀吀")
+ @ApiOperation(value = "鏍规嵁ID鏌ヨ")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "瀛楀吀ID", dataType = "Integer", paramType = "query", example = "1")
+ @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectRes")
public ResponseMsg<ResEntity> selectRes(int id) {
@@ -184,12 +257,12 @@
return success(resEntity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "鏌ヨ鎵�鏈夊瓧鍏�")
+ @ApiOperation(value = "鏌ヨ鎵�鏈�")
@GetMapping(value = "/selectResAll")
public ResponseMsg<List<ResEntity>> selectResAll() {
try {
@@ -197,7 +270,37 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
+
+ @SysLog()
+ @ApiOperation(value = "涓婁紶鏂囦欢")
+ @ResponseBody
+ @PostMapping(value = "/upload")
+ public ResponseMsg<String> upload(@RequestParam("file") MultipartFile file, HttpServletRequest req) {
+ UserEntity ue = tokenService.getCurrentUser(req);
+
+ return uploadAttachService.upload(ue, TAB_NAME, file, this);
+ }
+
+ @SysLog()
+ @ApiOperation(value = "涓嬭浇鏂囦欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "guid", value = "闄勪欢Guid", dataType = "String", paramType = "body")
+ })
+ @GetMapping(value = "/download")
+ public void download(String guid, HttpServletResponse res) {
+ uploadAttachService.download(guid, false, res);
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ョ湅鏂囦欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "guid", value = "闄勪欢Guid", dataType = "String", paramType = "body")
+ })
+ @GetMapping(value = "/downloadForView")
+ public void downloadForView(String guid, HttpServletResponse res) {
+ uploadAttachService.download(guid, true, res);
+ }
}
--
Gitblit v1.9.3