From 13b58d0fc355b6256d165cc2ae6a571ffa8e778d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 15 五月 2024 17:35:29 +0800
Subject: [PATCH] 代码初始化
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 14 +++
/dev/null | 38 ---------
server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingListResponse.java | 10 ++
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java | 3
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java | 2
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/NoticeApi.java | 12 ++-
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/UtilApi.java | 8 +-
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 18 +++
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java | 44 +++++-----
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java | 73 ++++++++----------
10 files changed, 106 insertions(+), 116 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java
index bfeec82..c4552b2 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java
@@ -87,8 +87,7 @@
@PostMapping("/updateById")
@RequiresPermissions("business:bookings:update")
public ApiResponse updateById(@RequestBody Bookings bookings) {
- LoginUserInfo user = getLoginUser(null);
- bookings.setCreator(user.getId());
+ bookings.setLoginUserInfo(getLoginUser(null));
bookingsService.updateById(bookings);
return ApiResponse.success(null);
}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/ApiController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/ApiController.java
deleted file mode 100644
index c392575..0000000
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/ApiController.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.doumee.cloud.web;
-
-import com.doumee.config.Jwt.JwtTokenUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Controller鍩虹被
- * @author Eva.Caesar Liu
- * @date 2022/03/15 09:54
- */
-@Slf4j
-public class ApiController {
-
-
- /**
- * 寰楀埌request瀵硅薄
- *
- * @return
- */
- public HttpServletRequest getRequest() {
- HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- return request;
- }
- /**
- * 鑾峰彇鐢ㄦ埛ID
- *
- * @return
- */
- protected Integer getMemberId() {
- Object obj = this.getRequest().getAttribute(JwtTokenUtil.UserId_Name);
- return obj != null ? (Integer) obj : null;
- }
-
-}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java
index 81c8fad..6fbef3f 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java
@@ -1,10 +1,13 @@
package com.doumee.cloud.web;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.doumee.api.BaseController;
import com.doumee.config.Jwt.JwtTokenUtil;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.QrCodeUtils;
import com.doumee.dao.business.model.Bookings;
@@ -38,9 +41,9 @@
@Api(tags = "2銆侀瀹氫細璁笟鍔�")
@Trace(exclude = true)
@RestController
-@RequestMapping("/web/meeting")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/meeting")
@Slf4j
-public class MeetingApi extends ApiController{
+public class MeetingApi extends BaseController {
@Autowired
private BookingsService bookingsService;
@@ -52,13 +55,14 @@
@ApiOperation(value = "褰撴湀浼氳琛�", notes = "褰撴湀浼氳琛�")
@GetMapping("/monthMeeting")
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "String", name = "yearMonth", value = "骞存湀 yyyy-MM", required = true)
})
- public ApiResponse<List<MonthDataResponse>> monthDay(@RequestParam String yearMonth) {
+ public ApiResponse<List<MonthDataResponse>> monthDay(@RequestParam String yearMonth
+ ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = getLoginUser(token);
List<String> dataList = DateUtil.getDayByMonth(yearMonth);
List<MonthDataResponse> monthDataResponseList = new ArrayList<>();
- List<Bookings> bookings = bookingsService.getMyBookings(getMemberId(),yearMonth);
+ List<Bookings> bookings = bookingsService.getMyBookings(user.getId(),yearMonth);
for (String str:dataList) {
MonthDataResponse monthDataResponse = new MonthDataResponse();
monthDataResponse.setWeekMsg(DateUtil.getWeek(DateUtil.StringToDate(str,"yyyy-MM-dd")).getChineseName());
@@ -72,11 +76,10 @@
@ApiOperation("鎴戠殑浼氳鍒楄〃")
@PostMapping("/myMeetingPage")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse<IPage<MeetingListResponse>> myMeetingPage(@RequestBody PageWrap<MeetingPageRequest> pageWrap) {
- pageWrap.getModel().setUserId(getMemberId());
+ public ApiResponse<IPage<MeetingListResponse>> myMeetingPage(@RequestBody PageWrap<MeetingPageRequest> pageWrap
+ ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = getLoginUser(token);
+ pageWrap.getModel().setUserId(user.getId());
IPage<MeetingListResponse> page = bookingsService.getMyMeetingPage(pageWrap);
return ApiResponse.success("鏌ヨ鎴愬姛",page);
}
@@ -85,7 +88,6 @@
@ApiOperation("浼氳璇︽儏")
@GetMapping("/meetingDetail")
@ApiImplicitParams({
-// @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true),
})
public ApiResponse<MeetingDetailResponse> meetingDetail(@RequestParam Integer id) {
@@ -93,7 +95,7 @@
}
- @ApiOperation("鑾峰彇浼氳寮�闂ㄤ簩缁寸爜")
+ /* @ApiOperation("鑾峰彇浼氳寮�闂ㄤ簩缁寸爜")
@GetMapping("/getQrCode")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@@ -116,7 +118,7 @@
response.setContentType("image/jpeg");
String content =bookingsService.getQrCode(id,memberId);
QrCodeUtils.encode(content,null, response.getOutputStream(), true);
- }
+ }*/
/*
@LoginRequired
@@ -134,23 +136,21 @@
@ApiOperation("浼氳棰勭害")
@PostMapping("/reservationMeeting")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse<Integer> reservationMeeting(@RequestBody BookingsRequest bookingsRequest) {
- bookingsRequest.setCreator(getMemberId());
- bookingsRequest.setEditor(getMemberId());
+ public ApiResponse<Integer> reservationMeeting(@RequestBody BookingsRequest bookingsRequest ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = getLoginUser(token);
+ bookingsRequest.setCreator(user.getId());
+ bookingsRequest.setEditor(user.getId());
return ApiResponse.success("鎿嶄綔鎴愬姛",bookingsService.reservationMeeting(bookingsRequest));
}
@ApiOperation("鍙栨秷浼氳棰勭害")
@GetMapping("/reservationCancel")
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true),
})
- public ApiResponse reservationCancel(@RequestParam Integer id) {
- bookingsService.reservationCancel(id,getMemberId());
+ public ApiResponse reservationCancel(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = getLoginUser(token);
+ bookingsService.reservationCancel(id,user.getId());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/NoticeApi.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/NoticeApi.java
index b7bb358..c32250a 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/NoticeApi.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/NoticeApi.java
@@ -1,7 +1,9 @@
package com.doumee.cloud.web;
+import com.doumee.api.BaseController;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -16,9 +18,9 @@
@Api(tags = "娑堟伅閫氱煡淇′笟鍔�")
@Trace(exclude = true)
@RestController
-@RequestMapping("/web/notice")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/notice")
@Slf4j
-public class NoticeApi extends ApiController{
+public class NoticeApi extends BaseController {
@Autowired
private NoticesService noticeService;
@@ -31,8 +33,10 @@
*/
@ApiOperation(value = "鏌ヨ鐢ㄦ埛閫氱煡", notes = "灏忕▼搴忕")
@PostMapping("/findNoticePage")
- public ApiResponse<PageData<Notices>> findNoticePage(@RequestBody PageWrap<Notices> pageWrap){
- pageWrap.getModel().setUserId(getMemberId());
+ public ApiResponse<PageData<Notices>> findNoticePage(@RequestBody PageWrap<Notices> pageWrap
+ ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ LoginUserInfo user = getLoginUser(token);
+ pageWrap.getModel().setUserId(user.getId());
return ApiResponse.success("鏌ヨ鎴愬姛",noticeService.findPage(pageWrap));
}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java
index 841e890..e98eae7 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java
@@ -1,10 +1,13 @@
package com.doumee.cloud.web;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.doumee.api.BaseController;
import com.doumee.config.Jwt.JwtTokenUtil;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.QrCodeUtils;
import com.doumee.dao.business.model.RoomTime;
import com.doumee.dao.web.request.RoomTimeRequest;
@@ -33,9 +36,9 @@
@Api(tags = "3銆佷細璁涓氬姟")
@Trace(exclude = true)
@RestController
-@RequestMapping("/web/rooms")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/rooms")
@Slf4j
-public class RoomsApi extends ApiController{
+public class RoomsApi extends BaseController {
@Autowired
private RoomsService roomsService;
@@ -43,57 +46,48 @@
@Autowired
private RoomTimeService roomTimeService;
- @ApiOperation("鑾峰彇浼氳瀹ゅ紑闂ㄤ簩缁寸爜")
- @GetMapping("/getQrCode")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳瀹や富閿�", required = true),
- })
- public ApiResponse<String> getQrCode(@RequestParam Integer id) {
- return ApiResponse.success("鏌ヨ鎴愬姛", roomsService.getQrCode(id,getMemberId()));
- }
+// @ApiOperation("鑾峰彇浼氳瀹ゅ紑闂ㄤ簩缁寸爜")
+// @GetMapping("/getQrCode")
+// @ApiImplicitParams({
+// @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+// @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳瀹や富閿�", required = true),
+// })
+// public ApiResponse<String> getQrCode(@RequestParam Integer id) {
+// return ApiResponse.success("鏌ヨ鎴愬姛", roomsService.getQrCode(id,getMemberId()));
+// }
- @ApiOperation("鑾峰彇浼氳瀹ゅ紑闂ㄤ簩缁寸爜-鍥剧墖娴�")
- @GetMapping("/getQrCodeImg")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳瀹や富閿�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public void getQrCodeImg(@RequestParam Integer id,@RequestParam String token, HttpServletResponse response) throws Exception {
- Integer memberId = JwtTokenUtil.getJwtPayLoad(token).getMemberId();
- response.setHeader("Cache-Control", "no-store, no-cache");
- response.setContentType("image/jpeg");
- String content =roomsService.getQrCode(id,memberId);
- QrCodeUtils.encode(content,null, response.getOutputStream(), true);
- }
+// @ApiOperation("鑾峰彇浼氳瀹ゅ紑闂ㄤ簩缁寸爜-鍥剧墖娴�")
+// @GetMapping("/getQrCodeImg")
+// @ApiImplicitParams({
+// @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳瀹や富閿�", required = true),
+// @ApiImplicitParam(paramType = "query", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+// })
+// public void getQrCodeImg(@RequestParam Integer id,@RequestParam String token, HttpServletResponse response) throws Exception {
+// Integer memberId = JwtTokenUtil.getJwtPayLoad(token).getMemberId();
+// response.setHeader("Cache-Control", "no-store, no-cache");
+// response.setContentType("image/jpeg");
+// String content =roomsService.getQrCode(id,memberId);
+// QrCodeUtils.encode(content,null, response.getOutputStream(), true);
+// }
@ApiOperation("浼氳瀹ゅ垪琛�")
@GetMapping("/roomsList")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse<List<RoomsResponse>> roomsList() {
+ public ApiResponse<List<RoomsResponse>> roomsList(@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success("鏌ヨ鎴愬姛",roomsService.getRoomsList());
}
-
@ApiOperation("浼氳瀹ゆ椂闂村紑鏀惧垪琛�")
@PostMapping("/getRoomUseTime")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse<List<RoomTime>> getRoomUseTime(@RequestBody RoomTimeRequest roomTimeRequest) {
+ public ApiResponse<List<RoomTime>> getRoomUseTime(@RequestBody RoomTimeRequest roomTimeRequest,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success("鏌ヨ鎴愬姛",roomTimeService.getRoomUseTime(roomTimeRequest));
}
@ApiOperation("鎴戠殑浼氳瀹ゅ垪琛�")
@PostMapping("/myRoomsPage")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse<IPage<RoomsResponse>> myRoomsPage(@RequestBody PageWrap<RoomsRequest> pageWrap) {
- pageWrap.getModel().setUserId(getMemberId());
+ public ApiResponse<IPage<RoomsResponse>> myRoomsPage(@RequestBody PageWrap<RoomsRequest> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = getLoginUser(token);
+ pageWrap.getModel().setUserId(user.getId());
IPage<RoomsResponse> page = roomsService.getRoomsPage(pageWrap);
return ApiResponse.success("鏌ヨ鎴愬姛",page);
}
@@ -102,10 +96,9 @@
@ApiOperation("浼氳瀹よ鎯�")
@GetMapping("/getRoomDetail")
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "roomId", value = "浼氳瀹や富閿�", required = true),
})
- public ApiResponse<RoomsResponse> getRoomDetail(@RequestParam Integer roomId) {
+ public ApiResponse<RoomsResponse> getRoomDetail(@RequestParam Integer roomId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success("鏌ヨ鎴愬姛",roomsService.getRoomDetail(roomId));
}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/UtilApi.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/UtilApi.java
index 091bf94..cde100f 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/UtilApi.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/UtilApi.java
@@ -1,8 +1,10 @@
package com.doumee.cloud.web;
+import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.UtilService;
import io.swagger.annotations.Api;
@@ -29,9 +31,9 @@
@Api(tags = "99銆佸府鍔╀笟鍔�")
@Trace(exclude = true)
@RestController
-@RequestMapping("/web/util")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/util")
@Slf4j
-public class UtilApi extends ApiController{
+public class UtilApi extends BaseController {
@Autowired
private UtilService utilService;
@@ -78,7 +80,5 @@
}
}
-
-
}
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java
index cc0769d..e8e58bc 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java
@@ -22,7 +22,7 @@
- @Select(" select a.id , b.`NAME` as roomName , a.`NAME` as meetingName ,date_format(a.START_TIME,'%Y-%m-%d') as meetingDate ," +
+ @Select(" select a.id , b.`NAME` as roomName , a.`NAME` as meetingName ,date_format(a.START_TIME,'%Y-%m-%d') as meetingDate , a.START_TIME as startTime, a.status ," +
" CONCAT(date_format(a.START_TIME,'%H:%i') , ' ~ ',date_format(a.END_TIME,'%H:%i')) as meetingTime, c.REALNAME as bookingUser ," +
" CASE WHEN a.START_TIME > now() and a.`STATUS` = 0 THEN 1 WHEN a.END_TIME < now() or a.`STATUS` = 1 THEN 3 ELSE 2 END meetingStatus , b.IMGURL as imgUrl " +
" from meeting_book a inner join meeting_rooms b on a.ROOM_ID = b.ID " +
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingListResponse.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingListResponse.java
index 9788683..4c21bae 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingListResponse.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingListResponse.java
@@ -6,6 +6,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.util.Date;
/**
* Created by IntelliJ IDEA.
@@ -32,6 +33,13 @@
@ApiModelProperty(value = "浼氳鏃堕棿 ( a ~ b)")
private String meetingTime;
+
+ @ApiModelProperty(value = "浼氳寮�濮嬫椂闂�",hidden = true)
+ private Date startTime;
+
+ @ApiModelProperty(value = "鐘舵�� 0宸查绾� 1宸叉挙閿� ",hidden = true)
+ private Integer status;
+
@ApiModelProperty(value = "浼氳棰勭害浜�")
private String bookingUser;
@@ -41,7 +49,7 @@
@ApiModelProperty(value = "鍓嶇紑")
private String prefixUrl;
- @ApiModelProperty(value = "浼氳鐘舵��: 1=鏈紑濮嬶紱2=杩涜涓紱3=宸茬粨鏉�")
+ @ApiModelProperty(value = "浼氳鐘舵��: 1=鏈紑濮嬶紱2=杩涜涓紱3=宸茬粨鏉� ; 4=鍗冲皢寮�濮�; 5=宸叉挙閿�")
private Integer meetingStatus;
}
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index d3a0a58..0a6fb11 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -120,7 +120,7 @@
@Override
@Transactional(rollbackFor = {BusinessException.class, Exception.class})
public Integer create(Bookings bookings) {
- LoginUserInfo user = new LoginUserInfo();
+ LoginUserInfo user = bookings.getLoginUserInfo();
user.setId(bookings.getCreator());
isCreateParamValid(bookings, user);
bookings.setCreateDate(new Date());
@@ -778,6 +778,18 @@
String path = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
page.getRecords().forEach(i -> {
i.setPrefixUrl(path);
+ if(i.getMeetingStatus().equals(Constants.ZERO)){
+ if(i.getStatus()==Constants.ONE){
+ i.setMeetingStatus(5);
+ }else{
+ //寮�濮嬪墠5鍒嗛挓 澶т簬褰撳墠鏃堕棿 鍒欐樉绀哄嵆灏嗗紑濮�
+ if(DateUtil.afterMinutesDate(i.getStartTime(),-5).getTime()>System.currentTimeMillis()){
+ i.setMeetingStatus(4);
+ }
+ }
+
+ }
+
});
return page;
}
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
index d68a093..18973d8 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -2839,9 +2839,9 @@
public static void main(String[] args) {
try {
- Date date = getISO8601DateByStr("2024-04-15T07:46:36.014+08:00");
- Date date1 = getISO8601DateByStr("2024-06-14T08:46:36.014+08:00");
- System.out.println(daysBetweenDates11(date1,date)+1);
+// Date date = getISO8601DateByStr("2024-04-15T07:46:36.014+08:00");
+// Date date1 = getISO8601DateByStr("2024-06-14T08:46:36.014+08:00");
+ System.out.println(DateUtil.afterMinutesDate(-5));
} catch (Exception ex) {
ex.printStackTrace();
@@ -3098,6 +3098,18 @@
}
/**
+ * X 鍒嗛挓鍚庢椂闂�
+ * @param minutes
+ * @return
+ */
+ public static Date afterMinutesDate(Date date,Integer minutes){
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(date);
+ cal.add(Calendar.MINUTE,minutes);
+ return cal.getTime();
+ }
+
+ /**
* LocalDateTime to date
* @param now
* @return
--
Gitblit v1.9.3