From e1b48a354bb0a430a1f913f1b8de03d69c9514e9 Mon Sep 17 00:00:00 2001
From: 6c <420680616@qq.com>
Date: 星期一, 03 十一月 2025 11:56:43 +0800
Subject: [PATCH] 已送审保养打印-打印模板处理为保存到数据库
---
src/main/java/com/product/file/controller/DocumentDirectoryController.java | 120 ++++++++++++++++++++++--------------------------------------
1 files changed, 44 insertions(+), 76 deletions(-)
diff --git a/src/main/java/com/product/file/controller/DocumentDirectoryController.java b/src/main/java/com/product/file/controller/DocumentDirectoryController.java
index 0537848..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;
@@ -36,7 +35,7 @@
@RequestMapping("/api/directory")
@RestController
public class DocumentDirectoryController extends AbstractBaseController {
-
+
@Autowired
DocumentDirectoryService documentDirectoryService;
@@ -45,10 +44,10 @@
*/
@Autowired
PermissionService permissionService;
-
+
/**
* 鏂板鏂囦欢澶规暟鎹�
- *
+ *
* @param request
* @return
*/
@@ -69,10 +68,10 @@
DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getText());
}
}
-
+
/**
* 鏂囨。鐩綍淇濆瓨
- *
+ *
* @param request
* @return
*/
@@ -88,6 +87,7 @@
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) {
@@ -100,7 +100,7 @@
/**
* 涓汉鏂囦欢澶归噸鍛藉悕
- *
+ *
* @param request
* @return
*/
@@ -109,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();
@@ -157,7 +145,7 @@
/**
* 鍒犻櫎鏂囦欢澶�
- *
+ *
* @param request
* @return
*/
@@ -166,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();
@@ -214,7 +190,7 @@
/**
* 鏂囦欢鐩綍鍒楄〃灞曠ず
- *
+ *
* @param request
* @return
*/
@@ -223,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);
@@ -250,7 +214,7 @@
/**
* 鑾峰彇鏂囨。鐩綍鏍戝舰鍒楄〃
- *
+ *
* @param request
* @return
*/
@@ -259,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);
@@ -286,7 +238,7 @@
/**
* 鑾峰彇鏂囨。鐩綍璇︽儏
- *
+ *
* @param request
* @return
*/
@@ -295,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();
@@ -335,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