From 9925bc571e1234d96a66063134ab9a9ddfd7c031 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期一, 03 十一月 2025 15:53:06 +0800
Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-file/V2.0.0 into dev

---
 src/main/java/com/product/file/controller/DocumentController.java |  233 ++++++++++++++++++----------------------------------------
 1 files changed, 73 insertions(+), 160 deletions(-)

diff --git a/src/main/java/com/product/file/controller/DocumentController.java b/src/main/java/com/product/file/controller/DocumentController.java
index 8a08d43..de3fd48 100644
--- a/src/main/java/com/product/file/controller/DocumentController.java
+++ b/src/main/java/com/product/file/controller/DocumentController.java
@@ -3,10 +3,8 @@
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.product.core.config.CoreConst;
 import com.product.core.entity.DataTableEntity;
 import com.product.core.entity.FieldSetEntity;
-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;
@@ -24,7 +22,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.swing.text.Document;
 import java.util.*;
 
 
@@ -95,18 +92,7 @@
 	public String upDocumentName(HttpServletRequest request) {
 		try {
 			//鑾峰彇鍙傛暟
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			//鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (fse == null) {
-				SpringMVCContextHolder
-						.getSystemLogger().error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-				return this.error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-			}
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
 			IDocumentService service = (IDocumentService) getProxyInstance(documentService);
 			boolean flag = service.upDocumentName(fse);
 			if (flag) {
@@ -134,18 +120,7 @@
 	public String delDocument(HttpServletRequest request) {
 		try {
 			//鑾峰彇鍙傛暟
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			//鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (fse == null) {
-				SpringMVCContextHolder
-						.getSystemLogger().error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-				return this.error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-			}
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
 			IDocumentService service = (IDocumentService) getProxyInstance(documentService);
 			boolean flag = service.delDocument(fse);
 			if (flag) {
@@ -173,18 +148,7 @@
 	public String documentAll(HttpServletRequest request) {
 		try {
 			//鑾峰彇鍙傛暟
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			//鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (fse == null) {
-				SpringMVCContextHolder
-						.getSystemLogger().error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-				return this.error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-			}
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
 			DataTableEntity dataTableEntity = documentService.documentAll(fse);
 			return OK_List(dataTableEntity);
 		} catch (BaseException e) {
@@ -208,18 +172,7 @@
 	public String documentInfo(HttpServletRequest request) {
 		try {
 			//鑾峰彇鍙傛暟
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			//鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (fse == null) {
-				SpringMVCContextHolder
-						.getSystemLogger().error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-				return this.error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-			}
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
 			return OK_List(documentService.documentInfo(fse));
 		} catch (BaseException e) {
 			SpringMVCContextHolder.getSystemLogger().error(e);
@@ -245,18 +198,7 @@
 	public String getButtonPermissions(HttpServletRequest request) {
 		try {
 			//鑾峰彇鍙傛暟
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			//鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (fse == null) {
-				SpringMVCContextHolder
-						.getSystemLogger().error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-				return this.error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-			}
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
 			if (BaseUtil.strIsNull(fse.getString(CmnConst.DIRECTORY_UUID))) {
 				return OK();
 			}
@@ -293,18 +235,7 @@
 	public String popBoxGetFileDirectory(HttpServletRequest request) {
 		try {
 			//鑾峰彇鍙傛暟
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			//鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (fse == null) {
-				SpringMVCContextHolder
-						.getSystemLogger().error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-				return this.error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-			}
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
 			JSONObject obj = documentService.popBoxGetFileDirectory(fse);
 			return ResultInfo.success(obj);
 		} catch (BaseException e) {
@@ -328,18 +259,7 @@
 	public String fileMoveTo(HttpServletRequest request) {
 		try {
 			//鑾峰彇鍙傛暟
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			//鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (fse == null) {
-				SpringMVCContextHolder
-						.getSystemLogger().error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-				return this.error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-			}
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
 			if (documentService.fileMoveTo(fse)) {
 				return OK();
 			} else {
@@ -357,6 +277,7 @@
 
 
 	/**
+	 * 	鑾峰彇鏂囦欢鏃ュ織
 	 * @param request
 	 * @return
 	 */
@@ -365,18 +286,7 @@
 	public String getDocumentLog(HttpServletRequest request) {
 		try {
 			//鑾峰彇鍙傛暟
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			//鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (fse == null) {
-				SpringMVCContextHolder
-						.getSystemLogger().error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-				return this.error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-			}
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
 			return OK_List(documentService.getDocumentLog(fse));
 		} catch (BaseException e) {
 			SpringMVCContextHolder.getSystemLogger().error(e);
@@ -486,23 +396,18 @@
 	@RequestMapping(value = "/getApplyDocument/{version}", method = RequestMethod.POST)
 	@ApiVersion(1)
 	public String getApplyDocument(HttpServletRequest request) {
-
-		//鑾峰彇鍙傛暟
-		FieldSetEntity fse = null;
-		Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-		if (bean != null) {
-			RequestParameterEntity reqp = (RequestParameterEntity) bean;
-			fse = reqp.getFormData();
+		try {
+			//鑾峰彇鍙傛暟
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+			DataTableEntity applyDocument = documentService.getApplyDocument(fse);
+			return OK_List(applyDocument);
+		} catch (BaseException e) {
+			e.printStackTrace();
+			return this.error(e);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return this.error(DocumentCode.DOCUMENT_OPERATE_FAIL.getValue(), DocumentCode.DOCUMENT_OPERATE_FAIL.getText() + e.getMessage());
 		}
-		//鍒ゆ柇鍙傛暟鏄惁涓虹┖
-		if (fse == null) {
-			SpringMVCContextHolder
-					.getSystemLogger().error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-			return this.error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-		}
-		DataTableEntity applyDocument = documentService.getApplyDocument(fse);
-		return OK_List(applyDocument);
-
 	}
 
 
@@ -515,21 +420,18 @@
 	@RequestMapping(value = "/addOrUpdateApplyDocument/{version}", method = RequestMethod.POST)
 	@ApiVersion(1)
 	public String addOrUpdateApplyDocument(HttpServletRequest request) {
-		//鑾峰彇鍙傛暟
-		FieldSetEntity fse = null;
-		Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-		if (bean != null) {
-			RequestParameterEntity reqp = (RequestParameterEntity) bean;
-			fse = reqp.getFormData();
+		try {
+			//鑾峰彇鍙傛暟
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+			documentService.addOrUpdateApplyDocument(fse);
+			return OK();
+		} catch (BaseException e) {
+			e.printStackTrace();
+			return this.error(e);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return this.error(DocumentCode.DOCUMENT_OPERATE_FAIL.getValue(), DocumentCode.DOCUMENT_OPERATE_FAIL.getText() + e.getMessage());
 		}
-		//鍒ゆ柇鍙傛暟鏄惁涓虹┖
-		if (fse == null) {
-			SpringMVCContextHolder
-					.getSystemLogger().error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-			return this.error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-		}
-		documentService.addOrUpdateApplyDocument(fse);
-		return OK();
 	}
 
 	/**
@@ -540,8 +442,16 @@
 	@RequestMapping(value = "/getApplayFileSort/{version}", method = RequestMethod.POST)
 	@ApiVersion(1)
 	public String getApplayFileSort() {
-		DataTableEntity applayFileSort = documentService.getApplyFileSort();
-		return OK_List(applayFileSort);
+		try {
+			DataTableEntity applayFileSort = documentService.getApplyFileSort();
+			return OK_List(applayFileSort);
+		} catch (BaseException e) {
+			e.printStackTrace();
+			return this.error(e);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return this.error(DocumentCode.DOCUMENT_OPERATE_FAIL.getValue(), DocumentCode.DOCUMENT_OPERATE_FAIL.getText() + e.getMessage());
+		}
 	}
 
 
@@ -553,8 +463,16 @@
 	@RequestMapping(value = "/getApplayUserSort/{version}", method = RequestMethod.POST)
 	@ApiVersion(1)
 	public String getApplayUserSort() {
-		DataTableEntity applayFileSort = documentService.getApplyUserSort();
-		return OK_List(applayFileSort);
+		try {
+			DataTableEntity applayFileSort = documentService.getApplyUserSort();
+			return OK_List(applayFileSort);
+		} catch (BaseException e) {
+			e.printStackTrace();
+			return this.error(e);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return this.error(DocumentCode.DOCUMENT_OPERATE_FAIL.getValue(), DocumentCode.DOCUMENT_OPERATE_FAIL.getText() + e.getMessage());
+		}
 	}
 
 	/**
@@ -566,39 +484,34 @@
 	@RequestMapping(value = "/getApplayInfo/{version}", method = RequestMethod.POST)
 	@ApiVersion(1)
 	public String getApplayInfo(HttpServletRequest request) {
-		//鑾峰彇鍙傛暟
-		FieldSetEntity fse = null;
-		Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-		if (bean != null) {
-			RequestParameterEntity reqp = (RequestParameterEntity) bean;
-			fse = reqp.getFormData();
+		try {
+			//鑾峰彇鍙傛暟
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+			FieldSetEntity applayInfo = documentService.getApplyInfo(fse);
+			return OK_List(applayInfo);
+		} catch (BaseException e) {
+			e.printStackTrace();
+			return this.error(e);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return this.error(DocumentCode.DOCUMENT_OPERATE_FAIL.getValue(), DocumentCode.DOCUMENT_OPERATE_FAIL.getText() + e.getMessage());
 		}
-		//鍒ゆ柇鍙傛暟鏄惁涓虹┖
-		if (fse == null) {
-			SpringMVCContextHolder
-					.getSystemLogger().error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-			return this.error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-		}
-		FieldSetEntity applayInfo = documentService.getApplyInfo(fse);
-		return OK_List(applayInfo);
 	}
+	
 	@RequestMapping(value = "/getFileItemize/{version}", method = RequestMethod.POST)
 	@ApiVersion(1)
 	public String getFileItemize(HttpServletRequest request) {
-		//鑾峰彇鍙傛暟
-		FieldSetEntity fse = null;
-		Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-		if (bean != null) {
-			RequestParameterEntity reqp = (RequestParameterEntity) bean;
-			fse = reqp.getFormData();
+		try {
+			//鑾峰彇鍙傛暟
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+			return OK_List(documentService.getFileItemize(fse));
+		} catch (BaseException e) {
+			e.printStackTrace();
+			return this.error(e);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return this.error(DocumentCode.DOCUMENT_OPERATE_FAIL.getValue(), DocumentCode.DOCUMENT_OPERATE_FAIL.getText() + e.getMessage());
 		}
-		//鍒ゆ柇鍙傛暟鏄惁涓虹┖
-		if (fse == null) {
-			SpringMVCContextHolder
-					.getSystemLogger().error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-			return this.error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
-		}
-		return OK_List(documentService.getFileItemize(fse));
 	}
 }
 

--
Gitblit v1.9.2