From 074485f56f073cf11fb29e6aab4ec9a2d4f3f549 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 九月 2024 14:10:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java | 9
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 4
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java | 31 ++
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java | 75 ++++++
server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java | 4
server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingListResponse.java | 10
h5_meeting/pages/index/index.vue | 132 ++++++++---
h5_meeting/package.json | 3
server/meeting/meeting_service/src/main/java/com/doumee/core/wx/MeetConstants.java | 3
admin/src/views/meeting/components/OperaRoomsWindow.vue | 10
h5/manifest.json | 2
h5_meeting/manifest.json | 2
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java | 9
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 152 +++++++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/InterestedListVO.java | 26 ++
h5/pages/staffLogin/login.vue | 2
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java | 17 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/PCWorkPlatformDataVO.java | 3
server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/RoomDetailResponse.java | 39 +++
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java | 24 +
server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/RoomsResponse.java | 8
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java | 3
h5_meeting/package-lock.json | 134 ++++++++++
server/meeting/meeting_service/src/main/java/com/doumee/dao/admin/request/BusinessOverDTO.java | 2
h5_meeting/.hbuilderx/launch.json | 9
h5/static/redirect.html | 1
26 files changed, 629 insertions(+), 85 deletions(-)
diff --git a/admin/src/views/meeting/components/OperaRoomsWindow.vue b/admin/src/views/meeting/components/OperaRoomsWindow.vue
index 15981d2..46e53f5 100644
--- a/admin/src/views/meeting/components/OperaRoomsWindow.vue
+++ b/admin/src/views/meeting/components/OperaRoomsWindow.vue
@@ -150,9 +150,6 @@
open(title, target) {
this.title = title
this.visible = true
- this.form.imgFullUrl = ''
- // this.timeRange = ['14:34:55', '14:34:55']
- // debugger
this.timeRange = ['', '']
// 鏂板缓
if (target == null) {
@@ -167,13 +164,14 @@
for (const key in this.form) {
this.form[key] = target[key]
}
+ if(target.fileType == 1 && target.multifileList && target.multifileList.length > 0){
+ this.$set(this.form, 'videoFullUrl', target.multifileList[0].fileurlFull)
+ this.$set(this.form, 'videourl', target.multifileList[0].fileurl)
+ }
this.timeRange = [target.startTime, target.endTime]
this.form.projectList = this.form.projectList ? target.projectList.map(item => item.projectId) : []
this.form.sysList = this.form.sysList ? this.form.sysList.map(item => item.userId) : []
// console.log(this.form.imgFullUrl);
- console.log(this.form)
- console.log(this.form.intervalTime)
- console.log(target)
})
},
imgDel(i) {
diff --git a/h5/manifest.json b/h5/manifest.json
index b6fb455..50678d7 100644
--- a/h5/manifest.json
+++ b/h5/manifest.json
@@ -91,7 +91,7 @@
"proxy" : {
"/admin_interface" : {
// 杩欎釜瀛楁鍚嶉渶涓庝綘閰嶇疆鐨刡asePrefixUrl涓�鑷达紝绯荤粺璇嗗埆鍒板甫鏈�/dev-api璇锋眰鐨勫湴鍧�鏃讹紝浼氬湪鍓嶉潰鎷兼帴涓婁唬鐞嗘湇鍔″櫒鍦板潃
- "target" : "http://192.168.0.139/admin_interface", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
+ "target" : "http://192.168.137.1:10010", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
// "target" : "http://192.168.31.42:10010", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
// "target" : "http://10.50.250.178:8088/gateway_interface", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
"changeOrigin" : true, // 鍏佽璺ㄥ煙
diff --git a/h5/pages/staffLogin/login.vue b/h5/pages/staffLogin/login.vue
index a0a5506..6ab5bd1 100644
--- a/h5/pages/staffLogin/login.vue
+++ b/h5/pages/staffLogin/login.vue
@@ -71,7 +71,7 @@
data() {
return {
form: {
- username: '18056814089',
+ username: '13996529050',
password: '123456',
code: 1
},
diff --git a/h5/static/redirect.html b/h5/static/redirect.html
index a47a805..2a21a20 100644
--- a/h5/static/redirect.html
+++ b/h5/static/redirect.html
@@ -7,6 +7,7 @@
var p = location.href.split("?")
// window.location.href = 'http://192.168.0.173/h5/#/pages/notice/notice?' + 'code=123123'
window.location.href = 'http://192.168.0.173/h5/#/pages/notice/notice?' + p[1]
+ // window.location.href = 'http://192.168.0.173/h5/#/pages/staff/meetingDetail?' + p[1]
// window.location.href = 'http://192.168.0.173/h5/#/pages/staff/index?' + p[1]
</script>
</head>
diff --git a/h5_meeting/.hbuilderx/launch.json b/h5_meeting/.hbuilderx/launch.json
new file mode 100644
index 0000000..f5c1c0b
--- /dev/null
+++ b/h5_meeting/.hbuilderx/launch.json
@@ -0,0 +1,9 @@
+{
+ "version" : "1.0",
+ "configurations" : [
+ {
+ "openVueDevtools" : false,
+ "type" : "uni-app:h5"
+ }
+ ]
+}
diff --git a/h5_meeting/manifest.json b/h5_meeting/manifest.json
index c4546a5..52ecdd7 100644
--- a/h5_meeting/manifest.json
+++ b/h5_meeting/manifest.json
@@ -19,7 +19,7 @@
"/meetingAdmin": {
// 杩欎釜瀛楁鍚嶉渶涓庝綘閰嶇疆鐨刡asePrefixUrl涓�鑷达紝绯荤粺璇嗗埆鍒板甫鏈�/dev-api璇锋眰鐨勫湴鍧�鏃讹紝浼氬湪鍓嶉潰鎷兼帴涓婁唬鐞嗘湇鍔″櫒鍦板潃
// "target" : "http://192.168.0.173/admin_interface", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
- "target": "http://192.168.0.139:10010", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
+ "target": "http://192.168.137.1:10010", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
"changeOrigin": true, // 鍏佽璺ㄥ煙
"pathRewrite": {
"^/meetingAdmin": "" // 閲嶅啓鍦板潃锛屽鏋滃疄闄呮帴鍙ｄ腑鏄笉甯�/dev-api锛岄渶瑕佸皢杩欎釜鍓嶇紑缃┖锛屽洜涓鸿繖涓墠缂�鍙槸涓轰簡璇嗗埆鐢紝璇嗗埆瀹屼箣鍚庡氨娌＄敤浜�
diff --git a/h5_meeting/package-lock.json b/h5_meeting/package-lock.json
index 23f7be0..41a7d26 100644
--- a/h5_meeting/package-lock.json
+++ b/h5_meeting/package-lock.json
@@ -1,17 +1,131 @@
{
- "name": "h5_meeting",
- "lockfileVersion": 3,
"requires": true,
- "packages": {
- "": {
- "dependencies": {
- "dayjs": "^1.11.13"
+ "lockfileVersion": 1,
+ "dependencies": {
+ "balanced-match": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+ },
+ "brace-expansion": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "requires": {
+ "balanced-match": "^1.0.0"
}
},
- "node_modules/dayjs": {
- "version": "1.11.13",
- "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
- "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
+ "dayjs": {
+ "version": "1.11.13"
+ },
+ "decompress-response": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+ "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+ "requires": {
+ "mimic-response": "^3.1.0"
+ }
+ },
+ "fs.realpath": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+ },
+ "glob": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+ "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+ "requires": {
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^5.0.1",
+ "once": "^1.3.0"
+ }
+ },
+ "inflight": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+ "requires": {
+ "once": "^1.3.0",
+ "wrappy": "1"
+ }
+ },
+ "inherits": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+ },
+ "js-binary-schema-parser": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/js-binary-schema-parser/-/js-binary-schema-parser-2.0.3.tgz",
+ "integrity": "sha512-xezGJmOb4lk/M1ZZLTR/jaBHQ4gG/lqQnJqdIv4721DMggsa1bDVlHXNeHYogaIEHD9vCRv0fcL4hMA+Coarkg=="
+ },
+ "mimic-response": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+ "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="
+ },
+ "minimatch": {
+ "version": "5.1.6",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+ "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+ "requires": {
+ "brace-expansion": "^2.0.1"
+ }
+ },
+ "once": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+ "requires": {
+ "wrappy": "1"
+ }
+ },
+ "parenthesis": {
+ "version": "3.1.8",
+ "resolved": "https://registry.npmjs.org/parenthesis/-/parenthesis-3.1.8.tgz",
+ "integrity": "sha512-KF/U8tk54BgQewkJPvB4s/US3VQY68BRDpH638+7O/n58TpnwiwnOtGIOsT2/i+M78s61BBpeC83STB88d8sqw=="
+ },
+ "simple-concat": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+ "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="
+ },
+ "simple-get": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
+ "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
+ "requires": {
+ "decompress-response": "^6.0.0",
+ "once": "^1.3.1",
+ "simple-concat": "^1.0.0"
+ }
+ },
+ "string-split-by": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/string-split-by/-/string-split-by-1.0.0.tgz",
+ "integrity": "sha512-KaJKY+hfpzNyet/emP81PJA9hTVSfxNLS9SFTWxdCnnW1/zOOwiV248+EfoX7IQFcBaOp4G5YE6xTJMF+pLg6A==",
+ "requires": {
+ "parenthesis": "^3.1.5"
+ }
+ },
+ "vue-qr": {
+ "version": "4.0.9",
+ "resolved": "https://registry.npmjs.org/vue-qr/-/vue-qr-4.0.9.tgz",
+ "integrity": "sha512-pAISV94T0MNEYA3NGjykUpsXRE2QfaNxlu9ZhEL6CERgqNc21hJYuP3hRVzAWfBQlgO18DPmZTbrFerJC3+Ikw==",
+ "requires": {
+ "glob": "^8.0.1",
+ "js-binary-schema-parser": "^2.0.2",
+ "simple-get": "^4.0.1",
+ "string-split-by": "^1.0.0"
+ }
+ },
+ "wrappy": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
}
}
}
diff --git a/h5_meeting/package.json b/h5_meeting/package.json
index 8155ec5..c2ce703 100644
--- a/h5_meeting/package.json
+++ b/h5_meeting/package.json
@@ -1,5 +1,6 @@
{
"dependencies": {
- "dayjs": "^1.11.13"
+ "dayjs": "^1.11.13",
+ "vue-qr": "^4.0.9"
}
}
diff --git a/h5_meeting/pages/index/index.vue b/h5_meeting/pages/index/index.vue
index a1878d3..91910e4 100644
--- a/h5_meeting/pages/index/index.vue
+++ b/h5_meeting/pages/index/index.vue
@@ -2,37 +2,44 @@
<view class="main_app">
<image src="@/static/bg@2x.png" class="main_bg" mode=""></image>
<view class="header_wrap">
- <view class="title" @touchend="touchend">浼氳瀹�</view>
+ <view class="title" @touchend="touchend">{{info.roomName}}</view>
<view class="time_wrap">
<view class="time">{{time}}</view>
<view class="date">{{date}}</view>
</view>
</view>
- <view class="home_status orange">浼氳涓�</view>
- <view class="meeting_name">浼氳鍚嶇О</view>
+ <view class="home_status">
+ <text v-if="!info.meetingListResponseList || info.meetingListResponseList.length == 0">绌洪棽涓�</text>
+ <text v-if="info.meetingListResponseList && info.meetingListResponseList.length > 0 && info.meetingListResponseList[0].meetingStatus == 4">鍗冲皢寮�濮�</text>
+ <text class="orange" v-if="info.meetingListResponseList && info.meetingListResponseList.length > 0 && info.meetingListResponseList[0].meetingStatus == 2">浼氳涓�</text>
+ <text v-if="info.meetingListResponseList && info.meetingListResponseList.length > 0 && info.meetingListResponseList[0].meetingStatus == 1">鏈紑濮�</text>
+ <text v-if="info.meetingListResponseList && info.meetingListResponseList.length > 0 && info.meetingListResponseList[0].meetingStatus == 3">宸茬粨鏉�</text>
+ <text v-if="info.meetingListResponseList && info.meetingListResponseList.length > 0 && info.meetingListResponseList[0].meetingStatus == 5">宸叉挙閿�</text>
+ </view>
+ <view class="meeting_name">{{meetingInfo.meetingName}}</view>
<view class="meeting_con">
<view class="content">
<view class="line">
<image src="@/static/ic_time@2x.png"></image>
- <text>10~12</text>
+ <text>{{meetingInfo.meetingTime }}</text>
</view>
<view class="line">
<image src="@/static/ic_people@2x.png"></image>
- <text>10~12</text>
+ <text>棰勭害浜猴細{{meetingInfo.bookingUser }}</text>
</view>
- </view>
- <view class="qrcode"></view>
+ </view>
+ <vueQr v-if="meetingInfo.id" :text="meetingInfo.id" class="qrcode" />
</view>
<view class="meeting_wrap">
- <view class="title">浠婃棩浼氳锛�6锛�</view>
+ <view class="title">浠婃棩浼氳锛坽{ info.meetingListResponseList && info.meetingListResponseList.length > 0 ? info.meetingListResponseList.length : 0 }}锛�</view>
<view class="list">
- <view class="item">
- <view class="name">寮�鍙戦儴浼氳</view>
- <view class="line">棰勭害浜猴細鏉庢��鑻�</view>
- <view class="line">13:30锝�15:00锛堝嵆灏嗗紑濮嬶級</view>
+ <view class="item" v-for="item in info.meetingListResponseList">
+ <view class="name">{{item.meetingName}}</view>
+ <view class="line">棰勭害浜猴細{{item.bookingUser}}</view>
+ <view class="line">{{item.meetingTime}}锛坽{statusMap[item.meetingStatus]}}锛�</view>
<image src="@/static/ic_meeting@2x.png" class="item_bg"></image>
</view>
- <view class="item empty">
+ <view v-if="!info.meetingListResponseList || info.meetingListResponseList.length == 0" class="item empty">
<view class="name">鏆傛棤浼氳</view>
<view class="line">棰勭害浜猴細-</view>
<view class="line">-</view>
@@ -40,38 +47,66 @@
</view>
</view>
</view>
+
+ <!-- -->
+ <swiper v-if="info.fileType == 0 && info.multifileList && info.multifileList.length > 0" class="swiper" circular autoplay indicator-dots>
+ <swiper-item v-for="item in info.multifileList">
+ <image class="swiper_item" :src="item.fileurlFull" mode="aspectFill"></image>
+ </swiper-item>
+ </swiper>
+ <!-- -->
+ <template v-if="info.fileType == 1 && info.multifileList && info.multifileList.length > 0">
+ <video :src="info.multifileList[0].fileurlFull" class="app_video" :autoplay="true" loop :controls="false"></video>
+ </template>
</view>
</template>
<script>
- import dayjs from 'dayjs'
+ import dayjs from 'dayjs'
+ import vueQr from 'vue-qr/src/packages/vue-qr.vue'
import {
meetScreenData
} from '@/api/index.js'
- export default {
+ export default {
+ components: {vueQr},
data() {
return {
time: '',
date: '',
timer: null,
- touchNum: 0,
- param: {}
+ touchNum: 0,
+ param: {},
+ info: {},
+ statusMap: {
+ 1: '鏈紑濮�',
+ 2: '杩涜涓�',
+ 3: '宸茬粨鏉�',
+ 4: '鍗冲皢寮�濮�',
+ 5: '宸叉挙閿�',
+ },
+ meetingInfo: {}
}
},
- onLoad() {
- this.initDatetime()
- this.param = uni.getStorageSync('param') || {}
- if(!this.param.code){
- return uni.navigateTo({
- url: '/pages/index/config'
- })
- }
+ onLoad() {
+ this.initDatetime()
+ this.param = uni.getStorageSync('param') || {}
+ if (!this.param.code) {
+ return uni.navigateTo({
+ url: '/pages/index/config'
+ })
+ }
this.getData()
},
methods: {
getData() {
- meetScreenData({
- roomId: this.param.code
+ meetScreenData({
+ roomId: this.param.code
+ }).then(res => {
+ this.info = res.data
+ if(this.info.meetingListResponseList && this.info.meetingListResponseList.length > 0){
+ this.meetingInfo = this.info.meetingListResponseList[0]
+ this.$forceUpdate()
+ }
})
},
touchend() {
@@ -81,8 +116,8 @@
console.log('鍗曞嚮')
}
if (this.touchNum >= 2) {
- uni.navigateTo({
- url: '/pages/index/config'
+ uni.navigateTo({
+ url: '/pages/index/config'
})
}
this.touchNum = 0
@@ -95,13 +130,37 @@
this.timer = setInterval(() => {
this.time = dayjs().format('HH:mm')
this.date = dayjs().format('YYYY-MM-DD') + ' ' + weeks[new Date().getDay()]
- }, 1000)
+ }, 1000)
+ setInterval(() => {
+ this.getData()
+ },this.param.time ? this.param.time * 1000 : 60 * 1000)
}
}
}
</script>
-<style lang="scss" scoped>
+<style lang="scss" scoped>
+ .swiper{
+ position: fixed;
+ top: 0;
+ left: 0;
+ z-index: 999;
+ width: 100%;
+ height: 100vh;
+ .swiper_item{
+ background-color: #0095AC;
+ width: 100%;
+ height: 100vh;
+ }
+ }
+ .app_video{
+ width: 100%;
+ height: 100vh;
+ position: fixed;
+ top: 0;
+ left: 0;
+ z-index: 999;
+ }
.main_app {
width: 100%;
min-height: 100vh;
@@ -112,7 +171,7 @@
justify-content: space-between;
padding-bottom: 35rpx;
color: #fff;
-
+ overflow: hidden;
.meeting_wrap {
margin-left: 42rpx;
margin-top: 85rpx;
@@ -143,12 +202,14 @@
flex-shrink: 0;
flex-direction: column;
width: 403rpx;
- height: 315rpx;
- background: linear-gradient(90deg, #0095AC 0%, #00B5D1 100%);
+ height: 315rpx;
+ background: linear-gradient( 90deg, #0080FF 0%, #00B0FF 100%);
border-radius: 7rpx;
margin-right: 28rpx;
position: relative;
-
+ &:nth-of-type(1){
+ background: linear-gradient(90deg, #0095AC 0%, #00B5D1 100%);
+ }
.item_bg {
position: absolute;
width: 178rpx;
@@ -201,7 +262,6 @@
.qrcode {
width: 166rpx;
height: 166rpx;
- border: 1px solid red;
}
}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
index db86fe6..2ccb1db 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
@@ -15,6 +15,7 @@
import com.doumee.dao.web.response.MeetingDetailResponse;
import com.doumee.dao.web.response.MeetingListResponse;
import com.doumee.dao.web.response.MonthDataResponse;
+import com.doumee.dao.web.response.RoomDetailResponse;
import com.doumee.service.business.BookingsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -136,8 +137,28 @@
@PostMapping("/reservationCancel")
public ApiResponse reservationCancel(@RequestBody BusinessOverDTO businessOverDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
LoginUserInfo user = getLoginUser(token);
- businessOverDTO.setUserId(user.getId()) ;
+ businessOverDTO.setUserId(user.getId());
bookingsService.reservationCancel(businessOverDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @ApiOperation("鎻愬墠寮�濮嬩細璁�")
+ @PostMapping("/startEarly")
+ public ApiResponse startEarly(@RequestBody BusinessOverDTO businessOverDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = getLoginUser(token);
+ businessOverDTO.setUserId(user.getId());
+ businessOverDTO.setStartType(Constants.ZERO);
+ bookingsService.startEarly(businessOverDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @ApiOperation("寮�濮嬩細璁�")
+ @PostMapping("/start")
+ public ApiResponse start(@RequestBody BusinessOverDTO businessOverDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = getLoginUser(token);
+ businessOverDTO.setUserId(user.getId());
+ businessOverDTO.setStartType(Constants.ONE);
+ bookingsService.start(businessOverDTO);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -152,4 +173,5 @@
+
}
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 c72c15d..795cba5 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.doumee.api.BaseController;
+import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.LoginUserInfo;
@@ -17,6 +18,7 @@
import com.doumee.dao.web.response.MeetingDetailResponse;
import com.doumee.dao.web.response.MeetingListResponse;
import com.doumee.dao.web.response.MonthDataResponse;
+import com.doumee.dao.web.response.RoomDetailResponse;
import com.doumee.service.business.BookingsService;
import com.doumee.service.system.SystemUserService;
import io.swagger.annotations.Api;
@@ -162,5 +164,34 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+ @ApiOperation("鎻愬墠寮�濮嬩細璁�")
+ @PostMapping("/startEarly")
+ public ApiResponse startEarly(@RequestBody BusinessOverDTO businessOverDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = getLoginUser(token);
+ businessOverDTO.setUserId(user.getId());
+ businessOverDTO.setStartType(Constants.ZERO);
+ bookingsService.startEarly(businessOverDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @ApiOperation("寮�濮嬩細璁�")
+ @PostMapping("/start")
+ public ApiResponse start(@RequestBody BusinessOverDTO businessOverDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = getLoginUser(token);
+ businessOverDTO.setUserId(user.getId());
+ businessOverDTO.setStartType(Constants.ONE);
+ bookingsService.start(businessOverDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @LoginNoRequired
+ @ApiOperation("浼氳灞忎俊鎭�")
+ @GetMapping("/meetScreenData")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "roomId", value = "浼氳瀹や富閿�", required = true),
+ })
+ public ApiResponse<RoomDetailResponse> meetScreenData(@RequestParam Integer roomId) {
+ return ApiResponse.success("鏌ヨ鎴愬姛",bookingsService.getRoomDetail(roomId));
+ }
}
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/MeetConstants.java b/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/MeetConstants.java
index f604866..12d2dcd 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/MeetConstants.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/core/wx/MeetConstants.java
@@ -16,6 +16,9 @@
//鍙戦�佷細璁紑濮� 瀹氭椂鎻愬墠澶氬皯鍒嗛挓鍙戦��
public static final String NOTICE_TIME = "NOTICE_TIME";
public static final String SYSTEM ="SYSTEM";
+ public static final String EARLY_START = "EARLY_START";
+ public static final String SOON_START = "SOON_START";
+ public static final String MEET_CODE_PREFIX = "MEET_CODE_PREFIX";
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/admin/request/BusinessOverDTO.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/admin/request/BusinessOverDTO.java
index ac5dc37..bd19d57 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/admin/request/BusinessOverDTO.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/admin/request/BusinessOverDTO.java
@@ -18,5 +18,7 @@
private String businessRemark;
@ApiModelProperty(value = "鐢ㄦ埛涓婚敭",required = true)
private Integer userId ;
+ @ApiModelProperty(value = "寮�濮嬬被鍨� 0 鎻愬墠寮�濮� 1 姝ｅ父寮�濮�",required = true)
+ private Integer startType ;
}
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 b2e7e2f..6aaf69e 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
@@ -24,7 +24,8 @@
@Select(" select a.id , a.START_TIME , a.END_TIME , 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() AND a.`STATUS` = 0 ) or a.`STATUS` = 2 ) THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE 2 END meetingStatus ," +
+ //" CASE WHEN a.START_TIME > now() AND a.`STATUS` = 0 THEN 1 WHEN ( (a.END_TIME < now() AND a.`STATUS` = 0 ) or a.`STATUS` = 2 ) THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE 2 END meetingStatus ," +
+ " CASE WHEN a.START_TIME_REAL IS NULL AND a.`STATUS` = 0 THEN 1 WHEN ( (a.END_TIME < now() AND a.`STATUS` = 0 ) or a.`STATUS` = 2 ) THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE 2 END meetingStatus ," +
" b.IMGURL as imgUrl ," +
" a.remark " +
" from meeting_book a inner join meeting_rooms b on a.ROOM_ID = b.ID " +
@@ -32,11 +33,21 @@
" ${ew.customSqlSegment} ")
IPage<MeetingListResponse> myMeetingPage(IPage<MeetingListResponse> page, @Param(Constants.WRAPPER) Wrapper wrapper);
-
+ @Select(" select a.id , a.START_TIME , a.END_TIME , 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() AND a.`STATUS` = 0 ) or a.`STATUS` = 2 ) THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE 2 END meetingStatus ," +
+ " CASE WHEN a.START_TIME_REAL IS NULL AND a.`STATUS` = 0 THEN 1 WHEN ( (a.END_TIME < now() AND a.`STATUS` = 0 ) or a.`STATUS` = 2 ) THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE 2 END meetingStatus ," +
+ " b.IMGURL as imgUrl ," +
+ " a.remark " +
+ " from meeting_book a inner join meeting_rooms b on a.ROOM_ID = b.ID " +
+ " inner join system_user c on a.CREATOR = c.id " +
+ " ${ew.customSqlSegment} ")
+ List<MeetingListResponse> meetingList(@Param(Constants.WRAPPER) Wrapper wrapper);
@Select(" select a.id , a.START_TIME , a.END_TIME , b.id as roomId, b.`NAME` as roomName , a.`NAME` as meetingName ,date_format(a.START_TIME,'%Y骞�%m鏈�%d鏃�') as meetingDate ," +
" CONCAT(date_format(a.START_TIME,'%H:%i') , ' ~ ',date_format(a.END_TIME,'%H:%i')) as meetingTime, c.REALNAME as bookingUserName ," +
- " CASE WHEN a.START_TIME > now() AND a.`STATUS` = 0 THEN 1 WHEN a.END_TIME < now() AND a.`STATUS` = 0 THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE 2 END meetingStatus ," +
+ //" CASE WHEN a.START_TIME > now() AND a.`STATUS` = 0 THEN 1 WHEN a.END_TIME < now() AND a.`STATUS` = 0 THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE 2 END meetingStatus ," +
+ " CASE WHEN a.START_TIME_REAL IS NULL AND a.`STATUS` = 0 THEN 1 WHEN a.END_TIME < now() AND a.`STATUS` = 0 THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE 2 END meetingStatus ," +
" a.CONTENT as meetingContent, c.MOBILE as bookingUserMobile , e.`NAME` as bookingUserDepartment , a.CREATOR as bookingUserId , a.remark " +
" from meeting_book a inner join meeting_rooms b on a.ROOM_ID = b.ID " +
" left join system_user c on a.CREATOR = c.id " +
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
index 87769ee..2484b0a 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
@@ -105,6 +105,9 @@
@ApiModelProperty(value = "鍙栨秷澶囨敞")
private String doneInfo;
+ @ApiModelProperty(value = "鎻愬墠寮�濮嬫椂闂�")
+ private Date startTimeReal;
+
@ApiModelProperty(value = "棰勭害浜�")
@TableField(exist = false)
private String realName ;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java
index c979bea..75b5aee 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java
@@ -1,8 +1,10 @@
package com.doumee.dao.business.model;
+import cn.hutool.core.img.Img;
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
+import com.doumee.dao.system.model.Multifile;
import com.doumee.dao.system.model.SystemUser;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -73,6 +75,9 @@
@ExcelColumn(name="瀹圭撼浜烘暟")
private Integer limitNum;
+ @ApiModelProperty(value = "浼氳瀹ゆ枃浠剁被鍨嬶細0=鍥剧墖锛堝鍥撅級锛�1=瑙嗛锛�2=鏃�")
+ private Integer fileType;
+
@ApiModelProperty(value = "浼氳瀹ゅ浘鐗�")
@ExcelColumn(name="浼氳瀹ゅ浘鐗�")
private String imgurl;
@@ -111,7 +116,9 @@
@TableField(exist = false)
private String imgFullUrl;
-
+ @ApiModelProperty(value = "闄勪欢鏂囦欢")
+ @TableField(exist = false)
+ private List<Multifile> multifileList;
}
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 01d666c..4556429 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
@@ -1,5 +1,6 @@
package com.doumee.dao.web.response;
+import com.doumee.dao.system.model.Multifile;
import com.doumee.dao.system.model.SystemUser;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +8,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* Created by IntelliJ IDEA.
@@ -39,7 +41,7 @@
@ApiModelProperty(value = "浼氳寮�濮嬫椂闂�",hidden = true)
private Date startTime;
- @ApiModelProperty(value = "鐘舵�� 0宸查绾� 1宸叉挙閿� ",hidden = true)
+ @ApiModelProperty(value = "鐘舵�� 0宸查绾� 1宸叉挙閿� 2宸茬粨鏉�",hidden = true)
private Integer status;
@ApiModelProperty(value = "浼氳棰勭害浜�")
@@ -48,6 +50,12 @@
@ApiModelProperty(value = "浼氳瀹ゅ浘鐗�")
private String imgUrl;
+ @ApiModelProperty(value = "鏂囦欢绫诲瀷")
+ private Integer fileType;
+
+ @ApiModelProperty(value = "浼氳瀹ら檮浠朵俊鎭�")
+ private List<Multifile> multifileList;
+
@ApiModelProperty(value = "鍓嶇紑")
private String prefixUrl;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/RoomDetailResponse.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/RoomDetailResponse.java
new file mode 100644
index 0000000..fb3d551
--- /dev/null
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/RoomDetailResponse.java
@@ -0,0 +1,39 @@
+package com.doumee.dao.web.response;
+
+import com.doumee.dao.system.model.Multifile;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/3/23 9:25
+ */
+@Data
+@ApiModel("浼氳瀹ゅ睆淇℃伅杩斿洖绫�")
+public class RoomDetailResponse {
+
+ @ApiModelProperty(value = "涓婚敭")
+ private Integer id;
+
+ @ApiModelProperty(value = "浼氳瀹ゅ悕绉�")
+ private String roomName;
+
+ @ApiModelProperty(value = "浼氳瀹ゆ枃浠剁被鍨嬶細0=鍥剧墖锛堝鍥撅級锛�1=瑙嗛锛�2=鏃�")
+ private Integer fileType;
+
+ @ApiModelProperty(value = "浜岀淮鐮佸墠缂�")
+ private String prefix;
+
+ @ApiModelProperty(value = "浼氳瀹ゆ枃浠�")
+ private List<Multifile> multifileList;
+
+ @ApiModelProperty(value = "浼氳鍒楄〃")
+ private List<MeetingListResponse> meetingListResponseList;
+
+}
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/RoomsResponse.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/RoomsResponse.java
index eb50c91..8ca60ac 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/RoomsResponse.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/RoomsResponse.java
@@ -8,6 +8,7 @@
import com.doumee.dao.business.model.ProjectRel;
import com.doumee.dao.business.model.RoomTime;
import com.doumee.dao.business.model.UserRel;
+import com.doumee.dao.system.model.Multifile;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -52,6 +53,9 @@
@ApiModelProperty(value = "浣跨敤椤荤煡")
private String tips;
+ @ApiModelProperty(value = "浼氳瀹ゆ枃浠剁被鍨嬶細0=鍥剧墖锛堝鍥撅級锛�1=瑙嗛锛�2=鏃�")
+ private Integer fileType;
+
@ApiModelProperty(value = "鍙備細浜哄憳")
@TableField(exist = false)
private List<UserRel> sysList;
@@ -59,4 +63,8 @@
@ApiModelProperty(value = "鏈嶅姟椤圭洰")
@TableField(exist = false)
private List<ProjectRel> projectList;
+
+ @ApiModelProperty(value = "闄勪欢鏂囦欢")
+ private List<Multifile> multifileList;
+
}
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
index 7ea8a40..6a56fb5 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
@@ -17,6 +17,7 @@
import com.doumee.dao.web.response.DateTimeResourceDate;
import com.doumee.dao.web.response.MeetingDetailResponse;
import com.doumee.dao.web.response.MeetingListResponse;
+import com.doumee.dao.web.response.RoomDetailResponse;
import org.apache.ibatis.annotations.Param;
import java.time.LocalDateTime;
@@ -166,8 +167,6 @@
/**
* 浼氳棰勭害璁板綍鍙栨秷
- * @param id
- * @param userId
*/
void reservationCancel(BusinessOverDTO businessOverDTO);
@@ -210,4 +209,10 @@
IPage<UserResponse> getUserPage(PageWrap<UserPageRequest> pageWrap);
void reservationOver(BusinessOverDTO businessOverDTO);
+
+ void start(BusinessOverDTO businessOverDTO);
+
+ void startEarly(BusinessOverDTO businessOverDTO);
+
+ RoomDetailResponse getRoomDetail(Integer roomId);
}
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 7a3ccc1..44ca327 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
@@ -841,19 +841,7 @@
.orderByAsc(Constants.equalsInteger(pageWrap.getModel().getQueryType(),MeetConstants.ONE),"a.START_TIME");
IPage<MeetingListResponse> page = bookingsMapper.myMeetingPage(pageWrap.toPage(), queryWrapper);
- 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.getMeetingStatus()==Constants.ONE){
- //寮�濮嬪墠120鍒嗛挓 澶т簬褰撳墠鏃堕棿 鍒欐樉绀哄嵆灏嗗紑濮�
- if(DateUtil.afterMinutesDate(i.getStartTime(),-120).getTime()>System.currentTimeMillis()){
- i.setMeetingStatus(4);
- }
- }
- }
-
- });
+ this.dealMeetingStatus(page.getRecords());
return page;
}
@@ -904,9 +892,7 @@
.eq("BOOKING_ID", id)
.eq("ISDELETED", MeetConstants.ZERO)
));
-
//鍙備細浜哄憳鍒楄〃
-
List<UserResponse> userResponseList = systemUserService.getUserList(id);
String avatarPath = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
@@ -1074,9 +1060,145 @@
bookingTimeJoinMapper.updateById(bookingTime);
}
}
+ }
+
+ /**
+ * 姝ｅ父寮�濮�
+ * @param businessOverDTO
+ */
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void start(BusinessOverDTO businessOverDTO) {
+ this.startEarly(businessOverDTO);
+ }
+
+ /**
+ * 鎻愬墠寮�濮�
+ * @param businessOverDTO
+ */
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void startEarly(BusinessOverDTO businessOverDTO) {
+ if(Objects.isNull(businessOverDTO)
+ || Objects.isNull(businessOverDTO.getUserId())
+ || Objects.isNull(businessOverDTO.getStartType())
+ || Objects.isNull(businessOverDTO.getId())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Bookings bookings = bookingsMapper.selectById(businessOverDTO.getId());
+ if (Objects.isNull(bookings)) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鏈煡璇㈠埌棰勭害璁板綍");
+ }
+ Long userRelList = userRelMapper.selectCount(new QueryWrapper<UserRel>().lambda()
+ .eq(UserRel::getIsdeleted,Constants.ZERO)
+ .eq(UserRel::getObjId,bookings.getRoomId())
+ .eq(UserRel::getObjType,Constants.ONE)
+ .eq(UserRel::getUserId,businessOverDTO.getUserId()));
+
+ if (!bookings.getCreator().equals(businessOverDTO.getUserId()) && userRelList <= 0) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "闈炰綘鐨勯绾﹁褰�,鏃犳硶杩涜璇ユ搷浣�");
+ }
+ if(!Constants.equalsInteger(bookings.getStatus(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "浼氳鐘舵�佸凡娴佽浆锛屾棤娉曡繘琛岃鎿嶄綔");
+ }
+ if(Objects.nonNull(bookings.getStartTimeReal())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "浼氳宸插紑濮嬶紝璇峰嬁閲嶅鎿嶄綔");
+ }
+ if (System.currentTimeMillis() > bookings.getEndTime().getTime()) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "浼氳宸茬粨鏉燂紝鏃犳硶杩涜璇ユ搷浣�");
+ }
+ if(Constants.equalsInteger(businessOverDTO.getStartType(),Constants.ZERO)){
+ //鏍规嵁閰嶇疆鑾峰彇鎻愬墠寮�濮嬬殑鍒嗛挓鏁伴噺
+ String configMinute = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.EARLY_START).getCode();
+ Integer beforeMinutes = StringUtils.isNotBlank(configMinute) ? Integer.valueOf(configMinute) : 120;
+ if(DateUtil.afterMinutesDate(bookings.getStartTime(),-beforeMinutes).getTime()>System.currentTimeMillis()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼氳浠呭彲浠ユ彁鍓�"+beforeMinutes+"鍒嗛挓寮�濮�");
+ }
+ }else{
+ if(bookings.getStartTime().getTime() > System.currentTimeMillis()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈埌浼氳鐢宠寮�濮嬫椂闂达紝鏃犳硶杩涜寮�鍚�");
+ }
+ }
+ bookings.setStartTimeReal(new Date());
+ bookings.setEditDate(new Date());
+ bookings.setEditor(businessOverDTO.getUserId());
+ bookingsMapper.updateById(bookings);
+ //鏇存柊宸茬粨鏉熶絾鏈粨鏉熺殑浼氳淇℃伅涓哄凡缁撴潫
+ bookingsMapper.update(null,new UpdateWrapper<Bookings>()
+ .lambda()
+ .set(Bookings::getStatus,Constants.TWO)
+ .set(Bookings::getDoneDate,new Date())
+ .apply(" END_TIME < now() ")
+ .eq(Bookings::getStatus,Constants.ZERO)
+ .eq(Bookings::getRoomId,bookings.getRoomId())
+ );
}
+
+ @Override
+ public RoomDetailResponse getRoomDetail(Integer roomId){
+ Rooms rooms = roomsMapper.selectById(roomId);
+ if(Objects.isNull(rooms) || !Constants.equalsInteger(rooms.getIsdeleted(),Constants.ZERO)
+ || !Constants.equalsInteger(rooms.getStatus(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼氳瀹や俊鎭棤鏁堬紝璇疯仈绯荤鐞嗗憳");
+ }
+ RoomDetailResponse response = new RoomDetailResponse();
+ response.setRoomName(rooms.getName());
+ response.setFileType(rooms.getFileType());
+
+ List<Multifile> multifileList = multifileJoinMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjId,roomId)
+ .eq(Multifile::getObjType,Constants.FOUR)
+ );
+
+ String prefix = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.MEET_CODE_PREFIX).getCode() ;
+ response.setPrefix(prefix);
+
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+ String path = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
+ for (Multifile multifile:multifileList) {
+ multifile.setFileurlFull(path + multifile.getFileurl());
+ }
+ response.setMultifileList(multifileList);
+ }
+
+ //鏌ヨ浼氳鍒楄〃
+ List<MeetingListResponse> meetingList = bookingsMapper.meetingList(
+ new QueryWrapper<Bookings>()
+ .eq( "b.id", rooms.getId())
+ .eq("b.ISDELETED",MeetConstants.ZERO)
+ .eq("b.STATUS",MeetConstants.ZERO)
+ .eq("a.ISDELETED",MeetConstants.ZERO)
+ .eq("a.status",Constants.ZERO)
+ .like("a.start_time",DateUtil.getCurrDate())
+ .orderByAsc("a.start_time")
+ );
+ this.dealMeetingStatus(meetingList);
+ response.setMeetingListResponseList(meetingList);
+ return response;
+ }
+
+
+ public void dealMeetingStatus(List<MeetingListResponse> meetingResponseList){
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(meetingResponseList)){
+ String path = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
+ String configMinute = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.SOON_START).getCode();
+ Integer minute = StringUtils.isNotBlank(configMinute) ? Integer.valueOf(configMinute) : 120;
+ for (MeetingListResponse m:meetingResponseList) {
+ if(Constants.equalsInteger(m.getStatus(),Constants.ZERO)&&Constants.equalsInteger(m.getMeetingStatus(),Constants.ONE)){
+ //寮�濮嬪墠120鍒嗛挓 澶т簬褰撳墠鏃堕棿 鍒欐樉绀哄嵆灏嗗紑濮�
+ if(DateUtil.afterMinutesDate(m.getStartTime(),-minute).getTime()>System.currentTimeMillis()){
+ m.setMeetingStatus(4);
+ }
+ }
+ m.setPrefixUrl(path);
+ }
+ }
+ }
+
+
/**
* 瀹氭椂鍙戦�佷細璁� 鍗冲皢寮�濮嬮�氱煡
*/
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 a3d4dae..5477185 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
@@ -16,6 +16,7 @@
import com.doumee.dao.business.RoomsMapper;
import com.doumee.dao.business.join.*;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.model.Multifile;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.request.MeetingPageRequest;
import com.doumee.dao.web.request.RoomsRequest;
@@ -56,6 +57,9 @@
private RoomsMapper roomsMapper;
@Autowired
private RoomsJoinMapper roomsJoinMapper;
+ @Autowired
+ private MultifileJoinMapper multifileJoinMapper;
+
@Autowired
private RoomTimeJoinMapper roomTimeJoinMapper;
@@ -90,7 +94,9 @@
if (starttime.after(endtime) || starttime.equals(endtime)) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鏃ユ湡鍖洪棿閿欒");
}
-
+ if(!Constants.equalsInteger(rooms.getFileType(),Constants.TWO)&&CollectionUtils.isEmpty(rooms.getMultifileList())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈笂浼犳枃浠跺浘鐗�");
+ }
rooms.setCreateDate(new Date());
rooms.setIsdeleted(Constants.ZERO);
@@ -98,7 +104,21 @@
rooms.setStatus(Constants.ZERO);
rooms.setEditDate(rooms.getCreateDate());
roomsMapper.insert(rooms);
-
+ if(!Constants.equalsInteger(rooms.getFileType(),Constants.TWO)){
+ List<Multifile> multifileList = rooms.getMultifileList();
+ for (Multifile multifile:multifileList) {
+ if(Objects.isNull(multifile)
+ || StringUtils.isBlank(multifile.getFileurl())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"闄勪欢鍙傛暟閿欒");
+ }
+ multifile.setCreateDate(new Date());
+ multifile.setObjId(rooms.getId());
+ multifile.setObjType(Constants.FOUR);
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setCreator(user.getId());
+ }
+ multifileJoinMapper.insert(multifileList);
+ }
rooms.setStartTime(rooms.getStartTime()+":00");
rooms.setEndTime(rooms.getEndTime()+":00");
rooms.setStartTime(DateUtil.formatDate(starttime.getTime(), "yyyy-MM-dd HH:mm:ss"));
@@ -117,6 +137,7 @@
if (StringUtils.isBlank(rooms.getName()) ||
StringUtils.isBlank(rooms.getStartTime()) ||
StringUtils.isBlank(rooms.getEndTime()) ||
+ Objects.isNull(rooms.getFileType()) ||
rooms.getIntervalTime() == null
) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), ResponseStatus.BAD_REQUEST.getMessage());
@@ -352,15 +373,43 @@
rooms.setIntervalTime(null);
}
-
rooms.setEditDate(new Date());
rooms.setEditor(user.getId());
+
+// if(!Constants.equalsInteger(rooms.getFileType(),Constants.TWO)&&StringUtils.isBlank(rooms.getImgurl())){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈笂浼犳枃浠跺浘鐗�");
+// }
+// if(Constants.equalsInteger(rooms.getFileType(),Constants.TWO)){
+// rooms.setImgurl(null);
+// }
+
roomsMapper.update(rooms, Wrappers.<Rooms>lambdaUpdate()
+ .set(Rooms::getFileType, rooms.getFileType())
.set(Rooms::getLimitNum, rooms.getLimitNum())
.set(Rooms::getTips, rooms.getTips())
.set(Rooms::getImgurl, rooms.getImgurl())
.eq(Rooms::getId, rooms.getId()));
+ multifileJoinMapper.delete(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjId,rooms.getId())
+ .eq(Multifile::getObjType,Constants.FOUR)
+ );
+
+ if(!Constants.equalsInteger(rooms.getFileType(),Constants.TWO)){
+ List<Multifile> multifileList = rooms.getMultifileList();
+ for (Multifile multifile:multifileList) {
+ if(Objects.isNull(multifile)
+ || StringUtils.isBlank(multifile.getFileurl())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"闄勪欢鍙傛暟閿欒");
+ }
+ multifile.setCreateDate(new Date());
+ multifile.setObjId(rooms.getId());
+ multifile.setObjType(Constants.FOUR);
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setCreator(user.getId());
+ }
+ multifileJoinMapper.insert(multifileList);
+ }
rooms.setStartTime(rooms.getStartTime()+":00");
rooms.setEndTime(rooms.getEndTime()+":00");
@@ -483,6 +532,19 @@
findpr.leftJoin(Projects.class,Projects::getId,ProjectRel::getProjectId);
List<ProjectRel> projectLisr= projectRelJoinMapper.selectJoinList(ProjectRel.class,findpr);
s.setProjectList(projectLisr);
+
+ if(!Constants.equalsInteger(s.getFileType(),Constants.TWO)){
+ List<Multifile > multifileList = multifileJoinMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjId,s.getId())
+ .eq(Multifile::getObjType,Constants.FOUR)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+ for (Multifile multifile:multifileList) {
+ multifile.setFileurlFull(path + multifile.getFileurl());
+ }
+ s.setMultifileList(multifileList);
+ }
+ }
});
return PageData.from(result);
@@ -591,6 +653,13 @@
List<ProjectRel> projectList= projectRelJoinMapper.selectJoinList(ProjectRel.class,findProjectRel);
roomsResponse.setProjectList(projectList);
+ if(Objects.nonNull(roomsResponse.getFileType()) && !Constants.equalsInteger(roomsResponse.getFileType(),Constants.TWO)){
+ roomsResponse.setMultifileList(
+ multifileJoinMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,roomsResponse.getId())
+ .eq(Multifile::getObjType,Constants.FOUR))
+ );
+ }
+
return roomsResponse;
}
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java b/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java
index 01edf42..cfeb7eb 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java
@@ -63,8 +63,8 @@
@ExcelColumn(name="绫诲瀷0鍥剧墖 1瑙嗛 2鍏朵粬")
private Integer type;
- @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0浼氳瀹ら瀹氶檮浠�", example = "1")
- @ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷 0浼氳瀹ら瀹氶檮浠�")
+ @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0闅愭偅鐜板満鎯呭喌 1闅愭偅澶勭悊鍓嶆儏鍐� 2闅愭偅澶勭悊鍚庢儏鍐� 3闅愭偅閫�鍥炶鏄� 4浼氳瀹ゆ枃浠�", example = "1")
+ @ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷 0闅愭偅鐜板満鎯呭喌 1闅愭偅澶勭悊鍓嶆儏鍐� 2闅愭偅澶勭悊鍚庢儏鍐� 3闅愭偅閫�鍥炶鏄� 4浼氳瀹ゆ枃浠�")
private Integer objType;
@ApiModelProperty(value = "鏂囦欢鍦板潃")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/InterestedListVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/InterestedListVO.java
new file mode 100644
index 0000000..56d3076
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/InterestedListVO.java
@@ -0,0 +1,26 @@
+package com.doumee.dao.admin.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2024/2/26 11:02
+ */
+@Data
+@ApiModel("宸ヤ綔鍙扮浉鍏虫柟鏁版嵁")
+public class InterestedListVO {
+
+ @ApiModelProperty(value = "浜烘暟")
+ private Long userNum;
+
+ @ApiModelProperty(value = "鍚嶇О")
+ private String interestedName;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/PCWorkPlatformDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/PCWorkPlatformDataVO.java
index 287cbc1..d458f70 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/PCWorkPlatformDataVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/PCWorkPlatformDataVO.java
@@ -56,7 +56,8 @@
@ApiModelProperty(value = "鍑哄洯杞︽")
private Long todayOutCarNum;
-
+ @ApiModelProperty(value = "鐩稿叧鏂规暟鎹�")
+ private List<InterestedListVO> interestedListVOList;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 1ed89f0..3a29e32 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -46,10 +46,13 @@
@Autowired
private HiddenDangerMapper hiddenDangerMapper;
+
@Autowired
private MultifileMapper multifileMapper;
+
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+
@Autowired
private MemberMapper memberMapper;
@@ -370,6 +373,7 @@
.set(Notices::getReaded,Constants.ONE)
.set(Notices::getStatus,Constants.ONE)
.set(Notices::getParam2,hiddenDanger.getStatus())
+ .set(Notices::getParam4,hiddenDanger.getLoginUserInfo().getMemberId())
.eq(Notices::getObjId,hiddenDanger.getId())
.eq(Notices::getObjType,Constants.THREE)
.eq(Notices::getUserId,hiddenDanger.getLoginUserInfo().getMemberId())
--
Gitblit v1.9.3