From 0a606aeb216c154f3b931f3fad332bc8b8b69721 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 九月 2024 15:38:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5_meeting/unpackage/res/icons/152x152.png | 0
h5_meeting/unpackage/res/icons/180x180.png | 0
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 31 +++++++++++++--
h5_meeting/unpackage/res/icons/29x29.png | 0
h5_meeting/unpackage/res/icons/1024x1024.png | 0
h5_meeting/unpackage/res/icons/144x144.png | 0
h5_meeting/unpackage/res/icons/58x58.png | 0
h5_meeting/unpackage/res/icons/120x120.png | 0
h5_meeting/unpackage/res/icons/60x60.png | 0
h5_meeting/unpackage/res/icons/192x192.png | 0
h5_meeting/api/index.js | 2
h5_meeting/unpackage/res/icons/40x40.png | 0
h5_meeting/utils/config.js | 2
h5_meeting/unpackage/res/icons/96x96.png | 0
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java | 8 +++
h5_meeting/unpackage/res/icons/76x76.png | 0
h5_meeting/unpackage/res/icons/80x80.png | 0
h5_meeting/unpackage/res/icons/167x167.png | 0
h5_meeting/unpackage/res/icons/87x87.png | 0
h5_meeting/unpackage/res/icons/20x20.png | 0
h5_meeting/unpackage/res/icons/72x72.png | 0
h5_meeting/manifest.json | 34 ++++++++++++++++
h5_meeting/pages/index/config.vue | 4 +-
23 files changed, 71 insertions(+), 10 deletions(-)
diff --git a/h5_meeting/api/index.js b/h5_meeting/api/index.js
index 773ed18..455b1d6 100644
--- a/h5_meeting/api/index.js
+++ b/h5_meeting/api/index.js
@@ -5,7 +5,7 @@
//
export const meetScreenData = (data) => {
return http({
- url: 'cloudService/web/meeting/meetScreenData',
+ url: '/meetingAdmin/cloudService/web/meeting/meetScreenData',
method: 'get',
data
})
diff --git a/h5_meeting/manifest.json b/h5_meeting/manifest.json
index e88dc5e..56005ca 100644
--- a/h5_meeting/manifest.json
+++ b/h5_meeting/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "h5_meeting",
+ "name" : "瀹夋嘲浼氳瀹�",
"appid" : "__UNI__EF8BAA7",
"description" : "",
"versionName" : "1.0.0",
@@ -47,6 +47,38 @@
/* SDK閰嶇疆 */
"sdkConfigs" : {
"ad" : {}
+ },
+ "icons" : {
+ "android" : {
+ "xxhdpi" : "unpackage/res/icons/144x144.png",
+ "xhdpi" : "unpackage/res/icons/96x96.png",
+ "hdpi" : "unpackage/res/icons/72x72.png",
+ "xxxhdpi" : "unpackage/res/icons/192x192.png"
+ },
+ "ios" : {
+ "appstore" : "unpackage/res/icons/1024x1024.png",
+ "ipad" : {
+ "app" : "unpackage/res/icons/76x76.png",
+ "app@2x" : "unpackage/res/icons/152x152.png",
+ "notification" : "unpackage/res/icons/20x20.png",
+ "notification@2x" : "unpackage/res/icons/40x40.png",
+ "proapp@2x" : "unpackage/res/icons/167x167.png",
+ "settings" : "unpackage/res/icons/29x29.png",
+ "settings@2x" : "unpackage/res/icons/58x58.png",
+ "spotlight" : "unpackage/res/icons/40x40.png",
+ "spotlight@2x" : "unpackage/res/icons/80x80.png"
+ },
+ "iphone" : {
+ "app@2x" : "unpackage/res/icons/120x120.png",
+ "app@3x" : "unpackage/res/icons/180x180.png",
+ "notification@2x" : "unpackage/res/icons/40x40.png",
+ "notification@3x" : "unpackage/res/icons/60x60.png",
+ "settings@2x" : "unpackage/res/icons/58x58.png",
+ "settings@3x" : "unpackage/res/icons/87x87.png",
+ "spotlight@2x" : "unpackage/res/icons/80x80.png",
+ "spotlight@3x" : "unpackage/res/icons/120x120.png"
+ }
+ }
}
}
},
diff --git a/h5_meeting/pages/index/config.vue b/h5_meeting/pages/index/config.vue
index b476e6a..f75c39c 100644
--- a/h5_meeting/pages/index/config.vue
+++ b/h5_meeting/pages/index/config.vue
@@ -11,14 +11,14 @@
<view class="item">
<view class="title">鎺ュ彛鍦板潃</view>
<view class="line">
- <input type="text" v-model="param.baseUrl" />
+ <input type="text" placeholder="http://10.50.250.178:8088/gateway_interface" v-model="param.baseUrl" />
<image src="../../static/icon/right.svg" class="icon"></image>
</view>
</view>
<view class="item">
<view class="title">鎺ュ彛璋冪敤闂撮殧(绉�)</view>
<view class="line">
- <input type="text" v-model="param.time" />
+ <input type="text" placeholder="60" v-model="param.time" />
<image src="../../static/icon/right.svg" class="icon"></image>
</view>
</view>
diff --git a/h5_meeting/unpackage/res/icons/1024x1024.png b/h5_meeting/unpackage/res/icons/1024x1024.png
new file mode 100644
index 0000000..8e5ccd4
--- /dev/null
+++ b/h5_meeting/unpackage/res/icons/1024x1024.png
Binary files differ
diff --git a/h5_meeting/unpackage/res/icons/120x120.png b/h5_meeting/unpackage/res/icons/120x120.png
new file mode 100644
index 0000000..650cc00
--- /dev/null
+++ b/h5_meeting/unpackage/res/icons/120x120.png
Binary files differ
diff --git a/h5_meeting/unpackage/res/icons/144x144.png b/h5_meeting/unpackage/res/icons/144x144.png
new file mode 100644
index 0000000..1b2fc49
--- /dev/null
+++ b/h5_meeting/unpackage/res/icons/144x144.png
Binary files differ
diff --git a/h5_meeting/unpackage/res/icons/152x152.png b/h5_meeting/unpackage/res/icons/152x152.png
new file mode 100644
index 0000000..0bc20ba
--- /dev/null
+++ b/h5_meeting/unpackage/res/icons/152x152.png
Binary files differ
diff --git a/h5_meeting/unpackage/res/icons/167x167.png b/h5_meeting/unpackage/res/icons/167x167.png
new file mode 100644
index 0000000..bd290e8
--- /dev/null
+++ b/h5_meeting/unpackage/res/icons/167x167.png
Binary files differ
diff --git a/h5_meeting/unpackage/res/icons/180x180.png b/h5_meeting/unpackage/res/icons/180x180.png
new file mode 100644
index 0000000..93ab56f
--- /dev/null
+++ b/h5_meeting/unpackage/res/icons/180x180.png
Binary files differ
diff --git a/h5_meeting/unpackage/res/icons/192x192.png b/h5_meeting/unpackage/res/icons/192x192.png
new file mode 100644
index 0000000..e6e6595
--- /dev/null
+++ b/h5_meeting/unpackage/res/icons/192x192.png
Binary files differ
diff --git a/h5_meeting/unpackage/res/icons/20x20.png b/h5_meeting/unpackage/res/icons/20x20.png
new file mode 100644
index 0000000..ceaeb7c
--- /dev/null
+++ b/h5_meeting/unpackage/res/icons/20x20.png
Binary files differ
diff --git a/h5_meeting/unpackage/res/icons/29x29.png b/h5_meeting/unpackage/res/icons/29x29.png
new file mode 100644
index 0000000..154fa02
--- /dev/null
+++ b/h5_meeting/unpackage/res/icons/29x29.png
Binary files differ
diff --git a/h5_meeting/unpackage/res/icons/40x40.png b/h5_meeting/unpackage/res/icons/40x40.png
new file mode 100644
index 0000000..d1c2b47
--- /dev/null
+++ b/h5_meeting/unpackage/res/icons/40x40.png
Binary files differ
diff --git a/h5_meeting/unpackage/res/icons/58x58.png b/h5_meeting/unpackage/res/icons/58x58.png
new file mode 100644
index 0000000..a4cc188
--- /dev/null
+++ b/h5_meeting/unpackage/res/icons/58x58.png
Binary files differ
diff --git a/h5_meeting/unpackage/res/icons/60x60.png b/h5_meeting/unpackage/res/icons/60x60.png
new file mode 100644
index 0000000..d42638d
--- /dev/null
+++ b/h5_meeting/unpackage/res/icons/60x60.png
Binary files differ
diff --git a/h5_meeting/unpackage/res/icons/72x72.png b/h5_meeting/unpackage/res/icons/72x72.png
new file mode 100644
index 0000000..f6ef39e
--- /dev/null
+++ b/h5_meeting/unpackage/res/icons/72x72.png
Binary files differ
diff --git a/h5_meeting/unpackage/res/icons/76x76.png b/h5_meeting/unpackage/res/icons/76x76.png
new file mode 100644
index 0000000..afed12c
--- /dev/null
+++ b/h5_meeting/unpackage/res/icons/76x76.png
Binary files differ
diff --git a/h5_meeting/unpackage/res/icons/80x80.png b/h5_meeting/unpackage/res/icons/80x80.png
new file mode 100644
index 0000000..e0b8ee0
--- /dev/null
+++ b/h5_meeting/unpackage/res/icons/80x80.png
Binary files differ
diff --git a/h5_meeting/unpackage/res/icons/87x87.png b/h5_meeting/unpackage/res/icons/87x87.png
new file mode 100644
index 0000000..09839e1
--- /dev/null
+++ b/h5_meeting/unpackage/res/icons/87x87.png
Binary files differ
diff --git a/h5_meeting/unpackage/res/icons/96x96.png b/h5_meeting/unpackage/res/icons/96x96.png
new file mode 100644
index 0000000..dcccdbc
--- /dev/null
+++ b/h5_meeting/unpackage/res/icons/96x96.png
Binary files differ
diff --git a/h5_meeting/utils/config.js b/h5_meeting/utils/config.js
index 19b2359..ce04ab2 100644
--- a/h5_meeting/utils/config.js
+++ b/h5_meeting/utils/config.js
@@ -1,6 +1,6 @@
// export const baseUrl = 'meetingAdmin/'
-export const baseUrl = 'http://10.50.250.178:8088/gateway_interface/meetingAdmin/'
+export const baseUrl = 'http://10.50.250.178:8088/gateway_interface/'
export const uploadAvatar = `${baseUrl}visitsAdmin/cloudService/web/public/uploadFtp.do`
export const uploadUrl = `${baseUrl}visitsAdmin/cloudService/public/uploadBatch`
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 dd0a9bb..e83f0fc 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
@@ -464,7 +464,7 @@
queryWrapper.selectAs(Rooms::getName, Bookings::getRoomName);
queryWrapper.selectAs(SystemUser::getRealname, Bookings::getRealName);
queryWrapper.selectAs(Company::getName, Bookings::getDepartmentName);
- queryWrapper.select(" CASE WHEN t.START_TIME > now() AND t.`STATUS` = 0 THEN 1 WHEN ( (t.END_TIME < now() AND t.`STATUS` = 0 ) or t.`STATUS` = 2 ) THEN 3 WHEN t.`STATUS` = 1 THEN 5 ELSE 2 END meetingStatus ");
+ queryWrapper.select(" CASE WHEN t.START_TIME_REAL IS NULL AND t.`STATUS` = 0 THEN 1 WHEN ( ( t.END_TIME < now() AND t.`STATUS` = 0 ) or t.`STATUS` = 2 ) THEN 3 WHEN t.`STATUS` = 1 THEN 5 ELSE 2 END meetingStatus ");
queryWrapper.leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId);
queryWrapper.leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator);
queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
@@ -476,7 +476,6 @@
queryWrapper.eq(pageWrap.getModel().getStatus() != null, Bookings::getStatus, pageWrap.getModel().getStatus());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getRealName()), SystemUser::getRealname, pageWrap.getModel().getRealName());
queryWrapper.eq(pageWrap.getModel().getDepartmentId() != null, Company::getId, pageWrap.getModel().getDepartmentId());
-
queryWrapper.apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
&&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.ONE),
@@ -1124,9 +1123,32 @@
if(DateUtil.afterMinutesDate(bookings.getStartTime(),-beforeMinutes).getTime()>System.currentTimeMillis()){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼氳浠呭彲浠ユ彁鍓�"+beforeMinutes+"鍒嗛挓寮�濮�");
}
+ //鏌ヨ鏄惁瀛樺湪鍏朵粬鏈紑濮嬬殑浼氳 闃叉棰楃矑搴︿笌鎻愬墠寮�濮嬬殑闂
+ if(bookingsMapper.selectCount(new QueryWrapper<Bookings>()
+ .lambda()
+ .apply(" now() < START_TIME and END_TIME <= '" + DateUtil.DateToStr(bookings.getStartTime(),"yyyy-MM-dd HH:mm:ss") +"'" )
+ .isNull(Bookings::getStartTimeReal)
+ .isNull(Bookings::getDoneDate)
+ .eq(Bookings::getStatus,Constants.ZERO)
+ .eq(Bookings::getRoomId,bookings.getRoomId())
+ .ne(Bookings::getId,bookings.getId())
+ )>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鏈紑鍚細璁紝鏃犳硶杩涜寮�濮嬩細璁�");
+ };
+
+ if(bookingsMapper.selectCount(new QueryWrapper<Bookings>()
+ .lambda()
+ .apply(" END_TIME > now() and START_TIME < now() ")
+ .isNotNull(Bookings::getStartTimeReal)
+ .isNull(Bookings::getDoneDate)
+ .eq(Bookings::getStatus,Constants.ZERO)
+ .eq(Bookings::getRoomId,bookings.getRoomId())
+ )>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠寮�鍚椂闂翠笌鍏朵粬浼氳瀛樺湪鍐茬獊锛屾棤娉曡繘琛屽紑濮嬩細璁�");
+ };
}else{
if(bookings.getStartTime().getTime() > System.currentTimeMillis()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈埌浼氳鐢宠寮�濮嬫椂闂达紝鏃犳硶杩涜寮�鍚�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈埌浼氳鐢宠寮�濮嬫椂闂达紝鏃犳硶杩涜寮�濮�");
}
}
bookings.setStartTimeReal(new Date());
@@ -1138,7 +1160,8 @@
.lambda()
.set(Bookings::getStatus,Constants.TWO)
.set(Bookings::getDoneDate,new Date())
- .apply(" END_TIME < now() ")
+ .set(Bookings::getDoneInfo,"鍏朵粬浼氳寮�濮嬶紝鑷姩鍏抽棴")
+ .apply(" ( END_TIME < now() or ( END_TIME > now() and START_TIME < now() and START_TIME_REAL is null ) )")
.eq(Bookings::getStatus,Constants.ZERO)
.eq(Bookings::getRoomId,bookings.getRoomId())
);
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java
index 5477185..8ef920e 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java
@@ -106,9 +106,12 @@
roomsMapper.insert(rooms);
if(!Constants.equalsInteger(rooms.getFileType(),Constants.TWO)){
List<Multifile> multifileList = rooms.getMultifileList();
+ if(CollectionUtils.isEmpty(multifileList)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇蜂笂浼犻檮浠朵俊鎭�");
+ }
for (Multifile multifile:multifileList) {
if(Objects.isNull(multifile)
- || StringUtils.isBlank(multifile.getFileurl())){
+ || StringUtils.isBlank(multifile.getFileurl())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"闄勪欢鍙傛暟閿欒");
}
multifile.setCreateDate(new Date());
@@ -397,6 +400,9 @@
if(!Constants.equalsInteger(rooms.getFileType(),Constants.TWO)){
List<Multifile> multifileList = rooms.getMultifileList();
+ if(CollectionUtils.isEmpty(multifileList)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇蜂笂浼犻檮浠朵俊鎭�");
+ }
for (Multifile multifile:multifileList) {
if(Objects.isNull(multifile)
|| StringUtils.isBlank(multifile.getFileurl())){
--
Gitblit v1.9.3