From 069faaad2f86e570842e4717ea0419e2daef9924 Mon Sep 17 00:00:00 2001 From: 18756 <1875631620@qq.com> Date: 星期二, 20 八月 2024 11:00:45 +0800 Subject: [PATCH] 会议室功能优化8.20 --- src/main/java/com/product/administration/controller/ConferenceManagerController.java | 42 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 39 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/product/administration/controller/ConferenceManagerController.java b/src/main/java/com/product/administration/controller/ConferenceManagerController.java index 76fd664..2e5d6ce 100644 --- a/src/main/java/com/product/administration/controller/ConferenceManagerController.java +++ b/src/main/java/com/product/administration/controller/ConferenceManagerController.java @@ -2,6 +2,7 @@ import com.alibaba.druid.util.StringUtils; import com.alibaba.fastjson.JSONObject; +import com.google.zxing.WriterException; import com.product.administration.config.CmnConst; import com.product.administration.config.SystemCode; import com.product.administration.service.ConferenceManagerService; @@ -22,6 +23,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.util.HashMap; import java.util.List; /** @@ -447,7 +450,7 @@ public String getMeetingDetails(HttpServletRequest request){ //鑾峰彇鍙傛暟 FieldSetEntity fse = null; - /*Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA); + Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA); if (bean != null) { RequestParameterEntity reqp = (RequestParameterEntity) bean; fse = reqp.getFormData(); @@ -455,11 +458,44 @@ //鍒ゆ柇鍙傛暟鏄惁涓虹┖ 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()); - }*/ - DataTableEntity meetingDetails = conferenceManagerService.getMeetingDetails(fse); + } + 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); + + } + + + @PostMapping("/get_QrCode/{version}") + @ApiVersion(1) + public String getQrCode(HttpServletRequest request) throws IOException, WriterException { + FieldSetEntity fse = null; + conferenceManagerService.getQrCode(fse); + return OK(); + } + + + + + } -- Gitblit v1.9.2