From a64a8cd39c6fa141931f71b55c95b068f928d18f Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期五, 23 八月 2024 16:17:22 +0800
Subject: [PATCH] 代码提交
---
src/main/java/com/product/file/controller/DocumentController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/product/file/controller/DocumentConstoller.java b/src/main/java/com/product/file/controller/DocumentController.java
similarity index 90%
rename from src/main/java/com/product/file/controller/DocumentConstoller.java
rename to src/main/java/com/product/file/controller/DocumentController.java
index 81c1537..b91da85 100644
--- a/src/main/java/com/product/file/controller/DocumentConstoller.java
+++ b/src/main/java/com/product/file/controller/DocumentController.java
@@ -39,7 +39,7 @@
*/
@RequestMapping("/api/document")
@RestController
-public class DocumentConstoller extends AbstractBaseController {
+public class DocumentController extends AbstractBaseController {
@Autowired
public DocumentService documentService;
@@ -54,18 +54,7 @@
public String addDocument(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);
String uuids = service.addDocument(fse);
return OK_Add(uuids);
@@ -382,6 +371,50 @@
return this.error(DocumentCode.DOCUMENT_LOG_FAIL.getValue(), DocumentCode.DOCUMENT_LOG_FAIL.getText());
}
}
+
+ /**
+ * 鏂囨。鏀惰棌
+ * @param request
+ * @return
+ */
+ @RequestMapping(value = "/collection/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String documentCollection(HttpServletRequest request) {
+ try {
+ //鑾峰彇鍙傛暟
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_DOCUMENT_COLLECTION);
+ return OK_Add(documentService.documentCollection(fse));
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return this.error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return this.error(DocumentCode.DOCUMENT_COLLECTION_FAIL.getValue(), DocumentCode.DOCUMENT_COLLECTION_FAIL.getText() + e.getMessage());
+ }
+ }
+ /**
+ * 鏂囨。鍙栨秷鏀惰棌
+ * @param request
+ * @return
+ */
+ @RequestMapping(value = "/cancel-collection/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String documentCancelCollection(HttpServletRequest request) {
+ try {
+ //鑾峰彇鍙傛暟
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_DOCUMENT_COLLECTION);
+ if (documentService.documentCancelCollection(fse.getString("document_uuid"))) {
+ return OK();
+ }
+ return error(DocumentCode.DOCUMENT_CANCEL_COLLECTION_FAIL.getValue(), DocumentCode.DOCUMENT_CANCEL_COLLECTION_FAIL.getText());
+ } 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());
+ }
+ }
@RequestMapping(value = "/getApplyDocument/{version}", method = RequestMethod.POST)
--
Gitblit v1.9.2