|
@@ -13,6 +13,7 @@ import javax.validation.constraints.NotNull;
|
|
|
|
|
|
|
|
import com.lc.ibps.base.core.encrypt.Base64;
|
|
import com.lc.ibps.base.core.encrypt.Base64;
|
|
|
import com.lc.ibps.base.db.util.TableMetaUtil;
|
|
import com.lc.ibps.base.db.util.TableMetaUtil;
|
|
|
|
|
+import com.lc.ibps.cloud.entity.APIRequest;
|
|
|
import org.springframework.http.MediaType;
|
|
import org.springframework.http.MediaType;
|
|
|
import org.springframework.jdbc.core.JdbcTemplate;
|
|
import org.springframework.jdbc.core.JdbcTemplate;
|
|
|
import org.springframework.mock.web.MockMultipartFile;
|
|
import org.springframework.mock.web.MockMultipartFile;
|
|
@@ -87,14 +88,15 @@ public class UploadProvider extends GenericUploadProvider implements IUploadServ
|
|
|
@RequestPart(name = "file", required = true)MultipartFile file) {
|
|
@RequestPart(name = "file", required = true)MultipartFile file) {
|
|
|
|
|
|
|
|
APIResult<AttachmentPo> result = new APIResult<>();
|
|
APIResult<AttachmentPo> result = new APIResult<>();
|
|
|
-
|
|
|
|
|
- String uploadFileVoStr = this.getRequest().getParameter("uploadFileVo");
|
|
|
|
|
UploadFileVo uploadFileVo = null;
|
|
UploadFileVo uploadFileVo = null;
|
|
|
- if(JacksonUtil.isJsonObject(uploadFileVoStr)) {
|
|
|
|
|
- uploadFileVo = JacksonUtil.getDTO(uploadFileVoStr, UploadFileVo.class);
|
|
|
|
|
|
|
+ Map<String, Object> paramsVo;
|
|
|
|
|
+ if (BeanUtils.isNotEmpty(this.getRequest())){
|
|
|
|
|
+ String uploadFileVoStr = this.getRequest().getParameter("uploadFileVo");
|
|
|
|
|
+ if(JacksonUtil.isJsonObject(uploadFileVoStr)) {
|
|
|
|
|
+ uploadFileVo = JacksonUtil.getDTO(uploadFileVoStr, UploadFileVo.class);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- Map<String, Object> paramsVo = getUploadParams(uploadFileVo);
|
|
|
|
|
|
|
+ paramsVo = getUploadParams(uploadFileVo);
|
|
|
Map<String, Object> paramsRequest = getUploadParams(this.getRequest());
|
|
Map<String, Object> paramsRequest = getUploadParams(this.getRequest());
|
|
|
paramsVo.putAll(paramsRequest);
|
|
paramsVo.putAll(paramsRequest);
|
|
|
|
|
|
|
@@ -465,34 +467,34 @@ public class UploadProvider extends GenericUploadProvider implements IUploadServ
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
private Map<String, Object> getUploadParams(HttpServletRequest request) {
|
|
private Map<String, Object> getUploadParams(HttpServletRequest request) {
|
|
|
- String uploadType = RequestUtil.getString(request, "uploadType", "file"); // 控件的类型
|
|
|
|
|
- String paramJson = RequestUtil.getString(request, "paramJson"); // 自定义参数
|
|
|
|
|
- String fileMd5 = RequestUtil.getString(request, "fileMd5");// 文件唯一标记 MD5
|
|
|
|
|
- Boolean isChunk = RequestUtil.getBoolean(request, "isChunk", true);// 是否分片存储
|
|
|
|
|
- // 当前分块下标
|
|
|
|
|
- String chunk = RequestUtil.getString(request, "chunk");
|
|
|
|
|
- // 当前分块大小
|
|
|
|
|
- String chunkSize = RequestUtil.getString(request, "chunkSize");
|
|
|
|
|
-
|
|
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
-
|
|
|
|
|
- params.put(FileParam.UPLOAD_TYPE, uploadType);
|
|
|
|
|
- params.put(FileParam.FILE_MD5, fileMd5);
|
|
|
|
|
- params.put(FileParam.IS_CHUNK, isChunk);
|
|
|
|
|
- params.put(FileParam.CHUNK, chunk);
|
|
|
|
|
- params.put(FileParam.CHUNK_SIZE, chunkSize);
|
|
|
|
|
-
|
|
|
|
|
params.put(FileParam.CUR_USER_ID, ContextUtil.getCurrentUser().getUserId());
|
|
params.put(FileParam.CUR_USER_ID, ContextUtil.getCurrentUser().getUserId());
|
|
|
params.put(FileParam.CUR_USER_ACCOUNT, ContextUtil.getCurrentUser().getAccount());
|
|
params.put(FileParam.CUR_USER_ACCOUNT, ContextUtil.getCurrentUser().getAccount());
|
|
|
params.put(FileParam.CUR_USER_NAME, ContextUtil.getCurrentUser().getFullname());
|
|
params.put(FileParam.CUR_USER_NAME, ContextUtil.getCurrentUser().getFullname());
|
|
|
-
|
|
|
|
|
- if (StringUtil.isNotEmpty(paramJson)) {
|
|
|
|
|
- try {
|
|
|
|
|
- Map<String, Object> paramMap = JacksonUtil.toMap(paramJson);
|
|
|
|
|
- if (BeanUtils.isNotEmpty(paramMap)){
|
|
|
|
|
- params.putAll(paramMap);
|
|
|
|
|
|
|
+ if (BeanUtils.isNotEmpty(request)) {
|
|
|
|
|
+ String uploadType = RequestUtil.getString(request, "uploadType", "file"); // 控件的类型
|
|
|
|
|
+ String paramJson = RequestUtil.getString(request, "paramJson"); // 自定义参数
|
|
|
|
|
+ String fileMd5 = RequestUtil.getString(request, "fileMd5");// 文件唯一标记 MD5
|
|
|
|
|
+ Boolean isChunk = RequestUtil.getBoolean(request, "isChunk", true);// 是否分片存储
|
|
|
|
|
+ // 当前分块下标
|
|
|
|
|
+ String chunk = RequestUtil.getString(request, "chunk");
|
|
|
|
|
+ // 当前分块大小
|
|
|
|
|
+ String chunkSize = RequestUtil.getString(request, "chunkSize");
|
|
|
|
|
+
|
|
|
|
|
+ params.put(FileParam.UPLOAD_TYPE, uploadType);
|
|
|
|
|
+ params.put(FileParam.FILE_MD5, fileMd5);
|
|
|
|
|
+ params.put(FileParam.IS_CHUNK, isChunk);
|
|
|
|
|
+ params.put(FileParam.CHUNK, chunk);
|
|
|
|
|
+ params.put(FileParam.CHUNK_SIZE, chunkSize);
|
|
|
|
|
+
|
|
|
|
|
+ if (StringUtil.isNotEmpty(paramJson)) {
|
|
|
|
|
+ try {
|
|
|
|
|
+ Map<String, Object> paramMap = JacksonUtil.toMap(paramJson);
|
|
|
|
|
+ if (BeanUtils.isNotEmpty(paramMap)){
|
|
|
|
|
+ params.putAll(paramMap);
|
|
|
|
|
+ }
|
|
|
|
|
+ } catch (Exception ignore) {
|
|
|
}
|
|
}
|
|
|
- } catch (Exception ignore) {
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|