From 91d07790ca2787b567c848aab5ef0f3c7808b2ee Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 06 五月 2024 16:44:57 +0800
Subject: [PATCH] 代码初始化
---
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomRecordCloudController.java | 7 ++-
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingTimeCloudController.java | 6 +-
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/ApiController.java | 2
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java | 6 +-
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MultifileCloudController.java | 8 ++-
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java | 7 +--
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectRelCloudController.java | 7 ++-
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java | 2
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java | 6 +-
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/WgListenerCloudController.java | 7 ++-
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomTimeCloudController.java | 7 ++-
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java | 7 ++-
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/NoticeApi.java | 2
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/UtilApi.java | 18 --------
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java | 2
15 files changed, 42 insertions(+), 52 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudBookingTimeController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingTimeCloudController.java
similarity index 95%
rename from server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudBookingTimeController.java
rename to server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingTimeCloudController.java
index b77bfd6..12d1fdd 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudBookingTimeController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingTimeCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud.admin;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
@@ -25,8 +25,8 @@
*/
@Api(tags = "浼氳瀹ら绾︽椂闂存鍏宠仈琛�")
@RestController
-@RequestMapping("/cloudService/bookingTime")
-public class CloudBookingTimeController extends BaseController {
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/bookingTime")
+public class BookingTimeCloudController extends BaseController {
@Autowired
private BookingTimeService bookingTimeService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudMeetingController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
similarity index 97%
rename from server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudMeetingController.java
rename to server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
index 1d92a06..051a4d5 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudMeetingController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud.admin;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.doumee.api.BaseController;
@@ -36,8 +36,8 @@
*/
@Api(tags = "浼氳瀹ら瀹氫俊鎭〃")
@RestController
-@RequestMapping("/cloudService/meeting")
-public class CloudMeetingController extends BaseController {
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/meeting")
+public class MeetingCloudController extends BaseController {
@Autowired
private BookingsService bookingsService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudMultifileController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MultifileCloudController.java
similarity index 92%
rename from server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudMultifileController.java
rename to server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MultifileCloudController.java
index fc44628..7c73001 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudMultifileController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MultifileCloudController.java
@@ -1,11 +1,13 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud.admin;
+import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.system.model.Multifile;
import com.doumee.service.system.MultifileService;
import io.swagger.annotations.Api;
@@ -23,8 +25,8 @@
*/
@Api(tags = "闄勪欢涓婁紶淇℃伅琛�")
@RestController
-@RequestMapping("/cloudService/multifile")
-public class CloudMultifileController extends BaseController {
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/multifile")
+public class MultifileCloudController extends BaseController {
@Autowired
private MultifileService multifileService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudProjectRelController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectRelCloudController.java
similarity index 93%
rename from server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudProjectRelController.java
rename to server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectRelCloudController.java
index 80f2eb3..e30fe10 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudProjectRelController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectRelCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud.admin;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
@@ -7,6 +7,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.ProjectRel;
import com.doumee.service.business.ProjectRelService;
import io.swagger.annotations.Api;
@@ -24,8 +25,8 @@
*/
@Api(tags = "鏈嶅姟椤圭洰鍏宠仈琛�")
@RestController
-@RequestMapping("/cloudService/projectRel")
-public class CloudProjectRelController extends BaseController {
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/projectRel")
+public class ProjectRelCloudController extends BaseController {
@Autowired
private ProjectRelService projectRelService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudProjectsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java
similarity index 95%
rename from server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudProjectsController.java
rename to server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java
index 2690bc9..4edf42c 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudProjectsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud.admin;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
@@ -26,8 +26,8 @@
*/
@Api(tags = "鏈嶅姟椤圭洰淇℃伅琛�")
@RestController
-@RequestMapping("/cloudService/projects")
-public class CloudProjectsController extends BaseController {
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/projects")
+public class ProjectsCloudController extends BaseController {
@Autowired
private ProjectsService projectsService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomRecordController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomRecordCloudController.java
similarity index 93%
rename from server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomRecordController.java
rename to server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomRecordCloudController.java
index 005be4b..6131135 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomRecordController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomRecordCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud.admin;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
@@ -7,6 +7,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.RoomRecord;
import com.doumee.service.business.RoomRecordService;
import io.swagger.annotations.Api;
@@ -24,8 +25,8 @@
*/
@Api(tags = "浼氳瀹ゅ紑闂ㄨ褰曡〃")
@RestController
-@RequestMapping("/cloudService/roomRecord")
-public class CloudRoomRecordController extends BaseController {
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/roomRecord")
+public class RoomRecordCloudController extends BaseController {
@Autowired
private RoomRecordService roomRecordService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomTimeController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomTimeCloudController.java
similarity index 93%
rename from server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomTimeController.java
rename to server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomTimeCloudController.java
index a7d30ef..8a4491e 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomTimeController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomTimeCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud.admin;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
@@ -7,6 +7,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.RoomTime;
import com.doumee.service.business.RoomTimeService;
import io.swagger.annotations.Api;
@@ -24,8 +25,8 @@
*/
@Api(tags = "浼氳瀹ら绾︽椂闂存淇℃伅琛�")
@RestController
-@RequestMapping("/cloudService/roomTime")
-public class CloudRoomTimeController extends BaseController {
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/roomTime")
+public class RoomTimeCloudController extends BaseController {
@Autowired
private RoomTimeService roomTimeService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java
similarity index 97%
rename from server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomsController.java
rename to server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java
index 1f24551..e41b7d2 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud.admin;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -23,7 +23,6 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,8 +36,8 @@
*/
@Api(tags = "浼氳瀹や俊鎭〃")
@RestController
-@RequestMapping("/cloudService/rooms")
-public class CloudRoomsController extends BaseController {
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/rooms")
+public class RoomsCloudController extends BaseController {
@Autowired
private RoomsService roomsService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudUserRelController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java
similarity index 93%
rename from server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudUserRelController.java
rename to server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java
index 1d5d78e..774c1b0 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudUserRelController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud.admin;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
@@ -7,6 +7,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.UserRel;
import com.doumee.service.business.UserRelService;
import io.swagger.annotations.Api;
@@ -24,8 +25,8 @@
*/
@Api(tags = "浼氳瀹ょ鐞嗗憳鍜屽弬浼氫汉鍛樺叧鑱旇〃")
@RestController
-@RequestMapping("/cloudService/userRel")
-public class CloudUserRelController extends BaseController {
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/userRel")
+public class UserRelCloudController extends BaseController {
@Autowired
private UserRelService userRelService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudWgListenerController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/WgListenerCloudController.java
similarity index 97%
rename from server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudWgListenerController.java
rename to server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/WgListenerCloudController.java
index 38dcd25..cbed8c3 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudWgListenerController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/WgListenerCloudController.java
@@ -1,9 +1,10 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud.admin;
import cn.hutool.core.io.IoUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.admin.request.InDeviceEntranceParam;
import com.doumee.dao.admin.response.DevWgDataResponseParam;
@@ -34,9 +35,9 @@
*/
@Api(tags = "寰厜浜岀淮鐮佽姹傚叆鍙ｆ帴鍙�",value = "")
@RestController
-@RequestMapping("/cloudService/wgListener")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/wgListener")
@Slf4j
-public class CloudWgListenerController {
+public class WgListenerCloudController {
@Autowired
private SystemUserService systemUserService;
@Autowired
diff --git a/server/meeting/meeting_web/src/main/java/com/doumee/api/web/ApiController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/ApiController.java
similarity index 96%
rename from server/meeting/meeting_web/src/main/java/com/doumee/api/web/ApiController.java
rename to server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/ApiController.java
index e7703c9..c392575 100644
--- a/server/meeting/meeting_web/src/main/java/com/doumee/api/web/ApiController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/ApiController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.web;
+package com.doumee.cloud.web;
import com.doumee.config.Jwt.JwtTokenUtil;
import lombok.extern.slf4j.Slf4j;
diff --git a/server/meeting/meeting_web/src/main/java/com/doumee/api/web/MeetingApi.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java
similarity index 99%
rename from server/meeting/meeting_web/src/main/java/com/doumee/api/web/MeetingApi.java
rename to server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java
index 73d1cbd..81c8fad 100644
--- a/server/meeting/meeting_web/src/main/java/com/doumee/api/web/MeetingApi.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java
@@ -1,4 +1,4 @@
-package com.doumee.api.web;
+package com.doumee.cloud.web;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.doumee.config.Jwt.JwtTokenUtil;
diff --git a/server/meeting/meeting_web/src/main/java/com/doumee/api/web/NoticeApi.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/NoticeApi.java
similarity index 98%
rename from server/meeting/meeting_web/src/main/java/com/doumee/api/web/NoticeApi.java
rename to server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/NoticeApi.java
index a3ce84f..b7bb358 100644
--- a/server/meeting/meeting_web/src/main/java/com/doumee/api/web/NoticeApi.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/NoticeApi.java
@@ -1,4 +1,4 @@
-package com.doumee.api.web;
+package com.doumee.cloud.web;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
diff --git a/server/meeting/meeting_web/src/main/java/com/doumee/api/web/RoomsApi.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java
similarity index 98%
rename from server/meeting/meeting_web/src/main/java/com/doumee/api/web/RoomsApi.java
rename to server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java
index 51d8af0..841e890 100644
--- a/server/meeting/meeting_web/src/main/java/com/doumee/api/web/RoomsApi.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java
@@ -1,4 +1,4 @@
-package com.doumee.api.web;
+package com.doumee.cloud.web;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.doumee.config.Jwt.JwtTokenUtil;
diff --git a/server/meeting/meeting_web/src/main/java/com/doumee/api/web/UtilApi.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/UtilApi.java
similarity index 83%
rename from server/meeting/meeting_web/src/main/java/com/doumee/api/web/UtilApi.java
rename to server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/UtilApi.java
index 1d694f8..091bf94 100644
--- a/server/meeting/meeting_web/src/main/java/com/doumee/api/web/UtilApi.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/UtilApi.java
@@ -1,28 +1,15 @@
-package com.doumee.api.web;
+package com.doumee.cloud.web;
-import cn.hutool.http.server.HttpServerResponse;
-import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
-import com.doumee.core.oss.FileModel;
-import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DateUtil;
-import com.doumee.dao.business.model.Bookings;
import com.doumee.dao.system.model.SystemDictData;
-import com.doumee.dao.web.response.MonthDataResponse;
import com.doumee.service.business.UtilService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,10 +18,7 @@
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
-import java.awt.image.RenderedImage;
import java.io.*;
-import java.util.*;
-import java.util.stream.Collectors;
/**
* Created by IntelliJ IDEA.
--
Gitblit v1.9.3