From 15cb14e5d1fe955df8d1b73c2c6c8ca768a64441 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期三, 24 九月 2025 17:48:54 +0800
Subject: [PATCH] 代码提交
---
src/main/java/com/product/administration/controller/CooperateController.java | 288 +++++++++------------------------------------------------
1 files changed, 45 insertions(+), 243 deletions(-)
diff --git a/src/main/java/com/product/administration/controller/CooperateController.java b/src/main/java/com/product/administration/controller/CooperateController.java
index f992756..9b2444c 100644
--- a/src/main/java/com/product/administration/controller/CooperateController.java
+++ b/src/main/java/com/product/administration/controller/CooperateController.java
@@ -5,14 +5,15 @@
import com.product.administration.service.CooperatesService;
import com.product.administration.service.ide.ICooperatesService;
import com.product.common.lang.StringUtils;
-import com.product.core.config.CoreConst;
import com.product.core.controller.support.AbstractBaseController;
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.module.sys.version.ApiVersion;
+import com.product.tool.flow.service.FlowCoordinationService;
+import com.product.util.BaseUtil;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,7 +36,8 @@
@Autowired
CooperatesService cooperatesService;
-
+ @Autowired
+ public FlowCoordinationService flowCoordinationService;
/**
* @Date: 2020-03-23 18:00
* @Author: ZhouJie
@@ -45,24 +47,7 @@
public String getCooperatesList(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 (bean == null || fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
- SystemCode.SYSTEM_FORM_NODATA.getText());
- return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
- }
- // 鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
- if (!CmnConst.PRODUCT_OA_COOPERATES.equals(fse.getTableName())) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
- SystemCode.SYSTEM_TABLE_NODATA.getText());
- return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
- }
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_COOPERATES);
// 鍒ゆ柇鍒嗛〉鍙傛暟
if (fse.getString(CmnConst.PAGESIZE) == null || fse.getString(CmnConst.CPAGE) == null) {
return this.error(SystemCode.SYSTEM_CPAGES_NOT_NULL.getValue(),
@@ -92,26 +77,9 @@
public String getCooperateInfo(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 (bean == null || fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
- SystemCode.SYSTEM_FORM_NODATA.getText());
- return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
- }
- // 鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
- if (!CmnConst.PRODUCT_OA_COOPERATES.equals(fse.getTableName())) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
- SystemCode.SYSTEM_TABLE_NODATA.getText());
- return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
- }
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_COOPERATES);
// 鍒ゆ柇uuid鏄惁涓虹┖
- if (com.alibaba.druid.util.StringUtils.isEmpty(fse.getString("uuid"))) {
+ if (StringUtils.isEmpty(fse.getUUID())) {
SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
SystemCode.SYSTEM_TABLE_NODATA.getText());
return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
@@ -138,24 +106,7 @@
public String releaseCooperate(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 (bean == null || fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
- SystemCode.SYSTEM_FORM_NODATA.getText());
- return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
- }
- // 鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
- if (!CmnConst.PRODUCT_OA_COOPERATES.equals(fse.getTableName())) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
- SystemCode.SYSTEM_TABLE_NODATA.getText());
- return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
- }
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_COOPERATES);
fse.setValue("type",4);
cooperatesService.sendCooperate(fse);
return OK();
@@ -180,24 +131,7 @@
public String addCooperate(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 (bean == null || fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
- SystemCode.SYSTEM_FORM_NODATA.getText());
- return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
- }
- // 鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
- if (!CmnConst.PRODUCT_OA_COOPERATES.equals(fse.getTableName())) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
- SystemCode.SYSTEM_TABLE_NODATA.getText());
- return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
- }
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_COOPERATES);
ICooperatesService service = (ICooperatesService) getProxyInstance(
cooperatesService);
String uuid = service.addCooperate(fse);
@@ -230,32 +164,14 @@
public String updateCooperate(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 (bean == null || fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
- SystemCode.SYSTEM_FORM_NODATA.getText());
- return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
- }
- // 鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
- if (!CmnConst.PRODUCT_OA_COOPERATES.equals(fse.getTableName())) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
- SystemCode.SYSTEM_TABLE_NODATA.getText());
- return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
- }
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_COOPERATES);
// 鍒ゆ柇uuid鏄惁涓虹┖
if (com.alibaba.druid.util.StringUtils.isEmpty(fse.getString("uuid"))) {
SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_COUNT.getValue(),
SystemCode.SYSTEM_FORM_COUNT.getText());
return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
}
- ICooperatesService service = (ICooperatesService) getProxyInstance(
- cooperatesService);
+ ICooperatesService service = (ICooperatesService) getProxyInstance(cooperatesService);
boolean succ = service.updateCooperate(fse);
if (succ) {
return OK();
@@ -286,26 +202,9 @@
public String deleteCooperate(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 (bean == null || fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
- SystemCode.SYSTEM_FORM_NODATA.getText());
- return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
- }
- // 鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
- if (!CmnConst.PRODUCT_OA_COOPERATES.equals(fse.getTableName())) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
- SystemCode.SYSTEM_TABLE_NODATA.getText());
- return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
- }
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_COOPERATES);
// 鍒ゆ柇uuid鏄惁涓虹┖
- if (com.alibaba.druid.util.StringUtils.isEmpty(fse.getString("uuid"))) {
+ if (StringUtils.isEmpty(fse.getUUID())) {
SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_COUNT.getValue(),
SystemCode.SYSTEM_FORM_COUNT.getText());
return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
@@ -331,7 +230,6 @@
SystemCode.SYSTEM_DELETE_COOPERATES_FAIL.getText());
}
}
-
/**
* @Date: 2020-04-01 16:06
* @Author: ZhouJie
@@ -341,26 +239,30 @@
public String sendCooperate(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 (bean == null || fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
- SystemCode.SYSTEM_FORM_NODATA.getText());
- return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
- }
- // 鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
- if (!CmnConst.PRODUCT_OA_COOPERATES.equals(fse.getTableName())) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
- SystemCode.SYSTEM_TABLE_NODATA.getText());
- return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
- }
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_COOPERATES);
cooperatesService.sendCooperate(fse);
-
+ return OK();
+ } 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(SystemCode.SYSTEM_SEND_COOPERATES_FAIL.getValue(),
+ SystemCode.SYSTEM_SEND_COOPERATES_FAIL.getText());
+ }
+ }
+ /**
+ * @Date: 2020-04-01 16:06
+ * @Author: ZhouJie
+ * @Description: 鍗忓悓鍔炲叕鎾ゅ洖鎴栬�呬腑姝� type 5涓 6 鎾ゅ洖
+ */
+ @RequestMapping(value = "/recession-stop-cooperate/{version}", method = RequestMethod.POST)
+ public String recessionOrStopCooperate(HttpServletRequest request) {
+ try {
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_COOPERATES);
+ flowCoordinationService.saveCoordinationStartFlow(fse);
return OK();
} catch (BaseException e) {
e.printStackTrace();
@@ -382,24 +284,7 @@
public String saveTodo(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 (bean == null || fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
- SystemCode.SYSTEM_FORM_NODATA.getText());
- return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
- }
- // 鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
- if (!CmnConst.PRODUCT_OA_COOPERATE_FLOW_NODE.equals(fse.getTableName())) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
- SystemCode.SYSTEM_TABLE_NODATA.getText());
- return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
- }
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_COOPERATE_FLOW_NODE);
cooperatesService.saveTodo(fse);
return OK();
} catch (BaseException e) {
@@ -422,26 +307,8 @@
public String addSupplyText(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 (bean == null || fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
- SystemCode.SYSTEM_FORM_NODATA.getText());
- return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
- }
- // 鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
- if (!CmnConst.PRODUCT_OA_COOPERATE_SUB.equals(fse.getTableName())) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
- SystemCode.SYSTEM_TABLE_NODATA.getText());
- return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
- }
- ICooperatesService service = (ICooperatesService) getProxyInstance(
- cooperatesService);
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_COOPERATE_SUB);
+ ICooperatesService service = (ICooperatesService) getProxyInstance(cooperatesService);
String uuid = service.addSupplyText(fse);
if (!StringUtils.isEmpty(uuid)) {
return OK_Add(uuid);
@@ -471,26 +338,8 @@
public String delSupplyText(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 (bean == null || fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
- SystemCode.SYSTEM_FORM_NODATA.getText());
- return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
- }
- // 鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
- if (!CmnConst.PRODUCT_OA_COOPERATE_SUB.equals(fse.getTableName())) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
- SystemCode.SYSTEM_TABLE_NODATA.getText());
- return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
- }
- ICooperatesService service = (ICooperatesService) getProxyInstance(
- cooperatesService);
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_COOPERATE_SUB);
+ ICooperatesService service = (ICooperatesService) getProxyInstance(cooperatesService);
boolean success = service.delSupplyText(fse);
if (success) {
return OK();
@@ -519,24 +368,7 @@
public String urging(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 (bean == null || fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
- SystemCode.SYSTEM_FORM_NODATA.getText());
- return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
- }
- // 鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
- if (!CmnConst.PRODUCT_OA_COOPERATES.equals(fse.getTableName())) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
- SystemCode.SYSTEM_TABLE_NODATA.getText());
- return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
- }
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_COOPERATES);
cooperatesService.urging(fse);
return OK();
} catch (BaseException e) {
@@ -558,22 +390,7 @@
@RequestMapping(value = "/modify-state/{version}", method = RequestMethod.POST)
public String modifyState(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(bean == null || fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
- return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
- }
- //鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
- if (!CmnConst.PRODUCT_OA_COOPERATE_FLOW_NODE.equals(fse.getTableName())) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), com.product.core.websocket.config.SystemCode.SYSTEM_MESSAGE_ACQUIRE_PARAM_FAIL.getText());
- return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
- }
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_COOPERATE_FLOW_NODE);
boolean sucess = cooperatesService.modifyState(fse.getUUID());
if (sucess) {
return OK();
@@ -597,22 +414,7 @@
@RequestMapping(value = "/user-list/{version}", method = RequestMethod.POST)
public String getNowUserList(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(bean == null || fse == null) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
- return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
- }
- //鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
- if (!CmnConst.PRODUCT_OA_COOPERATES.equals(fse.getTableName())) {
- SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), com.product.core.websocket.config.SystemCode.SYSTEM_MESSAGE_ACQUIRE_PARAM_FAIL.getText());
- return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
- }
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_COOPERATES);
DataTableEntity dt = cooperatesService.getNowUserList(fse);
return OK_List(dt);
} catch (BaseException e) {
--
Gitblit v1.9.2