From 9f529d59e088ecf2a7db1e1b1e5a2be4d84c7682 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期五, 17 十月 2025 18:20:45 +0800
Subject: [PATCH] 代码提交

---
 src/main/java/com/product/administration/controller/ConferenceManagerController.java |  418 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 204 insertions(+), 214 deletions(-)

diff --git a/src/main/java/com/product/administration/controller/ConferenceManagerController.java b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
index cb73c82..a134585 100644
--- a/src/main/java/com/product/administration/controller/ConferenceManagerController.java
+++ b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
@@ -13,7 +13,6 @@
 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;
 import com.product.core.permission.PermissionService;
 import com.product.module.sys.config.SystemErrorCode;
@@ -28,6 +27,8 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -59,20 +60,7 @@
     public String listConferenceRoom(HttpServletRequest request) {
         try {
             //鑾峰彇鍙傛暟
-            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());
-            }
-            // 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-            if (fse.getTableName() == null || !CmnConst.PRODUCT_OA_CONFERENCE_ROOM_CONFIG.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_CONFERENCE_ROOM_CONFIG);
             // 鍒ゆ柇鍒嗛〉鍙傛暟鏄惁姝e父
             if (StringUtils.isEmpty(fse.getString(CmnConst.PAGESIZE))
                     || StringUtils.isEmpty(fse.getString(CmnConst.CPAGE))) {
@@ -103,20 +91,7 @@
     public String findCconferenceRoom(HttpServletRequest request) {
         try {
             //鑾峰彇鍙傛暟
-            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());
-            }
-            // 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-            if (fse.getTableName() == null || !CmnConst.PRODUCT_OA_CONFERENCE_ROOM_CONFIG.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_CONFERENCE_ROOM_CONFIG);
             // 鍒ゆ柇uuid鏄惁姝e父
             if (StringUtils.isEmpty(fse.getUUID())) {
                 return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
@@ -136,7 +111,7 @@
     }
 
     /**
-     * 浼氳瀹や繚瀛�
+     * 浼氳瀹ら厤缃繚瀛�
      *
      * @param request
      * @return
@@ -145,21 +120,7 @@
     @ApiVersion(1)
     public String saveCconferenceRoom(HttpServletRequest request) {
         try {
-            //鑾峰彇鍙傛暟
-            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());
-            }
-            // 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-            if (fse.getTableName() == null || !CmnConst.PRODUCT_OA_CONFERENCE_ROOM_CONFIG.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_CONFERENCE_ROOM_CONFIG);
             //鏁版嵁鎿嶄綔鐨勬潈闄愰獙璇�
             if (!permissionService.validDataPermission(fse, CoreConst.DATA_PERMISSION_VALID_TYPE_ORG)) {
                 return this.error(SystemErrorCode.SYSTEM_NOT_OPER_PERMISSION.getValue(), SystemErrorCode.SYSTEM_NOT_OPER_PERMISSION.getText());
@@ -176,7 +137,7 @@
     }
 
     /**
-     * 浼氳瀹ゅ垹闄�
+     * 浼氳瀹ら厤缃垹闄�
      *
      * @param request
      * @return
@@ -186,20 +147,7 @@
     public String deleteCconferenceRoom(HttpServletRequest request) {
         try {
             //鑾峰彇鍙傛暟
-            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());
-            }
-            // 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-            if (fse.getTableName() == null || !CmnConst.PRODUCT_OA_CONFERENCE_ROOM_CONFIG.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_CONFERENCE_ROOM_CONFIG);
             // 鍒ゆ柇uuid鏄惁姝e父
             if (StringUtils.isEmpty(fse.getUUID())) {
                 return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
@@ -221,7 +169,7 @@
 
 
     /**
-     * 浼氳鐢宠
+     * 浼氳锛堜細璁锛夌敵璇峰垪琛�
      *
      * @param request
      * @return
@@ -231,20 +179,7 @@
     public String listConferenceApply(HttpServletRequest request) {
         try {
             //鑾峰彇鍙傛暟
-            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());
-            }
-            // 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-            if (fse.getTableName() == null || !CmnConst.PRODUCT_OA_CONFERENCE_APPLY.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_CONFERENCE_APPLY);
             // 鍒ゆ柇鍒嗛〉鍙傛暟鏄惁姝e父
             if (StringUtils.isEmpty(fse.getString(CmnConst.PAGESIZE))
                     || StringUtils.isEmpty(fse.getString(CmnConst.CPAGE))) {
@@ -266,7 +201,7 @@
 
 
     /**
-     * 浼氳瀹ら厤缃鎯�
+     * 浼氳锛堜細璁锛夌敵璇疯鎯�
      *
      * @param request
      * @return
@@ -276,20 +211,7 @@
     public String findCconferenceApply(HttpServletRequest request) {
         try {
             //鑾峰彇鍙傛暟
-            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());
-            }
-            // 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-            if (fse.getTableName() == null || !CmnConst.PRODUCT_OA_CONFERENCE_APPLY.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_CONFERENCE_APPLY);
             // 鍒ゆ柇uuid鏄惁姝e父
             if (StringUtils.isEmpty(fse.getUUID())) {
                 return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
@@ -310,7 +232,7 @@
     }
 
     /**
-     * 浼氳瀹や繚瀛�
+     * 浼氳锛堜細璁锛夌敵璇蜂繚瀛�
      *
      * @param request
      * @return
@@ -319,21 +241,7 @@
     @ApiVersion(1)
     public String saveCconferenceApply(HttpServletRequest request) {
         try {
-            //鑾峰彇鍙傛暟
-            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());
-            }
-            // 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-            if (fse.getTableName() == null || !CmnConst.PRODUCT_OA_CONFERENCE_APPLY.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_CONFERENCE_APPLY);
             //鏁版嵁鎿嶄綔鐨勬潈闄愰獙璇�
             if (!permissionService.validDataPermission(fse, CoreConst.DATA_PERMISSION_VALID_TYPE_ORG)) {
                 return this.error(SystemErrorCode.SYSTEM_NOT_OPER_PERMISSION.getValue(), SystemErrorCode.SYSTEM_NOT_OPER_PERMISSION.getText());
@@ -350,7 +258,7 @@
     }
 
     /**
-     * 浼氳瀹ゅ垹闄�
+     * 浼氳锛堜細璁锛夌敵璇峰垹闄�
      *
      * @param request
      * @return
@@ -359,21 +267,7 @@
     @ApiVersion(1)
     public String deleteCconferenceApply(HttpServletRequest request) {
         try {
-            //鑾峰彇鍙傛暟
-            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());
-            }
-            // 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-            if (fse.getTableName() == null || !CmnConst.PRODUCT_OA_CONFERENCE_APPLY.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_CONFERENCE_APPLY);
             // 鍒ゆ柇uuid鏄惁姝e父
             if (StringUtils.isEmpty(fse.getUUID())) {
                 return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
@@ -404,21 +298,7 @@
     @ApiVersion(1)
     public String conferenceRoomUsage(HttpServletRequest request) {
         try {
-            //鑾峰彇鍙傛暟
-            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());
-            }
-            // 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-            if (fse.getTableName() == null || !CmnConst.PRODUCT_OA_CONFERENCE_APPLY.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_CONFERENCE_APPLY);
             return conferenceManagerService.getConferenceRoomUsage(fse);
         } catch (BaseException e) {
             e.printStackTrace();
@@ -428,67 +308,73 @@
             return this.error(SystemCode.CONFERENCE_ROOM_GET_FIAL.getValue(), SystemCode.CONFERENCE_ROOM_GET_FIAL.getText() + e.getMessage());
         }
     }
-
-    @PostMapping("/get_kb_Data/{version}")
+    
+    /**
+     * 浼氳鐪嬫澘
+     * @param request
+     * @return
+     */
+    @PostMapping("/meeting-kanban/{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();
+   public String getKanbanData(HttpServletRequest request){
+    	try {
+	        //鑾峰彇鍙傛暟
+	        FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+	        DataTableEntity dtKanban = conferenceManagerService.getKanBanData(fse);
+	        return OK_List(dtKanban);
+    	}  catch (BaseException e) {
+            e.printStackTrace();
+            return this.error(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return this.error(SystemCode.CONFERENCE_ROOM_GET_FIAL.getValue(), SystemCode.CONFERENCE_ROOM_GET_FIAL.getText() + e.getMessage());
         }
-        //鍒ゆ柇鍙傛暟鏄惁涓虹┖
-        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);
-
     }
 
+    /**
+     * 鑾峰彇浼氳棰勭害璇︽儏
+     * @param request
+     * @return
+     */
     @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();
+    	try {
+	        //鑾峰彇鍙傛暟
+	        FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+	        List meetingDetails = conferenceManagerService.getMeetingDetails(fse);
+	        return OK(meetingDetails);
+    	}  catch (BaseException e) {
+            e.printStackTrace();
+            return this.error(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return this.error(SystemCode.CONFERENCE_ROOM_GET_FIAL.getValue(), SystemCode.CONFERENCE_ROOM_GET_FIAL.getText() + e.getMessage());
         }
-        //鍒ゆ柇鍙傛暟鏄惁涓虹┖
-        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);
-
-    }
+//    /**
+//     * 浼氳瀹ら绾︿繚瀛樻洿鏂板姛鑳�
+//     * @param request
+//     * @return
+//     */
+//
+//    @PostMapping("/save_or_update_meeting_info/{version}")
+//    @ApiVersion(1)
+//    public String saveOrUpdateMeetingInfo(HttpServletRequest request){
+//    	try {
+//	        //鑾峰彇鍙傛暟
+//	        FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+//	        conferenceManagerService.saveOrUpdateMeetingInfo(fse);
+//	        return OK();
+//    	}  catch (BaseException e) {
+//            e.printStackTrace();
+//            return this.error(e.getCode(), e.getMessage());
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return this.error(SystemCode.CONFERENCE_ROOM_GET_FIAL.getValue(), SystemCode.CONFERENCE_ROOM_GET_FIAL.getText() + e.getMessage());
+//        }
+//    }
 
 
     /**
@@ -503,40 +389,144 @@
     public void getQrCode(HttpServletRequest request, HttpServletResponse response) throws IOException, WriterException {
 
         //鑾峰彇鍙傛暟
-        FieldSetEntity fse = null;
-        Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-        if (bean != null) {
-            RequestParameterEntity reqp = (RequestParameterEntity) bean;
-            fse = reqp.getFormData();
+        FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+        if(!StringUtils.isEmpty(fse.getString("uuid"))){
+        	String uuid = fse.getString("uuid");
+        	// 璁剧疆鍝嶅簲娴佷俊鎭�
+            response.setContentType("image/jpg");
+            response.setHeader("Pragma", "no-cache");
+            response.setHeader("Cache-Control", "no-cache");
+            response.setDateHeader("Expires", 0);
 
-            if(fse!=null &&  !StringUtils.isEmpty(fse.getString("uuid"))){
-                String uuid = fse.getString("uuid");
-                // 璁剧疆鍝嶅簲娴佷俊鎭�
-                response.setContentType("image/jpg");
-                response.setHeader("Pragma", "no-cache");
-                response.setHeader("Cache-Control", "no-cache");
-                response.setDateHeader("Expires", 0);
+            OutputStream stream = response.getOutputStream();
 
-                OutputStream stream = response.getOutputStream();
-                //鍚庣璺宠浆鍦板潃
-               // String content = ("http://www.baidu.com");
-                JSONObject jsonData = new JSONObject();
-                jsonData.put("uuid",uuid);
-                jsonData.put("date",new Date());
-                //jsonData.put("url",content);
-                //鑾峰彇涓�涓簩缁寸爜鍥剧墖
-                BitMatrix bitMatrix = conferenceManagerService.getQrCode(jsonData.toString());
-                //浠ユ祦鐨勫舰寮忚緭鍑哄埌鍓嶇
-                MatrixToImageWriter.writeToStream(bitMatrix , "jpg" , stream);
-
-            }
+            JSONObject jsonData = new JSONObject();
+            jsonData.put("uuid",uuid);
+            Date date = new Date();
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String formatDate = dateFormat.format(date);
+            jsonData.put("date",formatDate);
+            //鑾峰彇涓�涓簩缁寸爜鍥剧墖
+            BitMatrix bitMatrix = conferenceManagerService.getQrCode(jsonData.toString());
+            //浠ユ祦鐨勫舰寮忚緭鍑哄埌鍓嶇
+            MatrixToImageWriter.writeToStream(bitMatrix , "jpg" , stream);
         }
+    }
 
-
+    /**
+     * 棰勭害浼氳鍙栨秷寮�鍚姛鑳�
+     * @param request
+     * @return
+     */
+    @PostMapping("/cancel_and_start/{version}")
+    @ApiVersion(1)
+    public String CancelAndStart(HttpServletRequest request){
+        //鑾峰彇鍙傛暟
+        FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+        conferenceManagerService.CancelAndStart(fse);
+        return OK();
     }
 
 
+    /**
+     * 浼氳绛惧埌鍔熻兘
+     * @param request
+     * @return
+     * @throws ParseException
+     */
+    @PostMapping("/conference_sign/{version}")
+    @ApiVersion(1)
+    public String ConferenceSign(HttpServletRequest request) throws ParseException {
+        //鑾峰彇鍙傛暟
+        FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+        String s = conferenceManagerService.ConferenceSign(fse);
+        return OK(s);
+    }
 
+    /**
+     * 鑾峰彇绛惧埌鎴栬�呰闂俊鎭�
+     * @param request
+     * @return
+     */
+    @PostMapping("/get_sign_or_visit_info/{version}")
+    @ApiVersion(1)
+    public String getMeetingSignOrVisit(HttpServletRequest request){
+        FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+        return OK_List(conferenceManagerService.getMeetingSignOrVisit(fse));
+    }
 
+    /**
+     * 鑾峰彇绛惧埌鎴栬�呰闂俊鎭�
+     * @param request
+     * @return
+     */
+//    @PostMapping("/get_signOrVisit_info/{version}")
+//    @ApiVersion(1)
+//    public String getSignOrVisitInfo(HttpServletRequest request){
+//        FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+//        HashMap signInfo = conferenceManagerService.getSignOrVisitInfo(fse);
+//        return OK(signInfo);
+//    }
+    /**
+     * 	鑾峰彇浼氳绾鍒楄〃
+     * @param request
+     * @return
+     */
+    @PostMapping("/list-meeting-minute/{version}")
+    @ApiVersion(1)
+    public String listMeetingMinute(HttpServletRequest request) {
+    	try {
+    		FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+        	// 鍒ゆ柇鍒嗛〉鍙傛暟鏄惁姝e父
+            if (StringUtils.isEmpty(fse.getString(CmnConst.PAGESIZE))
+                    || StringUtils.isEmpty(fse.getString(CmnConst.CPAGE))) {
+                return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
+            }
+            return OK_List(conferenceManagerService.listMeetingMinute(fse));
+    	} catch (BaseException e) {
+    		e.printStackTrace();
+            return this.error(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return this.error(SystemCode.CONFERENCE_APPLY_FIND_FIAL.getValue(), SystemCode.CONFERENCE_APPLY_FIND_FIAL.getText() + e.getMessage());
+        }
+	}
+    
+    /**
+     * 	鑾峰彇浼氳绾鍒楄〃
+     * @param request
+     * @return
+     */
+    @PostMapping("/find-meeting-minute/{version}")
+    @ApiVersion(1)
+    public String findMeetingMinute(HttpServletRequest request) {
+    	try {
+    		FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+        	// 鍒ゆ柇鍒嗛〉鍙傛暟鏄惁姝e父
+            if (StringUtils.isEmpty(fse.getString(CmnConst.UUID))
+                    && StringUtils.isEmpty(fse.getString("meeting_uuid"))) {
+                return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
+            }
+            return OK_List(conferenceManagerService.findMeetingMinute(fse));
+    	} catch (BaseException e) {
+    		e.printStackTrace();
+            return this.error(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return this.error(SystemCode.CONFERENCE_APPLY_FIND_FIAL.getValue(), SystemCode.CONFERENCE_APPLY_FIND_FIAL.getText() + e.getMessage());
+        }
+	}
 
+    /**
+     * 鍙戦�佹秷鎭�
+     * @param request
+     * @return
+     */
+    @PostMapping("/sendMsg/{version}")
+    @ApiVersion(1)
+    public String sendMsg(HttpServletRequest request){
+        FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+        conferenceManagerService.sendMsg(fse);
+        return OK();
+    }
 }

--
Gitblit v1.9.2