外部单位-附件存放阿里位置调整-02

src/main/webapp/static/oss/ossupload.js

@@ -286,6 +286,70 @@ function multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,upload
             multitest(client, storeAs, file,attachmentId,attachmentFlag,uploadPath.replace('http://dmtest-test.oss-cn-shanghai.aliyuncs.com', result.AliyunUrl),divId,size, cpt);
     })
 };
+
+function multipartUploadWithExter(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size, cpt,idx,prefix,currentUser) {
+
+    console.log("-----------------------start");
+    console.log("-----------------------"+realPath);
+
+    file.name.replace(" ","")
+    file.name.replace(/—/g,"")
+    var fileName = file.name;
+    // 将单引号‘’都转换成'，将双引号“”都转换成"
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"");
+    // 将中括号【】转换成[]，将大括号｛｝转换成{}
+    fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\｛/g,"(").replace(/\｝/g,")");
+    fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
+    // 将逗号，转换成,，将：转换成:
+    fileName = fileName.replace(/，/g,",").replace(/：/g,":");
+    //将中文——转换为英文-
+    fileName = fileName.replace(/—/g,"-")
+    fileName = fileName.replace(/……/g,"")
+    fileName = fileName.replace(/±/g,"")
+    fileName = fileName.replace(/#/g,"")
+    fileName = fileName.replace(/%/g,"")
+    fileName = fileName.replace(/Π/g,"")
+    fileName = fileName.replace(/π/g,"")
+    fileName = fileName.replace(/·/g,".")
+    var dfl=new File([file],fileName,{type:file.type});
+    file = dfl
+
+    requestUrl = realPath+"/previewController/getAccess";
+    OSS.urllib.request(requestUrl, {method: 'GET'}, function (err, response) {
+        if (err) {
+            console.log(err);
+            $.ajax({
+                type:"post",
+                url:realPath+"/previewController/saveJSError",
+                data:{object:err.toString()},
+                async: false,
+                success:function(data){
+                }
+            });
+            return alert(err);
+        }
+        try {
+            result = JSON.parse(response);
+        } catch (e) {
+            errmsg = 'parse sts response info error: ' + e.message;
+            return alert(errmsg);
+        }
+        console.log("---------result"+result);
+        client = new OSS.Wrapper({
+            accessKeyId: result.AccessKeyId,
+            accessKeySecret: result.AccessKeySecret,
+            stsToken: result.SecurityToken,
+            bucket: result.Bucket,
+            endpoint: result.Endpoint,
+            timeout:'30000'
+        });
+        storeAs = "attachment-file/" + storeAs +"/"+new Date().getTime()+ file.name;
+        if(cpt == 1)
+            multitestFlag(client,storeAs, file,attachmentId,attachmentFlag,uploadPath.replace('http://dmtest-test.oss-cn-shanghai.aliyuncs.com', result.AliyunUrl),divId,size, cpt,idx,prefix,currentUser);
+        else
+            multitest(client, storeAs, file,attachmentId,attachmentFlag,uploadPath.replace('http://dmtest-test.oss-cn-shanghai.aliyuncs.com', result.AliyunUrl),divId,size, cpt);
+    })
+};
 function multipartUploadWorkOrder(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size, cpt,idx,prefix,currentUser) {
 
     console.log("-----------------------start");

src/main/webapp/webpage/modules/externalUnit/capitalDemandFormAudit.jsp

@@ -96,6 +96,8 @@
 
 		function insertTitle(tValue){
 			console.log('insertTitle')
+			var projectId = $('#project_id').val();
+			console.log('projectId',projectId)
 			var list = "${capitalDemand.workAttachments}";
 			var size = (list.split('url')).length-1;
 			var files = $("#attachment_file_conciliationRecords")[0].files;
@@ -106,12 +108,12 @@
 				console.log(file);
 				var timestamp = new Date().getTime();
 				var remarks = ""
-				var storeAs = "externalUnit";
+				var storeAs = "externalUnit/"+projectId;
 				var uploadPath = "http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/" + storeAs;
 				/*将这段字符串存到数据库即可*/
 				var divId = "_exterProcess";
 				$("#addFile" + divId).show();
-				multipartUploadWithSts(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, size);
+				multipartUploadWithExter(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, size);
 			}
 			console.log('list',files)
 		}
@@ -124,7 +126,7 @@
 <div class="single-form">
 	<div class="container">
 		<form:form id="inputForm" modelAttribute="capitalDemand" action="${ctx}/externalUnit/capitalDemand/saveAuditDemand" method="post" class="form-horizontal">
-		<form:hidden path="project.id"/>
+		<form:hidden path="project.id" id="project_id"/>
 		<form:hidden path="id"/>
 		<form:hidden path="home"/>
 		<form:hidden path="act.taskId"/>

src/main/webapp/webpage/modules/externalUnit/externalUnitFileForm.jsp

@@ -54,7 +54,7 @@
 				/*将这段字符串存到数据库即可*/
 				var divId = "_exterNoProcess";
 				$("#addFile" + divId).show();
-				multipartUploadWithSts(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, size);
+				multipartUploadWithExter(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, size);
 			}
 			console.log('list',files)
 		}
@@ -65,6 +65,7 @@
 
 
 	</script>
+
 </head>
 <body>
 <div class="single-form">

src/main/webapp/webpage/modules/externalUnit/feedbackFormAdd.jsp

@@ -62,6 +62,7 @@
 		});
 		function insertTitle(tValue){
 			console.log('insertTitle')
+			var projectId = $('#projectId').val();
 			var list = "${feedback.workAttachments}";
 			var size = (list.split('url')).length-1;
 			var files = $("#attachment_file_conciliationRecords")[0].files;
@@ -72,12 +73,12 @@
 				console.log(file);
 				var timestamp = new Date().getTime();
 				var remarks = ""
-				var storeAs = "externalUnit";
+				var storeAs = "externalUnit/"+projectId;
 				var uploadPath = "http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/" + storeAs;
 				/*将这段字符串存到数据库即可*/
 				var divId = "_exterFeedback";
 				$("#addFile" + divId).show();
-				multipartUploadWithSts(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, size);
+				multipartUploadWithExter(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, size);
 			}
 			console.log('list',files)
 		}

src/main/webapp/webpage/modules/externalUnit/feedbackFormView.jsp

@@ -314,14 +314,14 @@
 											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 										</c:otherwise>
 									</c:choose>
-									<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
-										<a href="javascript:void(0)"
-										   onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')"
-										   class="op-btn op-btn-delete"><i class="fa fa-trash"></i>&nbsp;删除</a>
-									</c:if>
-									<c:if test="${workClientAttachment.collectFlag != 1}">
-										<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn layui-btn-warm" >&nbsp;收藏</a>
-									</c:if>
+<%--									<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
+<%--										<a href="javascript:void(0)"--%>
+<%--										   onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')"--%>
+<%--										   class="op-btn op-btn-delete"><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
+<%--									</c:if>--%>
+<%--									<c:if test="${workClientAttachment.collectFlag != 1}">--%>
+<%--										<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn layui-btn-warm" >&nbsp;收藏</a>--%>
+<%--									</c:if>--%>
 								</div>
 							</td>
 						</tr>