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/config/CmnConst.java | 4
src/main/java/com/product/administration/controller/CooperateController.java | 281 +-----------------------
src/main/java/com/product/administration/controller/AnnouncementController.java | 273 ++----------------------
src/main/java/com/product/administration/service/ConferenceManagerService.java | 42 +--
src/main/java/com/product/administration/service/AnnouncementService.java | 32 +-
src/main/java/com/product/administration/service/CooperatesService.java | 9
src/main/java/com/product/administration/service/ide/IAnnouncementService.java | 8
7 files changed, 88 insertions(+), 561 deletions(-)
diff --git a/src/main/java/com/product/administration/config/CmnConst.java b/src/main/java/com/product/administration/config/CmnConst.java
index b57d589..63027ca 100644
--- a/src/main/java/com/product/administration/config/CmnConst.java
+++ b/src/main/java/com/product/administration/config/CmnConst.java
@@ -102,8 +102,8 @@
public static final String PRODUCT_OA_SIGN_SEAL = "product_oa_sign_seal";// 绛剧珷-鍗扮珷
public static final String PRODUCT_SYS_ATTACHMENTS = "product_sys_attachments";// 闄勪欢
- public static final String product_oa_ANNOUNCEMENT = "product_oa_announcement";
- public static final String product_oa_ANNOUNCEMENT_ROLE = "product_oa_announcement_role";
+ public static final String PRODUCT_OA_ANNOUNCEMENT = "product_oa_announcement";
+ public static final String PRODUCT_OA_ANNOUNCEMENT_ROLE = "product_oa_announcement_role";
public static final String COMPARE_TYPE = "compare_type";
diff --git a/src/main/java/com/product/administration/controller/AnnouncementController.java b/src/main/java/com/product/administration/controller/AnnouncementController.java
index f2bf66a..cb4cea3 100644
--- a/src/main/java/com/product/administration/controller/AnnouncementController.java
+++ b/src/main/java/com/product/administration/controller/AnnouncementController.java
@@ -10,13 +10,14 @@
import com.product.administration.config.CmnConst;
import com.product.administration.config.SystemCode;
import com.product.administration.service.AnnouncementService;
-import com.product.core.config.CoreConst;
+import com.product.administration.service.ide.IAnnouncementService;
+import com.product.common.lang.StringUtils;
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.spring.context.SpringMVCContextHolder;
import com.product.module.sys.version.ApiVersion;
+import com.product.util.BaseUtil;
import com.product.util.ResultInfo;
@RestController
@@ -35,26 +36,7 @@
@ApiVersion(1)
public String announcementList(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_ANNOUNCEMENT.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_ANNOUNCEMENT);
return OK_List(announcementService.listAnnouncement(fse));
} catch (BaseException e) {
SpringMVCContextHolder.getSystemLogger().error(e);
@@ -75,26 +57,7 @@
@ApiVersion(1)
public String announcementListRelease(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_ANNOUNCEMENT.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_ANNOUNCEMENT);
return OK_List(announcementService.listAnnouncementRelease(fse));
} catch (BaseException e) {
SpringMVCContextHolder.getSystemLogger().error(e);
@@ -114,24 +77,7 @@
@ApiVersion(1)
public String announcementListReceive(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_ANNOUNCEMENT.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_ANNOUNCEMENT);
return OK_List(announcementService.listAnnouncementReceive(fse));
} catch (BaseException e) {
SpringMVCContextHolder.getSystemLogger().error(e);
@@ -151,24 +97,7 @@
@ApiVersion(1)
public String treeAnnouncementType(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_ANNOUNCEMENT.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_ANNOUNCEMENT);
return ResultInfo.success(announcementService.treeAnnouncementType(fse));
} catch (BaseException e) {
SpringMVCContextHolder.getSystemLogger().error(e);
@@ -189,26 +118,7 @@
@ApiVersion(1)
public String announcementRoleList(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_ANNOUNCEMENT.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_ANNOUNCEMENT);
return OK_List(announcementService.listAnnouncementRelease(fse));
} catch (BaseException e) {
SpringMVCContextHolder.getSystemLogger().error(e);
@@ -229,26 +139,9 @@
@ApiVersion(1)
public String readAnnouncementRemind(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_ANNOUNCEMENT.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_ANNOUNCEMENT);
// 鍒ゆ柇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());
@@ -269,31 +162,13 @@
@ApiVersion(1)
public String findAnnouncement(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_ANNOUNCEMENT.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_ANNOUNCEMENT);
// 鍒ゆ柇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());
}
-
FieldSetEntity findDict = announcementService.findAnnouncement(fse);
return OK_List(findDict);
} catch (BaseException e) {
@@ -317,25 +192,7 @@
@ApiVersion(1)
public String addAnnouncement(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_ANNOUNCEMENT.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_ANNOUNCEMENT);
String addRole = announcementService.addAnnouncement(fse);
return addRole != null ? OK_Add(addRole)
: error(SystemCode.ANNOUNCEMENT_ADD.getValue(), SystemCode.ANNOUNCEMENT_ADD.getText());
@@ -360,26 +217,9 @@
@ApiVersion(1)
public String releaseAnnouncement(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_ANNOUNCEMENT.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());
- }
-
- boolean addRole = announcementService.releaseAnnouncement(fse);
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_ANNOUNCEMENT);
+ IAnnouncementService service = (IAnnouncementService) getProxyInstance(announcementService);
+ boolean addRole = service.releaseAnnouncement(fse);
return addRole ? OK()
: error(SystemCode.ANNOUNCEMENT_ADD.getValue(), SystemCode.ANNOUNCEMENT_ADD.getText());
} catch (BaseException e) {
@@ -402,25 +242,7 @@
@ApiVersion(1)
public String remindAnnouncement(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_ANNOUNCEMENT.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_ANNOUNCEMENT);
boolean addRole = announcementService.remindAnnouncement(fse);
return addRole ? OK()
: error(SystemCode.ANNOUNCEMENT_ADD.getValue(), SystemCode.ANNOUNCEMENT_ADD.getText());
@@ -439,26 +261,9 @@
@ApiVersion(1)
public String updateAnnouncement(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_ANNOUNCEMENT.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_ANNOUNCEMENT);
// 鍒ゆ柇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());
@@ -486,26 +291,9 @@
@ApiVersion(1)
public String delectAnnouncement(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_ANNOUNCEMENT.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_ANNOUNCEMENT);
// 鍒ゆ柇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());
@@ -532,24 +320,7 @@
@ApiVersion(1)
public String listAnnouncementGateway(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_ANNOUNCEMENT.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_ANNOUNCEMENT);
return OK_List(announcementService.listAnnouncementGateway(fse));
} catch (BaseException e) {
SpringMVCContextHolder.getSystemLogger().error(e);
diff --git a/src/main/java/com/product/administration/controller/CooperateController.java b/src/main/java/com/product/administration/controller/CooperateController.java
index 813b9b4..9b2444c 100644
--- a/src/main/java/com/product/administration/controller/CooperateController.java
+++ b/src/main/java/com/product/administration/controller/CooperateController.java
@@ -5,15 +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;
@@ -47,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(),
@@ -94,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());
@@ -140,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();
@@ -182,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);
@@ -232,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();
@@ -288,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());
@@ -342,26 +239,8 @@
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();
@@ -382,25 +261,7 @@
@RequestMapping(value = "/recession-stop-cooperate/{version}", method = RequestMethod.POST)
public String recessionOrStopCooperate(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);
flowCoordinationService.saveCoordinationStartFlow(fse);
return OK();
} catch (BaseException e) {
@@ -423,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) {
@@ -463,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);
@@ -512,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();
@@ -560,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) {
@@ -599,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();
@@ -638,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) {
diff --git a/src/main/java/com/product/administration/service/AnnouncementService.java b/src/main/java/com/product/administration/service/AnnouncementService.java
index 1990dfa..3a7171b 100644
--- a/src/main/java/com/product/administration/service/AnnouncementService.java
+++ b/src/main/java/com/product/administration/service/AnnouncementService.java
@@ -10,6 +10,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.product.administration.config.CmnConst;
+import com.product.administration.service.ide.IAnnouncementService;
import com.product.core.config.CoreConst;
import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
@@ -19,11 +20,12 @@
import com.product.core.service.support.AbstractBaseService;
import com.product.core.service.support.QueryFilterService;
import com.product.core.spring.context.SpringMVCContextHolder;
+import com.product.core.transfer.Transactional;
import com.product.core.websocket.service.WebsocketMesssageServiceThread;
import com.product.util.BaseUtil;
@Component
-public class AnnouncementService extends AbstractBaseService {
+public class AnnouncementService extends AbstractBaseService implements IAnnouncementService{
@Autowired
public QueryFilterService queryFilterService;
@Autowired
@@ -37,6 +39,8 @@
return baseDao.add(fse);
}
+ @Override
+ @Transactional
public boolean releaseAnnouncement(FieldSetEntity fse) throws BaseException {
fse.setValue("publish_status", 1);
int user_id = SpringMVCContextHolder.getCurrentUser().getUser_id();
@@ -48,7 +52,7 @@
for (int i = 0; i < extentArr.length; i++) {
FieldSetEntity fs = new FieldSetEntity();
FieldMetaEntity metaEntity = new FieldMetaEntity();
- metaEntity.setTableName(new Object[]{CmnConst.product_oa_ANNOUNCEMENT_ROLE});
+ metaEntity.setTableName(new Object[]{CmnConst.PRODUCT_OA_ANNOUNCEMENT_ROLE});
fs.setMeta(metaEntity);
fs.setValue("user_id", extentArr[i]);
fs.setValue("status", 0);
@@ -66,17 +70,17 @@
}
}
WebsocketMesssageServiceThread.getInstance().appendMessage(fse.getString("extent"), "[鍏憡]" + user_name + "鍙戝竷浜嗐��" + fse.getString("title") + "銆嬪叕鍛�", "[鍏憡]" + user_name + "鍙戝竷浜嗐��" + fse.getString("title") + "銆嬪叕鍛�",
- user_id, "1", COOPERATE_URL + "?" + CoreConst.UUID + "=" + uuid + "&news=1", CmnConst.product_oa_ANNOUNCEMENT, fse.getUUID(), user_id, 0, 0);
+ user_id, "1", COOPERATE_URL + "?" + CoreConst.UUID + "=" + uuid + "&news=1", CmnConst.PRODUCT_OA_ANNOUNCEMENT, fse.getUUID(), user_id, 0, 0);
return !StringUtils.isEmpty(uuid);
}
public boolean remindAnnouncement(FieldSetEntity fs) throws BaseException {
- FieldSetEntity fse = baseDao.getFieldSetEntity(CmnConst.product_oa_ANNOUNCEMENT, fs.getUUID(), false);
+ FieldSetEntity fse = baseDao.getFieldSetEntity(CmnConst.PRODUCT_OA_ANNOUNCEMENT, fs.getUUID(), false);
String user_name = SpringMVCContextHolder.getCurrentUser().getUser_name();
int user_id = SpringMVCContextHolder.getCurrentUser().getUser_id();
WebsocketMesssageServiceThread.getInstance().appendMessage(fs.getString("extent"), "[鍏憡]" + user_name + "鎻愰啋浣犳煡鐪嬪叕鍛娿��" + fse.getString("title") + "銆�", "[鍏憡]" + user_name + "鎻愰啋浣犳煡鐪嬪叕鍛娿��" + fse.getString("title") + "銆�",
- user_id, "1", COOPERATE_URL + "?" + CoreConst.UUID + "=" + fs.getUUID() + "&news=1", CmnConst.product_oa_ANNOUNCEMENT, fse.getUUID(), user_id, 0, 0);
+ user_id, "1", COOPERATE_URL + "?" + CoreConst.UUID + "=" + fs.getUUID() + "&news=1", CmnConst.PRODUCT_OA_ANNOUNCEMENT, fse.getUUID(), user_id, 0, 0);
return !StringUtils.isEmpty(fs.getUUID());
}
@@ -88,7 +92,7 @@
}
public FieldSetEntity getAnnouncement(FieldSetEntity fse) throws BaseException {
- return baseDao.getFieldSetEntity(CmnConst.product_oa_ANNOUNCEMENT, fse.getString("uuid"), false);
+ return baseDao.getFieldSetEntity(CmnConst.PRODUCT_OA_ANNOUNCEMENT, fse.getString("uuid"), false);
}
public DataTableEntity listAnnouncement(FieldSetEntity fse) throws BaseException {
@@ -96,7 +100,7 @@
if (!BaseUtil.dataTableIsEmpty(fse.getSubDataTable("systemSeniorQueryString"))) {
queryFilter = " and " + queryFilterService.getQueryFilter(fse);
}
- DataTableEntity dt = baseDao.listTable(CmnConst.product_oa_ANNOUNCEMENT, "publish_status=0 " + queryFilter, new Object[]{},
+ DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_OA_ANNOUNCEMENT, "publish_status=0 " + queryFilter, new Object[]{},
new Object[]{}, " created_utc_datetime desc ", fse.getInteger("pagesize"), fse.getInteger("cpage"));
baseDao.loadPromptData(dt);
return dt;
@@ -107,7 +111,7 @@
if (!BaseUtil.dataTableIsEmpty(fse.getSubDataTable("systemSeniorQueryString"))) {
queryFilter = " and " + queryFilterService.getQueryFilter(fse);
}
- DataTableEntity dt = baseDao.listTable(CmnConst.product_oa_ANNOUNCEMENT, "publish_status=1" + queryFilter, new Object[]{},
+ DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_OA_ANNOUNCEMENT, "publish_status=1" + queryFilter, new Object[]{},
new Object[]{}, " created_utc_datetime desc ", fse.getInteger("pagesize"), fse.getInteger("cpage"));
baseDao.loadPromptData(dt);
return dt;
@@ -124,7 +128,7 @@
if (!StringUtils.isEmpty(fse.getString("type"))) {
type = " and type='" + fse.getString("type") + "'";
}
- DataTableEntity dt = baseDao.listTable(CmnConst.product_oa_ANNOUNCEMENT,
+ DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_OA_ANNOUNCEMENT,
"publish_status=1 and concat(',',extent,',') like '%" + id + "%'" + type + queryFilter, new Object[]{},
new Object[]{}, CmnConst.CREATED_UTC_DATETIME + " desc", fse.getInteger("pagesize"), fse.getInteger("cpage"));
baseDao.loadPromptData(dt);
@@ -161,14 +165,14 @@
public boolean delAnnouncement(FieldSetEntity fse) throws BaseException {
String[] uuid = fse.getString("uuid").split(",");
- return baseDao.delete(CmnConst.product_oa_ANNOUNCEMENT, uuid);
+ return baseDao.delete(CmnConst.PRODUCT_OA_ANNOUNCEMENT, uuid);
}
public FieldSetEntity findAnnouncement(FieldSetEntity fse) throws BaseException {
// FieldSetEntity fs = baseDao.getFieldSetEntity(CmnConst.product_oa_ANNOUNCEMENT, fse.getString("uuid"), false);
- String sqlfs = "SELECT *,(SELECT user_name FROM " + CmnConst.PRODUCT_SYS_USERS + " WHERE user_id=a.created_by)created_by_save,(SELECT user_name FROM " + CmnConst.PRODUCT_SYS_USERS + " WHERE user_id=a.updated_by)updated_by_save from " + CmnConst.product_oa_ANNOUNCEMENT + " a WHERE uuid=?";
+ String sqlfs = "SELECT *,(SELECT user_name FROM " + CmnConst.PRODUCT_SYS_USERS + " WHERE user_id=a.created_by)created_by_save,(SELECT user_name FROM " + CmnConst.PRODUCT_SYS_USERS + " WHERE user_id=a.updated_by)updated_by_save from " + CmnConst.PRODUCT_OA_ANNOUNCEMENT + " a WHERE uuid=?";
FieldSetEntity fs = baseDao.getFieldSetEntityBySQL(sqlfs, new String[]{fse.getString("uuid")}, false);
- String sql = "SELECT b.user_id user_id,b.show_name show_name,c.org_level_name,a.status FROM " + CmnConst.product_oa_ANNOUNCEMENT_ROLE + " a LEFT JOIN product_sys_staffs b on a.user_id=b.user_id LEFT JOIN product_sys_org_levels c on b.dept_uuid=c.uuid WHERE a.announcement_uuid=?";
+ String sql = "SELECT b.user_id user_id,b.show_name show_name,c.org_level_name,a.status FROM " + CmnConst.PRODUCT_OA_ANNOUNCEMENT_ROLE + " a LEFT JOIN product_sys_staffs b on a.user_id=b.user_id LEFT JOIN product_sys_org_levels c on b.dept_uuid=c.uuid WHERE a.announcement_uuid=?";
DataTableEntity dt = baseDao.listTable(sql, new String[]{fs.getUUID()});
fs.addSubDataTable(dt);
fs.setValue("number", dt.getRows());
@@ -183,7 +187,7 @@
}
public boolean readAnnouncementRemind(FieldSetEntity fs) throws BaseException {
- FieldSetEntity fse = baseDao.getFieldSetEntity(CmnConst.product_oa_ANNOUNCEMENT, fs.getUUID(), false);
+ FieldSetEntity fse = baseDao.getFieldSetEntity(CmnConst.PRODUCT_OA_ANNOUNCEMENT, fs.getUUID(), false);
String expiration_date = fse.getString("expiration_date");
SimpleDateFormat tempDate = new SimpleDateFormat("yyyy-MM-dd");
@@ -207,7 +211,7 @@
//褰撳墠浜簎uid
int user_id = SpringMVCContextHolder.getCurrentUser().getUser_id();
String id = "," + user_id + ",";
- DataTableEntity dt = baseDao.listTable(CmnConst.product_oa_ANNOUNCEMENT,
+ DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_OA_ANNOUNCEMENT,
"publish_status=1 and concat(',',extent,',') like '%" + id + "%'", new Object[]{},
new Object[]{}, CmnConst.CREATED_UTC_DATETIME + " desc", 5, 1);
baseDao.loadPromptData(dt);
diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index 4d1fff4..f8e335f 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -760,43 +760,27 @@
String startTime = fse.getString("startTime");
String endTime = fse.getString("endTime");
StringBuilder sql = new StringBuilder();
- sql.append(" SELECT ");
- sql.append(" a.uuid, ");
- sql.append(" b.uuid apply_uuid, ");
- sql.append(" a.room_name, ");
- sql.append(" b.meeting_topic, ");
+ sql.append("\nSELECT ");
+ sql.append("\n a.uuid,b.uuid apply_uuid,a.room_name,b.meeting_topic,b.flow_flag, ");
if (com.product.admin.config.CmnConst.MOBILE_CLIENT_TYPE.equalsIgnoreCase(clientType)) {
//绉诲姩绔�
sql.append(" date_format(b.start_time,'%Y-%m-%d %H:%i:%s') start_time, ");
sql.append(" date_format(b.end_time,'%Y-%m-%d %H:%i:%s') end_time, ");
} else {
-
sql.append(" b.start_time, ");
sql.append(" b.end_time, ");
}
- sql.append(" b.flow_flag, ");
sql.append(" ( SELECT user_name FROM product_sys_users WHERE user_id = b.created_by ) proposer ");
- sql.append(" FROM ");
- sql.append(" product_oa_CONFERENCE_room_config a ");
- sql.append(" LEFT JOIN ( SELECT flow_flag,meeting_room,uuid,meeting_topic,start_time,end_time,created_by FROM ");
- sql.append(" product_oa_conference_apply b WHERE ");
- sql.append("start_time>=? and start_time<=? or (end_time>=? and start_time<=?) ");
- sql.append(" and start_time is not null and end_time is not null and flow_flag in (1,2) ) b ");
- sql.append(" ON a.uuid = b.meeting_room ");
- sql.append(" WHERE ");
- sql.append(" a.`status` = 1 ");
- sql.append(" AND org_level_uuid = ? ");
- sql.append(" AND enabled_time <= now( ) ");
- sql.append(" GROUP BY ");
- sql.append(" a.uuid, ");
- sql.append(" b.uuid, ");
- sql.append(" a.room_name, ");
- sql.append(" b.meeting_topic, ");
- sql.append(" b.start_time, ");
- sql.append(" b.end_time, ");
- sql.append(" b.created_by,b.flow_flag ");
- sql.append(" ORDER BY ");
- sql.append(" b.start_time ");
+ sql.append("\nFROM product_oa_conference_room_config a ");
+ sql.append("\nLEFT JOIN ( ");
+ sql.append("\n SELECT flow_flag,meeting_room,uuid,meeting_topic,start_time,end_time,created_by ");
+ sql.append("\n FROM product_oa_conference_apply b ");
+ sql.append("\n WHERE start_time>=? and start_time<=? or (end_time>=? and start_time<=?) ");
+ sql.append("\n AND start_time is not null and end_time is not null and flow_flag in (1,2) ");
+ sql.append("\n) b ON a.uuid = b.meeting_room ");
+ sql.append("\nWHERE a.status = 1 AND org_level_uuid = ? AND enabled_time <= now( ) ");
+ sql.append("\nGROUP BY a.uuid, b.uuid, a.room_name, b.meeting_topic, b.start_time, b.end_time, b.created_by,b.flow_flag ");
+ sql.append("\nORDER BY b.start_time ");
DataTableEntity dt = baseDao.listTable(sql.toString(), new Object[]{startTime, endTime, startTime, endTime, org_level_uuid});
dt.getMeta().addAliasTable(CmnConst.PRODUCT_OA_CONFERENCE_APPLY, "b");
baseDao.loadPromptData(dt);
@@ -1061,7 +1045,7 @@
}
}
DataTableEntity dt = baseDao.listTable(fse.getTableName(), filter.toString(), new Object[]{}, null,
- UnifySQLFunction.ifnull("updated_utc_datetime", "created_utc_datetime" + " DESC"),
+ UnifySQLFunction.ifnull("updated_utc_datetime", "created_utc_datetime") + " DESC",
fse.getInteger(CmnConst.PAGESIZE), fse.getInteger(CmnConst.CPAGE), false);
baseDao.loadPromptData(dt);
return dt;
diff --git a/src/main/java/com/product/administration/service/CooperatesService.java b/src/main/java/com/product/administration/service/CooperatesService.java
index 69df92c..d7a6f24 100644
--- a/src/main/java/com/product/administration/service/CooperatesService.java
+++ b/src/main/java/com/product/administration/service/CooperatesService.java
@@ -20,7 +20,6 @@
import com.product.util.UnifySQLFunction;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
import com.product.tool.flow.service.FlowCoordinationService;
import org.springframework.stereotype.Service;
@@ -92,10 +91,10 @@
stringBuilder.append("\nSELECT ");
stringBuilder.append("\n uuid,title,cooperate_uuid,grade,receiver as id,receiver,sender,receiver_name,sender_name,status, ");
stringBuilder.append("\n tricode,opinion,handle_time,type,attachments,is_hide_commentss, ");
- stringBuilder.append("\n (select user_name FROM product_sys_users where user_id=receiver) label,");
- stringBuilder.append("\n ").append(UnifySQLFunction.ifnull("concat(tricode,'-',receiver)", "receiver")).append(" AS code");
- stringBuilder.append("\nFROM product_oa_cooperate_flow_node where cooperate_uuid=? ");
- stringBuilder.append("\nORDER BY tricode ");
+ stringBuilder.append("\n (select user_name FROM product_sys_users where user_id=receiver)AS label,");
+ stringBuilder.append("\n ").append(UnifySQLFunction.ifnull(UnifySQLFunction.concatNullFunction("tricode", "'-'", "receiver"), "receiver::TEXT", "code"));
+ stringBuilder.append("\nFROM product_oa_cooperate_flow_node where cooperate_uuid = ? ");
+ stringBuilder.append("\nORDER BY code");
DataTableEntity dt = baseDao.listTable(stringBuilder.toString(), new Object[]{fs.getString("uuid")});
JSONArray json = null;
if (dt != null && dt.getRows() > 0) {
diff --git a/src/main/java/com/product/administration/service/ide/IAnnouncementService.java b/src/main/java/com/product/administration/service/ide/IAnnouncementService.java
new file mode 100644
index 0000000..97abaab
--- /dev/null
+++ b/src/main/java/com/product/administration/service/ide/IAnnouncementService.java
@@ -0,0 +1,8 @@
+package com.product.administration.service.ide;
+
+import com.product.core.entity.FieldSetEntity;
+
+public interface IAnnouncementService {
+
+ boolean releaseAnnouncement(FieldSetEntity fse);
+}
--
Gitblit v1.9.2