From 0e730e50ae1adcd416fb929b37f022e595d88d79 Mon Sep 17 00:00:00 2001 From: 许鹏程 <1821349743@qq.com> Date: 星期二, 20 八月 2024 09:58:49 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/product/administration/controller/ConferenceManagerController.java | 65 ++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/product/administration/controller/ConferenceManagerController.java b/src/main/java/com/product/administration/controller/ConferenceManagerController.java index c39458f..b61739f 100644 --- a/src/main/java/com/product/administration/controller/ConferenceManagerController.java +++ b/src/main/java/com/product/administration/controller/ConferenceManagerController.java @@ -8,6 +8,7 @@ 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; @@ -21,6 +22,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.List; /** * @Author cheng @@ -419,4 +422,66 @@ } } + @PostMapping("/get_kb_Data/{version}") + @ApiVersion(1) + public String getkbData(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()); + } + List kbData = conferenceManagerService.getKbData(fse); + + return OK(kbData); + + } + + @PostMapping("/get_Meeting_Details/{version}") + @ApiVersion(1) + public String getMeetingDetails(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()); + } + List meetingDetails = conferenceManagerService.getMeetingDetails(fse); + return OK(meetingDetails); + + } + + + @PostMapping("/save_or_update_meeting_info/{version}") + @ApiVersion(1) + public String saveOrUpdateMeetingInfo(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()); + } + HashMap hashMap = conferenceManagerService.saveOrUpdateMeetingInfo(fse); + return OK(hashMap); + + } + + } -- Gitblit v1.9.2