new

ccb_fund_trusteeship/src/main/java/com/fuzamei/service/OperationHistoryService.java

@@ -18,37 +18,25 @@ public class OperationHistoryService {
 	@Autowired
 	private OperationHistoryDao operationHistoryDao;
 
-	@Autowired
-	private UserAuthoricationDao userAuthoricationDao;
-
 	/**
 	* @Title: queryOperationHistoryInformation
-	* @Description: TODO(根据用户的id号查询操作记录，但是现在只做了风管岗可以查看所有的信息，)
-	* @param @param map
-	* @param @return    设定文件
-	* @return PageDTO    返回类型
+	* @Description: TODO(根据用户的id号查询操作记录，风管岗可以查看所有的信息，)
 	* @author ylx
 	* @date 2017年12月27日 下午3:02:42
-	* @throws
 	 */
 	public PageDTO queryOperationHistoryInformation(Map<String, Object> map) {
 		PageDTO pageDto = new PageDTO(); // 创建分页对象
 		//定义一个查询信息的list
 		List<OperationHistory> informationList=null;
-		int userId = (Integer) map.get("userId");
-		UserDetail userDetail=userAuthoricationDao.queryUserDetailInformation(userId);
-		if(userDetail==null){
-			throw new RuntimeException("用户信息不存在");
-		}
+		UserDetail userDetail=(UserDetail) map.get("userDetail");
 		List<String> roleList = userDetail.getRole_name();
 		if(roleList.contains(Role.VENTURE_MANAGEMENT_POS)){		//判断是否是风管岗位
-			// 去dao层取分页的数据,因为是风管岗位，可以查看所有人的操作记录
+			//风管岗可以查看所有人的操作记录
 			informationList = operationHistoryDao.queryOperationHistoryInformation(map); 
 		}else{
 			//根据用户id号查询出用户的账号account信息
-			//这里还有上下级关系查看的问题还没解决============================================================>>>>>>待定TODO
+			//这里还有上下级关系查看的问题还没解决============================================================>>待定TODO
 			String account = userDetail.getAccount();
-			System.out.println(account);
 			if(StringUtil.isEmpty(account)){
 				throw new RuntimeException("用户账号信息不存在");
 			}

ccb_fund_trusteeship/src/main/java/com/fuzamei/service/ProjectFileService.java

@@ -21,9 +21,6 @@ public class ProjectFileService {
 	@Autowired
 	private ProjectFileDao projectFileDao;
 	
-	@Autowired
-	private UserAuthoricationService userAuthoricationService;
-
 	@Autowired
 	private AttachmentService attachmentService;
 	/**
@@ -39,9 +36,6 @@ public class ProjectFileService {
 	 */
 	public PageDTO queryProjectFileInformation(Map<String, Object> map) {
 		PageDTO pageDto = new PageDTO(); // 创建分页对象
-		int userId = (Integer) map.get("userId");
-//		userAuthoricationService.checkUserAuthority(userId,Role.SUPERVISION_AGENCY,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);		//查看用户非空和权限
-		userAuthoricationService.checkUserAuthority(userId);//所有人都能看
 		List<ProjectFile> informationList = projectFileDao.queryProjectFileInformation(map);
 		int count = projectFileDao.findAllInformation(map);
 		pageDto.setRows(informationList);
@@ -62,9 +56,9 @@ public class ProjectFileService {
 	* @throws
 	 */
 	public Map<String, Object> checkoutProjectFiles(Map<String, Object> map) {
-		int userId = (Integer) map.get("userId");
+//		int userId = (Integer) map.get("userId");
 //		userAuthoricationService.checkUserAuthority(userId,Role.SUPERVISION_AGENCY,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);	//查看用户非空和权限
-		userAuthoricationService.checkUserAuthority(userId);	//所有人都能下载
+//		userAuthoricationService.checkUserAuthority(userId);	//所有人都能下载
 		List<ProjectFile> informationList = projectFileDao.checkoutProjectFiles(map);	//将项目id和项目名称封装成map到dao层去获取数据
 		Map<String, Object> mapBackToController = new LinkedHashMap<String, Object>();
 		mapBackToController.put("projectId", map.get("projectId"));		//展示给前端的项目id号码

ccb_fund_trusteeship/src/main/java/com/fuzamei/utils/AbsolutePathUtil.java

@@ -0,0 +1,27 @@
+package com.fuzamei.utils;
+
+import java.io.File;
+
+import javax.servlet.http.HttpServletRequest;
+
+public final class AbsolutePathUtil {
+	
+	private static final String SP = File.separator;
+	
+	private AbsolutePathUtil() {
+		throw new AssertionError("instaniation is not permitted");
+	}
+	
+	/**
+	* @Description: TODO(返回当前操作系统的用户路径下的绝对路径)
+	* @param @return    设定文件
+	* @return String    返回类型
+	* @author ylx
+	* @date 2018年1月10日 下午3:05:53
+	 */
+	public static final String getAbsolutePath(HttpServletRequest request){
+		String path = System.getProperty("user.home")+SP+"content";
+		return path;
+	}
+
+}

ccb_fund_trusteeship/src/main/java/com/fuzamei/utils/CalculateFileHashUtil.java

@@ -0,0 +1,36 @@
+package com.fuzamei.utils;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.springframework.web.multipart.MultipartFile;
+
+public final class CalculateFileHashUtil {
+	private CalculateFileHashUtil() {
+		throw new AssertionError("instaniation is not permitted");
+	}
+	
+	/**
+	* @Description: TODO(通过产生临时文件的形式计算hash值)
+	* @param @param file
+	* @param @return    设定文件
+	* @return String    返回类型
+	* @author ylx
+	* @date 2018年1月10日 下午4:05:07
+	 */
+	public static final String calculateHash(MultipartFile file) {
+		File tempFile=null;
+		try {
+			tempFile = File.createTempFile(String.valueOf(System.currentTimeMillis()),"");
+			file.transferTo(tempFile);
+			String hash = HashXiZhiUtil.getMD5Checksum(tempFile);
+			return hash;
+		} catch (Exception e) {
+			throw new RuntimeException("文件计算hash值出现异常");
+		}finally{
+			if(tempFile!=null){
+				tempFile.delete();
+			}
+		}
+	}
+}

ccb_fund_trusteeship/src/main/java/com/fuzamei/utils/HashXiZhiUtil.java

@@ -1,5 +1,6 @@
 package com.fuzamei.utils;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.security.MessageDigest;
@@ -7,65 +8,80 @@ import java.security.MessageDigest;
 public class HashXiZhiUtil {
 
 	public static byte[] getMd5(String input) {
-        try {
-            byte[] by = input.getBytes("UTF-8");
-            MessageDigest det = MessageDigest.getInstance("SHA");
-            return det.digest(by);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-	public static String bytesToHexString(byte[] src){
-        StringBuilder stringBuilder = new StringBuilder("");
-        if (src == null || src.length <= 0) {
-            return null;
-        }
-        for (int i = 0; i < src.length; i++) {
-            int v = src[i] & 0xFF;
-            String hv = Integer.toHexString(v);
-            if (hv.length() < 2) {
-                stringBuilder.append(0);
-            }
-            stringBuilder.append(hv);
-        }
-        return stringBuilder.toString();
-    }
-	
-	public static String getMD5Checksum(String filename) throws Exception {  
-		   byte[] b = createChecksum(filename);  
-		   String result = "";  
-		  
-		   for (int i=0; i < b.length; i++) {  
-		       result += Integer.toString( ( b[i] & 0xff ) + 0x100, 16).substring(1);//加0x100是因为有的b[i]的十六进制只有1位  
-		   }  
-		   return result;  
+		try {
+			byte[] by = input.getBytes("UTF-8");
+			MessageDigest det = MessageDigest.getInstance("SHA");
+			return det.digest(by);
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
-	public static byte[] createChecksum(String filename) throws Exception {  
-		   InputStream fis =  new FileInputStream(filename);          //<span style="color: rgb(51, 51, 51); font-family: arial; font-size: 13px; line-height: 20px;">将流类型字符串转换为String类型字符串</span>  
-		  
-		   byte[] buffer = new byte[1024];  
-		   MessageDigest complete = MessageDigest.getInstance("MD5"); //如果想使用SHA-1或SHA-256，则传入SHA-1,SHA-256  
-		   int numRead;  
-		  
-		   do {  
-		       numRead = fis.read(buffer);    //从文件读到buffer，最多装满buffer  
-		       if (numRead > 0) {  
-		       complete.update(buffer, 0, numRead);  //用读到的字节进行MD5的计算，第二个参数是偏移量  
-		       }  
-		   } while (numRead != -1);  
-		  
-		   fis.close();  
-		   return complete.digest();  
-		}  
+		return null;
+	}
 
+	public static String bytesToHexString(byte[] src) {
+		StringBuilder stringBuilder = new StringBuilder("");
+		if (src == null || src.length <= 0) {
+			return null;
+		}
+		for (int i = 0; i < src.length; i++) {
+			int v = src[i] & 0xFF;
+			String hv = Integer.toHexString(v);
+			if (hv.length() < 2) {
+				stringBuilder.append(0);
+			}
+			stringBuilder.append(hv);
+		}
+		return stringBuilder.toString();
+	}
 
-	/*public static void main(String[] args) {
-	  System.out.println(HashXiZhiUtil.getMd5("D:\\xiangnu\\123.doc"));
-	  System.out.println(HashXiZhiUtil.bytesToHexString(HashXiZhiUtil.getMd5("D:\\xiangnu\\123.doc")));
-	  System.out.println(HashXiZhiUtil.bytesToHexString(HashXiZhiUtil.getMd5("D:\\xiangnu\\123.doc")));
+	public static String getMD5Checksum(String filename) throws Exception {
+		return getMD5Checksum(new File(filename));
 	}
-	*/
-	
 	
+	public static String getMD5Checksum(File file) throws Exception {
+		byte[] b = createChecksum(file);
+		String result = "";
+		
+		for (int i = 0; i < b.length; i++) {
+			result += Integer.toString((b[i] & 0xff) + 0x100, 16).substring(1);// 加0x100是因为有的b[i]的十六进制只有1位
+		}
+		return result;
+	}
+
+	public static byte[] createChecksum(String filename) throws Exception {
+		return createChecksum(new File(filename));
+	}
+
+	public static byte[] createChecksum(File file) throws Exception {
+		InputStream fis = new FileInputStream(file); // <span style="color:
+														// rgb(51, 51, 51);
+														// font-family: arial;
+														// font-size: 13px;
+														// line-height:
+														// 20px;">将流类型字符串转换为String类型字符串</span>
+
+		byte[] buffer = new byte[1024];
+		MessageDigest complete = MessageDigest.getInstance("MD5"); // 如果想使用SHA-1或SHA-256，则传入SHA-1,SHA-256
+		int numRead;
+
+		do {
+			numRead = fis.read(buffer); // 从文件读到buffer，最多装满buffer
+			if (numRead > 0) {
+				complete.update(buffer, 0, numRead); // 用读到的字节进行MD5的计算，第二个参数是偏移量
+			}
+		} while (numRead != -1);
+
+		fis.close();
+		return complete.digest();
+	}
+
+	/*
+	 * public static void main(String[] args) {
+	 * System.out.println(HashXiZhiUtil.getMd5("D:\\xiangnu\\123.doc"));
+	 * System.out.println(HashXiZhiUtil.bytesToHexString(HashXiZhiUtil.getMd5(
+	 * "D:\\xiangnu\\123.doc")));
+	 * System.out.println(HashXiZhiUtil.bytesToHexString(HashXiZhiUtil.getMd5(
+	 * "D:\\xiangnu\\123.doc"))); }
+	 */
+
 }

ccb_fund_trusteeship/src/main/java/com/fuzamei/web/OperationHistoryAction.java

@@ -12,7 +12,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
+import com.fuzamei.entity.UserDetail;
 import com.fuzamei.service.OperationHistoryService;
+import com.fuzamei.service.UserAuthoricationService;
 import com.fuzamei.utils.JSONUtil;
 import com.fuzamei.utils.PageDTO;
 import com.fuzamei.utils.ValidationUtil;
@@ -25,6 +27,9 @@ public class OperationHistoryAction {
 	@Autowired
 	private OperationHistoryService operationHistoryService;
 	
+	@Autowired
+	private UserAuthoricationService userAuthoricationService;
+	
 	private static final int ROW_NUM = 10; // 分页每页显示数据的数量
 	
 	/**
@@ -52,9 +57,10 @@ public class OperationHistoryAction {
 		try {
 			System.out.println("查询操作记录信息....");
 			@SuppressWarnings("unchecked")
-			Map<String, String> map = JSON.parseObject(data, Map.class);	//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
-			int userId = ValidationUtil.checkAndAssignInt(map.get("userId"));	//userId只要是一个int类型即可
-			int page = ValidationUtil.checkMinAndAssignInt(map.get("page"), 1); // 默认页是第一页
+			Map<String, String> map = JSON.parseObject(data, Map.class);
+			int userId = ValidationUtil.checkAndAssignInt(map.get("userId"));//userId只要是一个int类型即可
+			UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId);
+			int page = ValidationUtil.checkMinAndAssignInt(map.get("page"), 1); //页数最小值不能小于1
 			String account = ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("account")); // 账号默认空值""（空串，也可以是null,根据需求改）
 			String role = ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("role")); // 操作角色默认空值""
 			String type = ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("type"));; // 操作类型默认空值""
@@ -63,6 +69,7 @@ public class OperationHistoryAction {
 			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
 			mapToService.put("userId", userId);					//用户id用于查询权限或者角色信息
 			mapToService.put("startPage", (page - 1) * ROW_NUM);
+			mapToService.put("userDetail", userDetail);
 			mapToService.put("account", account);
 			mapToService.put("role", role);
 			mapToService.put("type", type);

ccb_fund_trusteeship/src/main/java/com/fuzamei/web/ProjectFileAction.java

@@ -4,6 +4,8 @@ import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLEncoder;
 import java.util.LinkedHashMap;
@@ -28,6 +30,9 @@ import com.fuzamei.constant.Role;
 import com.fuzamei.entity.UserDetail;
 import com.fuzamei.service.ProjectFileService;
 import com.fuzamei.service.UserAuthoricationService;
+import com.fuzamei.utils.AbsolutePathUtil;
+import com.fuzamei.utils.AbsolutePathUtil;
+import com.fuzamei.utils.CalculateFileHashUtil;
 import com.fuzamei.utils.HashXiZhiUtil;
 import com.fuzamei.utils.JSONUtil;
 import com.fuzamei.utils.PageDTO;
@@ -77,9 +82,10 @@ public class ProjectFileAction {
 			@SuppressWarnings("unchecked")
 			Map<String, String> map = JSON.parseObject(data, Map.class);	//将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
 			int userId = ValidationUtil.checkAndAssignInt(map.get("userId"));	//userId只要是一个int类型即可
+			userAuthoricationService.checkUserAuthority(userId);//校验并让所有人都能看
 			int page = ValidationUtil.checkMinAndAssignInt(map.get("page"), 1); // 默认页数是第一页
 			String projectName = ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("projectName")); // 默认名称为空值
-			long startTime = ValidationUtil.checkAndAssignDefaultLong(map.get("startTime"), 0); // 默认起始时间为0
+			long startTime = ValidationUtil.checkAndAssignDefaultLong(map.get("startTime"), 0L); // 默认起始时间为0
 			long endTime = ValidationUtil.checkAndAssignDefaultLong(map.get("endTime"), Long.MAX_VALUE); // 默认终止时间为Long最大值
 			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
 			mapToService.put("userId", userId);					//用户id用于查询权限或者角色信息
@@ -100,7 +106,6 @@ public class ProjectFileAction {
 	}
 	
 	/**
-	 * 
 	* @Title: checkoutProjectFiles
 	* @Description: TODO--------------->>显示下载文件的提示框
 	* 				以下为前端传递过来的参数
@@ -115,7 +120,6 @@ public class ProjectFileAction {
 	* @return Map<String,Object>    返回类型
 	* @author ylx
 	* @date 2017年12月15日 下午8:09:44
-	* @throws
 	 */
 	@RequestMapping(value = "/checkoutProjectFiles")
 	private Map<String, Object> checkoutProjectFiles(@RequestBody String data){
@@ -124,7 +128,8 @@ public class ProjectFileAction {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data, Map.class);	// 将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
 			int userId = ValidationUtil.checkAndAssignInt(map.get("userId"));	//userId只要是一个int类型即可
-			Integer projectId = ValidationUtil.checkAndAssignDefaultInt(map.get("projectId"),0);	//默认项目编号为空
+			userAuthoricationService.checkUserAuthority(userId);	//所有人都能下载
+			Integer projectId = ValidationUtil.checkAndAssignInt(map.get("projectId"));
 			String projectName=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("projectName"));		//默认项目名称为空值
 			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
 			mapToService.put("userId", userId);
@@ -133,12 +138,11 @@ public class ProjectFileAction {
 			Map<String, Object> mapFromService = projectFileService.checkoutProjectFiles(mapToService); //由于这里不需要分页，只要service传过来一个map对象即可
 			return JSONUtil.getJsonMap(200, true, HintMSG.CHECK_SUCCESS, mapFromService); //将从service返回回来的map对象通过map对象直接返回给前端
 		} catch (Exception e) {
-			return JSONUtil.getJsonMap(500, false, HintMSG.CHECK_FAIL+":"+e.getMessage(), null); 
+			return JSONUtil.getJsonMap(500, false, HintMSG.CHECK_FAIL+":"+e.getMessage(), null);
 		}
 	}
 	
 	/**
-	 * 
 	* @Title: download
 	* @Description: TODO(项目文档中的文件下载功能实现)
 	* 				前端传来一个get或post请求
@@ -147,15 +151,17 @@ public class ProjectFileAction {
 	* @return void    返回类型
 	* @author ylx
 	* @date 2017年12月15日 下午6:03:53
-	* @throws
 	 */
 	@RequestMapping(value="/downloadProjectFile")
-	private Map<String, Object> download(HttpServletRequest request,HttpServletResponse response,@RequestParam("url") String url,@RequestParam("userId") Object uId) {
+	private Map<String, Object> download(HttpServletRequest request,
+										 HttpServletResponse response,
+										 @RequestParam("url") String url,
+										 @RequestParam("userId") Object uId) {
 		try {
 			int userId=ValidationUtil.checkAndAssignInt(uId);
 //			userAuthoricationService.checkUserAuthority(userId,Role.SUPERVISION_AGENCY,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);//查看用户是否为空及是否有权限下载项目文档文件
 			userAuthoricationService.checkUserAuthority(userId);//所有人都能下载
-			String fileName = request.getServletContext().getRealPath("")+url;  		//SP是系统分隔符
+			String fileName = AbsolutePathUtil.getAbsolutePath(request)+SP+url;  		//SP是系统分隔符
 			//如果文件不存在直接抛出异常
 			if(!new File(fileName).exists()){
 				throw new RuntimeException(HintMSG.FILE_NOT_FOUND);
@@ -200,9 +206,9 @@ public class ProjectFileAction {
 		try {
 			@SuppressWarnings("unchecked")
 			Map<String,Object> map = JSON.parseObject(data, Map.class);
-			int userId = ValidationUtil.checkAndAssignInt(map.get("userId"));									//userId只要是一个int类型即可
-			userAuthoricationService.checkUserAuthority(userId,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);				//该权限只有	【省分行托管分中心档案保管岗】才能操作
-			Integer projectId = ValidationUtil.checkAndAssignDefaultInt(map.get("projectId"),-1);				//默认项目编号为-1,就是让你查不到
+			int userId = ValidationUtil.checkAndAssignInt(map.get("userId"));
+			userAuthoricationService.checkUserAuthority(userId,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);	//该权限只有【省分行托管分中心档案保管岗】才能操作
+			Integer projectId = ValidationUtil.checkAndAssignInt(map.get("projectId"));	
 			String projectName=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("projectName"));	//默认项目名称为空值
 			Map<String, Object> mapToClient =new LinkedHashMap<String, Object>();
 			mapToClient.put("projectId", projectId);
@@ -238,39 +244,36 @@ public class ProjectFileAction {
 									HttpServletRequest request) {
 		try {
 			int userId=ValidationUtil.checkAndAssignInt(uId);
-			UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);//查看用户是否为空及是否有权限下载项目文档文件
-			String projectId = ValidationUtil.checkBlankAndAssignString(pId);				//校验projectId并赋值
-			String projectName = ValidationUtil.checkBlankAndAssignString(pName);			//校验projectName并赋值
+			UserDetail userDetail = userAuthoricationService.checkUserAuthority(userId,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);//上传文件权限检测
+			String projectId = ValidationUtil.checkBlankAndAssignString(pId);
+			String projectName = ValidationUtil.checkBlankAndAssignString(pName);
 			if(file.isEmpty()){
-				throw new RuntimeException(HintMSG.FILE_CANT_BE_NULL);						//校验上传的文件是否为空
+				throw new RuntimeException(HintMSG.FILE_CANT_BE_NULL);
 			}
-			String path = request.getServletContext().getRealPath("")+SP+"content";			//SP是系统分隔符,path是存放上传文件的父类文件夹绝对路径====>>这个路径要改TODO	
+			String path = AbsolutePathUtil.getAbsolutePath(request);//==================================================>>这个路径要改TODO	
 			File dir=new File(path);
 			if(!dir.exists()){
 				dir.mkdirs();
 			}
-			String filename = file.getOriginalFilename();									//filename是上传文件的真实文件名
-			String pathFile=path+SP+filename;												//pathFile是该文件在系统中的绝对路径
+			String filename = file.getOriginalFilename();//filename是上传文件的真实文件名
+			String pathFile=path+SP+filename;//pathFile是该文件在系统中的绝对路径
 			File newFile=new File(pathFile);
 			
-			String fileHash = HashXiZhiUtil.getMD5Checksum(filename);						//文件上传后计算文件的hash值=============>>换hash算法这里直接换掉即可TODO			
+			String fileHash = CalculateFileHashUtil.calculateHash(file);//传入MultiPartFile直接计算hash值
+			
 			Map<String, Object> mapToService =new LinkedHashMap<String, Object>();
-			mapToService.put("userDetail", userDetail);				//将用户的信息传入
+			mapToService.put("userDetail", userDetail);
 			mapToService.put("projectId", projectId);
 			mapToService.put("projectName", projectName);
-			mapToService.put("url", "/content/"+filename);			//将文件下载路径url通过map传到service层进行校验
-			mapToService.put("attachmentName", filename);			//将文件以附件名的形式通过map传递到service层中进行校验
-			mapToService.put("hash", fileHash);						//将上传的文件hash值放入map
-			projectFileService.insertInformationIntoTable(mapToService);		//将获取到的数据插入到各类表中
-			
+			mapToService.put("url", "/content/"+filename);
+			mapToService.put("attachmentName", filename);
+			mapToService.put("hash", fileHash);
+			projectFileService.insertInformationIntoTable(mapToService);
 			//文件最后上传，防止出现垃圾数据
-			file.transferTo(newFile);														//文件已经上传成功
-			
-			Map<String, Object> mapResult = JSONUtil.getJsonMap(200, true, HintMSG.UPLOAD_SUCCESS,null); //返回给前端一个map进行前段提示
-			return mapResult;
+			file.transferTo(newFile);
+			return JSONUtil.getJsonMap(200, true, HintMSG.UPLOAD_SUCCESS,null);
 		} catch (Exception e) {
-			Map<String, Object> mapResult = JSONUtil.getJsonMap(500, true, HintMSG.UPLOAD_FAIL+":"+e.getMessage(),null); //返回给前端一个map进行前段提示
-			return mapResult;
+			return JSONUtil.getJsonMap(500, false, HintMSG.UPLOAD_FAIL+":"+e.getMessage(),null);
 		}
 	}