From 4fb14ab9cfd6c8aae9e85c23eb7f7aabadd17727 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期一, 27 十月 2025 14:48:39 +0800
Subject: [PATCH] 单位文件夹代码提交
---
src/main/java/com/product/file/controller/DocumentController.java | 233 ++++++++++----------------------
src/main/java/com/product/file/service/DocumentService.java | 73 ++++-----
src/main/java/com/product/file/controller/DocumentDirectoryController.java | 71 ---------
3 files changed, 112 insertions(+), 265 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));
}
}
diff --git a/src/main/java/com/product/file/controller/DocumentDirectoryController.java b/src/main/java/com/product/file/controller/DocumentDirectoryController.java
index 41573e4..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();
diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index 9b6469d..cc507bd 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -25,6 +25,7 @@
import org.springframework.stereotype.Component;
import java.util.*;
+import java.util.stream.Collectors;
/**
* Copyright lx
@@ -324,52 +325,46 @@
@Override
public FieldSetEntity getButtonPermissions(FieldSetEntity fieldSetEntity) throws BaseException {
- String butt = "";
+ String finalButtonPermissions = "";
DataTableEntity dataTable = null;
FieldSetEntity fse = new FieldSetEntity();
fse.setTableName(CmnConst.PRODUCT_OA_DOCUMENT);
if (StringUtils.equalsAny(fieldSetEntity.getString(CmnConst.DIRECTORY_UUID), "!borrow", "!favorite")) {
// 鏀惰棌澶瑰拰鍊熼槄鏂囦欢澶圭壒娈婂鐞�
-
dataTable = this.documentAll(fieldSetEntity);
- butt = "1,2";
+ finalButtonPermissions = "1,2";
} else if ("1".equals(fieldSetEntity.getString(CmnConst.DIRECTORY_TYPE))) {
- //鑾峰彇鐨剈ser_id
- Integer user_id = SpringMVCContextHolder.getCurrentUser().getUser_id();
- String key = "%," + user_id + ",%";
+ //鑾峰彇褰撳墠鐐瑰嚮鏂囦欢澶筓UID
String directory_uuid = fieldSetEntity.getString(CmnConst.DIRECTORY_UUID);
- //String key = "%,140,%";
- DataTableEntity dataTableEntity = new DataTableEntity();
-
- FieldSetEntity org = recursionRole(directory_uuid);
- if (verifyOrgExist(org.getString("storage_uuid"))) {
- StringBuffer sql = new StringBuffer();
- sql.append(" SELECT substring_index(substring_index(a.rigths,',',b.help_topic_id+1),',',-1) fun FROM PRODUCT_OA_directory_rights a ")
- .append(" INNER join mysql.help_topic b on b.help_topic_id < (length(a.rigths) - length(replace(a.rigths,',',''))+1) ")
- .append(" WHERE a.directory_uuid = ? ");
- dataTableEntity = baseDao.listTable(sql.toString(), new String[]{org.getString("directory_uuid")});
- }
- StringBuffer button = new StringBuffer();
- if (!BaseUtil.dataTableIsEmpty(dataTableEntity)) {
- for (int i = 0, length = dataTableEntity.getRows(); i < length; i++) {
- FieldSetEntity field = dataTableEntity.getFieldSetEntity(i);
- String fun = field.getString("fun");
- //鏉冮檺1(鏌ョ湅),2(涓嬭浇),3(鏂板涓婁紶),4(淇敼,閲嶅懡鍚�),5(鍒犻櫎),6(绉诲姩)
- button.append(fun).append(",");
- if ("1".equals(fun)) {
- //鏈夋煡鐪嬫潈闄愬氨鍔犺浇鍒楄〃
- dataTable = this.documentAll(fieldSetEntity);
+ // 鑾峰彇鐐瑰嚮鏂囦欢澶圭殑鎿嶄綔鏉冮檺锛堝鏋滃綋鍓嶆枃浠跺す娌℃湁閰嶇疆鏉冮檺锛屽垯閫掑綊涓婄骇鐩綍鏉冮檺锛�
+ DataTableEntity dtOperationPermissions = recursionRole(directory_uuid);
+ if (!BaseUtil.dataTableIsEmpty(dtOperationPermissions)) {
+ String buttonPermissions = ",";
+ for (int i = 0; i < dtOperationPermissions.getRows(); i++) {
+ // 鑾峰彇鍗曟潯鎿嶄綔鏉冮檺鏁版嵁
+ FieldSetEntity fseOperationPermissions = dtOperationPermissions.getFieldSetEntity(i);
+ // 楠岃瘉鎿嶄綔鏉冮檺鏄惁涓庡綋鍓嶆搷浣滀汉鍖归厤鎴愬姛
+ if (verifyOrgExist(fseOperationPermissions.getString("storage_uuid"))) {
+ // 鎸夐挳鏉冮檺鎷兼帴
+ buttonPermissions += fseOperationPermissions.getString("rigths") + ",";
}
}
- }
- if (!BaseUtil.strIsNull(button.toString())) {
- butt = button.substring(0, button.length() - 1);
+ if (!BaseUtil.strIsNull(buttonPermissions)) {
+ // 鍒ゆ柇鏄惁鍖呭惈鏌ョ湅鏉冮檺锛屽寘鍚煡鐪嬫潈闄愬垯鑾峰彇鏂囦欢鍒楄〃
+ if (buttonPermissions.contains(",1,")) {
+ dataTable = this.documentAll(fieldSetEntity);
+ }
+ finalButtonPermissions = Arrays.stream(buttonPermissions.split(","))
+ .filter(s -> !s.isEmpty())
+ .distinct()
+ .collect(Collectors.joining(","));
+ }
}
} else {
dataTable = this.documentAll(fieldSetEntity);
}
Map<String, DataTableEntity> dataMap = MapUtils.newHashMap();
- fse.setValue("button", butt);
+ fse.setValue("button", finalButtonPermissions);
//鍔犺浇鏂囦欢璺緞
DataTableEntity file_list;
if (StringUtils.equalsAny(fieldSetEntity.getString(CmnConst.DIRECTORY_UUID), "!borrow", "!favorite")) {
@@ -396,20 +391,20 @@
return fse;
}
-
+
/**
* 閫掑綊鑾峰彇鏉冮檺濡傛灉褰撳墠鏂囨。鏈厤缃潈闄愬氨鍘婚�掑綊鏌ヨ鐖剁骇鏉冮檺
* @param directory_uuid
* @return
*/
- private FieldSetEntity recursionRole(String directory_uuid){
- FieldSetEntity org = baseDao.getFieldSetByFilter(CmnConst.PRODUCT_OA_DIRECTORY_RIGHTS, "directory_uuid=?", new String[]{directory_uuid}, false);
- if (FieldSetEntity.isEmpty(org)&&!StringUtils.isEmpty(directory_uuid)){
- FieldSetEntity directoryFs = baseDao.getFieldSet(CmnConst.PRODUCT_OA_DIRECTORY, directory_uuid,false);
- FieldSetEntity parentFs = baseDao.getFieldSetByFilter(CmnConst.PRODUCT_OA_DIRECTORY, "tricode=?",new String[]{directoryFs.getString("tricode_parent")},false);
- org=recursionRole(parentFs.getUUID());
+ private DataTableEntity recursionRole(String directory_uuid){
+ DataTableEntity dtOperationPermissions = baseDao.listTable(CmnConst.PRODUCT_OA_DIRECTORY_RIGHTS, "directory_uuid = ?", new Object[] {directory_uuid});
+ if (BaseUtil.dataTableIsEmpty(dtOperationPermissions)) {
+ FieldSetEntity fseDirectory = baseDao.getFieldSet(CmnConst.PRODUCT_OA_DIRECTORY, directory_uuid,false);
+ FieldSetEntity fseDirectoryParent = baseDao.getFieldSetByFilter(CmnConst.PRODUCT_OA_DIRECTORY, "tricode=?",new String[]{fseDirectory.getString("tricode_parent")},false);
+ dtOperationPermissions = recursionRole(fseDirectoryParent.getUUID());
}
- return org;
+ return dtOperationPermissions;
}
@Override
--
Gitblit v1.9.2