|
|
@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
+import com.fuzamei.constant.Role;
|
|
|
import com.fuzamei.entity.UserDetail;
|
|
|
import com.fuzamei.service.ProjectFileService;
|
|
|
import com.fuzamei.utils.HashXiZhiUtil;
|
|
|
@@ -150,7 +151,7 @@ public class ProjectFileAction {
|
|
|
public Map<String, Object> download(HttpServletRequest request,HttpServletResponse response,@RequestParam("url") String url,@RequestParam("userId") Object id) {
|
|
|
try {
|
|
|
int userId=ValidationUtil.checkAndAssignInt(id);
|
|
|
- projectFileService.checkUserAuthority(userId,"监管机构","省分行托管分中心档案保管岗");//查看用户是否为空及是否有权限下载项目文档文件
|
|
|
+ projectFileService.checkUserAuthority(userId,Role.SUPERVISION_AGENCY,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);//查看用户是否为空及是否有权限下载项目文档文件
|
|
|
String fileName = request.getServletContext().getRealPath("")+url; //SP是系统分隔符
|
|
|
//如果文件不存在直接抛出异常
|
|
|
if(!new File(fileName).exists()){
|
|
|
@@ -198,8 +199,8 @@ public class ProjectFileAction {
|
|
|
try {
|
|
|
Map<String,Object> map = JSON.parseObject(data, Map.class);
|
|
|
int userId = ValidationUtil.checkAndAssignInt(map.get("userId")); //userId只要是一个int类型即可
|
|
|
- projectFileService.checkUserAuthority(userId,"省分行托管分中心档案保管岗"); //该权限只有 【省分行托管分中心档案保管岗】才能操作
|
|
|
- Integer projectId = ValidationUtil.checkAndAssignDefaultInt(map.get("projectId"),0); //默认项目编号为空
|
|
|
+ projectFileService.checkUserAuthority(userId,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC); //该权限只有 【省分行托管分中心档案保管岗】才能操作
|
|
|
+ Integer projectId = ValidationUtil.checkAndAssignDefaultInt(map.get("projectId"),-1); //默认项目编号为-1,就是让你查不到
|
|
|
String projectName=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("projectName")); //默认项目名称为空值
|
|
|
Map<String, Object> mapToClient =new LinkedHashMap<String, Object>();
|
|
|
mapToClient.put("projectId", projectId);
|
|
|
@@ -229,10 +230,14 @@ public class ProjectFileAction {
|
|
|
*/
|
|
|
@RequestMapping(value="/uploadProjetcFile",method=RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
- public Map<String, Object> upload(@RequestParam("file") MultipartFile file,HttpServletRequest request,@RequestParam("projectId") String pId,@RequestParam("projectName") String pName,@RequestParam("userId") Object uId) {
|
|
|
+ public Map<String, Object> upload(@RequestParam("file") MultipartFile file,//================================>>多文件上传？待定TODO
|
|
|
+ @RequestParam("projectId") String pId,
|
|
|
+ @RequestParam("projectName") String pName,
|
|
|
+ @RequestParam("userId") Object uId,
|
|
|
+ HttpServletRequest request) {
|
|
|
try {
|
|
|
int userId=ValidationUtil.checkAndAssignInt(uId);
|
|
|
- UserDetail userDetail = projectFileService.checkUserAuthority(userId,"监管机构","省分行托管分中心档案保管岗");//查看用户是否为空及是否有权限下载项目文档文件
|
|
|
+ UserDetail userDetail = projectFileService.checkUserAuthority(userId,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);//查看用户是否为空及是否有权限下载项目文档文件
|
|
|
String projectId = ValidationUtil.checkBlankAndAssignString(pId); //校验projectId并赋值
|
|
|
String projectName = ValidationUtil.checkBlankAndAssignString(pName); //校验projectName并赋值
|
|
|
String path = request.getServletContext().getRealPath("")+SP+"content"; //SP是系统分隔符,path是存放上传文件的父类文件夹绝对路径
|
|
|
@@ -244,7 +249,7 @@ public class ProjectFileAction {
|
|
|
String pathFile=path+SP+filename; //pathFile是该文件在系统中的绝对路径
|
|
|
File newFile=new File(pathFile);
|
|
|
file.transferTo(newFile); //文件已经上传成功
|
|
|
- String fileHash = HashXiZhiUtil.getMD5Checksum(filename); //文件上传后计算文件的hash值=============>>换hash算法这里直接换掉即可
|
|
|
+ String fileHash = HashXiZhiUtil.getMD5Checksum(filename); //文件上传后计算文件的hash值=============>>换hash算法这里直接换掉即可TODO
|
|
|
Map<String, Object> mapToService =new LinkedHashMap<String, Object>();
|
|
|
mapToService.put("userDetail", userDetail); //将用户的信息传入
|
|
|
mapToService.put("projectId", projectId);
|
