From d64e7af39538a31b8a947113631c6ed2028d181f Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期一, 13 十月 2025 16:45:12 +0800
Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-administration/V2.0.0 into dev
---
src/main/java/com/product/administration/service/ide/IConferenceManagerService.java | 12 +----
src/main/java/com/product/administration/controller/ConferenceManagerController.java | 80 ++++++++++++++++++++++++++++-----------
src/main/java/com/product/administration/config/SystemCode.java | 4 +-
3 files changed, 62 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/product/administration/config/SystemCode.java b/src/main/java/com/product/administration/config/SystemCode.java
index d6043e6..2657e57 100644
--- a/src/main/java/com/product/administration/config/SystemCode.java
+++ b/src/main/java/com/product/administration/config/SystemCode.java
@@ -108,16 +108,16 @@
SYSTEM_DELETE_CAR_APPLICATION_FAIL("鐢ㄨ溅鐢宠鍒犻櫎澶辫触", ModuleEnum.ADMINISTRAT.getValue() + "068"),
//浼氳
+ CONFERENCE_ROOM_GET_FIAL("浼氳瀹よ幏鍙栧け璐�", ModuleEnum.ADMINISTRAT.getValue() + "077"),
CONFERENCE_ROOM_LIST_FIAL("浼氳瀹ゅ垪琛ㄨ幏鍙栧け璐�", ModuleEnum.ADMINISTRAT.getValue() + "069"),
CONFERENCE_ROOM_FIND_FIAL("浼氳瀹よ鎯呰幏鍙栧け璐�", ModuleEnum.ADMINISTRAT.getValue() + "070"),
CONFERENCE_ROOM_SAVE_FIAL("浼氳瀹や繚瀛樺け璐�", ModuleEnum.ADMINISTRAT.getValue() + "071"),
CONFERENCE_ROOM_DEL_FIAL("浼氳瀹ゅ垹闄ゅけ璐�", ModuleEnum.ADMINISTRAT.getValue() + "072"),
+ CONFERENCE_ROOM_IS_USED("璇ユ椂闂存鍐呬細璁琚娇鐢紝璇烽噸鏂伴�夋嫨", ModuleEnum.ADMINISTRAT.getValue() + "078"),
CONFERENCE_APPLY_LIST_FIAL("浼氳瀹ょ敵璇峰垪琛ㄨ幏鍙栧け璐�", ModuleEnum.ADMINISTRAT.getValue() + "073"),
CONFERENCE_APPLY_FIND_FIAL("浼氳瀹ょ敵璇疯鎯呰幏鍙栧け璐�", ModuleEnum.ADMINISTRAT.getValue() + "074"),
CONFERENCE_APPLY_SAVE_FIAL("浼氳瀹ょ敵璇蜂繚瀛樺け璐�", ModuleEnum.ADMINISTRAT.getValue() + "075"),
CONFERENCE_APPLY_DEL_FIAL("浼氳瀹ょ敵璇峰垹闄ゅけ璐�", ModuleEnum.ADMINISTRAT.getValue() + "076"),
- CONFERENCE_ROOM_GET_FIAL("浼氳瀹よ幏鍙栧け璐�", ModuleEnum.ADMINISTRAT.getValue() + "077"),
- CONFERENCE_ROOM_IS_USED("璇ユ椂闂存鍐呬細璁琚娇鐢紝璇烽噸鏂伴�夋嫨", ModuleEnum.ADMINISTRAT.getValue() + "078"),
SYSTEM_GET_CAR_CHART_LIST_FAIL("鐢ㄨ溅鐪嬫澘鍒楄〃鑾峰彇澶辫触", ModuleEnum.ADMINISTRAT.getValue() + "079"),
SYSTEM_GET_CAR_CHART_INFO_FAIL("鐢ㄨ溅鐪嬫澘璇︽儏鑾峰彇澶辫触", ModuleEnum.ADMINISTRAT.getValue() + "080"),
diff --git a/src/main/java/com/product/administration/controller/ConferenceManagerController.java b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
index eed54ec..4391525 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;
@@ -337,22 +336,22 @@
* @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());
- }
- }
+// @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());
+// }
+// }
/**
* 鑾峰彇浼氳棰勭害璇︽儏
@@ -466,19 +465,54 @@
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("/get_sign_or_visit_info/{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());
+ }
+ }
/**
* 鍙戦�佹秷鎭�
diff --git a/src/main/java/com/product/administration/service/ide/IConferenceManagerService.java b/src/main/java/com/product/administration/service/ide/IConferenceManagerService.java
index d010b43..96f8163 100644
--- a/src/main/java/com/product/administration/service/ide/IConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ide/IConferenceManagerService.java
@@ -37,7 +37,7 @@
boolean delConferenceApply(FieldSetEntity fse)throws BaseException;
- List getkbData(FieldSetEntity fse)throws BaseException;
+// List getkbData(FieldSetEntity fse)throws BaseException;
DataTableEntity getKanBanData(FieldSetEntity fse)throws BaseException;
@@ -51,13 +51,7 @@
String ConferenceSign(FieldSetEntity fse) throws BaseException, ParseException;
- HashMap getSignOrVisitInfo(FieldSetEntity fse) throws BaseException;
+ DataTableEntity getMeetingSignOrVisit(FieldSetEntity fse) throws BaseException;
- void sendMsg(FieldSetEntity fse) throws BaseException;
-
-
-
-
-
-
+ void sendMsg(FieldSetEntity fse) throws BaseException;
}
--
Gitblit v1.9.2