65b48b6a by chentao

no message

1 parent 7db0327d
Showing 51 changed files with 101 additions and 150 deletions
...@@ -5,8 +5,8 @@ import com.lego.common.core.controller.BaseController; ...@@ -5,8 +5,8 @@ import com.lego.common.core.controller.BaseController;
5 import com.lego.common.core.domain.PageQuery; 5 import com.lego.common.core.domain.PageQuery;
6 import com.lego.common.core.domain.R; 6 import com.lego.common.core.domain.R;
7 import com.lego.common.core.page.TableDataInfo; 7 import com.lego.common.core.page.TableDataInfo;
8 import com.lego.core.domin.bo.AdvertBo; 8 import com.lego.core.domain.bo.AdvertBo;
9 import com.lego.core.domin.vo.AdvertVo; 9 import com.lego.core.domain.vo.AdvertVo;
10 import com.lego.core.service.IAdvertService; 10 import com.lego.core.service.IAdvertService;
11 import lombok.RequiredArgsConstructor; 11 import lombok.RequiredArgsConstructor;
12 import org.springframework.web.bind.annotation.*; 12 import org.springframework.web.bind.annotation.*;
......
...@@ -2,15 +2,11 @@ package com.lego.web.controller.core; ...@@ -2,15 +2,11 @@ package com.lego.web.controller.core;
2 2
3 import com.lego.common.annotation.RepeatSubmit; 3 import com.lego.common.annotation.RepeatSubmit;
4 import com.lego.common.core.controller.BaseController; 4 import com.lego.common.core.controller.BaseController;
5 import com.lego.common.core.domain.PageQuery;
6 import com.lego.common.core.domain.R; 5 import com.lego.common.core.domain.R;
7 import com.lego.common.core.page.TableDataInfo; 6 import com.lego.common.core.page.TableDataInfo;
8 import com.lego.core.domin.bo.BuildingBlockBo; 7 import com.lego.core.domain.bo.BuildingBlockBo;
9 import com.lego.core.domin.bo.BuildingBlockQueryBo; 8 import com.lego.core.domain.bo.BuildingBlockQueryBo;
10 import com.lego.core.domin.bo.EntiretyBo; 9 import com.lego.core.domain.vo.BuildingBlockVo;
11 import com.lego.core.domin.vo.BuildingBlockVo;
12 import com.lego.core.domin.vo.EntiretyVo;
13 import com.lego.core.service.IAdvertService;
14 import com.lego.core.service.IBuildingBlockService; 10 import com.lego.core.service.IBuildingBlockService;
15 import lombok.RequiredArgsConstructor; 11 import lombok.RequiredArgsConstructor;
16 import org.springframework.web.bind.annotation.*; 12 import org.springframework.web.bind.annotation.*;
......
...@@ -8,9 +8,9 @@ import com.lego.common.core.domain.R; ...@@ -8,9 +8,9 @@ import com.lego.common.core.domain.R;
8 import com.lego.common.core.page.TableDataInfo; 8 import com.lego.common.core.page.TableDataInfo;
9 import com.lego.common.utils.EncryptUtils; 9 import com.lego.common.utils.EncryptUtils;
10 import com.lego.common.utils.StringUtils; 10 import com.lego.common.utils.StringUtils;
11 import com.lego.core.domin.bo.CourseBo; 11 import com.lego.core.domain.bo.CourseBo;
12 import com.lego.core.domin.bo.CourseQueryBo; 12 import com.lego.core.domain.bo.CourseQueryBo;
13 import com.lego.core.domin.vo.CourseVo; 13 import com.lego.core.domain.vo.CourseVo;
14 import com.lego.core.mapper.CourseMapper; 14 import com.lego.core.mapper.CourseMapper;
15 import com.lego.core.service.ICourseService; 15 import com.lego.core.service.ICourseService;
16 import com.lego.oss.core.OssClient; 16 import com.lego.oss.core.OssClient;
......
...@@ -5,12 +5,8 @@ import com.lego.common.core.controller.BaseController; ...@@ -5,12 +5,8 @@ import com.lego.common.core.controller.BaseController;
5 import com.lego.common.core.domain.PageQuery; 5 import com.lego.common.core.domain.PageQuery;
6 import com.lego.common.core.domain.R; 6 import com.lego.common.core.domain.R;
7 import com.lego.common.core.page.TableDataInfo; 7 import com.lego.common.core.page.TableDataInfo;
8 import com.lego.core.domin.Entirety; 8 import com.lego.core.domain.bo.EntiretyBo;
9 import com.lego.core.domin.bo.AdvertBo; 9 import com.lego.core.domain.vo.EntiretyVo;
10 import com.lego.core.domin.bo.EntiretyBo;
11 import com.lego.core.domin.vo.AdvertVo;
12 import com.lego.core.domin.vo.EntiretyVo;
13 import com.lego.core.service.ICourseService;
14 import com.lego.core.service.IEntiretyService; 10 import com.lego.core.service.IEntiretyService;
15 import lombok.RequiredArgsConstructor; 11 import lombok.RequiredArgsConstructor;
16 import org.springframework.web.bind.annotation.*; 12 import org.springframework.web.bind.annotation.*;
......
...@@ -2,16 +2,11 @@ package com.lego.web.controller.core; ...@@ -2,16 +2,11 @@ package com.lego.web.controller.core;
2 2
3 import com.lego.common.annotation.RepeatSubmit; 3 import com.lego.common.annotation.RepeatSubmit;
4 import com.lego.common.core.controller.BaseController; 4 import com.lego.common.core.controller.BaseController;
5 import com.lego.common.core.domain.PageQuery;
6 import com.lego.common.core.domain.R; 5 import com.lego.common.core.domain.R;
7 import com.lego.common.core.page.TableDataInfo; 6 import com.lego.common.core.page.TableDataInfo;
8 import com.lego.common.core.validate.QueryGroup; 7 import com.lego.core.domain.bo.QuestionBo;
9 import com.lego.core.domin.bo.AdvertBo; 8 import com.lego.core.domain.bo.QuestionQueryBo;
10 import com.lego.core.domin.bo.QuestionBo; 9 import com.lego.core.domain.vo.QuestionVo;
11 import com.lego.core.domin.bo.QuestionQueryBo;
12 import com.lego.core.domin.vo.AdvertVo;
13 import com.lego.core.domin.vo.QuestionVo;
14 import com.lego.core.service.IEntiretyService;
15 import com.lego.core.service.IQuestionService; 10 import com.lego.core.service.IQuestionService;
16 import lombok.RequiredArgsConstructor; 11 import lombok.RequiredArgsConstructor;
17 import org.springframework.web.bind.annotation.*; 12 import org.springframework.web.bind.annotation.*;
......
...@@ -7,10 +7,10 @@ import com.lego.common.core.domain.R; ...@@ -7,10 +7,10 @@ import com.lego.common.core.domain.R;
7 import com.lego.common.core.page.TableDataInfo; 7 import com.lego.common.core.page.TableDataInfo;
8 import com.lego.common.utils.EncryptUtils; 8 import com.lego.common.utils.EncryptUtils;
9 import com.lego.common.utils.MessageUtils; 9 import com.lego.common.utils.MessageUtils;
10 import com.lego.core.domin.bo.UpgradeBo; 10 import com.lego.core.domain.bo.UpgradeBo;
11 import com.lego.core.domin.bo.UpgradeQueryBo; 11 import com.lego.core.domain.bo.UpgradeQueryBo;
12 import com.lego.core.domin.vo.ResourceVo; 12 import com.lego.core.domain.vo.ResourceVo;
13 import com.lego.core.domin.vo.UpgradeVo; 13 import com.lego.core.domain.vo.UpgradeVo;
14 import com.lego.core.service.IUpgradeService; 14 import com.lego.core.service.IUpgradeService;
15 import lombok.RequiredArgsConstructor; 15 import lombok.RequiredArgsConstructor;
16 import org.springframework.web.bind.annotation.*; 16 import org.springframework.web.bind.annotation.*;
......
1 package com.lego.core.annotation; 1 package com.lego.core.annotation;
2 2
3 import com.lego.common.utils.StringUtils; 3 import com.lego.common.utils.StringUtils;
4 import com.lego.core.domin.bo.CourseBo; 4 import com.lego.core.domain.bo.CourseBo;
5 5
6 import javax.validation.ConstraintValidator; 6 import javax.validation.ConstraintValidator;
7 import javax.validation.ConstraintValidatorContext; 7 import javax.validation.ConstraintValidatorContext;
......
1 package com.lego.core.aspect; 1 package com.lego.core.aspect;
2 2
3 import cn.hutool.core.util.StrUtil; 3 import cn.hutool.core.util.StrUtil;
4 import com.lego.core.domin.bo.BaseBO; 4 import com.lego.core.domain.bo.BaseBO;
5 import org.aspectj.lang.JoinPoint; 5 import org.aspectj.lang.JoinPoint;
6 import org.aspectj.lang.annotation.Aspect; 6 import org.aspectj.lang.annotation.Aspect;
7 import org.aspectj.lang.annotation.Before; 7 import org.aspectj.lang.annotation.Before;
......
1 package com.lego.core.domin; 1 package com.lego.core.domain;
2 2
3 import com.baomidou.mybatisplus.annotation.TableId; 3 import com.baomidou.mybatisplus.annotation.TableId;
4 import com.baomidou.mybatisplus.annotation.TableLogic; 4 import com.baomidou.mybatisplus.annotation.TableLogic;
......
1 package com.lego.core.domin; 1 package com.lego.core.domain;
2 2
3 import com.baomidou.mybatisplus.annotation.TableId; 3 import com.baomidou.mybatisplus.annotation.TableId;
4 import com.baomidou.mybatisplus.annotation.TableLogic; 4 import com.baomidou.mybatisplus.annotation.TableLogic;
......
1 package com.lego.core.domin; 1 package com.lego.core.domain;
2 2
3 import com.baomidou.mybatisplus.annotation.TableId; 3 import com.baomidou.mybatisplus.annotation.TableId;
4 import com.baomidou.mybatisplus.annotation.TableLogic; 4 import com.baomidou.mybatisplus.annotation.TableLogic;
......
1 package com.lego.core.domin; 1 package com.lego.core.domain;
2 2
3 import com.baomidou.mybatisplus.annotation.TableId; 3 import com.baomidou.mybatisplus.annotation.TableId;
4 import com.baomidou.mybatisplus.annotation.TableLogic; 4 import com.baomidou.mybatisplus.annotation.TableLogic;
......
1 package com.lego.core.domin; 1 package com.lego.core.domain;
2 2
3 import com.baomidou.mybatisplus.annotation.TableId; 3 import com.baomidou.mybatisplus.annotation.TableId;
4 import com.baomidou.mybatisplus.annotation.TableLogic; 4 import com.baomidou.mybatisplus.annotation.TableLogic;
......
1 package com.lego.core.domin; 1 package com.lego.core.domain;
2 2
3 import com.baomidou.mybatisplus.annotation.TableId; 3 import com.baomidou.mybatisplus.annotation.TableId;
4 import com.baomidou.mybatisplus.annotation.TableLogic; 4 import com.baomidou.mybatisplus.annotation.TableLogic;
......
1 package com.lego.core.domin.bo; 1 package com.lego.core.domain.bo;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.lego.core.domin.bo; 1 package com.lego.core.domain.bo;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.lego.core.domin.bo; 1 package com.lego.core.domain.bo;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.lego.core.domin.bo; 1 package com.lego.core.domain.bo;
2 2
3 import com.lego.common.core.domain.PageQuery; 3 import com.lego.common.core.domain.PageQuery;
4 import lombok.Data; 4 import lombok.Data;
......
1 package com.lego.core.domin.bo; 1 package com.lego.core.domain.bo;
2 2
3 import com.lego.core.annotation.AtLeastOneNonNull;
4 import lombok.Data; 3 import lombok.Data;
5 4
6 import javax.validation.constraints.NotBlank; 5 import javax.validation.constraints.NotBlank;
......
1 package com.lego.core.domin.bo; 1 package com.lego.core.domain.bo;
2 2
3 import com.lego.common.core.domain.PageQuery; 3 import com.lego.common.core.domain.PageQuery;
4 import lombok.Data; 4 import lombok.Data;
......
1 package com.lego.core.domin.bo; 1 package com.lego.core.domain.bo;
2 2
3 import com.baomidou.mybatisplus.annotation.TableId;
4 import lombok.Data; 3 import lombok.Data;
5 4
6 import javax.validation.constraints.Max; 5 import javax.validation.constraints.Max;
......
1 package com.lego.core.domin.bo; 1 package com.lego.core.domain.bo;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.lego.core.domin.bo; 1 package com.lego.core.domain.bo;
2 2
3 import com.lego.common.core.domain.PageQuery; 3 import com.lego.common.core.domain.PageQuery;
4 import lombok.Data; 4 import lombok.Data;
......
1 package com.lego.core.domin.bo; 1 package com.lego.core.domain.bo;
2 2
3 import com.baomidou.mybatisplus.annotation.TableId;
4 import lombok.Data; 3 import lombok.Data;
5 4
6 import java.util.Date;
7
8 /** 5 /**
9 * APP升级请求对象 6 * APP升级请求对象
10 * 7 *
......
1 package com.lego.core.domin.bo; 1 package com.lego.core.domain.bo;
2 2
3 import com.baomidou.mybatisplus.annotation.TableId;
4 import com.lego.common.core.domain.PageQuery; 3 import com.lego.common.core.domain.PageQuery;
5 import lombok.Data; 4 import lombok.Data;
6 5
7 import java.util.Date;
8
9 /** 6 /**
10 * APP升级请求对象 7 * APP升级请求对象
11 * 8 *
......
1 package com.lego.core.domin.vo; 1 package com.lego.core.domain.vo;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
5 import javax.validation.constraints.NotBlank;
6
7 /** 5 /**
8 * 广告视图对象 core_advert 6 * 广告视图对象 core_advert
9 * 7 *
......
1 package com.lego.core.domin.vo; 1 package com.lego.core.domain.vo;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.lego.core.domin.vo; 1 package com.lego.core.domain.vo;
2 2
3 import com.lego.common.core.domain.dto.BizFileVo; 3 import com.lego.common.core.domain.dto.BizFileVo;
4 import lombok.Data; 4 import lombok.Data;
......
1 package com.lego.core.domin.vo; 1 package com.lego.core.domain.vo;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
5 import java.util.List;
6
7 /** 5 /**
8 * 套件视图对象 core_entirety 6 * 套件视图对象 core_entirety
9 * 7 *
......
1 package com.lego.core.domin.vo; 1 package com.lego.core.domain.vo;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.lego.core.domin.vo; 1 package com.lego.core.domain.vo;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.lego.core.domin.vo; 1 package com.lego.core.domain.vo;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.lego.core.domin.vo; 1 package com.lego.core.domain.vo;
2 2
3 import com.baomidou.mybatisplus.annotation.TableId; 3 import com.baomidou.mybatisplus.annotation.TableId;
4 import lombok.Data; 4 import lombok.Data;
......
1 package com.lego.core.mapper; 1 package com.lego.core.mapper;
2 2
3 import com.lego.common.core.mapper.BaseMapperPlus; 3 import com.lego.common.core.mapper.BaseMapperPlus;
4 import com.lego.core.domin.Advert; 4 import com.lego.core.domain.Advert;
5 import com.lego.core.domin.vo.AdvertVo; 5 import com.lego.core.domain.vo.AdvertVo;
6 6
7 /** 7 /**
8 * 广告Mapper接口 8 * 广告Mapper接口
......
1 package com.lego.core.mapper; 1 package com.lego.core.mapper;
2 2
3 import com.lego.common.core.mapper.BaseMapperPlus; 3 import com.lego.common.core.mapper.BaseMapperPlus;
4 import com.lego.core.domin.Advert; 4 import com.lego.core.domain.BuildingBlock;
5 import com.lego.core.domin.BuildingBlock; 5 import com.lego.core.domain.vo.BuildingBlockVo;
6 import com.lego.core.domin.vo.AdvertVo;
7 import com.lego.core.domin.vo.BuildingBlockVo;
8 6
9 /** 7 /**
10 * 系列Mapper接口 8 * 系列Mapper接口
......
1 package com.lego.core.mapper; 1 package com.lego.core.mapper;
2 2
3 import com.lego.common.core.mapper.BaseMapperPlus; 3 import com.lego.common.core.mapper.BaseMapperPlus;
4 import com.lego.core.domin.BuildingBlock; 4 import com.lego.core.domain.Course;
5 import com.lego.core.domin.Course; 5 import com.lego.core.domain.vo.CourseVo;
6 import com.lego.core.domin.vo.BuildingBlockVo;
7 import com.lego.core.domin.vo.CourseVo;
8 6
9 /** 7 /**
10 * 课程Mapper接口 8 * 课程Mapper接口
......
1 package com.lego.core.mapper; 1 package com.lego.core.mapper;
2 2
3 import com.lego.common.core.mapper.BaseMapperPlus; 3 import com.lego.common.core.mapper.BaseMapperPlus;
4 import com.lego.core.domin.Course; 4 import com.lego.core.domain.Entirety;
5 import com.lego.core.domin.Entirety; 5 import com.lego.core.domain.vo.EntiretyVo;
6 import com.lego.core.domin.vo.CourseVo;
7 import com.lego.core.domin.vo.EntiretyVo;
8 6
9 /** 7 /**
10 * 套件Mapper接口 8 * 套件Mapper接口
......
1 package com.lego.core.mapper; 1 package com.lego.core.mapper;
2 2
3 import com.lego.common.core.mapper.BaseMapperPlus; 3 import com.lego.common.core.mapper.BaseMapperPlus;
4 import com.lego.core.domin.Entirety; 4 import com.lego.core.domain.Question;
5 import com.lego.core.domin.Question; 5 import com.lego.core.domain.vo.QuestionVo;
6 import com.lego.core.domin.vo.EntiretyVo;
7 import com.lego.core.domin.vo.QuestionVo;
8 6
9 /** 7 /**
10 * 问题Mapper接口 8 * 问题Mapper接口
......
1 package com.lego.core.mapper; 1 package com.lego.core.mapper;
2 2
3 import com.lego.common.core.mapper.BaseMapperPlus; 3 import com.lego.common.core.mapper.BaseMapperPlus;
4 import com.lego.core.domin.Question; 4 import com.lego.core.domain.Upgrade;
5 import com.lego.core.domin.Upgrade; 5 import com.lego.core.domain.vo.UpgradeVo;
6 import com.lego.core.domin.vo.QuestionVo;
7 import com.lego.core.domin.vo.UpgradeVo;
8 6
9 /** 7 /**
10 * APP升级Mapper接口 8 * APP升级Mapper接口
......
...@@ -3,9 +3,8 @@ package com.lego.core.service; ...@@ -3,9 +3,8 @@ package com.lego.core.service;
3 3
4 import com.lego.common.core.domain.PageQuery; 4 import com.lego.common.core.domain.PageQuery;
5 import com.lego.common.core.page.TableDataInfo; 5 import com.lego.common.core.page.TableDataInfo;
6 import com.lego.core.domin.Advert; 6 import com.lego.core.domain.bo.AdvertBo;
7 import com.lego.core.domin.bo.AdvertBo; 7 import com.lego.core.domain.vo.AdvertVo;
8 import com.lego.core.domin.vo.AdvertVo;
9 8
10 import java.rmi.ServerException; 9 import java.rmi.ServerException;
11 import java.util.List; 10 import java.util.List;
......
...@@ -2,9 +2,9 @@ package com.lego.core.service; ...@@ -2,9 +2,9 @@ package com.lego.core.service;
2 2
3 3
4 import com.lego.common.core.page.TableDataInfo; 4 import com.lego.common.core.page.TableDataInfo;
5 import com.lego.core.domin.bo.BuildingBlockBo; 5 import com.lego.core.domain.bo.BuildingBlockBo;
6 import com.lego.core.domin.bo.BuildingBlockQueryBo; 6 import com.lego.core.domain.bo.BuildingBlockQueryBo;
7 import com.lego.core.domin.vo.BuildingBlockVo; 7 import com.lego.core.domain.vo.BuildingBlockVo;
8 8
9 import java.rmi.ServerException; 9 import java.rmi.ServerException;
10 import java.util.Collection; 10 import java.util.Collection;
......
1 package com.lego.core.service; 1 package com.lego.core.service;
2 2
3 import com.lego.common.core.page.TableDataInfo; 3 import com.lego.common.core.page.TableDataInfo;
4 import com.lego.core.domin.bo.CourseBo; 4 import com.lego.core.domain.bo.CourseBo;
5 import com.lego.core.domin.bo.CourseQueryBo; 5 import com.lego.core.domain.bo.CourseQueryBo;
6 import com.lego.core.domin.vo.CourseVo; 6 import com.lego.core.domain.vo.CourseVo;
7 7
8 import java.rmi.ServerException; 8 import java.rmi.ServerException;
9 import java.util.List; 9 import java.util.List;
......
...@@ -3,11 +3,8 @@ package com.lego.core.service; ...@@ -3,11 +3,8 @@ package com.lego.core.service;
3 3
4 import com.lego.common.core.domain.PageQuery; 4 import com.lego.common.core.domain.PageQuery;
5 import com.lego.common.core.page.TableDataInfo; 5 import com.lego.common.core.page.TableDataInfo;
6 import com.lego.core.domin.bo.AdvertBo; 6 import com.lego.core.domain.bo.EntiretyBo;
7 import com.lego.core.domin.bo.EntiretyBo; 7 import com.lego.core.domain.vo.EntiretyVo;
8 import com.lego.core.domin.vo.AdvertVo;
9 import com.lego.core.domin.vo.BuildingBlockVo;
10 import com.lego.core.domin.vo.EntiretyVo;
11 8
12 import java.rmi.ServerException; 9 import java.rmi.ServerException;
13 import java.util.Collection; 10 import java.util.Collection;
......
...@@ -2,9 +2,9 @@ package com.lego.core.service; ...@@ -2,9 +2,9 @@ package com.lego.core.service;
2 2
3 3
4 import com.lego.common.core.page.TableDataInfo; 4 import com.lego.common.core.page.TableDataInfo;
5 import com.lego.core.domin.bo.QuestionBo; 5 import com.lego.core.domain.bo.QuestionBo;
6 import com.lego.core.domin.bo.QuestionQueryBo; 6 import com.lego.core.domain.bo.QuestionQueryBo;
7 import com.lego.core.domin.vo.QuestionVo; 7 import com.lego.core.domain.vo.QuestionVo;
8 8
9 import java.rmi.ServerException; 9 import java.rmi.ServerException;
10 import java.util.List; 10 import java.util.List;
......
...@@ -2,10 +2,10 @@ package com.lego.core.service; ...@@ -2,10 +2,10 @@ package com.lego.core.service;
2 2
3 3
4 import com.lego.common.core.page.TableDataInfo; 4 import com.lego.common.core.page.TableDataInfo;
5 import com.lego.core.domin.bo.UpgradeBo; 5 import com.lego.core.domain.bo.UpgradeBo;
6 import com.lego.core.domin.bo.UpgradeQueryBo; 6 import com.lego.core.domain.bo.UpgradeQueryBo;
7 import com.lego.core.domin.vo.ResourceVo; 7 import com.lego.core.domain.vo.ResourceVo;
8 import com.lego.core.domin.vo.UpgradeVo; 8 import com.lego.core.domain.vo.UpgradeVo;
9 9
10 import java.rmi.ServerException; 10 import java.rmi.ServerException;
11 11
......
...@@ -9,9 +9,9 @@ import com.lego.common.core.domain.PageQuery; ...@@ -9,9 +9,9 @@ import com.lego.common.core.domain.PageQuery;
9 import com.lego.common.core.page.TableDataInfo; 9 import com.lego.common.core.page.TableDataInfo;
10 import com.lego.common.utils.MessageUtils; 10 import com.lego.common.utils.MessageUtils;
11 import com.lego.core.annotation.LanguageAnnotation; 11 import com.lego.core.annotation.LanguageAnnotation;
12 import com.lego.core.domin.Advert; 12 import com.lego.core.domain.Advert;
13 import com.lego.core.domin.bo.AdvertBo; 13 import com.lego.core.domain.bo.AdvertBo;
14 import com.lego.core.domin.vo.AdvertVo; 14 import com.lego.core.domain.vo.AdvertVo;
15 import com.lego.core.enums.StatusEnums; 15 import com.lego.core.enums.StatusEnums;
16 import com.lego.core.mapper.AdvertMapper; 16 import com.lego.core.mapper.AdvertMapper;
17 import com.lego.core.service.IAdvertService; 17 import com.lego.core.service.IAdvertService;
......
...@@ -11,22 +11,18 @@ import com.lego.common.utils.MessageUtils; ...@@ -11,22 +11,18 @@ import com.lego.common.utils.MessageUtils;
11 import com.lego.common.utils.StreamUtils; 11 import com.lego.common.utils.StreamUtils;
12 import com.lego.common.utils.spring.SpringUtils; 12 import com.lego.common.utils.spring.SpringUtils;
13 import com.lego.core.annotation.LanguageAnnotation; 13 import com.lego.core.annotation.LanguageAnnotation;
14 import com.lego.core.domin.BuildingBlock; 14 import com.lego.core.domain.BuildingBlock;
15 import com.lego.core.domin.Course; 15 import com.lego.core.domain.Entirety;
16 import com.lego.core.domin.Entirety; 16 import com.lego.core.domain.bo.BuildingBlockBo;
17 import com.lego.core.domin.bo.BuildingBlockBo; 17 import com.lego.core.domain.bo.BuildingBlockQueryBo;
18 import com.lego.core.domin.bo.BuildingBlockQueryBo; 18 import com.lego.core.domain.vo.BuildingBlockVo;
19 import com.lego.core.domin.vo.BuildingBlockVo; 19 import com.lego.core.domain.vo.EntiretyVo;
20 import com.lego.core.domin.vo.EntiretyVo;
21 import com.lego.core.mapper.BuildingBlockMapper; 20 import com.lego.core.mapper.BuildingBlockMapper;
22 import com.lego.core.mapper.CourseMapper;
23 import com.lego.core.mapper.EntiretyMapper; 21 import com.lego.core.mapper.EntiretyMapper;
24 import com.lego.core.service.IBuildingBlockService; 22 import com.lego.core.service.IBuildingBlockService;
25 import com.lego.core.service.IEntiretyService; 23 import com.lego.core.service.IEntiretyService;
26 import com.lego.system.domain.vo.SysOssVo;
27 import com.lego.system.service.ISysOssService; 24 import com.lego.system.service.ISysOssService;
28 import lombok.RequiredArgsConstructor; 25 import lombok.RequiredArgsConstructor;
29 import org.apache.commons.compress.utils.Lists;
30 import org.springframework.stereotype.Service; 26 import org.springframework.stereotype.Service;
31 import org.springframework.util.CollectionUtils; 27 import org.springframework.util.CollectionUtils;
32 28
......
...@@ -11,11 +11,11 @@ import com.lego.common.core.service.OssService; ...@@ -11,11 +11,11 @@ import com.lego.common.core.service.OssService;
11 import com.lego.common.utils.MessageUtils; 11 import com.lego.common.utils.MessageUtils;
12 import com.lego.common.utils.StreamUtils; 12 import com.lego.common.utils.StreamUtils;
13 import com.lego.core.annotation.LanguageAnnotation; 13 import com.lego.core.annotation.LanguageAnnotation;
14 import com.lego.core.domin.Course; 14 import com.lego.core.domain.Course;
15 import com.lego.core.domin.bo.CourseBo; 15 import com.lego.core.domain.bo.CourseBo;
16 import com.lego.core.domin.bo.CourseQueryBo; 16 import com.lego.core.domain.bo.CourseQueryBo;
17 import com.lego.core.domin.vo.CourseVo; 17 import com.lego.core.domain.vo.CourseVo;
18 import com.lego.core.domin.vo.EntiretyVo; 18 import com.lego.core.domain.vo.EntiretyVo;
19 import com.lego.core.mapper.CourseMapper; 19 import com.lego.core.mapper.CourseMapper;
20 import com.lego.core.service.ICourseService; 20 import com.lego.core.service.ICourseService;
21 import com.lego.core.service.IEntiretyService; 21 import com.lego.core.service.IEntiretyService;
......
...@@ -12,16 +12,15 @@ import com.lego.common.utils.MessageUtils; ...@@ -12,16 +12,15 @@ import com.lego.common.utils.MessageUtils;
12 import com.lego.common.utils.StreamUtils; 12 import com.lego.common.utils.StreamUtils;
13 import com.lego.common.utils.spring.SpringUtils; 13 import com.lego.common.utils.spring.SpringUtils;
14 import com.lego.core.annotation.LanguageAnnotation; 14 import com.lego.core.annotation.LanguageAnnotation;
15 import com.lego.core.domin.Course; 15 import com.lego.core.domain.Course;
16 import com.lego.core.domin.Entirety; 16 import com.lego.core.domain.Entirety;
17 import com.lego.core.domin.bo.EntiretyBo; 17 import com.lego.core.domain.bo.EntiretyBo;
18 import com.lego.core.domin.vo.BuildingBlockVo; 18 import com.lego.core.domain.vo.BuildingBlockVo;
19 import com.lego.core.domin.vo.EntiretyVo; 19 import com.lego.core.domain.vo.EntiretyVo;
20 import com.lego.core.mapper.CourseMapper; 20 import com.lego.core.mapper.CourseMapper;
21 import com.lego.core.mapper.EntiretyMapper; 21 import com.lego.core.mapper.EntiretyMapper;
22 import com.lego.core.service.IBuildingBlockService; 22 import com.lego.core.service.IBuildingBlockService;
23 import com.lego.core.service.IEntiretyService; 23 import com.lego.core.service.IEntiretyService;
24 import com.lego.system.domain.vo.SysOssVo;
25 import com.lego.system.service.ISysOssService; 24 import com.lego.system.service.ISysOssService;
26 import io.micrometer.core.instrument.util.StringUtils; 25 import io.micrometer.core.instrument.util.StringUtils;
27 import lombok.RequiredArgsConstructor; 26 import lombok.RequiredArgsConstructor;
......
...@@ -10,12 +10,11 @@ import com.lego.common.utils.MessageUtils; ...@@ -10,12 +10,11 @@ import com.lego.common.utils.MessageUtils;
10 import com.lego.common.utils.StreamUtils; 10 import com.lego.common.utils.StreamUtils;
11 import com.lego.common.utils.spring.SpringUtils; 11 import com.lego.common.utils.spring.SpringUtils;
12 import com.lego.core.annotation.LanguageAnnotation; 12 import com.lego.core.annotation.LanguageAnnotation;
13 import com.lego.core.domin.Question; 13 import com.lego.core.domain.Question;
14 import com.lego.core.domin.bo.QuestionBo; 14 import com.lego.core.domain.bo.QuestionBo;
15 import com.lego.core.domin.bo.QuestionQueryBo; 15 import com.lego.core.domain.bo.QuestionQueryBo;
16 import com.lego.core.domin.vo.BuildingBlockVo; 16 import com.lego.core.domain.vo.BuildingBlockVo;
17 import com.lego.core.domin.vo.EntiretyVo; 17 import com.lego.core.domain.vo.QuestionVo;
18 import com.lego.core.domin.vo.QuestionVo;
19 import com.lego.core.enums.StatusEnums; 18 import com.lego.core.enums.StatusEnums;
20 import com.lego.core.mapper.QuestionMapper; 19 import com.lego.core.mapper.QuestionMapper;
21 import com.lego.core.service.IBuildingBlockService; 20 import com.lego.core.service.IBuildingBlockService;
......
...@@ -8,25 +8,21 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -8,25 +8,21 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
8 import com.lego.common.constant.CacheNames; 8 import com.lego.common.constant.CacheNames;
9 import com.lego.common.core.page.TableDataInfo; 9 import com.lego.common.core.page.TableDataInfo;
10 import com.lego.common.core.service.ConfigService; 10 import com.lego.common.core.service.ConfigService;
11 import com.lego.common.core.service.OssService;
12 import com.lego.common.utils.DateUtils; 11 import com.lego.common.utils.DateUtils;
13 import com.lego.common.utils.EncryptUtils; 12 import com.lego.common.utils.EncryptUtils;
14 import com.lego.common.utils.MessageUtils; 13 import com.lego.common.utils.MessageUtils;
15 import com.lego.common.utils.redis.CacheUtils; 14 import com.lego.common.utils.redis.CacheUtils;
16 import com.lego.core.annotation.LanguageAnnotation; 15 import com.lego.core.annotation.LanguageAnnotation;
17 import com.lego.core.domin.Course; 16 import com.lego.core.domain.Upgrade;
18 import com.lego.core.domin.Upgrade; 17 import com.lego.core.domain.bo.UpgradeBo;
19 import com.lego.core.domin.bo.QuestionQueryBo; 18 import com.lego.core.domain.bo.UpgradeQueryBo;
20 import com.lego.core.domin.bo.UpgradeBo; 19 import com.lego.core.domain.vo.*;
21 import com.lego.core.domin.bo.UpgradeQueryBo;
22 import com.lego.core.domin.vo.*;
23 import com.lego.core.enums.StatusEnums; 20 import com.lego.core.enums.StatusEnums;
24 import com.lego.core.mapper.UpgradeMapper; 21 import com.lego.core.mapper.UpgradeMapper;
25 import com.lego.core.service.*; 22 import com.lego.core.service.*;
26 import com.lego.system.domain.vo.SysOssVo; 23 import com.lego.system.domain.vo.SysOssVo;
27 import com.lego.system.service.ISysOssService; 24 import com.lego.system.service.ISysOssService;
28 import lombok.RequiredArgsConstructor; 25 import lombok.RequiredArgsConstructor;
29 import org.springframework.cache.annotation.Cacheable;
30 import org.springframework.stereotype.Service; 26 import org.springframework.stereotype.Service;
31 27
32 import java.rmi.ServerException; 28 import java.rmi.ServerException;
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!