k94314517
2024-05-06 91d07790ca2787b567c848aab5ef0f3c7808b2ee
代码初始化
已重命名15个文件
94 ■■■■■ 文件已修改
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingTimeCloudController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MultifileCloudController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectRelCloudController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomRecordCloudController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomTimeCloudController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/WgListenerCloudController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/ApiController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/NoticeApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/UtilApi.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingTimeCloudController.java
ÎļþÃû´Ó server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudBookingTimeController.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;
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
ÎļþÃû´Ó server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudMeetingController.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;
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MultifileCloudController.java
ÎļþÃû´Ó server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudMultifileController.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;
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectRelCloudController.java
ÎļþÃû´Ó server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudProjectRelController.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;
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java
ÎļþÃû´Ó server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudProjectsController.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;
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomRecordCloudController.java
ÎļþÃû´Ó server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomRecordController.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;
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomTimeCloudController.java
ÎļþÃû´Ó server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomTimeController.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;
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java
ÎļþÃû´Ó server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomsController.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;
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java
ÎļþÃû´Ó server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudUserRelController.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;
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/WgListenerCloudController.java
ÎļþÃû´Ó server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudWgListenerController.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
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/ApiController.java
ÎļþÃû´Ó server/meeting/meeting_web/src/main/java/com/doumee/api/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;
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java
ÎļþÃû´Ó server/meeting/meeting_web/src/main/java/com/doumee/api/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;
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/NoticeApi.java
ÎļþÃû´Ó server/meeting/meeting_web/src/main/java/com/doumee/api/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;
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java
ÎļþÃû´Ó server/meeting/meeting_web/src/main/java/com/doumee/api/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;
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/UtilApi.java
ÎļþÃû´Ó server/meeting/meeting_web/src/main/java/com/doumee/api/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.