From 77a145b91efa63fddd18ba243ddc95a631620f72 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期一, 20 十月 2025 11:53:31 +0800
Subject: [PATCH] 会议代码提交
---
src/main/java/com/product/administration/controller/ConferenceManagerController.java | 159 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 98 insertions(+), 61 deletions(-)
diff --git a/src/main/java/com/product/administration/controller/ConferenceManagerController.java b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
index eed54ec..f04a000 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;
@@ -112,7 +111,7 @@
}
/**
- * 浼氳瀹や繚瀛�
+ * 浼氳瀹ら厤缃繚瀛�
*
* @param request
* @return
@@ -138,7 +137,7 @@
}
/**
- * 浼氳瀹ゅ垹闄�
+ * 浼氳瀹ら厤缃垹闄�
*
* @param request
* @return
@@ -170,7 +169,7 @@
/**
- * 浼氳瀹ょ敵璇�
+ * 浼氳锛堜細璁锛夌敵璇峰垪琛�
*
* @param request
* @return
@@ -202,7 +201,7 @@
/**
- * 浼氳瀹ら厤缃鎯�
+ * 浼氳锛堜細璁锛夌敵璇疯鎯�
*
* @param request
* @return
@@ -233,7 +232,7 @@
}
/**
- * 浼氳瀹ょ敵璇蜂繚瀛�
+ * 浼氳锛堜細璁锛夌敵璇蜂繚瀛�
*
* @param request
* @return
@@ -259,7 +258,7 @@
}
/**
- * 浼氳瀹ょ敵璇峰垹闄�
+ * 浼氳锛堜細璁锛夌敵璇峰垹闄�
*
* @param request
* @return
@@ -311,7 +310,7 @@
}
/**
- * 浼氳棰勭害鐪嬫澘鍔熻兘
+ * 浼氳鐪嬫澘
* @param request
* @return
*/
@@ -333,40 +332,18 @@
}
/**
- * 浼氳棰勭害鐪嬫澘鍔熻兘
- * @param request
- * @return
- */
- @PostMapping("/get_kb_Data/{version}")
- @ApiVersion(1)
- public String getkbData(HttpServletRequest request){
- try {
- //鑾峰彇鍙傛暟
- FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
- List kbData = conferenceManagerService.getkbData(fse);
- return OK(kbData);
- } 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());
- }
- }
-
- /**
* 鑾峰彇浼氳棰勭害璇︽儏
* @param request
* @return
*/
- @PostMapping("/get_Meeting_Details/{version}")
+ @PostMapping("/get-meeting-records/{version}")
@ApiVersion(1)
public String getMeetingDetails(HttpServletRequest request){
try {
//鑾峰彇鍙傛暟
FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
- List meetingDetails = conferenceManagerService.getMeetingDetails(fse);
- return OK(meetingDetails);
+ DataTableEntity meetingDetails = conferenceManagerService.getMeetingRecords(fse);
+ return OK_List(meetingDetails);
} catch (BaseException e) {
e.printStackTrace();
return this.error(e.getCode(), e.getMessage());
@@ -376,28 +353,28 @@
}
}
- /**
- * 浼氳瀹ら绾︿繚瀛樻洿鏂板姛鑳�
- * @param request
- * @return
- */
-
- @PostMapping("/save_or_update_meeting_info/{version}")
- @ApiVersion(1)
- public String saveOrUpdateMeetingInfo(HttpServletRequest request){
- try {
- //鑾峰彇鍙傛暟
- FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
- HashMap hashMap = conferenceManagerService.saveOrUpdateMeetingInfo(fse);
- return OK(hashMap);
- } 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());
- }
- }
+// /**
+// * 浼氳瀹ら绾︿繚瀛樻洿鏂板姛鑳�
+// * @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());
+// }
+// }
/**
@@ -466,19 +443,79 @@
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}")
+// @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 getSignOrVisitInfo(HttpServletRequest request){
- FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
- HashMap signInfo = conferenceManagerService.getSignOrVisitInfo(fse);
- return OK(signInfo);
- }
+ public String listMeetingMinute(HttpServletRequest request) {
+ try {
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+ // 鍒ゆ柇鍒嗛〉鍙傛暟鏄惁姝ｅ父
+ 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);
+ // 鍒ゆ柇鍒嗛〉鍙傛暟鏄惁姝ｅ父
+ 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());
+ }
+ }
/**
* 鍙戦�佹秷鎭�
--
Gitblit v1.9.2