From 9a6140574003ec25e95e0248785843c3598168c4 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期五, 23 八月 2024 16:17:42 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-file/V2.0.0
---
src/main/java/com/product/file/controller/FileManagerController.java | 198 ++++++++-----------------------------------------
1 files changed, 33 insertions(+), 165 deletions(-)
diff --git a/src/main/java/com/product/file/controller/FileManagerController.java b/src/main/java/com/product/file/controller/FileManagerController.java
index 5caf7b9..72f55fe 100644
--- a/src/main/java/com/product/file/controller/FileManagerController.java
+++ b/src/main/java/com/product/file/controller/FileManagerController.java
@@ -8,6 +8,7 @@
import com.product.core.entity.RequestParameterEntity;
import com.product.core.exception.BaseException;
import com.product.core.spring.context.SpringMVCContextHolder;
+import com.product.file.config.CmnConst;
import com.product.file.config.FileCode;
import com.product.file.service.FileManagerService;
import com.product.module.sys.version.ApiVersion;
@@ -34,6 +35,7 @@
@Autowired
public FileManagerService fileManagerService;
+
/**
* @param uuid
* @param response
@@ -56,144 +58,6 @@
}
}
- /**
- * 鏂囦欢璁板綍-鏂板
- *
- * @param request 璇锋眰
- * @return 缁撴灉
- */
- @RequestMapping(value = "/add-file-record-plan/{version}", method = RequestMethod.POST)
- @ApiVersion(1)
- public String addFileRecordPlan(HttpServletRequest request) {
- try {
- FieldSetEntity fse = null;
- Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
- RequestParameterEntity rpe = (RequestParameterEntity) bean;
- if (null != rpe && null != rpe.getFormData()) {
- fse = rpe.getFormData();
- }
- if (fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(FileCode.FORM_NODATA.getValue(), FileCode.FORM_NODATA.getText());
- return this.error(FileCode.FORM_NODATA.getValue(), FileCode.FORM_NODATA.getText());
- }
- FieldSetEntity fs = fileManagerService.addFileRecordPlan(fse);
- return fs != null ? this.OK_List(fs) : this.error(FileCode.ADD_FILE_RECORD_FAIL.getValue(), FileCode.ADD_FILE_RECORD_FAIL.getText());
- } catch (BaseException e) {
- SpringMVCContextHolder.getSystemLogger().error(e);
- return this.error(e.getCode(), e.getMessageInfo());
- } catch (Exception e) {
- SpringMVCContextHolder.getSystemLogger().error(e);
- e.printStackTrace();
- return error(FileCode.ADD_FILE_RECORD_FAIL.getValue(), FileCode.ADD_FILE_RECORD_FAIL.getText());
- }
- }
-
- /**
- * 鏂囦欢璁板綍-鏂囦欢鏂板缁撴灉鍥炶皟
- *
- * @param request 璇锋眰
- * @return 缁撴灉
- */
- @RequestMapping(value = "/add-file-callback/{version}", method = RequestMethod.POST)
- @ApiVersion(1)
- public String addFileCallback(HttpServletRequest request) {
- try {
- FieldSetEntity fse = null;
- Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
- RequestParameterEntity rpe = (RequestParameterEntity) bean;
- if (null != rpe && null != rpe.getFormData()) {
- fse = rpe.getFormData();
- }
- if (fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(FileCode.FORM_NODATA.getValue(), FileCode.FORM_NODATA.getText());
- return this.error(FileCode.FORM_NODATA.getValue(), FileCode.FORM_NODATA.getText());
- }
- JSONObject data = fileManagerService.addFileCallback(fse);
- JSONObject result = new JSONObject();
- result.put("data", data);
- result.put("msg", FileCode.SUCCESS.getText());
- result.put("code", "200");
- result.put("status", "success");
- return result.toString();
- } catch (BaseException e) {
- SpringMVCContextHolder.getSystemLogger().error(e);
- return this.error(e.getCode(), e.getMessageInfo());
- } catch (Exception e) {
- SpringMVCContextHolder.getSystemLogger().error(e);
- e.printStackTrace();
- return error(FileCode.ADD_FILE_CALLBACK_FAIL.getValue(), FileCode.ADD_FILE_CALLBACK_FAIL.getText());
- }
- }
-
- /**
- * 鏂囦欢璁板綍-鍒犻櫎鍑嗗锛堢姸鎬佷慨鏀癸級
- *
- * @param request 璇锋眰
- * @return 缁撴灉
- */
- @RequestMapping(value = "/del-file-record-plan/{version}", method = RequestMethod.POST)
- @ApiVersion(1)
- public String delFileRecordPlan(HttpServletRequest request) {
- try {
- FieldSetEntity fse = null;
- Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
- RequestParameterEntity rpe = (RequestParameterEntity) bean;
- if (null != rpe && null != rpe.getFormData()) {
- fse = rpe.getFormData();
- }
- if (fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(FileCode.FORM_NODATA.getValue(), FileCode.FORM_NODATA.getText());
- return this.error(FileCode.FORM_NODATA.getValue(), FileCode.FORM_NODATA.getText());
- }
- FieldSetEntity fs = fileManagerService.delFileRecordPlan(fse);
-
- return fs != null ? this.OK_List(fs) : this.error(FileCode.DELETE_FILE_PLAN_FIAL.getValue(), FileCode.DELETE_FILE_PLAN_FIAL.getText());
- } catch (BaseException e) {
- SpringMVCContextHolder.getSystemLogger().error(e);
- return this.error(e.getCode(), e.getMessageInfo());
- } catch (Exception e) {
- SpringMVCContextHolder.getSystemLogger().error(e);
- e.printStackTrace();
- return error(FileCode.DELETE_FILE_PLAN_FIAL.getValue(), FileCode.DELETE_FILE_PLAN_FIAL.getText());
- }
- }
-
- /**
- * 鏂囦欢璁板綍-鏂囦欢鏂板缁撴灉鍥炶皟
- *
- * @param request 璇锋眰
- * @return 缁撴灉
- */
- @RequestMapping(value = "/del-file-callback/{version}", method = RequestMethod.POST)
- @ApiVersion(1)
- public String delFileCallback(HttpServletRequest request) {
- try {
- FieldSetEntity fse = null;
- Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
- RequestParameterEntity rpe = (RequestParameterEntity) bean;
- if (null != rpe && null != rpe.getFormData()) {
- fse = rpe.getFormData();
- }
- if (fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(FileCode.FORM_NODATA.getValue(), FileCode.FORM_NODATA.getText());
- return this.error(FileCode.FORM_NODATA.getValue(), FileCode.FORM_NODATA.getText());
- }
- JSONObject data = fileManagerService.delFileCallback(fse);
- JSONObject result = new JSONObject();
- result.put("data", data);
- result.put("msg", FileCode.SUCCESS.getText());
- result.put("code", "200");
- result.put("status", "success");
- return result.toString();
- } catch (BaseException e) {
- SpringMVCContextHolder.getSystemLogger().error(e);
- return this.error(e.getCode(), e.getMessageInfo());
- } catch (Exception e) {
- SpringMVCContextHolder.getSystemLogger().error(e);
- e.printStackTrace();
- return error(FileCode.DELETE_FILE_CALLBACK_FIAL.getValue(), FileCode.DELETE_FILE_CALLBACK_FIAL.getText());
- }
- }
/**
* 鑾峰彇瀹㈡埛涓婁紶鐨勬枃浠舵�诲ぇ灏�
@@ -357,32 +221,6 @@
}
}
- /**
- * 鑾峰彇鏂囦欢璁板綍淇℃伅
- *
- * @return 缁撴灉
- */
- @RequestMapping(value = "/get-file-info/{version}", method = RequestMethod.POST)
- @ApiVersion(1)
- public String getFileInfo(HttpServletRequest request) {
- try {
- FieldSetEntity fse = null;
- Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
- RequestParameterEntity rpe = (RequestParameterEntity) bean;
- if (null != rpe && null != rpe.getFormData()) {
- fse = rpe.getFormData();
- }
- if (fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(FileCode.FORM_NODATA.getValue(), FileCode.FORM_NODATA.getText());
- return this.error(FileCode.FORM_NODATA.getValue(), FileCode.FORM_NODATA.getText());
- }
- return BaseUtil.success(fileManagerService.getFileInfo(fse), null);
- } catch (Exception e) {
- SpringMVCContextHolder.getSystemLogger().error(e);
- e.printStackTrace();
- return error(FileCode.CLEAR_NO_USED_DATA_FAIL.getValue(), FileCode.CLEAR_NO_USED_DATA_FAIL.getText());
- }
- }
/**
* 鏂囦欢鍒櫎
@@ -436,7 +274,37 @@
return error(FileCode.UPLOAD_FILE_FAIL.getValue(), FileCode.UPLOAD_FILE_FAIL.getText());
}
}
-
+ /**
+ * 涓嬭浇鏂囦欢鎴栬�呭湪绾块瑙�
+ *
+ * @return 缁撴灉
+ */
+ @RequestMapping(value = "/get-file-content/{version}", method = RequestMethod.GET)
+ @ApiVersion(1)
+ public String getFileContents(HttpServletRequest request, HttpServletResponse response) {
+ try {
+ FieldSetEntity fse = null;
+ String uuid = request.getParameter(CoreConst.UUID);
+ String onlineView = request.getParameter(CmnConst.NEED_ONLINE_VIEW);
+
+ if (StringUtils.isEmpty(uuid)) {
+ SpringMVCContextHolder.getSystemLogger().error(FileCode.FORM_NODATA.getValue(), FileCode.FORM_NODATA.getText());
+ return this.error(FileCode.FORM_NODATA.getValue(), FileCode.FORM_NODATA.getText());
+ }
+ fse=new FieldSetEntity();
+ fse.setTableName(CmnConst.PRODUCT_SYS_ATTACHMENTS);
+ fse.setValue(CoreConst.UUID, uuid);
+ fse.setValue(CmnConst.NEED_ONLINE_VIEW, onlineView);
+ SpringMVCContextHolder.getSystemLogger().info("閫氳繃GET璇锋眰鑾峰彇闄勪欢鍐呭");
+ // 姝ｅ紡浠ｇ爜
+ fileManagerService.getFileContent(fse, response);
+ return OK();
+ } catch (Exception e) {
+ SpringMVCContextHolder.getSystemLogger().error(e);
+ e.printStackTrace();
+ return error(FileCode.GET_FILE_CONTENT_FAIL.getValue(), FileCode.GET_FILE_CONTENT_FAIL.getText());
+ }
+ }
/**
* 涓嬭浇鏂囦欢鎴栬�呭湪绾块瑙�
*
--
Gitblit v1.9.2