From 74472c9d22dddcb41383794caf0011043b20f817 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期二, 31 三月 2020 13:25:47 +0800
Subject: [PATCH] fix 数据权限
---
src/main/java/com/highdatas/mdm/controller/ActivitiController.java | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/ActivitiController.java b/src/main/java/com/highdatas/mdm/controller/ActivitiController.java
index 81bf095..511b300 100644
--- a/src/main/java/com/highdatas/mdm/controller/ActivitiController.java
+++ b/src/main/java/com/highdatas/mdm/controller/ActivitiController.java
@@ -18,13 +18,15 @@
import org.activiti.engine.task.Task;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import java.io.*;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.*;
import java.util.stream.Collectors;
@@ -71,8 +73,7 @@
@Autowired
IMaintainFieldService maintainFieldService;
- @Value("${img.url}")
- String basePath;
+
@RequestMapping(value = "/list", method = RequestMethod.GET)
public Result<List<Map<String, Object>>> list(HttpServletRequest request) throws FileNotFoundException {
@@ -90,16 +91,14 @@
}
@RequestMapping(value = "/img/{modelId}", method = RequestMethod.GET)
public void image(@PathVariable String modelId, HttpServletResponse response) {
- String filePath = basePath + modelId +"/"+ modelId + ".png";
- File file = new File(filePath);
- FileInputStream fileInputStream = null;
+ InputStream is = repositoryService.getModelImg(modelId);
+
response.setHeader("Content-Type", "image/png");
try{
- fileInputStream = new FileInputStream(file);
OutputStream outputStream = response.getOutputStream();
byte[] b = new byte[1024];
int len;
- while ((len = fileInputStream.read(b, 0, 1024)) != -1) {
+ while ((len = is.read(b, 0, 1024)) != -1) {
outputStream.write(b, 0, len);
}
}
@@ -107,9 +106,9 @@
e.printStackTrace();
}
finally {
- if (fileInputStream != null) {
+ if (is != null) {
try {
- fileInputStream.close();
+ is.close();
} catch (IOException e) {
e.printStackTrace();
}
@@ -314,6 +313,7 @@
return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
}
HttpSession session = request.getSession();
+ //todo 鍒ゆ柇褰撳墠task鏄惁鏄綋鍓嶄汉鑳藉鎵圭殑
taskService.setSession(session);
ActivitiStatus status = flows.getStatus();
@@ -383,5 +383,33 @@
}
}
+ @RequestMapping(value = "/addActUser")
+ public Result addActUser(@RequestParam String userId){
+ return identityService.addUser(userId);
+ }
+
+ @RequestMapping(value = "/addActRole")
+ public Result addActRole(@RequestParam String roleId){
+ return identityService.addRole(roleId);
+ }
+
+ @RequestMapping(value = "/addActUserRole")
+ public Result addActUserRole(@RequestParam String roleId, @RequestParam String userId){
+ return identityService.addUserRole(roleId,userId);
+ }
+ @RequestMapping(value = "/deleteActUserRole")
+ public Result deleteActUserRole(@RequestParam String roleId, @RequestParam String userId){
+ return identityService.deleteUserRole(roleId,userId);
+ }
+
+ @RequestMapping(value = "/deleteActRole")
+ public Result deleteActRole(@RequestParam String roleId){
+ return identityService.deleteRole(roleId);
+ }
+
+ @RequestMapping(value = "/deleteActUser")
+ public Result deleteActUser(@RequestParam String userId){
+ return identityService.deleteUser(userId);
+ }
}
--
Gitblit v1.8.0