修改mapper文件路径

添加“MessageRecordMapper”

src/main/java/com/ycwl/basic/controller/viid/ViidController.java

@@ -3,9 +3,9 @@ package com.ycwl.basic.controller.viid;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.ycwl.basic.annotation.IgnoreToken;
-import com.ycwl.basic.mapper.pc.DeviceMapper;
-import com.ycwl.basic.mapper.pc.FaceSampleMapper;
-import com.ycwl.basic.mapper.pc.SourceMapper;
+import com.ycwl.basic.mapper.DeviceMapper;
+import com.ycwl.basic.mapper.FaceSampleMapper;
+import com.ycwl.basic.mapper.SourceMapper;
 import com.ycwl.basic.model.pc.device.entity.DeviceEntity;
 import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity;
 import com.ycwl.basic.model.pc.source.entity.SourceEntity;

src/main/java/com/ycwl/basic/mapper/AdminUserMapper.java

@@ -1,4 +1,4 @@
-package com.ycwl.basic.mapper.pc;
+package com.ycwl.basic.mapper;
 
 
 

src/main/java/com/ycwl/basic/mapper/BrokerMapper.java

@@ -1,4 +1,4 @@
-package com.ycwl.basic.mapper.pc;
+package com.ycwl.basic.mapper;
 
 import com.ycwl.basic.model.pc.broker.entity.BrokerEntity;
 import com.ycwl.basic.model.pc.broker.req.BrokerReqQuery;

src/main/java/com/ycwl/basic/mapper/DeviceMapper.java

@@ -1,4 +1,4 @@
-package com.ycwl.basic.mapper.pc;
+package com.ycwl.basic.mapper;
 
 import com.ycwl.basic.model.mobile.scenic.ScenicDeviceCountVO;
 import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity;

src/main/java/com/ycwl/basic/mapper/FaceMapper.java

@@ -1,4 +1,4 @@
-package com.ycwl.basic.mapper.pc;
+package com.ycwl.basic.mapper;
 
 import com.ycwl.basic.model.pc.face.entity.FaceEntity;
 import com.ycwl.basic.model.pc.face.req.FaceReqQuery;

src/main/java/com/ycwl/basic/mapper/FaceSampleMapper.java

@@ -1,4 +1,4 @@
-package com.ycwl.basic.mapper.pc;
+package com.ycwl.basic.mapper;
 
 import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity;
 import com.ycwl.basic.model.pc.faceSample.req.FaceSampleReqQuery;

src/main/java/com/ycwl/basic/mapper/MemberMapper.java

@@ -1,4 +1,4 @@
-package com.ycwl.basic.mapper.pc;
+package com.ycwl.basic.mapper;
 
 import com.ycwl.basic.model.pc.member.entity.MemberEntity;
 import com.ycwl.basic.model.pc.member.req.MemberReqQuery;

src/main/java/com/ycwl/basic/mapper/MenuMapper.java

@@ -1,4 +1,4 @@
-package com.ycwl.basic.mapper.pc;
+package com.ycwl.basic.mapper;
 
 import com.ycwl.basic.model.pc.menu.MenuNode;
 import com.ycwl.basic.model.pc.menu.entity.MenuEntity;

src/main/java/com/ycwl/basic/mapper/MessageRecordMapper.java

@@ -0,0 +1,11 @@
+package com.ycwl.basic.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Author：longbinbin
+ * @Date：2024/12/13 11:33
+ */
+@Mapper
+public interface MessageRecordMapper {
+}

src/main/java/com/ycwl/basic/mapper/OrderMapper.java

@@ -1,4 +1,4 @@
-package com.ycwl.basic.mapper.pc;
+package com.ycwl.basic.mapper;
 
 import com.ycwl.basic.model.mobile.order.OrderAppPageReq;
 import com.ycwl.basic.model.pc.order.entity.OrderItemEntity;

src/main/java/com/ycwl/basic/mapper/OrderOperationMapper.java

@@ -1,4 +1,4 @@
-package com.ycwl.basic.mapper.pc;
+package com.ycwl.basic.mapper;
 
 import com.ycwl.basic.model.pc.orderOp.entity.OrderOperationEntity;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/ycwl/basic/mapper/RenderWorkerMapper.java

@@ -1,4 +1,4 @@
-package com.ycwl.basic.mapper.pc;
+package com.ycwl.basic.mapper;
 
 import com.ycwl.basic.model.pc.renderWorker.entity.RenderWorkerEntity;
 import com.ycwl.basic.model.pc.renderWorker.req.RenderWorkerReqQuery;

src/main/java/com/ycwl/basic/mapper/RoleMapper.java

@@ -1,4 +1,4 @@
-package com.ycwl.basic.mapper.pc;
+package com.ycwl.basic.mapper;
 
 import com.ycwl.basic.model.pc.menu.MenuNode;
 import com.ycwl.basic.model.pc.role.req.AddOrUpdateRoleReqVO;

src/main/java/com/ycwl/basic/mapper/ScenicAccountMapper.java

@@ -1,4 +1,4 @@
-package com.ycwl.basic.mapper.pc;
+package com.ycwl.basic.mapper;
 
 import com.ycwl.basic.model.pc.scenic.entity.ScenicAccountEntity;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/ycwl/basic/mapper/ScenicMapper.java

@@ -1,4 +1,4 @@
-package com.ycwl.basic.mapper.pc;
+package com.ycwl.basic.mapper;
 
 import com.ycwl.basic.model.mobile.scenic.ScenicAppVO;
 import com.ycwl.basic.model.mobile.scenic.ScenicIndexVO;

src/main/java/com/ycwl/basic/mapper/SourceMapper.java

@@ -1,4 +1,4 @@
-package com.ycwl.basic.mapper.pc;
+package com.ycwl.basic.mapper;
 
 import com.ycwl.basic.model.pc.source.entity.SourceEntity;
 import com.ycwl.basic.model.pc.source.req.SourceReqQuery;

src/main/java/com/ycwl/basic/mapper/TaskMapper.java

@@ -1,4 +1,4 @@
-package com.ycwl.basic.mapper.pc;
+package com.ycwl.basic.mapper;
 
 import com.ycwl.basic.model.pc.task.entity.TaskEntity;
 import com.ycwl.basic.model.pc.task.req.TaskReqQuery;

src/main/java/com/ycwl/basic/mapper/TemplateMapper.java

@@ -1,4 +1,4 @@
-package com.ycwl.basic.mapper.pc;
+package com.ycwl.basic.mapper;
 
 import com.ycwl.basic.model.pc.task.entity.TaskEntity;
 import com.ycwl.basic.model.pc.task.req.TaskReqQuery;

src/main/java/com/ycwl/basic/mapper/VideoMapper.java

@@ -1,4 +1,4 @@
-package com.ycwl.basic.mapper.pc;
+package com.ycwl.basic.mapper;
 
 import com.ycwl.basic.model.pc.template.entity.TemplateEntity;
 import com.ycwl.basic.model.pc.template.req.TemplateReqQuery;

src/main/java/com/ycwl/basic/service/impl/mobile/AppMemberServiceImpl.java

@@ -9,7 +9,7 @@ import com.ycwl.basic.enums.AgreementEnum;
 import com.ycwl.basic.enums.BizCodeEnum;
 import com.ycwl.basic.enums.WechatErrorCodeEnum;
 import com.ycwl.basic.exception.AppException;
-import com.ycwl.basic.mapper.pc.MemberMapper;
+import com.ycwl.basic.mapper.MemberMapper;
 import com.ycwl.basic.model.jwt.JwtInfo;
 import com.ycwl.basic.model.mobile.weChat.DTO.WeChatUserInfoDTO;
 import com.ycwl.basic.model.mobile.weChat.DTO.WeChatUserInfoUpdateDTO;

src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java

@@ -5,9 +5,8 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ycwl.basic.constant.BaseContextHandler;
 import com.ycwl.basic.constant.NumberConstant;
-import com.ycwl.basic.mapper.pc.*;
+import com.ycwl.basic.mapper.*;
 import com.ycwl.basic.model.jwt.JwtInfo;
-import com.ycwl.basic.model.mobile.goods.GoodsPageVO;
 import com.ycwl.basic.model.mobile.index.TopStateResp;
 import com.ycwl.basic.model.mobile.scenic.ScenicAppVO;
 import com.ycwl.basic.model.mobile.scenic.ScenicDeviceCountVO;

src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java

@@ -1,6 +1,6 @@
 package com.ycwl.basic.service.impl.mobile;
 
-import com.ycwl.basic.mapper.pc.*;
+import com.ycwl.basic.mapper.*;
 import com.ycwl.basic.model.jwt.JwtInfo;
 import com.ycwl.basic.model.mobile.goods.*;
 import com.ycwl.basic.model.mobile.scenic.ScenicDeviceCountVO;

src/main/java/com/ycwl/basic/service/impl/pc/AdminUserServiceImpl.java

@@ -6,8 +6,8 @@ import com.github.pagehelper.PageInfo;
 
 import com.ycwl.basic.constant.BaseContextHandler;
 import com.ycwl.basic.exception.RoleStatusException;
-import com.ycwl.basic.mapper.pc.AdminUserMapper;
-import com.ycwl.basic.mapper.pc.RoleMapper;
+import com.ycwl.basic.mapper.AdminUserMapper;
+import com.ycwl.basic.mapper.RoleMapper;
 import com.ycwl.basic.model.jwt.JwtInfo;
 import com.ycwl.basic.model.pc.adminUser.entity.LoginEntity;
 import com.ycwl.basic.model.pc.adminUser.req.*;

src/main/java/com/ycwl/basic/service/impl/pc/BrokerServiceImpl.java

@@ -2,10 +2,9 @@ package com.ycwl.basic.service.impl.pc;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.ycwl.basic.mapper.pc.BrokerMapper;
+import com.ycwl.basic.mapper.BrokerMapper;
 import com.ycwl.basic.model.pc.broker.entity.BrokerEntity;
 import com.ycwl.basic.model.pc.broker.req.BrokerReqQuery;
-import com.ycwl.basic.model.pc.broker.resp.BrokerRespVO;
 import com.ycwl.basic.service.pc.BrokerService;
 import com.ycwl.basic.utils.SnowFlakeUtil;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java

@@ -2,7 +2,7 @@ package com.ycwl.basic.service.impl.pc;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.ycwl.basic.mapper.pc.DeviceMapper;
+import com.ycwl.basic.mapper.DeviceMapper;
 import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity;
 import com.ycwl.basic.model.pc.device.req.DeviceAddOrUpdateReq;
 import com.ycwl.basic.model.pc.device.req.DeviceReqQuery;

src/main/java/com/ycwl/basic/service/impl/pc/FaceSampleServiceImpl.java

@@ -2,7 +2,7 @@ package com.ycwl.basic.service.impl.pc;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.ycwl.basic.mapper.pc.FaceSampleMapper;
+import com.ycwl.basic.mapper.FaceSampleMapper;
 import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity;
 import com.ycwl.basic.model.pc.faceSample.req.FaceSampleReqQuery;
 import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO;

src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java

@@ -3,18 +3,16 @@ package com.ycwl.basic.service.impl.pc;
 import cn.hutool.core.bean.BeanUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.ycwl.basic.constant.BaseContextHandler;
 import com.ycwl.basic.enums.StatisticEnum;
 import com.ycwl.basic.exception.BaseException;
 import com.ycwl.basic.mapper.StatisticsMapper;
-import com.ycwl.basic.mapper.pc.FaceMapper;
+import com.ycwl.basic.mapper.FaceMapper;
 import com.ycwl.basic.model.jwt.JwtInfo;
 import com.ycwl.basic.model.mobile.statistic.req.StatisticsRecordAddReq;
 import com.ycwl.basic.model.pc.face.entity.FaceEntity;
 import com.ycwl.basic.model.pc.face.req.FaceReqQuery;
 import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
 import com.ycwl.basic.model.task.resp.SearchFaceRespVo;
-import com.ycwl.basic.service.impl.task.TaskFaceServiceImpl;
 import com.ycwl.basic.service.pc.FaceService;
 import com.ycwl.basic.service.task.TaskFaceService;
 import com.ycwl.basic.utils.*;
@@ -22,7 +20,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;

src/main/java/com/ycwl/basic/service/impl/pc/MemberServiceImpl.java

@@ -2,7 +2,7 @@ package com.ycwl.basic.service.impl.pc;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.ycwl.basic.mapper.pc.MemberMapper;
+import com.ycwl.basic.mapper.MemberMapper;
 import com.ycwl.basic.model.pc.member.entity.MemberEntity;
 import com.ycwl.basic.model.pc.member.req.MemberReqQuery;
 import com.ycwl.basic.model.pc.member.resp.MemberRespVO;

src/main/java/com/ycwl/basic/service/impl/pc/MenuServiceImpl.java

@@ -1,6 +1,6 @@
 package com.ycwl.basic.service.impl.pc;
 
-import com.ycwl.basic.mapper.pc.MenuMapper;
+import com.ycwl.basic.mapper.MenuMapper;
 import com.ycwl.basic.model.pc.menu.MenuNode;
 import com.ycwl.basic.model.pc.menu.entity.MenuEntity;
 import com.ycwl.basic.service.pc.MenuService;

src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java

@@ -6,8 +6,7 @@ import com.ycwl.basic.constant.BaseContextHandler;
 import com.ycwl.basic.constant.NumberConstant;
 import com.ycwl.basic.enums.*;
 import com.ycwl.basic.exception.AppException;
-import com.ycwl.basic.mapper.StatisticsMapper;
-import com.ycwl.basic.mapper.pc.*;
+import com.ycwl.basic.mapper.*;
 import com.ycwl.basic.model.jwt.JwtInfo;
 import com.ycwl.basic.model.mobile.goods.GoodsDetailVO;
 import com.ycwl.basic.model.mobile.goods.GoodsPriceQueryReq;

src/main/java/com/ycwl/basic/service/impl/pc/RenderWorkerServiceImpl.java

@@ -2,7 +2,7 @@ package com.ycwl.basic.service.impl.pc;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.ycwl.basic.mapper.pc.RenderWorkerMapper;
+import com.ycwl.basic.mapper.RenderWorkerMapper;
 import com.ycwl.basic.model.pc.renderWorker.entity.RenderWorkerEntity;
 import com.ycwl.basic.model.pc.renderWorker.req.RenderWorkerReqQuery;
 import com.ycwl.basic.service.pc.RenderWorkerService;

src/main/java/com/ycwl/basic/service/impl/pc/RoleServiceImpl.java

@@ -2,8 +2,8 @@ package com.ycwl.basic.service.impl.pc;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.ycwl.basic.mapper.pc.MenuMapper;
-import com.ycwl.basic.mapper.pc.RoleMapper;
+import com.ycwl.basic.mapper.MenuMapper;
+import com.ycwl.basic.mapper.RoleMapper;
 import com.ycwl.basic.model.pc.menu.MenuNode;
 import com.ycwl.basic.model.pc.role.req.AddOrUpdateRoleReqVO;
 import com.ycwl.basic.model.pc.role.req.RoleListReqVO;

src/main/java/com/ycwl/basic/service/impl/pc/ScenicServiceImpl.java

@@ -8,8 +8,8 @@ import com.aliyuncs.profile.DefaultProfile;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ycwl.basic.config.FaceDetectConfig;
-import com.ycwl.basic.mapper.pc.ScenicAccountMapper;
-import com.ycwl.basic.mapper.pc.ScenicMapper;
+import com.ycwl.basic.mapper.ScenicAccountMapper;
+import com.ycwl.basic.mapper.ScenicMapper;
 import com.ycwl.basic.model.pc.scenic.entity.ScenicAccountEntity;
 import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity;
 import com.ycwl.basic.model.pc.scenic.req.ScenicAddOrUpdateReq;

src/main/java/com/ycwl/basic/service/impl/pc/SourceServiceImpl.java

@@ -2,7 +2,7 @@ package com.ycwl.basic.service.impl.pc;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.ycwl.basic.mapper.pc.SourceMapper;
+import com.ycwl.basic.mapper.SourceMapper;
 import com.ycwl.basic.model.pc.source.entity.SourceEntity;
 import com.ycwl.basic.model.pc.source.req.SourceReqQuery;
 import com.ycwl.basic.model.pc.source.resp.SourceRespVO;

src/main/java/com/ycwl/basic/service/impl/pc/TaskServiceImpl.java

@@ -2,7 +2,7 @@ package com.ycwl.basic.service.impl.pc;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.ycwl.basic.mapper.pc.TaskMapper;
+import com.ycwl.basic.mapper.TaskMapper;
 import com.ycwl.basic.model.pc.task.entity.TaskEntity;
 import com.ycwl.basic.model.pc.task.req.TaskReqQuery;
 import com.ycwl.basic.model.pc.task.resp.TaskRespVO;

src/main/java/com/ycwl/basic/service/impl/pc/TemplateServiceImpl.java

@@ -2,7 +2,7 @@ package com.ycwl.basic.service.impl.pc;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.ycwl.basic.mapper.pc.TemplateMapper;
+import com.ycwl.basic.mapper.TemplateMapper;
 import com.ycwl.basic.model.pc.template.entity.TemplateConfigEntity;
 import com.ycwl.basic.model.pc.template.entity.TemplateEntity;
 import com.ycwl.basic.model.pc.template.req.TemplateReqQuery;

src/main/java/com/ycwl/basic/service/impl/pc/VideoServiceImpl.java

@@ -2,7 +2,7 @@ package com.ycwl.basic.service.impl.pc;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.ycwl.basic.mapper.pc.VideoMapper;
+import com.ycwl.basic.mapper.VideoMapper;
 import com.ycwl.basic.model.pc.video.entity.VideoEntity;
 import com.ycwl.basic.model.pc.video.req.VideoReqQuery;
 import com.ycwl.basic.model.pc.video.resp.VideoRespVO;

src/main/java/com/ycwl/basic/service/impl/task/TaskFaceServiceImpl.java

@@ -11,11 +11,10 @@ import com.aliyuncs.facebody.model.v20191230.SearchFaceRequest;
 import com.aliyuncs.facebody.model.v20191230.SearchFaceResponse;
 import com.ycwl.basic.config.FaceDetectConfig;
 import com.ycwl.basic.exception.BaseException;
-import com.ycwl.basic.exception.BizException;
-import com.ycwl.basic.mapper.pc.DeviceMapper;
-import com.ycwl.basic.mapper.pc.FaceMapper;
-import com.ycwl.basic.mapper.pc.FaceSampleMapper;
-import com.ycwl.basic.mapper.pc.ScenicMapper;
+import com.ycwl.basic.mapper.DeviceMapper;
+import com.ycwl.basic.mapper.FaceMapper;
+import com.ycwl.basic.mapper.FaceSampleMapper;
+import com.ycwl.basic.mapper.ScenicMapper;
 import com.ycwl.basic.model.pc.face.entity.FaceEntity;
 import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
 import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity;
@@ -34,7 +33,6 @@ import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.IAcsClient;
 import com.aliyuncs.profile.DefaultProfile;
 
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;

src/main/java/com/ycwl/basic/service/impl/task/TaskTaskServiceImpl.java

@@ -2,13 +2,13 @@ package com.ycwl.basic.service.impl.task;
 
 import com.alibaba.fastjson.JSON;
 import com.ycwl.basic.constant.TaskConstant;
-import com.ycwl.basic.mapper.pc.FaceMapper;
-import com.ycwl.basic.mapper.pc.FaceSampleMapper;
-import com.ycwl.basic.mapper.pc.RenderWorkerMapper;
-import com.ycwl.basic.mapper.pc.SourceMapper;
-import com.ycwl.basic.mapper.pc.TaskMapper;
-import com.ycwl.basic.mapper.pc.TemplateMapper;
-import com.ycwl.basic.mapper.pc.VideoMapper;
+import com.ycwl.basic.mapper.FaceMapper;
+import com.ycwl.basic.mapper.FaceSampleMapper;
+import com.ycwl.basic.mapper.RenderWorkerMapper;
+import com.ycwl.basic.mapper.SourceMapper;
+import com.ycwl.basic.mapper.TaskMapper;
+import com.ycwl.basic.mapper.TemplateMapper;
+import com.ycwl.basic.mapper.VideoMapper;
 import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
 import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO;
 import com.ycwl.basic.model.pc.renderWorker.entity.RenderWorkerEntity;

src/main/java/com/ycwl/basic/task/DynamicTaskGenerator.java

@@ -1,10 +1,10 @@
 package com.ycwl.basic.task;
 
-import com.ycwl.basic.mapper.pc.DeviceMapper;
-import com.ycwl.basic.mapper.pc.FaceMapper;
-import com.ycwl.basic.mapper.pc.FaceSampleMapper;
-import com.ycwl.basic.mapper.pc.ScenicMapper;
-import com.ycwl.basic.mapper.pc.TemplateMapper;
+import com.ycwl.basic.mapper.DeviceMapper;
+import com.ycwl.basic.mapper.FaceMapper;
+import com.ycwl.basic.mapper.FaceSampleMapper;
+import com.ycwl.basic.mapper.ScenicMapper;
+import com.ycwl.basic.mapper.TemplateMapper;
 import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
 import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO;
 import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity;

src/main/java/com/ycwl/basic/task/FaceCleaner.java

@@ -1,7 +1,6 @@
 package com.ycwl.basic.task;
 
-import com.ycwl.basic.mapper.pc.FaceSampleMapper;
-import com.ycwl.basic.mapper.pc.ScenicMapper;
+import com.ycwl.basic.mapper.ScenicMapper;
 import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery;
 import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO;
 import com.ycwl.basic.service.task.TaskFaceService;

src/main/java/com/ycwl/basic/task/VideoPieceCleaner.java

@@ -3,7 +3,7 @@ package com.ycwl.basic.task;
 
 import com.ycwl.basic.device.DeviceFactory;
 import com.ycwl.basic.device.operator.IDeviceStorageOperator;
-import com.ycwl.basic.mapper.pc.DeviceMapper;
+import com.ycwl.basic.mapper.DeviceMapper;
 import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity;
 import com.ycwl.basic.model.pc.device.req.DeviceReqQuery;
 import com.ycwl.basic.model.pc.device.resp.DeviceRespVO;

src/main/java/com/ycwl/basic/task/VideoPieceGetter.java

@@ -1,12 +1,11 @@
 package com.ycwl.basic.task;
 
-import cn.hutool.core.date.DateUtil;
 import com.ycwl.basic.device.DeviceFactory;
 import com.ycwl.basic.device.entity.common.FileObject;
 import com.ycwl.basic.device.operator.IDeviceStorageOperator;
-import com.ycwl.basic.mapper.pc.DeviceMapper;
-import com.ycwl.basic.mapper.pc.FaceSampleMapper;
-import com.ycwl.basic.mapper.pc.SourceMapper;
+import com.ycwl.basic.mapper.DeviceMapper;
+import com.ycwl.basic.mapper.FaceSampleMapper;
+import com.ycwl.basic.mapper.SourceMapper;
 import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity;
 import com.ycwl.basic.model.pc.device.entity.DeviceEntity;
 import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO;

src/main/resources/mapper/AdminUserMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycwl.basic.mapper.pc.AdminUserMapper">
+<mapper namespace="com.ycwl.basic.mapper.AdminUserMapper">
     <insert id="add" parameterType="com.ycwl.basic.model.pc.adminUser.req.AddOrUpdateAdminUserReqVO">
         insert into admin_user(`id`,
                                `role_id`,

src/main/resources/mapper/BrokerMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycwl.basic.mapper.pc.BrokerMapper">
+<mapper namespace="com.ycwl.basic.mapper.BrokerMapper">
     <insert id="add">
         insert into broker(id, `name`, promo_code) values (#{id}, #{name}, #{promoCode})
     </insert>

src/main/resources/mapper/DeviceMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycwl.basic.mapper.pc.DeviceMapper">
+<mapper namespace="com.ycwl.basic.mapper.DeviceMapper">
     <insert id="add">
         insert into device(id, scenic_id, name, no, latitude, longitude) values (#{id}, #{scenicId}, #{name}, #{no}, #{latitude}, #{longitude})
     </insert>

src/main/resources/mapper/FaceMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycwl.basic.mapper.pc.FaceMapper">
+<mapper namespace="com.ycwl.basic.mapper.FaceMapper">
     <insert id="add">
         insert into face(id, scenic_id, score, member_id, face_url, match_sample_ids, first_match_rate, match_result)
         values (#{id}, #{scenicId}, #{score}, #{memberId}, #{faceUrl}, #{matchSampleIds}, #{firstMatchRate}, #{matchResult})

src/main/resources/mapper/FaceSampleMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycwl.basic.mapper.pc.FaceSampleMapper">
+<mapper namespace="com.ycwl.basic.mapper.FaceSampleMapper">
     <insert id="add">
         insert into face_sample(id, scenic_id, device_id, source_id, face_url, match_sample_ids, first_match_rate, match_result,`status`, create_at)
         values (#{id}, #{scenicId}, #{deviceId}, #{sourceId}, #{faceUrl}, #{matchSampleIds}, #{firstMatchRate}, #{matchResult},#{status},#{createAt})

src/main/resources/mapper/MemberMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycwl.basic.mapper.pc.MemberMapper">
+<mapper namespace="com.ycwl.basic.mapper.MemberMapper">
     <insert id="add">
         insert into member(id, openid,avatar_url, nickname, real_name, promo_code, broker_id, agreement, phone, country, province,
                            city)

src/main/resources/mapper/MenuMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycwl.basic.mapper.pc.MenuMapper">
+<mapper namespace="com.ycwl.basic.mapper.MenuMapper">
     <insert id="addRoleMenu">
         insert into role_menu(`role_id`, `menu_id`)
         values

src/main/resources/mapper/MessageRecordMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ycwl.basic.mapper.MessageRecordMapper">
+</mapper>

src/main/resources/mapper/OrderMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycwl.basic.mapper.pc.OrderMapper">
+<mapper namespace="com.ycwl.basic.mapper.OrderMapper">
     <resultMap id="PCBaseResultMap" type="com.ycwl.basic.model.pc.order.resp.OrderRespVO">
         <id column="id" property="id"/>
         <result column="scenic_id" property="scenicId"/>

src/main/resources/mapper/OrderOperationMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ycwl.basic.mapper.pc.OrderOperationMapper">
+<mapper namespace="com.ycwl.basic.mapper.OrderOperationMapper">
     <insert id="add">
         insert into order_operation (order_id, type, remark, `user`, user_id, create_time)
         values (#{orderId}, #{type}, #{remark}, #{user}, #{userId}, now());

src/main/resources/mapper/RenderWorkerMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycwl.basic.mapper.pc.RenderWorkerMapper">
+<mapper namespace="com.ycwl.basic.mapper.RenderWorkerMapper">
     <insert id="add">
         insert into render_worker(id, `name`, platform, runtime_version, version, access_key,
                                   cpu_count, cpu_usage, memory_total, memory_available, support_feature, scenic_only, test_only, `online`, `status`)

src/main/resources/mapper/RoleMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycwl.basic.mapper.pc.RoleMapper">
+<mapper namespace="com.ycwl.basic.mapper.RoleMapper">
     <insert id="add" parameterType="com.ycwl.basic.model.pc.role.req.AddOrUpdateRoleReqVO">
         insert into role(`id`, `name`)
         values (#{id}, #{name})

src/main/resources/mapper/ScenicAccountMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ycwl.basic.mapper.pc.ScenicAccountMapper">
+<mapper namespace="com.ycwl.basic.mapper.ScenicAccountMapper">
     <insert id="add">
         insert into scenic_account(id, scenic_id, is_super, name, account, password, create_time, update_time)
         values (#{id}, #{scenicId}, #{isSuper}, #{name}, #{account}, #{password}, now(), now())

src/main/resources/mapper/ScenicMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycwl.basic.mapper.pc.ScenicMapper">
+<mapper namespace="com.ycwl.basic.mapper.ScenicMapper">
     <insert id="add">
         insert into scenic(id, `name`, introduction, phone, cover_url, longitude, latitude, radius, province, city, area, address)
         values (#{id}, #{name}, #{introduction}, #{phone}, #{coverUrl},#{longitude}, #{latitude}, #{radius}, #{province}, #{city}, #{area}, #{address})

src/main/resources/mapper/SourceMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycwl.basic.mapper.pc.SourceMapper">
+<mapper namespace="com.ycwl.basic.mapper.SourceMapper">
     <insert id="add">
         insert into source(id, scenic_id, device_id, member_id, url, video_url, `type`, face_sample_id)
         values (#{id}, #{scenicId}, #{deviceId}, #{memberId}, #{url}, #{videoUrl}, #{type}, #{faceSampleId})

src/main/resources/mapper/TaskMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycwl.basic.mapper.pc.TaskMapper">
+<mapper namespace="com.ycwl.basic.mapper.TaskMapper">
     <insert id="add">
         insert into task(id, worker_id, member_id, template_id, scenic_id, task_params, video_url, `status`, result)
         values (#{id}, #{workerId}, #{memberId}, #{templateId}, #{scenicId}, #{taskParams}, #{videoUrl}, #{status}, #{result})

src/main/resources/mapper/TemplateMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycwl.basic.mapper.pc.TemplateMapper">
+<mapper namespace="com.ycwl.basic.mapper.TemplateMapper">
     <insert id="add">
         insert into template(id, scenic_id, `name`, pid, is_placeholder, source_url, luts, overlays, audios, cover_url, frame_rate, speed, price)
         values (#{id}, #{scenicId}, #{name}, #{pid}, #{isPlaceholder}, #{sourceUrl}, #{luts}, #{overlays}, #{audios}, #{coverUrl}, #{frameRate}, #{speed}, #{price})

src/main/resources/mapper/VideoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycwl.basic.mapper.pc.VideoMapper">
+<mapper namespace="com.ycwl.basic.mapper.VideoMapper">
     <insert id="add">
         insert into video(id, scenic_id, member_id, template_id, task_id, worker_id, video_url)
         values (#{id}, #{scenicId}, #{memberId}, #{templateId}, #{taskId}, #{workerId}, #{videoUrl})