From 753244324eb25da1648de79a4b2b1df3d1a3d49c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 10 五月 2024 16:15:21 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java | 0
admin/src/views/meeting/components/OperaBookingsDetailWindow.vue | 2
admin/src/api/meeting/projects.js | 3
admin/src/components/common/UploadAvatarVideo.vue | 8
admin/src/views/meeting/roomStatistics.vue | 4
admin/src/api/meeting/devices.js | 3
admin/src/components/common/upload.vue | 2
admin/src/views/meeting/bookings.vue | 6
admin/src/api/meeting/home.js | 3
admin/src/views/meeting/components/OperaNoticeWindow.vue | 2
admin/src/views/meeting/components/OperaRoomsWindow.vue | 4
admin/src/api/system/dictData.js | 5
admin/src/views/meeting/devices.vue | 6
admin/src/components/common/RichEditor.vue | 2
admin/src/components/common/UploadAvatarImage.vue | 8
admin/src/components/common/UploadFile.vue | 8
admin/src/api/meeting/bookings.js | 3
admin/src/components/common/UploadFileCommon.vue | 10
admin/src/api/meeting/roomTime.js | 3
admin/src/views/meeting/components/OperaDevicesWindow.vue | 2
admin/src/api/meeting/roomRecord.js | 3
admin/src/views/meeting/rooms.vue | 4
admin/src/api/meeting/rooms.js | 3
admin/src/views/meeting/components/OperaProjectsWindow.vue | 2
/dev/null | 215 ------------------------------
admin/src/views/business/visitorSources.vue | 2
admin/src/components/common/UploadImage.vue | 22 +-
admin/src/views/meeting/components/OperaRoomRecordWindow.vue | 2
admin/src/api/meeting/notice.js | 3
admin/src/views/meeting/userStatistics.vue | 4
admin/src/components/base/BaseTable.vue | 8 +
admin/src/views/meeting/components/OperaBookingsWindow.vue | 6
admin/src/views/meeting/components/selectMember.vue | 2
admin/src/views/meeting/roomRecord.vue | 4
34 files changed, 75 insertions(+), 289 deletions(-)
diff --git a/admin/src/views/meeting/api/bookings.js b/admin/src/api/meeting/bookings.js
similarity index 97%
rename from admin/src/views/meeting/api/bookings.js
rename to admin/src/api/meeting/bookings.js
index ec67c18..72bfb1d 100644
--- a/admin/src/views/meeting/api/bookings.js
+++ b/admin/src/api/meeting/bookings.js
@@ -1,5 +1,4 @@
-import request from '@/utils/request'
-
+import request from '../../utils/request'
// 鏌ヨ
export function fetchList (data) {
return request.post('/meetingAdmin/cloudService/business/bookings/page', data, {
diff --git a/admin/src/views/meeting/api/devices.js b/admin/src/api/meeting/devices.js
similarity index 95%
rename from admin/src/views/meeting/api/devices.js
rename to admin/src/api/meeting/devices.js
index fad04e2..6709043 100644
--- a/admin/src/views/meeting/api/devices.js
+++ b/admin/src/api/meeting/devices.js
@@ -1,5 +1,4 @@
-import request from '@/utils/request'
-
+import request from '../../utils/request'
// 鏌ヨ
export function fetchList (data) {
return request.post('/meetingAdmin/cloudService/business/devices/page', data, {
diff --git a/admin/src/views/meeting/api/home.js b/admin/src/api/meeting/home.js
similarity index 76%
rename from admin/src/views/meeting/api/home.js
rename to admin/src/api/meeting/home.js
index 2921e3c..f18b5cf 100644
--- a/admin/src/views/meeting/api/home.js
+++ b/admin/src/api/meeting/home.js
@@ -1,5 +1,4 @@
-import request from '@/utils/request'
-
+import request from '../../utils/request'
// 鏌ヨ
export function home (data) {
return request.post('/meetingAdmin/cloudService/business/home/home', data, {
diff --git a/admin/src/views/meeting/api/notice.js b/admin/src/api/meeting/notice.js
similarity index 95%
rename from admin/src/views/meeting/api/notice.js
rename to admin/src/api/meeting/notice.js
index 6531f80..0c7b158 100644
--- a/admin/src/views/meeting/api/notice.js
+++ b/admin/src/api/meeting/notice.js
@@ -1,5 +1,4 @@
-import request from '@/utils/request'
-
+import request from '../../utils/request'
// 鏌ヨ
export function fetchList (data) {
return request.post('/meetingAdmin/cloudService/business/notice/page', data, {
diff --git a/admin/src/views/meeting/api/projects.js b/admin/src/api/meeting/projects.js
similarity index 96%
rename from admin/src/views/meeting/api/projects.js
rename to admin/src/api/meeting/projects.js
index e32a71d..30bb958 100644
--- a/admin/src/views/meeting/api/projects.js
+++ b/admin/src/api/meeting/projects.js
@@ -1,5 +1,4 @@
-import request from '@/utils/request'
-
+import request from '../../utils/request'
// 鏌ヨ
export function fetchList (data) {
return request.post('/meetingAdmin/cloudService/business/projects/page', data, {
diff --git a/admin/src/views/meeting/api/roomRecord.js b/admin/src/api/meeting/roomRecord.js
similarity index 95%
rename from admin/src/views/meeting/api/roomRecord.js
rename to admin/src/api/meeting/roomRecord.js
index 06f3358..d4cbb0d 100644
--- a/admin/src/views/meeting/api/roomRecord.js
+++ b/admin/src/api/meeting/roomRecord.js
@@ -1,5 +1,4 @@
-import request from '@/utils/request'
-
+import request from '../../utils/request'
// 鏌ヨ
export function fetchList (data) {
return request.post('/meetingAdmin/cloudService/business/roomRecord/page', data, {
diff --git a/admin/src/views/meeting/api/roomTime.js b/admin/src/api/meeting/roomTime.js
similarity index 75%
rename from admin/src/views/meeting/api/roomTime.js
rename to admin/src/api/meeting/roomTime.js
index e8e8bdd..9d717e9 100644
--- a/admin/src/views/meeting/api/roomTime.js
+++ b/admin/src/api/meeting/roomTime.js
@@ -1,5 +1,4 @@
-import request from '@/utils/request'
-
+import request from '../../utils/request'
// 鏌ヨ
export function findList (data) {
return request.post('/meetingAdmin/cloudService/business/roomTime/findList', data)
diff --git a/admin/src/views/meeting/api/rooms.js b/admin/src/api/meeting/rooms.js
similarity index 96%
rename from admin/src/views/meeting/api/rooms.js
rename to admin/src/api/meeting/rooms.js
index 4af96bc..c129e77 100644
--- a/admin/src/views/meeting/api/rooms.js
+++ b/admin/src/api/meeting/rooms.js
@@ -1,5 +1,4 @@
-import request from '@/utils/request'
-
+import request from '../../utils/request'
// 鏌ヨ
export function fetchList (data) {
return request.post('/meetingAdmin/cloudService/business/rooms/page', data, {
diff --git a/admin/src/api/system/dictData.js b/admin/src/api/system/dictData.js
index 953c736..2d1cb52 100644
--- a/admin/src/api/system/dictData.js
+++ b/admin/src/api/system/dictData.js
@@ -19,7 +19,10 @@
export function deleteById (id) {
return request.get(`/visitsAdmin/cloudService/system/dictData/delete/${id}`)
}
-
+// 鏌ヨ瀛楀吀鍊兼暟鎹�
+export function getSystemDictData (label) {
+ return request.get(`/visitsAdmin/cloudService/system/dictData/getSystemDictData?dictCode=SYSTEM&label=${label}`)
+}
// 鎵归噺鍒犻櫎
export function deleteByIdInBatch (ids) {
return request.get('/system/dictData/delete/batch', {
diff --git a/admin/src/components/base/BaseTable.vue b/admin/src/components/base/BaseTable.vue
index ccdafc0..6ddfb22 100644
--- a/admin/src/components/base/BaseTable.vue
+++ b/admin/src/components/base/BaseTable.vue
@@ -51,7 +51,13 @@
if (extParams.api == null) {
throw new Error('Missing config option \'api\'.')
}
- this.api = require('@/api' + extParams.api)
+
+ if(extParams.api.indexOf('@/',0) === 0){
+ this.api = require(extParams.api)
+ }else {
+ this.api = require('@/api' + extParams.api)
+ }
+ // this.api = require('@/api' + extParams.api)
extParams.module && (this.module = extParams.module)
extParams['field.id'] && (this.configData['field.id'] = extParams['field.id'])
extParams['field.main'] && (this.configData['field.main'] = extParams['field.main'])
diff --git a/admin/src/components/common/RichEditor.vue b/admin/src/components/common/RichEditor.vue
index 4ac38b2..0c56289 100644
--- a/admin/src/components/common/RichEditor.vue
+++ b/admin/src/components/common/RichEditor.vue
@@ -111,7 +111,7 @@
uploadImage: {
// server: '/api/upload',
name: 'file',
- server: process.env.VUE_APP_API_PREFIX + '/public/uploadLocal',
+ server: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/uploadLocal',
meta: {
folder: 'shop'
},
diff --git a/admin/src/components/common/UploadAvatarImage.vue b/admin/src/components/common/UploadAvatarImage.vue
index 7d5ddae..d541ed6 100644
--- a/admin/src/components/common/UploadAvatarImage.vue
+++ b/admin/src/components/common/UploadAvatarImage.vue
@@ -36,7 +36,7 @@
},
data() {
return {
- uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/upload'
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload'
}
},
@@ -50,13 +50,13 @@
this.$message.success('涓婁紶鎴愬姛')
this.$emit('uploadSuccess', { imgurl: data.imgaddr, imgurlfull: data.url, name: data.originname })
} else {
- this.$tip.apiFailed('涓婁紶澶辫触')
+ this.$message.error('涓婁紶澶辫触')
}
this.$emit('uploadEnd')
},
uploadError() {
- this.$tip.apiFailed('涓婁紶澶辫触')
- this.$emit('endUpload')
+ this.$message.error('涓婁紶澶辫触')
+ this.$emit('uploadEnd')
},
// // 鎷︽埅
beforeAvatarUpload(file) {
diff --git a/admin/src/components/common/UploadAvatarVideo.vue b/admin/src/components/common/UploadAvatarVideo.vue
index 5031b58..c0e43d9 100644
--- a/admin/src/components/common/UploadAvatarVideo.vue
+++ b/admin/src/components/common/UploadAvatarVideo.vue
@@ -36,7 +36,7 @@
},
data() {
return {
- uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/upload'
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload'
}
},
@@ -50,13 +50,13 @@
this.$message.success('涓婁紶鎴愬姛')
this.$emit('uploadSuccess', { imgurl: data.imgaddr, imgurlfull: data.url, name: data.originname })
} else {
- this.$tip.apiFailed('涓婁紶澶辫触')
+ this.$message.error('涓婁紶澶辫触')
}
this.$emit('uploadEnd')
},
uploadError() {
- this.$tip.apiFailed('涓婁紶澶辫触')
- this.$emit('endUpload')
+ this.$message.apiFailed('涓婁紶澶辫触')
+ this.$emit('uploadEnd')
},
// // 鎷︽埅
beforeAvatarUpload(file) {
diff --git a/admin/src/components/common/UploadFile.vue b/admin/src/components/common/UploadFile.vue
index 45049cb..7dcad1f 100644
--- a/admin/src/components/common/UploadFile.vue
+++ b/admin/src/components/common/UploadFile.vue
@@ -34,7 +34,7 @@
data() {
return {
fileList:null,
- uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/upload?folder='+this.uploadData.folder
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload?folder='+this.uploadData.folder
}
},
@@ -48,13 +48,13 @@
this.$message.success('涓婁紶鎴愬姛')
this.$emit('uploadSuccess', { fileurl: data.imgaddr, fileurlFull: data.url, name: data.originname })
} else {
- this.$tip.apiFailed('涓婁紶澶辫触')
+ this.$message.error('涓婁紶澶辫触')
}
this.$emit('uploadEnd')
},
uploadError() {
- this.$tip.apiFailed('涓婁紶澶辫触')
- this.$emit('endUpload')
+ this.$message.error('涓婁紶澶辫触')
+ this.$emit('uploadEnd')
},
// // 鎷︽埅
beforeFileUpload(file) {
diff --git a/admin/src/components/common/UploadFileCommon.vue b/admin/src/components/common/UploadFileCommon.vue
index ba92eae..db8be23 100644
--- a/admin/src/components/common/UploadFileCommon.vue
+++ b/admin/src/components/common/UploadFileCommon.vue
@@ -39,7 +39,7 @@
},
data() {
return {
- uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/upload'
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload'
}
},
@@ -55,13 +55,13 @@
this.$message.success('涓婁紶鎴愬姛')
this.$emit('uploadSuccess', { fileurl: data.imgaddr, fileUrlFull: data.url, name: data.originname })
} else {
- this.$tip.apiFailed('涓婁紶澶辫触')
+ this.$message.error('涓婁紶澶辫触')
}
this.$emit('uploadEnd')
},
uploadError() {
- this.$tip.apiFailed('涓婁紶澶辫触')
- this.$emit('endUpload')
+ this.$message.error('涓婁紶澶辫触')
+ this.$emit('uploadEnd')
},
// // 鎷︽埅
beforeAvatarUpload(file) {
@@ -147,4 +147,4 @@
width: 90px !important;
height: 90px !important;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/admin/src/components/common/UploadImage.vue b/admin/src/components/common/UploadImage.vue
index 67ccb8a..c0bb2bb 100644
--- a/admin/src/components/common/UploadImage.vue
+++ b/admin/src/components/common/UploadImage.vue
@@ -33,15 +33,15 @@
</span>
</div>
</el-upload>
- <el-image-viewer
- v-if="showViewer"
+ <el-image-viewer
+ v-if="showViewer"
:on-close="closeViewer"
:initialIndex="tempIndex"
:url-list="srcList"
:z-index="3000"
/>
</div>
-
+
</template>
<script>
@@ -59,8 +59,8 @@
},
data() {
return {
- uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/uploadLocal',
-
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/uploadLocal',
+
realList: [],
srcList: [],
tempIndex: 0,
@@ -76,20 +76,20 @@
this.srcList = []
}
}
-
+
}
},
methods: {
beforeUpload(file) {
-
+
this.$emit('beginUpload')
return true
},
// 涓婁紶鍥剧墖鎴愬姛
- uploadSuccess (res, file, fileList) {
+ uploadSuccess (res, file, fileList) {
// console.log('this.fileList', this.fileList);
// console.log('fileList', fileList);
- this.$emit('endUpload')
+ this.$emit('uploadEnd')
this.realList = fileList
this.srcList.push(res.data.url)
// console.log('file', file);
@@ -106,7 +106,7 @@
}
},
fail (err, file, fileList) {
- this.$emit('endUpload')
+ this.$emit('uploadEnd')
this.$message.error('涓婁紶澶辫触')
},
handlePictureCardPreview(file) {
@@ -127,7 +127,7 @@
this.realList.splice(tempIndex, 1)
this.fileList.splice(tempIndex, 1)
this.srcList.splice(tempIndex, 1)
-
+
},
},
}
diff --git a/admin/src/components/common/upload.vue b/admin/src/components/common/upload.vue
index 22d22f9..9917980 100644
--- a/admin/src/components/common/upload.vue
+++ b/admin/src/components/common/upload.vue
@@ -43,7 +43,7 @@
},
data() {
return {
- uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/upload'
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload'
}
},
diff --git a/admin/src/views/business/visitorSources.vue b/admin/src/views/business/visitorSources.vue
index 5df4993..f7aaf88 100644
--- a/admin/src/views/business/visitorSources.vue
+++ b/admin/src/views/business/visitorSources.vue
@@ -114,7 +114,7 @@
fd.append('folder', 'visit/')
fd.append('file', file)
return upload(fd).then(res => {
- return res.prefixPath + res.folder + res.halfPath
+ return res.url
})
}
}),
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index 8592bd7..e0c4f2f 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -139,10 +139,10 @@
import Pagination from '@/components/common/Pagination'
import OperaBookingsWindow from '@/views/meeting/components/OperaBookingsWindow'
import OperaBookingsDetailWindow from '@/views/meeting/components/OperaBookingsDetailWindow'
-import { findList } from '@/views/meeting/api/rooms'
+import { findList } from '@/api/meeting/rooms'
import { getSystemDictData } from '@/api/system/dictData'
import { fetchTree } from '@/api/system/department'
-import { cancelById, bookingsDetail } from '@/views/meeting/api/bookings'
+import { cancelById, bookingsDetail } from '@/api/meeting/bookings'
export default {
name: 'Bookings',
extends: BaseTable,
@@ -195,7 +195,7 @@
created () {
this.config({
module: '浼氳瀹ら瀹氫俊鎭〃',
- api: '@/views/meeting/api/bookings',
+ api: '/meeting/bookings',
'field.id': 'id',
'field.main': 'id'
})
diff --git a/admin/src/views/meeting/components/OperaBookingsDetailWindow.vue b/admin/src/views/meeting/components/OperaBookingsDetailWindow.vue
index 96533ad..a1de55f 100644
--- a/admin/src/views/meeting/components/OperaBookingsDetailWindow.vue
+++ b/admin/src/views/meeting/components/OperaBookingsDetailWindow.vue
@@ -89,7 +89,7 @@
},
created () {
this.config({
- api: '@/views/meeting/api/bookings',
+ api: '/meeting/bookings',
'field.id': 'id'
})
diff --git a/admin/src/views/meeting/components/OperaBookingsWindow.vue b/admin/src/views/meeting/components/OperaBookingsWindow.vue
index 74de916..0af16af 100644
--- a/admin/src/views/meeting/components/OperaBookingsWindow.vue
+++ b/admin/src/views/meeting/components/OperaBookingsWindow.vue
@@ -103,8 +103,8 @@
import FileLink from '@/views/meeting/components/common/FileLink'
import { uploadFileLocal as upload } from '@/api/system/common'
import { fetchList as userList } from '@/api/system/user'
-import { findListByObjId } from '@/views/meeting/api/projects'
-import { findList } from '@/views/meeting/api/roomTime'
+import { findListByObjId } from '@/api/meeting/projects'
+import { findList } from '@/api/meeting/roomTime'
import { numRule, arrayRule } from '@/utils/form'
export default {
name: 'OperaBookingsWindow',
@@ -159,7 +159,7 @@
inject: ['rooms'],
created () {
this.config({
- api: '@/views/meeting/api/bookings',
+ api: '/meeting/bookings',
'field.id': 'id'
})
userList({
diff --git a/admin/src/views/meeting/components/OperaDevicesWindow.vue b/admin/src/views/meeting/components/OperaDevicesWindow.vue
index 3bf1457..d6ac254 100644
--- a/admin/src/views/meeting/components/OperaDevicesWindow.vue
+++ b/admin/src/views/meeting/components/OperaDevicesWindow.vue
@@ -81,7 +81,7 @@
inject: ['room'],
created () {
this.config({
- api: '@/views/meeting/api/devices',
+ api: '/meeting/devices',
'field.id': 'id'
})
diff --git a/admin/src/views/meeting/components/OperaNoticeWindow.vue b/admin/src/views/meeting/components/OperaNoticeWindow.vue
index af04093..47884d8 100644
--- a/admin/src/views/meeting/components/OperaNoticeWindow.vue
+++ b/admin/src/views/meeting/components/OperaNoticeWindow.vue
@@ -71,7 +71,7 @@
},
created () {
this.config({
- api: '@/views/meeting/api/notice',
+ api: 'meeting/notice',
'field.id': 'id'
})
}
diff --git a/admin/src/views/meeting/components/OperaProjectsWindow.vue b/admin/src/views/meeting/components/OperaProjectsWindow.vue
index ce5488f..21c69d8 100644
--- a/admin/src/views/meeting/components/OperaProjectsWindow.vue
+++ b/admin/src/views/meeting/components/OperaProjectsWindow.vue
@@ -88,7 +88,7 @@
},
created () {
this.config({
- api: '@/views/meeting/api/projects',
+ api: '/meeting/projects',
'field.id': 'id'
})
},
diff --git a/admin/src/views/meeting/components/OperaRoomRecordWindow.vue b/admin/src/views/meeting/components/OperaRoomRecordWindow.vue
index 7967d91..964a835 100644
--- a/admin/src/views/meeting/components/OperaRoomRecordWindow.vue
+++ b/admin/src/views/meeting/components/OperaRoomRecordWindow.vue
@@ -70,7 +70,7 @@
},
created () {
this.config({
- api: '@/views/meeting/api/roomRecord',
+ api: '/meeting/roomRecord',
'field.id': 'id'
})
}
diff --git a/admin/src/views/meeting/components/OperaRoomsWindow.vue b/admin/src/views/meeting/components/OperaRoomsWindow.vue
index f8d603a..853154d 100644
--- a/admin/src/views/meeting/components/OperaRoomsWindow.vue
+++ b/admin/src/views/meeting/components/OperaRoomsWindow.vue
@@ -73,7 +73,7 @@
import GlobalAlertWindow from '@/components/common/GlobalAlertWindow'
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
import { numRule } from '@/utils/form'
-import { fetchList } from '@/views/meeting/api/projects'
+import { fetchList } from '@/api/meeting/projects'
export default {
name: 'OperaRoomsWindow',
extends: BaseOpera,
@@ -135,7 +135,7 @@
inject: ['userList'],
created () {
this.config({
- api: '@/views/meeting/api/rooms',
+ api: '/meeting/rooms',
'field.id': 'id'
})
// realname: this.filterText
diff --git a/admin/src/views/meeting/components/selectMember.vue b/admin/src/views/meeting/components/selectMember.vue
index 559bfc6..44e11f3 100644
--- a/admin/src/views/meeting/components/selectMember.vue
+++ b/admin/src/views/meeting/components/selectMember.vue
@@ -91,7 +91,7 @@
},
created () {
this.config({
- api: '@/views/meeting/api/bookings',
+ api: '/meeting/bookings',
'field.id': 'id'
})
diff --git a/admin/src/views/meeting/devices.vue b/admin/src/views/meeting/devices.vue
index 1170a22..cd564ba 100644
--- a/admin/src/views/meeting/devices.vue
+++ b/admin/src/views/meeting/devices.vue
@@ -94,8 +94,8 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaDevicesWindow from '@/views/meeting/components/OperaDevicesWindow'
-import { findList } from '@/views/meeting/api/rooms'
-import { updateById } from '@/views/meeting/api/devices'
+import { findList } from '@/api/meeting/rooms'
+import { updateById } from '@/api/meeting/devices'
export default {
name: 'Devices',
extends: BaseTable,
@@ -127,7 +127,7 @@
created () {
this.config({
module: '璁惧绠＄悊淇℃伅琛�',
- api: '@/views/meeting/api/devices',
+ api: '/meeting/devices',
'field.id': 'id',
'field.main': 'id'
})
diff --git a/admin/src/views/meeting/roomRecord.vue b/admin/src/views/meeting/roomRecord.vue
index efe450c..f2020b1 100644
--- a/admin/src/views/meeting/roomRecord.vue
+++ b/admin/src/views/meeting/roomRecord.vue
@@ -95,7 +95,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaRoomRecordWindow from '@/views/meeting/components/OperaRoomRecordWindow'
-import { findList } from '@/views/meeting/api/rooms'
+import { findList } from '@/api/meeting/rooms'
export default {
name: 'RoomRecord',
extends: BaseTable,
@@ -121,7 +121,7 @@
created () {
this.config({
module: '浼氳瀹ゅ紑闂ㄨ褰曡〃',
- api: '@/views/meeting/api/roomRecord',
+ api: '/meeting/roomRecord',
'field.id': 'id',
'field.main': 'id'
})
diff --git a/admin/src/views/meeting/roomStatistics.vue b/admin/src/views/meeting/roomStatistics.vue
index 5550a21..908efdf 100644
--- a/admin/src/views/meeting/roomStatistics.vue
+++ b/admin/src/views/meeting/roomStatistics.vue
@@ -130,7 +130,7 @@
<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
-import { getRoomStatistics, exportRoomStatistics } from '@/views/meeting/api/bookings'
+import { getRoomStatistics, exportRoomStatistics } from '@/api/meeting/bookings'
// import { findList } from '@/api/meeting/rooms'
export default {
name: 'Rooms',
@@ -153,7 +153,7 @@
created () {
this.config({
module: '浼氳瀹や俊鎭〃',
- api: '@/views/meeting/api/rooms',
+ api: '/meeting/rooms',
'field.id': 'id',
'field.main': 'id'
})
diff --git a/admin/src/views/meeting/rooms.vue b/admin/src/views/meeting/rooms.vue
index 166f5e0..a8ef660 100644
--- a/admin/src/views/meeting/rooms.vue
+++ b/admin/src/views/meeting/rooms.vue
@@ -122,7 +122,7 @@
import OperaRoomsWindow from '@/views/meeting/components/OperaRoomsWindow'
import { fetchList as userList } from '@/api/system/user'
// import selectMember from '@/components/meeting/selectMember'
-import { updateStatusById } from '@/views/meeting/api/rooms'
+import { updateStatusById } from '@/api/meeting/rooms'
export default {
name: 'Rooms',
extends: BaseTable,
@@ -159,7 +159,7 @@
created () {
this.config({
module: '浼氳瀹や俊鎭〃',
- api: '@/views/meeting/api/rooms',
+ api: '/meeting/rooms',
'field.id': 'id',
'field.main': 'id'
})
diff --git a/admin/src/views/meeting/userStatistics.vue b/admin/src/views/meeting/userStatistics.vue
index 89dd501..27a2fb0 100644
--- a/admin/src/views/meeting/userStatistics.vue
+++ b/admin/src/views/meeting/userStatistics.vue
@@ -128,7 +128,7 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import { getUserStatistics, exportUserStatistics } from '@/views/meeting/api/bookings'
+import { getUserStatistics, exportUserStatistics } from '@/api/meeting/bookings'
import { fetchList as userList } from '@/api/system/user'
export default {
@@ -152,7 +152,7 @@
created () {
this.config({
module: '浼氳瀹や俊鎭〃',
- api: '@/views/meeting/api/rooms',
+ api: '/meeting/rooms',
'field.id': 'id',
'field.main': 'id'
})
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/CloudBookingsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/CloudBookingsController.java
deleted file mode 100644
index cf6831e..0000000
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/CloudBookingsController.java
+++ /dev/null
@@ -1,215 +0,0 @@
-package com.doumee.api;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-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;
-import com.doumee.core.utils.DateUtil;
-import com.doumee.dao.business.model.Bookings;
-import com.doumee.dao.business.vo.RoomStatisticsVo;
-import com.doumee.dao.system.dto.UserStatisticsDTO;
-import com.doumee.dao.system.vo.UserStatisticsVo;
-import com.doumee.dao.web.response.DateTimeResourceDate;
-import com.doumee.dao.web.response.MeetingDetailResponse;
-import com.doumee.service.business.BookingsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author 姹熻箘韫�
- * @date 2023/05/04 18:18
- */
-@Api(tags = "寰湇鍔�-浼氳瀹ょ浉鍏虫帴鍙�")
-@RestController
-@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/bookings")
-public class CloudBookingsController extends BaseController {
-
- @Autowired
- private BookingsService bookingsService;
-
- @ApiOperation("娴嬭瘯缃戠")
- @GetMapping("/test")
- public ApiResponse test() {
- return ApiResponse.success("浼氳瀹ゆ祴璇曟垚鍔�");
- }
-
- @LoginNoRequired
- @ApiOperation("娴嬭瘯鏃犻渶鐧诲綍鎴愬姛")
- @GetMapping("/testNoLogin")
- public ApiResponse testNoLogin() {
- return ApiResponse.success("浼氳瀹ょ鐞嗘祴璇曟棤闇�鐧诲綍鎴愬姛");
- }
- @PreventRepeat
- @ApiOperation("鏂板缓")
- @PostMapping("/create")
- public ApiResponse create(@RequestBody Bookings bookings) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- bookings.setCreator(user.getId());
- return ApiResponse.success(bookingsService.create(bookings));
- }
-
- @ApiOperation("鏍规嵁ID鍒犻櫎")
- @GetMapping("/delete/{id}")
- public ApiResponse deleteById(@PathVariable Integer id) {
- bookingsService.deleteById(id);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鎵归噺鍒犻櫎")
- @GetMapping("/delete/batch")
- public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
- String [] idArray = ids.split(",");
- List<Integer> idList = new ArrayList<>();
- for (String id : idArray) {
- idList.add(Integer.valueOf(id));
- }
- bookingsService.deleteByIdInBatch(idList);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鏍规嵁ID淇敼")
- @PostMapping("/updateById")
- public ApiResponse updateById(@RequestBody Bookings bookings) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- bookings.setCreator(user.getId());
- bookingsService.updateById(bookings);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鍒嗛〉鏌ヨ")
- @PostMapping("/page")
- public ApiResponse<PageData<Bookings>> findPage (@RequestBody PageWrap<Bookings> pageWrap) {
- return ApiResponse.success(bookingsService.findPage(pageWrap));
- }
-
- @ApiOperation("瀵煎嚭Excel")
- @PostMapping("/exportExcel")
- @RequiresPermissions("business:bookings:exportExcel")
- public void exportExcel (@RequestBody PageWrap<Bookings> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(Bookings.class).export(bookingsService.findPage(pageWrap).getRecords(), "浼氳瀹ら瀹氫俊鎭〃", response);
- }
-
- @ApiOperation("鏍规嵁ID鏌ヨ")
- @GetMapping("/{id}")
- public ApiResponse<MeetingDetailResponse> findById(@PathVariable Integer id) {
- return ApiResponse.success(bookingsService.getMeetingDetail(id));
- }
-
-
- @ApiOperation("鍙栨秷")
- @PostMapping("/cancelById")
- public ApiResponse cancelById(@RequestBody Bookings bookings) {
- bookingsService.cancelById(bookings);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("浼氳瀹や娇鐢ㄦ椂闀跨粺璁�")
- @GetMapping("/getRoomStatistics")
- public ApiResponse<List<RoomStatisticsVo>> getRoomStatistics(@RequestParam Integer yearNum, @RequestParam Integer roomId){
- return ApiResponse.success(bookingsService.getRoomStatistics(yearNum));
- }
-
- @ApiOperation("浜哄憳鍙傚姞浼氳鏃跺父")
- @PostMapping("/getUserStatistics")
- public ApiResponse<PageData<UserStatisticsVo>> getUserStatistics(@RequestBody PageWrap<UserStatisticsDTO> pageWrap ){
- return ApiResponse.success(bookingsService.getUserStatistics(pageWrap));
- }
-
- @ApiOperation("浜哄憳鍙備細鏃堕暱缁熻瀵煎嚭Excel")
- @PostMapping("/exportUserStatistics")
- public void exportUserStatistics (@RequestBody PageWrap<UserStatisticsDTO> pageWrap,HttpServletResponse response) {
-
- List<UserStatisticsVo> records = bookingsService.getUserStatistics(pageWrap).getRecords();
- if (!CollectionUtils.isEmpty(records)){
- JSONArray o = (JSONArray) JSON.toJSON(records);
- o.forEach(s->{
- JSONObject jsonObject = (JSONObject) s;
- Set<Map.Entry<String, Object>> entries = jsonObject.entrySet();
- for (Map.Entry<String, Object> entry:entries){
-
- if (entry.getValue() instanceof BigDecimal){
- BigDecimal value = (BigDecimal) entry.getValue();
- entry.setValue(value.compareTo(value.setScale(0, RoundingMode.DOWN)) > 0 ? value : value.setScale(0, RoundingMode.DOWN));
- }
- }
- });
- records = o.toJavaList(UserStatisticsVo.class);
- }
- ExcelExporter.build(UserStatisticsVo.class).export(records, "浜哄憳鍙備細鏃堕暱缁熻", response);
- }
-
- @ApiOperation("浼氳瀹や娇鐢ㄦ椂闀跨粺璁″鍑篍xcel")
- @PostMapping("/exportRoomStatistics")
- public void exportRoomStatistics (@RequestBody PageWrap<UserStatisticsDTO> pageWrap,HttpServletResponse response) {
- List<RoomStatisticsVo> roomStatistics = bookingsService.getRoomStatistics(pageWrap.getModel().getYearNum());
- if (!CollectionUtils.isEmpty(roomStatistics)){
- JSONArray o = (JSONArray) JSON.toJSON(roomStatistics);
- o.forEach(s->{
- JSONObject jsonObject = (JSONObject) s;
- Set<Map.Entry<String, Object>> entries = jsonObject.entrySet();
- for (Map.Entry<String, Object> entry:entries){
-
- if (entry.getValue() instanceof BigDecimal){
- BigDecimal value = (BigDecimal) entry.getValue();
- entry.setValue(value.compareTo(value.setScale(0, RoundingMode.DOWN)) > 0 ? value : value.setScale(0, RoundingMode.DOWN));
- }
- }
- });
- roomStatistics = o.toJavaList(RoomStatisticsVo.class);
- }
- ExcelExporter.build(RoomStatisticsVo.class).export(roomStatistics, "浼氳瀹や娇鐢ㄦ椂闀跨粺璁�", response);
- }
-
- @ApiOperation("鍙備笌鐨勯绾︿細璁�")
- @GetMapping("/reservationCancel")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "1 浠婂ぉ 2 鏈懆", required = true),
- })
- public ApiResponse<List<Bookings>> getMyJoinBookingMeet(@RequestParam Integer type){
-
- LocalDateTime startTime = LocalDateTime.of(LocalDate.now(), LocalTime.of(00,00,00));
- LocalDateTime endTime = LocalDateTime.of(LocalDate.now(), LocalTime.of(23,59,59));
- if(Constants.equalsInteger(type,Constants.TWO)){
- startTime = DateUtil.getMonday();
- endTime = DateUtil.getSunday();
- }
- return ApiResponse.success(bookingsService.getMyJoinBookingMeet(getLoginUser().getId(), null,startTime,endTime));
- }
-
- /**
- * 鑾峰彇鐢ㄦ埛褰撳綋鏈堥绾︿細璁儏鍐�
- * @return
- */
- @ApiOperation("鑾峰彇鐢ㄦ埛褰撳綋鏈堥绾︿細璁儏鍐�")
- @PostMapping("/findMothBookingMeet")
- public ApiResponse<List<DateTimeResourceDate>> findMothBookingMeet( @RequestParam(required = false) Integer roomId,String dateMonth){
-
-
- return ApiResponse.success(bookingsService.findMothBookingMeet(getLoginUser().getId(),roomId,dateMonth));
- }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
--
Gitblit v1.9.3