From 394d19ca078d342474a8803db3186452348ac113 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期五, 23 八月 2024 16:17:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/product/administration/controller/ConferenceManagerController.java |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/product/administration/controller/ConferenceManagerController.java b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
index b12bb1f..28102cc 100644
--- a/src/main/java/com/product/administration/controller/ConferenceManagerController.java
+++ b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
@@ -11,7 +11,6 @@
 import com.product.administration.service.ide.IConferenceManagerService;
 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;
@@ -19,9 +18,7 @@
 import com.product.module.sys.config.SystemErrorCode;
 import com.product.module.sys.version.ApiVersion;
 import com.product.util.BaseUtil;
-import org.omg.CORBA.DATA_CONVERSION;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -30,7 +27,6 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -605,7 +601,7 @@
 
 
     /**
-     * 鑾峰彇绛惧埌淇℃伅
+     * 鑾峰彇绛惧埌鎴栬�呰闂俊鎭�
      * @param request
      * @return
      */
@@ -628,6 +624,28 @@
 
     }
 
+    /**
+     * 鍙戦�佹秷鎭�
+     * @param request
+     * @return
+     */
+    @PostMapping("/sendMsg/{version}")
+    @ApiVersion(1)
+    public String sendMsg(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.sendMsg(fse);
+        return OK();
+    }
+
 
 
 }

--
Gitblit v1.9.2