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/DocumentDirectoryController.java | 99 ++++++++++++++++---------------------------------
1 files changed, 33 insertions(+), 66 deletions(-)
diff --git a/src/main/java/com/product/file/controller/DocumentDirectoryController.java b/src/main/java/com/product/file/controller/DocumentDirectoryController.java
index f6c645a..6616269 100644
--- a/src/main/java/com/product/file/controller/DocumentDirectoryController.java
+++ b/src/main/java/com/product/file/controller/DocumentDirectoryController.java
@@ -3,7 +3,6 @@
import com.product.core.config.CoreConst;
import com.product.core.controller.support.AbstractBaseController;
import com.product.core.entity.FieldSetEntity;
-import com.product.core.entity.RequestParameterEntity;
import com.product.core.exception.BaseException;
import com.product.core.permission.PermissionService;
import com.product.core.spring.context.SpringMVCContextHolder;
@@ -110,19 +109,7 @@
public String upDocumentDirectoryName(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);
String uuid = fse.getString(CmnConst.UUID);// 琛╱uid
// 瓒呯骇绠＄悊鍛樹负1 鏅�氬崟浣嶇鐞嗗憳2
SystemUser currentUser = SpringMVCContextHolder.getCurrentUser();
@@ -167,19 +154,7 @@
public String delDocumentDirectory(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);
String uuid = fse.getString(CmnConst.UUID);// 琛╱uid
// 瓒呯骇绠＄悊鍛樹负1 鏅�氬崟浣嶇鐞嗗憳2
SystemUser currentUser = SpringMVCContextHolder.getCurrentUser();
@@ -224,19 +199,7 @@
public String moveToList(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(documentDirectoryService.moveToList(fse));
} catch (BaseException e) {
SpringMVCContextHolder.getSystemLogger().error(e);
@@ -260,19 +223,7 @@
public String treeListAll(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 ResultInfo.success(documentDirectoryService.treeListAll(fse));
} catch (BaseException e) {
SpringMVCContextHolder.getSystemLogger().error(e);
@@ -296,19 +247,7 @@
public String documentDirectoryInfo(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);
String uuid = fse.getString(CmnConst.UUID);// 琛╱uid
// 瓒呯骇绠＄悊鍛樹负1 鏅�氬崟浣嶇鐞嗗憳2
SystemUser currentUser = SpringMVCContextHolder.getCurrentUser();
@@ -336,4 +275,32 @@
DocumentCode.DOCUMENT_CATALOG_GET_FAIL.getText());
}
}
+
+ /**
+ * 淇濆瓨鏂囨。褰掓。閰嶇疆
+ * @param request
+ * @return
+ */
+ @RequestMapping(value = "/save-file-config/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String saveFileConfig(HttpServletRequest request) {
+ try {
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+ IDocumentDirectoryService service = (IDocumentDirectoryService) getProxyInstance(documentDirectoryService);
+ if(service.saveFileConfig(fse)) {
+ return OK();
+ }
+ return error(DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getValue(),
+ DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getText());
+ } catch (BaseException e) {
+ e.printStackTrace();
+ SpringMVCContextHolder.getSystemLogger().error(e);
+ return this.error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ SpringMVCContextHolder.getSystemLogger().error(e);
+ return error(DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getValue(),
+ DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getText());
+ }
+ }
}
--
Gitblit v1.9.2