|
|
@@ -33,14 +33,15 @@ import com.fuzamei.service.UserAuthoricationService;
|
|
|
import com.fuzamei.utils.AbsolutePathUtil;
|
|
|
import com.fuzamei.utils.AbsolutePathUtil;
|
|
|
import com.fuzamei.utils.CalculateFileHashUtil;
|
|
|
+import com.fuzamei.utils.FileTransferUtil;
|
|
|
import com.fuzamei.utils.HashXiZhiUtil;
|
|
|
import com.fuzamei.utils.JSONUtil;
|
|
|
import com.fuzamei.utils.PageDTO;
|
|
|
+import com.fuzamei.utils.RelativePathUtil;
|
|
|
import com.fuzamei.utils.ValidationUtil;
|
|
|
/**
|
|
|
* 项目文档模块
|
|
|
* @author ylx
|
|
|
- *
|
|
|
*/
|
|
|
@RestController
|
|
|
@RequestMapping("/project_file")
|
|
|
@@ -68,7 +69,6 @@ public class ProjectFileAction {
|
|
|
"startTime":"",
|
|
|
"endTime":""
|
|
|
}
|
|
|
- * @param
|
|
|
* @param data
|
|
|
* @param @return
|
|
|
* 设定文件 @return Map<String,Object> 返回类型
|
|
|
@@ -186,7 +186,6 @@ public class ProjectFileAction {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- *
|
|
|
* @Title: showUploadProjectFileInterface
|
|
|
* @Description: TODO------------->>显示项目文档上传的界面
|
|
|
* 以下为前端传递过来的参数
|
|
|
@@ -199,7 +198,6 @@ public class ProjectFileAction {
|
|
|
* @return Map<String,Object> 返回类型
|
|
|
* @author ylx
|
|
|
* @date 2017年12月15日 下午8:11:09
|
|
|
- * @throws
|
|
|
*/
|
|
|
@RequestMapping(value = "/showUploadProjectFileInterface")
|
|
|
private Map<String, Object> showUploadProjectFileInterface(@RequestBody String data){
|
|
|
@@ -251,26 +249,21 @@ public class ProjectFileAction {
|
|
|
throw new RuntimeException(HintMSG.FILE_CANT_BE_NULL);
|
|
|
}
|
|
|
String path = AbsolutePathUtil.getAbsolutePath(request);//==================================================>>这个路径要改TODO
|
|
|
- File dir=new File(path);
|
|
|
- if(!dir.exists()){
|
|
|
- dir.mkdirs();
|
|
|
- }
|
|
|
+ String relativePath = "/ProjectFile/";
|
|
|
String filename = file.getOriginalFilename();//filename是上传文件的真实文件名
|
|
|
- String pathFile=path+SP+filename;//pathFile是该文件在系统中的绝对路径
|
|
|
- File newFile=new File(pathFile);
|
|
|
-
|
|
|
- String fileHash = CalculateFileHashUtil.calculateHash(file);//传入MultiPartFile直接计算hash值
|
|
|
-
|
|
|
+ String modifiedFilename = RelativePathUtil.timeStampAddFilename(filename);//文件名加上前缀防止重名
|
|
|
+ String url=relativePath + modifiedFilename;//在文件名前面加一个时间戳,pathFile是该文件の绝对路径
|
|
|
+ String fileHash = CalculateFileHashUtil.calculateHash(file);//传入MultiPartFile直接计算hash值,并完成删除操作
|
|
|
Map<String, Object> mapToService =new LinkedHashMap<String, Object>();
|
|
|
mapToService.put("userDetail", userDetail);
|
|
|
mapToService.put("projectId", projectId);
|
|
|
mapToService.put("projectName", projectName);
|
|
|
- mapToService.put("url", "/content/"+filename);
|
|
|
+ mapToService.put("url", url);
|
|
|
mapToService.put("attachmentName", filename);
|
|
|
mapToService.put("hash", fileHash);
|
|
|
projectFileService.insertInformationIntoTable(mapToService);
|
|
|
//文件最后上传，防止出现垃圾数据
|
|
|
- file.transferTo(newFile);
|
|
|
+ FileTransferUtil.transfer(file, modifiedFilename ,path + relativePath);
|
|
|
return JSONUtil.getJsonMap(200, true, HintMSG.UPLOAD_SUCCESS,null);
|
|
|
} catch (Exception e) {
|
|
|
return JSONUtil.getJsonMap(500, false, HintMSG.UPLOAD_FAIL+":"+e.getMessage(),null);
|
ylx