From 9ecb3e5aa030a885acfe42fe119e094eb552965b Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期二, 20 八月 2024 16:51:20 +0800
Subject: [PATCH] 会议室功能取消开启8.20-1
---
src/main/java/com/product/administration/controller/ConferenceManagerController.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/product/administration/controller/ConferenceManagerController.java b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
index 1f27665..18b6969 100644
--- a/src/main/java/com/product/administration/controller/ConferenceManagerController.java
+++ b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
@@ -509,13 +509,8 @@
RequestParameterEntity reqp = (RequestParameterEntity) bean;
fse = reqp.getFormData();
- //鍒ゆ柇鍙傛暟鏄惁涓虹┖
- if (bean == null || fse == null) {
- this.error(com.product.admin.config.SystemCode.SYSTEM_FORM_NODATA.getValue(), com.product.admin.config.SystemCode.SYSTEM_FORM_NODATA.getText());
- }
- String uuid = fse.getString("uuid");
- if(!StringUtils.isEmpty(uuid)){
-
+ if(fse!=null && !StringUtils.isEmpty(fse.getString("uuid"))){
+ String uuid = fse.getString("uuid");
// 璁剧疆鍝嶅簲娴佷俊鎭�
response.setContentType("image/jpg");
response.setHeader("Pragma", "no-cache");
@@ -540,6 +535,23 @@
}
+ @PostMapping("/cancel_and_start/{version}")
+ @ApiVersion(1)
+ public String CancelAndStart(HttpServletRequest request){
+ //鑾峰彇鍙傛暟
+ 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) {
+ return this.error(com.product.admin.config.SystemCode.SYSTEM_FORM_NODATA.getValue(), com.product.admin.config.SystemCode.SYSTEM_FORM_NODATA.getText());
+ }
+ conferenceManagerService.CancelAndStart(fse);
+ return OK();
+ }
--
Gitblit v1.9.2