xinyb_
2021-09-24 17c1055ac108e6bef6c2b515c58b2f9ecea0da73
调整物料主批量上传附件的错误提示和事务
4个文件已修改
49 ■■■■■ 已修改文件
WebRoot/general/batchUpload/uploadIndex.jsp 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/applicationContext.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/yc/batchUpload/conterll/BatchUploadConterll.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/yc/batchUpload/service/impl/BatchUploadServiceImpl.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
src/applicationContext.xml
@@ -142,9 +142,9 @@
    <!-- 事物,日志(拦截service包的所有执行sql函数对执行sql报错的保存到数据库)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" />
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;
    }
}
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;
        }