From 0b9605b411d7aa07c704153d8c3ff4baa0dc1a66 Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期四, 22 八月 2024 10:06:12 +0800
Subject: [PATCH] 会议室功能签到信息8.22
---
src/main/java/com/product/administration/controller/ConferenceManagerController.java | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/product/administration/controller/ConferenceManagerController.java b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
index d1c0944..4be1f50 100644
--- a/src/main/java/com/product/administration/controller/ConferenceManagerController.java
+++ b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
@@ -518,19 +518,19 @@
* @throws IOException
* @throws WriterException
*/
- @GetMapping("/get_QrCode/{version}")
+ @PostMapping("/get_QrCode/{version}")
@ApiVersion(1)
- public void getQrCode(String uuid,HttpServletRequest request, HttpServletResponse response) throws IOException, WriterException {
+ public void getQrCode(HttpServletRequest request, HttpServletResponse response) throws IOException, WriterException {
//鑾峰彇鍙傛暟
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();
- if(fse!=null && !StringUtils.isEmpty(fse.getString("uuid"))){*/
- // String uuid = fse.getString("uuid");
+ if(fse!=null && !StringUtils.isEmpty(fse.getString("uuid"))){
+ String uuid = fse.getString("uuid");
// 璁剧疆鍝嶅簲娴佷俊鎭�
response.setContentType("image/jpg");
response.setHeader("Pragma", "no-cache");
@@ -549,9 +549,8 @@
BitMatrix bitMatrix = conferenceManagerService.getQrCode(jsonData.toString());
//浠ユ祦鐨勫舰寮忚緭鍑哄埌鍓嶇
MatrixToImageWriter.writeToStream(bitMatrix , "jpg" , stream);
-
- // }
- //}
+ }
+ }
}
@@ -580,12 +579,18 @@
}
+ /**
+ * 浼氳绛惧埌鍔熻兘
+ * @param request
+ * @return
+ * @throws ParseException
+ */
@PostMapping("/conference_sign/{version}")
@ApiVersion(1)
public String ConferenceSign(HttpServletRequest request) throws ParseException {
//鑾峰彇鍙傛暟
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();
@@ -593,11 +598,36 @@
//鍒ゆ柇鍙傛暟鏄惁涓虹┖
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());
- }*/
+ }
String s = conferenceManagerService.ConferenceSign(fse);
return OK(s);
}
+ /**
+ * 鑾峰彇绛惧埌淇℃伅
+ * @param request
+ * @return
+ */
+ @PostMapping("/get_sign_info/{version}")
+ @ApiVersion(1)
+ public String getSignInfo(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 signInfo = conferenceManagerService.getSignInfo(fse);
+ return OK(signInfo);
+
+ }
+
+
}
--
Gitblit v1.9.2