From 4d610081d9d2da1a4db118ce260d5afeea312d9f Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 28 八月 2024 10:09:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/product/file/controller/DocumentDirectoryController.java | 101 ++++++++------------------------------------------
1 files changed, 17 insertions(+), 84 deletions(-)
diff --git a/src/main/java/com/product/file/controller/DocumentDirectoryController.java b/src/main/java/com/product/file/controller/DocumentDirectoryController.java
index cfcb179..0537848 100644
--- a/src/main/java/com/product/file/controller/DocumentDirectoryController.java
+++ b/src/main/java/com/product/file/controller/DocumentDirectoryController.java
@@ -36,7 +36,7 @@
@RequestMapping("/api/directory")
@RestController
public class DocumentDirectoryController extends AbstractBaseController {
-
+
@Autowired
DocumentDirectoryService documentDirectoryService;
@@ -45,10 +45,10 @@
*/
@Autowired
PermissionService permissionService;
-
+
/**
* 鏂板鏂囦欢澶规暟鎹�
- *
+ *
* @param request
* @return
*/
@@ -69,90 +69,23 @@
DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getText());
}
}
-
+
/**
- * 鏂板鏂囦欢澶规暟鎹�
- *
+ * 鏂囨。鐩綍淇濆瓨
+ *
* @param request
* @return
*/
- @RequestMapping(value = "/addDocumentDirectory/{version}", method = RequestMethod.POST)
+ @RequestMapping(value = "/save-directory/{version}", method = RequestMethod.POST)
@ApiVersion(1)
- public String addDocumentDirectory(HttpServletRequest request) {
+ public String saveDocumentDireactory(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);
IDocumentDirectoryService service = (IDocumentDirectoryService) getProxyInstance(documentDirectoryService);
- return OK_Add(service.addDocumentDirectory(fse));
- } catch (BaseException e) {
- e.printStackTrace();
- SpringMVCContextHolder.getSystemLogger().error(e);
- return this.error(e);
- } catch (Exception e) {
- e.printStackTrace();
- SpringMVCContextHolder.getSystemLogger().error(e);
- return this.error(DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getValue(),
- DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getText());
- }
- }
-
- /**
- * 淇敼鏂囦欢澶�
- *
- * @param request
- * @return
- */
- @RequestMapping(value = "/upDocumentDirectory/{version}", method = RequestMethod.POST)
- @ApiVersion(1)
- public String upDocumentDirectory(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());
- }
- String uuid = fse.getString(CmnConst.UUID);// 琛╱uid
- // 瓒呯骇绠＄悊鍛樹负1 鏅�氬崟浣嶇鐞嗗憳2
- SystemUser currentUser = SpringMVCContextHolder.getCurrentUser();
- int type;
- if (currentUser.getUserType() == 2) {
- type = CoreConst.DATA_PERMISSION_VALID_TYPE_ORG;
- } else {
- type = CoreConst.DATA_PERMISSION_VALID_TYPE_USER;
- }
- // 鏁版嵁鎿嶄綔鐨勬潈闄愰獙璇�
- if (!permissionService.validDataPermission(CmnConst.PRODUCT_OA_DIRECTORY, uuid, type)) {
- SpringMVCContextHolder.getSystemLogger().error(SystemErrorCode.SYSTEM_NOT_OPER_PERMISSION.getValue(),
- SystemErrorCode.SYSTEM_NOT_OPER_PERMISSION.getText());
- return this.error(SystemErrorCode.SYSTEM_NOT_OPER_PERMISSION.getValue(),
- SystemErrorCode.SYSTEM_NOT_OPER_PERMISSION.getText());
- }
- IDocumentDirectoryService service = (IDocumentDirectoryService) getProxyInstance(documentDirectoryService);
- if (service.upDocumentDirectory(fse)) {
+ if(service.saveDocumentDireactory(fse)) {
return OK();
}
- return this.error(DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getValue(),
+ return error(DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getValue(),
DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getText());
} catch (BaseException e) {
SpringMVCContextHolder.getSystemLogger().error(e);
@@ -160,14 +93,14 @@
} catch (Exception e) {
e.printStackTrace();
SpringMVCContextHolder.getSystemLogger().error(e);
- return this.error(DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getValue(),
+ return error(DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getValue(),
DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getText());
}
}
/**
* 涓汉鏂囦欢澶归噸鍛藉悕
- *
+ *
* @param request
* @return
*/
@@ -224,7 +157,7 @@
/**
* 鍒犻櫎鏂囦欢澶�
- *
+ *
* @param request
* @return
*/
@@ -281,7 +214,7 @@
/**
* 鏂囦欢鐩綍鍒楄〃灞曠ず
- *
+ *
* @param request
* @return
*/
@@ -317,7 +250,7 @@
/**
* 鑾峰彇鏂囨。鐩綍鏍戝舰鍒楄〃
- *
+ *
* @param request
* @return
*/
@@ -353,7 +286,7 @@
/**
* 鑾峰彇鏂囨。鐩綍璇︽儏
- *
+ *
* @param request
* @return
*/
--
Gitblit v1.9.2