diff --git a/src/main/java/com/ycwl/basic/controller/viid/ViidController.java b/src/main/java/com/ycwl/basic/controller/viid/ViidController.java index 80550bd..a538220 100644 --- a/src/main/java/com/ycwl/basic/controller/viid/ViidController.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/mapper/pc/AdminUserMapper.java b/src/main/java/com/ycwl/basic/mapper/AdminUserMapper.java similarity index 96% rename from src/main/java/com/ycwl/basic/mapper/pc/AdminUserMapper.java rename to src/main/java/com/ycwl/basic/mapper/AdminUserMapper.java index f49dbf0..b4257ee 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/AdminUserMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/AdminUserMapper.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.mapper.pc; +package com.ycwl.basic.mapper; diff --git a/src/main/java/com/ycwl/basic/mapper/pc/BrokerMapper.java b/src/main/java/com/ycwl/basic/mapper/BrokerMapper.java similarity index 94% rename from src/main/java/com/ycwl/basic/mapper/pc/BrokerMapper.java rename to src/main/java/com/ycwl/basic/mapper/BrokerMapper.java index d5cdc8c..c3c9f1f 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/BrokerMapper.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/mapper/pc/DeviceMapper.java b/src/main/java/com/ycwl/basic/mapper/DeviceMapper.java similarity index 97% rename from src/main/java/com/ycwl/basic/mapper/pc/DeviceMapper.java rename to src/main/java/com/ycwl/basic/mapper/DeviceMapper.java index f73994d..646aacd 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/DeviceMapper.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/mapper/pc/FaceMapper.java b/src/main/java/com/ycwl/basic/mapper/FaceMapper.java similarity index 95% rename from src/main/java/com/ycwl/basic/mapper/pc/FaceMapper.java rename to src/main/java/com/ycwl/basic/mapper/FaceMapper.java index 7ebc1ac..191993b 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/FaceMapper.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/mapper/pc/FaceSampleMapper.java b/src/main/java/com/ycwl/basic/mapper/FaceSampleMapper.java similarity index 95% rename from src/main/java/com/ycwl/basic/mapper/pc/FaceSampleMapper.java rename to src/main/java/com/ycwl/basic/mapper/FaceSampleMapper.java index cf41d0d..df15489 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/FaceSampleMapper.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/mapper/pc/MemberMapper.java b/src/main/java/com/ycwl/basic/mapper/MemberMapper.java similarity index 97% rename from src/main/java/com/ycwl/basic/mapper/pc/MemberMapper.java rename to src/main/java/com/ycwl/basic/mapper/MemberMapper.java index 9bcc74c..54a879e 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/MemberMapper.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/mapper/pc/MenuMapper.java b/src/main/java/com/ycwl/basic/mapper/MenuMapper.java similarity index 96% rename from src/main/java/com/ycwl/basic/mapper/pc/MenuMapper.java rename to src/main/java/com/ycwl/basic/mapper/MenuMapper.java index 4cabe87..9a13669 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/MenuMapper.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/mapper/MessageRecordMapper.java b/src/main/java/com/ycwl/basic/mapper/MessageRecordMapper.java new file mode 100644 index 0000000..603093c --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/ycwl/basic/mapper/pc/OrderMapper.java b/src/main/java/com/ycwl/basic/mapper/OrderMapper.java similarity index 96% rename from src/main/java/com/ycwl/basic/mapper/pc/OrderMapper.java rename to src/main/java/com/ycwl/basic/mapper/OrderMapper.java index 071a798..9a8bbdd 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/OrderMapper.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/mapper/pc/OrderOperationMapper.java b/src/main/java/com/ycwl/basic/mapper/OrderOperationMapper.java similarity index 89% rename from src/main/java/com/ycwl/basic/mapper/pc/OrderOperationMapper.java rename to src/main/java/com/ycwl/basic/mapper/OrderOperationMapper.java index 7a1531f..b9f4962 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/OrderOperationMapper.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/mapper/pc/RenderWorkerMapper.java b/src/main/java/com/ycwl/basic/mapper/RenderWorkerMapper.java similarity index 95% rename from src/main/java/com/ycwl/basic/mapper/pc/RenderWorkerMapper.java rename to src/main/java/com/ycwl/basic/mapper/RenderWorkerMapper.java index a84c737..1347426 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/RenderWorkerMapper.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/mapper/pc/RoleMapper.java b/src/main/java/com/ycwl/basic/mapper/RoleMapper.java similarity index 95% rename from src/main/java/com/ycwl/basic/mapper/pc/RoleMapper.java rename to src/main/java/com/ycwl/basic/mapper/RoleMapper.java index b954d6b..c7f6234 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/RoleMapper.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/mapper/pc/ScenicAccountMapper.java b/src/main/java/com/ycwl/basic/mapper/ScenicAccountMapper.java similarity index 93% rename from src/main/java/com/ycwl/basic/mapper/pc/ScenicAccountMapper.java rename to src/main/java/com/ycwl/basic/mapper/ScenicAccountMapper.java index ca5901b..52c8b71 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/ScenicAccountMapper.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/mapper/pc/ScenicMapper.java b/src/main/java/com/ycwl/basic/mapper/ScenicMapper.java similarity index 97% rename from src/main/java/com/ycwl/basic/mapper/pc/ScenicMapper.java rename to src/main/java/com/ycwl/basic/mapper/ScenicMapper.java index f417196..941e4de 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/ScenicMapper.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/mapper/pc/SourceMapper.java b/src/main/java/com/ycwl/basic/mapper/SourceMapper.java similarity index 96% rename from src/main/java/com/ycwl/basic/mapper/pc/SourceMapper.java rename to src/main/java/com/ycwl/basic/mapper/SourceMapper.java index fb96f5a..64b3758 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/SourceMapper.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/mapper/pc/TaskMapper.java b/src/main/java/com/ycwl/basic/mapper/TaskMapper.java similarity index 97% rename from src/main/java/com/ycwl/basic/mapper/pc/TaskMapper.java rename to src/main/java/com/ycwl/basic/mapper/TaskMapper.java index 3fcf20e..cc7a407 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/TaskMapper.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/mapper/pc/TemplateMapper.java b/src/main/java/com/ycwl/basic/mapper/TemplateMapper.java similarity index 97% rename from src/main/java/com/ycwl/basic/mapper/pc/TemplateMapper.java rename to src/main/java/com/ycwl/basic/mapper/TemplateMapper.java index 2f76cdb..e702993 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/TemplateMapper.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/mapper/pc/VideoMapper.java b/src/main/java/com/ycwl/basic/mapper/VideoMapper.java similarity index 95% rename from src/main/java/com/ycwl/basic/mapper/pc/VideoMapper.java rename to src/main/java/com/ycwl/basic/mapper/VideoMapper.java index 124afa1..6c466dd 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/VideoMapper.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/service/impl/mobile/AppMemberServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/mobile/AppMemberServiceImpl.java index b6d04cd..d84bd71 100644 --- a/src/main/java/com/ycwl/basic/service/impl/mobile/AppMemberServiceImpl.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java index a95b3b0..218c877 100644 --- a/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java index c0c26f1..97431c3 100644 --- a/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/AdminUserServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/AdminUserServiceImpl.java index 40bbc91..3f429c9 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/AdminUserServiceImpl.java +++ b/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.*; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/BrokerServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/BrokerServiceImpl.java index 64208c0..265398f 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/BrokerServiceImpl.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java index 87160e9..ab61384 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/FaceSampleServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/FaceSampleServiceImpl.java index f5ed762..c5669e3 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/FaceSampleServiceImpl.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java index cc4727b..2341cc5 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/MemberServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/MemberServiceImpl.java index a74ff64..9dcaad0 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/MemberServiceImpl.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/MenuServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/MenuServiceImpl.java index f383a33..d0de308 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/MenuServiceImpl.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java index edda5f6..58ee27c 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/RenderWorkerServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/RenderWorkerServiceImpl.java index 3dfe1a8..8dba6c5 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/RenderWorkerServiceImpl.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/RoleServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/RoleServiceImpl.java index 9aa005b..326375e 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/RoleServiceImpl.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/ScenicServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/ScenicServiceImpl.java index e0f18ef..a659f65 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/ScenicServiceImpl.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/SourceServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/SourceServiceImpl.java index 0cb3642..6067464 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/SourceServiceImpl.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/TaskServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/TaskServiceImpl.java index 79dd28b..8a14141 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/TaskServiceImpl.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/TemplateServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/TemplateServiceImpl.java index c4be60e..50825da 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/TemplateServiceImpl.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/VideoServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/VideoServiceImpl.java index 0ae127f..be1c35a 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/VideoServiceImpl.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/service/impl/task/TaskFaceServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/task/TaskFaceServiceImpl.java index 371bc5f..70d94a8 100644 --- a/src/main/java/com/ycwl/basic/service/impl/task/TaskFaceServiceImpl.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/service/impl/task/TaskTaskServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/task/TaskTaskServiceImpl.java index c9fdbe3..4a9129d 100644 --- a/src/main/java/com/ycwl/basic/service/impl/task/TaskTaskServiceImpl.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/task/DynamicTaskGenerator.java b/src/main/java/com/ycwl/basic/task/DynamicTaskGenerator.java index 41932b5..981f1d3 100644 --- a/src/main/java/com/ycwl/basic/task/DynamicTaskGenerator.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/task/FaceCleaner.java b/src/main/java/com/ycwl/basic/task/FaceCleaner.java index 14c4b22..1c1b243 100644 --- a/src/main/java/com/ycwl/basic/task/FaceCleaner.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/task/VideoPieceCleaner.java b/src/main/java/com/ycwl/basic/task/VideoPieceCleaner.java index aa44056..8ba2506 100644 --- a/src/main/java/com/ycwl/basic/task/VideoPieceCleaner.java +++ b/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; diff --git a/src/main/java/com/ycwl/basic/task/VideoPieceGetter.java b/src/main/java/com/ycwl/basic/task/VideoPieceGetter.java index 43fe52d..df6d6fc 100644 --- a/src/main/java/com/ycwl/basic/task/VideoPieceGetter.java +++ b/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; diff --git a/src/main/resources/mapper/pc/AdminUserMapper.xml b/src/main/resources/mapper/AdminUserMapper.xml similarity index 97% rename from src/main/resources/mapper/pc/AdminUserMapper.xml rename to src/main/resources/mapper/AdminUserMapper.xml index 1d7d72a..6f23277 100644 --- a/src/main/resources/mapper/pc/AdminUserMapper.xml +++ b/src/main/resources/mapper/AdminUserMapper.xml @@ -1,6 +1,6 @@ - + insert into admin_user(`id`, `role_id`, diff --git a/src/main/resources/mapper/pc/BrokerMapper.xml b/src/main/resources/mapper/BrokerMapper.xml similarity index 97% rename from src/main/resources/mapper/pc/BrokerMapper.xml rename to src/main/resources/mapper/BrokerMapper.xml index d2a6700..3df4c6d 100644 --- a/src/main/resources/mapper/pc/BrokerMapper.xml +++ b/src/main/resources/mapper/BrokerMapper.xml @@ -1,6 +1,6 @@ - + insert into broker(id, `name`, promo_code) values (#{id}, #{name}, #{promoCode}) diff --git a/src/main/resources/mapper/pc/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml similarity index 98% rename from src/main/resources/mapper/pc/DeviceMapper.xml rename to src/main/resources/mapper/DeviceMapper.xml index 5685564..ffd80b8 100644 --- a/src/main/resources/mapper/pc/DeviceMapper.xml +++ b/src/main/resources/mapper/DeviceMapper.xml @@ -1,6 +1,6 @@ - + insert into device(id, scenic_id, name, no, latitude, longitude) values (#{id}, #{scenicId}, #{name}, #{no}, #{latitude}, #{longitude}) diff --git a/src/main/resources/mapper/pc/FaceMapper.xml b/src/main/resources/mapper/FaceMapper.xml similarity index 98% rename from src/main/resources/mapper/pc/FaceMapper.xml rename to src/main/resources/mapper/FaceMapper.xml index b46b00d..3395255 100644 --- a/src/main/resources/mapper/pc/FaceMapper.xml +++ b/src/main/resources/mapper/FaceMapper.xml @@ -1,6 +1,6 @@ - + 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}) diff --git a/src/main/resources/mapper/pc/FaceSampleMapper.xml b/src/main/resources/mapper/FaceSampleMapper.xml similarity index 98% rename from src/main/resources/mapper/pc/FaceSampleMapper.xml rename to src/main/resources/mapper/FaceSampleMapper.xml index a70ba85..86e74d5 100644 --- a/src/main/resources/mapper/pc/FaceSampleMapper.xml +++ b/src/main/resources/mapper/FaceSampleMapper.xml @@ -1,6 +1,6 @@ - + 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}) diff --git a/src/main/resources/mapper/pc/MemberMapper.xml b/src/main/resources/mapper/MemberMapper.xml similarity index 98% rename from src/main/resources/mapper/pc/MemberMapper.xml rename to src/main/resources/mapper/MemberMapper.xml index 422dbf8..b998655 100644 --- a/src/main/resources/mapper/pc/MemberMapper.xml +++ b/src/main/resources/mapper/MemberMapper.xml @@ -1,6 +1,6 @@ - + insert into member(id, openid,avatar_url, nickname, real_name, promo_code, broker_id, agreement, phone, country, province, city) diff --git a/src/main/resources/mapper/pc/MenuMapper.xml b/src/main/resources/mapper/MenuMapper.xml similarity index 97% rename from src/main/resources/mapper/pc/MenuMapper.xml rename to src/main/resources/mapper/MenuMapper.xml index 70c4c65..cffc477 100644 --- a/src/main/resources/mapper/pc/MenuMapper.xml +++ b/src/main/resources/mapper/MenuMapper.xml @@ -1,6 +1,6 @@ - + insert into role_menu(`role_id`, `menu_id`) values diff --git a/src/main/resources/mapper/MessageRecordMapper.xml b/src/main/resources/mapper/MessageRecordMapper.xml new file mode 100644 index 0000000..eb42a14 --- /dev/null +++ b/src/main/resources/mapper/MessageRecordMapper.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/pc/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml similarity index 99% rename from src/main/resources/mapper/pc/OrderMapper.xml rename to src/main/resources/mapper/OrderMapper.xml index 28e643e..60b7d9c 100644 --- a/src/main/resources/mapper/pc/OrderMapper.xml +++ b/src/main/resources/mapper/OrderMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mapper/pc/OrderOperationMapper.xml b/src/main/resources/mapper/OrderOperationMapper.xml similarity index 88% rename from src/main/resources/mapper/pc/OrderOperationMapper.xml rename to src/main/resources/mapper/OrderOperationMapper.xml index ae1da7a..d76bff3 100644 --- a/src/main/resources/mapper/pc/OrderOperationMapper.xml +++ b/src/main/resources/mapper/OrderOperationMapper.xml @@ -1,6 +1,6 @@ - + insert into order_operation (order_id, type, remark, `user`, user_id, create_time) values (#{orderId}, #{type}, #{remark}, #{user}, #{userId}, now()); diff --git a/src/main/resources/mapper/pc/RenderWorkerMapper.xml b/src/main/resources/mapper/RenderWorkerMapper.xml similarity index 98% rename from src/main/resources/mapper/pc/RenderWorkerMapper.xml rename to src/main/resources/mapper/RenderWorkerMapper.xml index 8bbab5b..ef8e3e2 100644 --- a/src/main/resources/mapper/pc/RenderWorkerMapper.xml +++ b/src/main/resources/mapper/RenderWorkerMapper.xml @@ -1,6 +1,6 @@ - + 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`) diff --git a/src/main/resources/mapper/pc/RoleMapper.xml b/src/main/resources/mapper/RoleMapper.xml similarity index 97% rename from src/main/resources/mapper/pc/RoleMapper.xml rename to src/main/resources/mapper/RoleMapper.xml index f45c76b..f606b03 100644 --- a/src/main/resources/mapper/pc/RoleMapper.xml +++ b/src/main/resources/mapper/RoleMapper.xml @@ -1,6 +1,6 @@ - + insert into role(`id`, `name`) values (#{id}, #{name}) diff --git a/src/main/resources/mapper/pc/ScenicAccountMapper.xml b/src/main/resources/mapper/ScenicAccountMapper.xml similarity index 96% rename from src/main/resources/mapper/pc/ScenicAccountMapper.xml rename to src/main/resources/mapper/ScenicAccountMapper.xml index 1cbb251..ec0eb12 100644 --- a/src/main/resources/mapper/pc/ScenicAccountMapper.xml +++ b/src/main/resources/mapper/ScenicAccountMapper.xml @@ -1,6 +1,6 @@ - + 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()) diff --git a/src/main/resources/mapper/pc/ScenicMapper.xml b/src/main/resources/mapper/ScenicMapper.xml similarity index 99% rename from src/main/resources/mapper/pc/ScenicMapper.xml rename to src/main/resources/mapper/ScenicMapper.xml index 56fefcc..567397a 100644 --- a/src/main/resources/mapper/pc/ScenicMapper.xml +++ b/src/main/resources/mapper/ScenicMapper.xml @@ -1,6 +1,6 @@ - + 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}) diff --git a/src/main/resources/mapper/pc/SourceMapper.xml b/src/main/resources/mapper/SourceMapper.xml similarity index 97% rename from src/main/resources/mapper/pc/SourceMapper.xml rename to src/main/resources/mapper/SourceMapper.xml index b454508..c13eaed 100644 --- a/src/main/resources/mapper/pc/SourceMapper.xml +++ b/src/main/resources/mapper/SourceMapper.xml @@ -1,6 +1,6 @@ - + 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}) diff --git a/src/main/resources/mapper/pc/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml similarity index 100% rename from src/main/resources/mapper/pc/StatisticsMapper.xml rename to src/main/resources/mapper/StatisticsMapper.xml diff --git a/src/main/resources/mapper/pc/TaskMapper.xml b/src/main/resources/mapper/TaskMapper.xml similarity index 98% rename from src/main/resources/mapper/pc/TaskMapper.xml rename to src/main/resources/mapper/TaskMapper.xml index 23d21dd..4b36379 100644 --- a/src/main/resources/mapper/pc/TaskMapper.xml +++ b/src/main/resources/mapper/TaskMapper.xml @@ -1,6 +1,6 @@ - + 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}) diff --git a/src/main/resources/mapper/pc/TemplateMapper.xml b/src/main/resources/mapper/TemplateMapper.xml similarity index 98% rename from src/main/resources/mapper/pc/TemplateMapper.xml rename to src/main/resources/mapper/TemplateMapper.xml index 020744b..b0e5a22 100644 --- a/src/main/resources/mapper/pc/TemplateMapper.xml +++ b/src/main/resources/mapper/TemplateMapper.xml @@ -1,6 +1,6 @@ - + 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}) diff --git a/src/main/resources/mapper/pc/VideoMapper.xml b/src/main/resources/mapper/VideoMapper.xml similarity index 97% rename from src/main/resources/mapper/pc/VideoMapper.xml rename to src/main/resources/mapper/VideoMapper.xml index c25afa1..2117137 100644 --- a/src/main/resources/mapper/pc/VideoMapper.xml +++ b/src/main/resources/mapper/VideoMapper.xml @@ -1,6 +1,6 @@ - + insert into video(id, scenic_id, member_id, template_id, task_id, worker_id, video_url) values (#{id}, #{scenicId}, #{memberId}, #{templateId}, #{taskId}, #{workerId}, #{videoUrl})