From 17c1055ac108e6bef6c2b515c58b2f9ecea0da73 Mon Sep 17 00:00:00 2001
From: xinyb_ <xin0322>
Date: 星期五, 24 九月 2021 14:53:16 +0800
Subject: [PATCH] 调整物料主批量上传附件的错误提示和事务
---
WebRoot/general/batchUpload/uploadIndex.jsp | 21 ++++++++++++++++++++-
src/applicationContext.xml | 4 ++--
src/com/yc/batchUpload/service/impl/BatchUploadServiceImpl.java | 4 +---
src/com/yc/batchUpload/conterll/BatchUploadConterll.java | 20 +++++++++-----------
4 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/WebRoot/general/batchUpload/uploadIndex.jsp b/WebRoot/general/batchUpload/uploadIndex.jsp
index 2ffdf45..370fa6e 100644
--- a/WebRoot/general/batchUpload/uploadIndex.jsp
+++ b/WebRoot/general/batchUpload/uploadIndex.jsp
@@ -54,6 +54,11 @@
.file-drop-zone.clickable:hover{
border: 1px dashed #128be7 !important;
}
+ .file-error-message {
+ position: fixed;
+ top: 230px;
+ width: 70%;
+ }
</style>
</head>
<body>
@@ -96,10 +101,24 @@
browseOnZoneClick: true, //甯冨皵鍊硷紝鏄惁鍦ㄧ偣鍑婚瑙堝尯鍩熸椂瑙﹀彂鏂囦欢娴忚/閫夋嫨銆傞粯璁や负false
maxFilesNum: 0, // 涓婁紶鏈�澶х殑鏂囦欢鏁伴噺
}).on('fileuploaded',function(event, data, previewId, index){//鍗曚釜涓婁紶鍚�
+ var json=data.response;
+ if(json.code==-1){
+ $(".file-upload-indicator").attr("title","涓婁紶閿欒");
+ $(".file-upload-indicator").find("i").addClass("fa-exclamation-circle text-danger");
+ $(".progress").hide();
+ $(".file-error-message").html(json.data);
+ $(".file-error-message").show();
+ return;
+ }
$(".kv-file-remove").hide();
}).on('filebatchuploadsuccess', function (event, data, previewId, index) {//鎵归噺涓婁紶鎴愬姛缁撴灉澶勭悊
+ var json=data.response;
+ if(json.code==-1){
+ alert(json.data);
+ return;
+ }
$(".kv-file-remove").hide();
- });
+ })
})
</script>
</body>
diff --git a/src/applicationContext.xml b/src/applicationContext.xml
index 5382ed5..3cf5537 100644
--- a/src/applicationContext.xml
+++ b/src/applicationContext.xml
@@ -142,9 +142,9 @@
<!-- 浜嬬墿锛屾棩蹇�(鎷︽埅service鍖呯殑鎵�鏈夋墽琛宻ql鍑芥暟瀵规墽琛宻ql鎶ラ敊鐨勪繚瀛樺埌鏁版嵁搴�)AOP閰嶇疆-->
<aop:config>
<aop:pointcut id="bizMethods"
- expression="execution(* com.yc.service..*.*(..)) or execution(* com.yc.sdk.shopping.service..*.*(..)) or execution(* com.yc.sdk.weixincp.service..*.*(..)) or execution(* com.yc.sdk.weixinmp.service..*.*(..)) or execution(* com.yc.api.service..*.*(..)) or execution(* com.yc.ionic.service..*.*(..)) or execution(* com.yc.sdk.oauth2.service..*.*(..)) or execution(* com.yc.im.service..*.*(..)) " />
+ expression="execution(* com.yc.service..*.*(..)) or execution(* com.yc.sdk.shopping.service..*.*(..)) or execution(* com.yc.sdk.weixincp.service..*.*(..)) or execution(* com.yc.sdk.weixinmp.service..*.*(..)) or execution(* com.yc.api.service..*.*(..)) or execution(* com.yc.ionic.service..*.*(..)) or execution(* com.yc.sdk.oauth2.service..*.*(..)) or execution(* com.yc.im.service..*.*(..)) or execution(* com.yc.batchUpload.service..*.*(..)) " />
<aop:pointcut id="logger"
- expression="(execution(* com.yc.service..*.*(..)) or execution(* com.yc.sdk.shopping.service..*.*(..)) or execution(* com.yc.sdk.weixincp.service..*.*(..)) or execution(* com.yc.sdk.weixinmp.service..*.*(..)) or execution(* com.yc.api.service..*.*(..)) or execution(* com.yc.ionic.service..*.*(..)) or execution(* com.yc.sdk.oauth2.service..*.*(..)) or execution(* com.yc.im.service..*.*(..)) ) and !execution(* com.yc.service.log.ErrorLogImpl.*(..))" />
+ expression="(execution(* com.yc.service..*.*(..)) or execution(* com.yc.sdk.shopping.service..*.*(..)) or execution(* com.yc.sdk.weixincp.service..*.*(..)) or execution(* com.yc.sdk.weixinmp.service..*.*(..)) or execution(* com.yc.api.service..*.*(..)) or execution(* com.yc.ionic.service..*.*(..)) or execution(* com.yc.sdk.oauth2.service..*.*(..)) or execution(* com.yc.im.service..*.*(..)) or execution(* com.yc.batchUpload.service..*.*(..)) ) and !execution(* com.yc.service.log.ErrorLogImpl.*(..))" />
<aop:advisor advice-ref="txAdvice" pointcut-ref="bizMethods" />
<aop:aspect id="loggerAspect" ref="genericLoggerBean">
<aop:around pointcut-ref="logger" method="invoke" />
diff --git a/src/com/yc/batchUpload/conterll/BatchUploadConterll.java b/src/com/yc/batchUpload/conterll/BatchUploadConterll.java
index 120da1a..0bbcec7 100644
--- a/src/com/yc/batchUpload/conterll/BatchUploadConterll.java
+++ b/src/com/yc/batchUpload/conterll/BatchUploadConterll.java
@@ -28,25 +28,23 @@
@RequestMapping("/uploadImage.do")
@ResponseBody
- public CallBackMsg batchUpload(HttpServletRequest request) {
- CallBackMsg msg = new CallBackMsg();
+ public CallBackMsg batchUpload(HttpServletRequest request) throws Exception {
+ CallBackMsg msg=new CallBackMsg();
try {
MultipartResolver resolver = new CommonsMultipartResolver(request.getSession().getServletContext());
MultipartHttpServletRequest multipartRequest = resolver.resolveMultipart(request);
List<MultipartFile> files = multipartRequest.getFiles("file_data");//鏂囦欢淇℃伅
- String formId=multipartRequest.getParameter("formId");
- Integer dbid = Integer.parseInt( multipartRequest.getParameter("dbid"));
- String userCode = multipartRequest.getParameter("userCode");
- String userName = multipartRequest.getParameter("userName");
-
- //SpObserver.setDBtoInstance("_" + request.getSession().getAttribute(SessionKey.DATA_BASE_ID));
+ String formId = multipartRequest.getParameter("formId");
+ Integer dbid = Integer.parseInt(multipartRequest.getParameter("dbid"));
+ String userCode = multipartRequest.getParameter("userCode");
+ String userName = multipartRequest.getParameter("userName");
SpObserver.setDBtoInstance("_" + dbid);
- msg = batchUploadService.uploadBatchImage(formId,files,userCode,userName,request);
+ return batchUploadService.uploadBatchImage(formId, files, userCode, userName, request);
} catch (Exception e) {
- msg.setFail("寮傚父閿欒锛�" + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+ msg.setFail(e.getCause()!=null?e.getCause().getMessage():e.getMessage());
+ return msg;
} finally {
SpObserver.setDBtoInstance();
}
- return msg;
}
}
diff --git a/src/com/yc/batchUpload/service/impl/BatchUploadServiceImpl.java b/src/com/yc/batchUpload/service/impl/BatchUploadServiceImpl.java
index 293c7a8..44596b7 100644
--- a/src/com/yc/batchUpload/service/impl/BatchUploadServiceImpl.java
+++ b/src/com/yc/batchUpload/service/impl/BatchUploadServiceImpl.java
@@ -120,12 +120,10 @@
}
}
}
-
msg.setOk(cont);
-
return msg;
} catch (Exception e) {
- msg.setMsg(e.getCause()!=null?e.getCause().getMessage():e.getMessage());
+// msg.setMsg(e.getCause()!=null?e.getCause().getMessage():e.getMessage());
e.printStackTrace();
throw e;
}
--
Gitblit v1.8.0