From ab7ddb13ba6ea769748d1ee67255a53ad7913554 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 21 八月 2024 10:40:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/product/administration/controller/ConferenceManagerController.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/product/administration/controller/ConferenceManagerController.java b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
index 8e79019..ba7967e 100644
--- a/src/main/java/com/product/administration/controller/ConferenceManagerController.java
+++ b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
@@ -429,6 +429,11 @@
}
}
+ /**
+ * 浼氳棰勭害鐪嬫澘鍔熻兘
+ * @param request
+ * @return
+ */
@PostMapping("/get_kb_Data/{version}")
@ApiVersion(1)
public String getkbData(HttpServletRequest request){
@@ -450,6 +455,11 @@
}
+ /**
+ * 鑾峰彇浼氳棰勭害璇︽儏
+ * @param request
+ * @return
+ */
@PostMapping("/get_Meeting_Details/{version}")
@ApiVersion(1)
public String getMeetingDetails(HttpServletRequest request){
@@ -469,6 +479,11 @@
}
+ /**
+ * 浼氳瀹ら绾︿繚瀛樻洿鏂板姛鑳�
+ * @param request
+ * @return
+ */
@PostMapping("/save_or_update_meeting_info/{version}")
@ApiVersion(1)
@@ -509,7 +524,7 @@
RequestParameterEntity reqp = (RequestParameterEntity) bean;
fse = reqp.getFormData();
- if(fse==null || !StringUtils.isEmpty(fse.getString("uuid"))){
+ if(fse!=null && !StringUtils.isEmpty(fse.getString("uuid"))){
String uuid = fse.getString("uuid");
// 璁剧疆鍝嶅簲娴佷俊鎭�
response.setContentType("image/jpg");
@@ -535,6 +550,28 @@
}
+ /**
+ * 棰勭害浼氳鍙栨秷寮�鍚姛鑳�
+ * @param request
+ * @return
+ */
+ @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