fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/bank/QuestionController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.bank;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.modules.bank.bo.QuestionAddBo;
+import com.zhongzheng.modules.bank.bo.QuestionEditBo;
+import com.zhongzheng.modules.bank.bo.QuestionQueryBo;
+import com.zhongzheng.modules.bank.service.IQuestionService;
+import com.zhongzheng.modules.bank.vo.QuestionVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 题库题目Controller
+ *
+ * @author hjl
+ * @date 2021-10-21
+ */
+@Api(value = "题库题目控制器", tags = {"题库题目管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/bank/question")
+public class QuestionController extends BaseController {
+
+    private final IQuestionService iQuestionService;
+
+    /**
+     * 查询题库题目列表
+     */
+    @ApiOperation("查询题库题目列表")
+    @PreAuthorize("@ss.hasPermi('system:question:list')")
+    @GetMapping("/list")
+    public TableDataInfo<QuestionVo> list(QuestionQueryBo bo) {
+        startPage();
+        List<QuestionVo> list = iQuestionService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出题库题目列表
+     */
+   /* @ApiOperation("导出题库题目列表")
+    @PreAuthorize("@ss.hasPermi('system:question:export')")
+    @Log(title = "题库题目", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<QuestionVo> export(QuestionQueryBo bo) {
+        List<QuestionVo> list = iQuestionService.queryList(bo);
+        ExcelUtil<QuestionVo> util = new ExcelUtil<QuestionVo>(QuestionVo.class);
+        return util.exportExcel(list, "题库题目");
+    }*/
+
+    /**
+     * 获取题库题目详细信息
+     */
+    @ApiOperation("获取题库题目详细信息")
+    @PreAuthorize("@ss.hasPermi('system:question:query')")
+    @GetMapping("/{questionId}")
+    public AjaxResult<QuestionVo> getInfo(@PathVariable("questionId" ) Long questionId) {
+        return AjaxResult.success(iQuestionService.queryById(questionId));
+    }
+
+    /**
+     * 新增题库题目
+     */
+    @ApiOperation("新增题库题目")
+    @PreAuthorize("@ss.hasPermi('system:question:add')")
+    @Log(title = "题库题目", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody QuestionAddBo bo) {
+        return toAjax(iQuestionService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改题库题目
+     */
+    @ApiOperation("修改题库题目")
+    @PreAuthorize("@ss.hasPermi('system:question:edit')")
+    @Log(title = "题库题目", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody QuestionEditBo bo) {
+        return toAjax(iQuestionService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除题库题目
+     */
+    /*@ApiOperation("删除题库题目")
+    @PreAuthorize("@ss.hasPermi('system:question:remove')")
+    @Log(title = "题库题目" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{questionIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] questionIds) {
+        return toAjax(iQuestionService.deleteWithValidByIds(Arrays.asList(questionIds), true) ? 1 : 0);
+    }*/
+}

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -11,14 +11,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.activity.bo.ActivityTaskUserAddBo;
-import com.zhongzheng.modules.activity.domain.ActivityTaskUser;
-import com.zhongzheng.modules.activity.service.IActivityGradeService;
-import com.zhongzheng.modules.activity.service.IActivityTaskService;
-import com.zhongzheng.modules.activity.service.IActivityTaskUserService;
-import com.zhongzheng.modules.activity.service.impl.ActivityTaskUserServiceImpl;
-import com.zhongzheng.modules.activity.vo.ActivityGradeVo;
-import com.zhongzheng.modules.activity.vo.ActivityTaskVo;
 import com.zhongzheng.modules.collect.domain.CollectBank;
 import com.zhongzheng.modules.collect.domain.CollectCourse;
 import com.zhongzheng.modules.collect.domain.CollectNote;
@@ -48,8 +40,7 @@ import java.sql.Timestamp;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.zhongzheng.modules.activity.service.impl.ActivityTaskUserServiceImpl.getTimesmorning;
-import static com.zhongzheng.modules.activity.service.impl.ActivityTaskUserServiceImpl.getTimesnight;
+
 
 /**
  * 用户Service业务层处理
@@ -69,17 +60,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Autowired
     private CollectNoteMapper collectNoteMapper;
 
-    @Autowired
-    private IActivityTaskUserService activityTaskUserService;
 
-    @Autowired
-    private IActivityTaskService activityTaskService;
 
     @Autowired
     private IUserService userService;
 
-    @Autowired
-    private IActivityGradeService activityGradeService;
+
 
     @Autowired
     private UserMapper userMapper;
@@ -198,58 +184,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         update.setUpdateTime(DateUtils.getNowTime());
 
         //增加客户端信息进行添加积分
-        information(bo);
+
 
         return this.updateById(update);
     }
 
-    public void information(UserEditBo bo) throws IllegalAccessException {
-        //判断是否是完善信息
-        ActivityTaskVo activityTaskVo = activityTaskService.queryByTaskId(1L);
-        if (activityTaskVo == null){
-            return ;
-        }
-        //得出已领取的分数是多少
-        LambdaQueryWrapper<ActivityTaskUser> lqw =Wrappers.lambdaQuery();;
-        lqw.eq(bo.getUserId() != null,ActivityTaskUser::getUserId,bo.getUserId());
-        lqw.eq(ActivityTaskUser::getTaskType, 1);
-        List<ActivityTaskUser> list = activityTaskUserService.list(lqw);
-        BigDecimal bigDecimal = new BigDecimal("0");
-        if (!CollectionUtils.isEmpty(list)) {
-            for (ActivityTaskUser activityTaskUser : list) {
-                bigDecimal = bigDecimal.add(new BigDecimal(activityTaskUser.getScore()));
-            }
-        }
-        if (bigDecimal.compareTo(new BigDecimal(activityTaskVo.getStartIntegral()))  > -1){
-            return;
-        }
-        UserSchoolInfoEditBo userSchoolInfoEditBo = new UserSchoolInfoEditBo();
-        //userVO用户  有参值/总数 得出比例 乘以分数 四舍五入
-        Field[] field = bo.getClass().getDeclaredFields();
-        Integer integer = countUser(bo);
-        String num = String.valueOf(new BigDecimal(Convert.toStr(field.length-6)).divide(new BigDecimal(integer.toString()),2));
-        BigDecimal result5 = new BigDecimal(Convert.toStr(activityTaskVo.getStartIntegral()*0.8)).divide(new BigDecimal(num),BigDecimal.ROUND_HALF_UP);
-
-        //增加用户领取记录
-        ActivityTaskUser add = BeanUtil.toBean(bo, ActivityTaskUser.class);
-        add.setScore(result5.toString());
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        add.setUserId(bo.getUserId());
-        add.setTaskType(activityTaskVo.getTaskType());
-        add.setTaskId(activityTaskVo.getId());
-        //增加用户积分
-        UserVo userVo = userService.queryById(bo.getUserId());
-        if (userVo.getIntegral() == null){
-            userVo.setIntegral(0L);
-        }
-        //增加用户积分更新等级
-        Long Integer = userVo.getIntegral()+ Convert.toLong(result5);
-        ActivityGradeVo list1 = activityGradeService.queryByInteger(Integer);
-        userVo.setUserLevel(list1.getGrade());
-        increaseUser(userVo,Integer);
-        activityTaskUserService.save(add);
-    }
+
 
 
     private Boolean increaseUser(UserVo userVo,Long score){
@@ -404,14 +344,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     @Override
     public Integer getIssue(Long userId) {
-        LambdaQueryWrapper<ActivityTaskUser> lqw = Wrappers.lambdaQuery();
-        lqw.eq(ActivityTaskUser::getTaskType,0);
-        lqw.eq(userId !=null,ActivityTaskUser::getUserId,userId);
-        lqw.between(ActivityTaskUser::getCreateTime,getTimesmorning(),getTimesnight());
-        List<ActivityTaskUser> list = activityTaskUserService.list(lqw);
-        if (!CollectionUtils.isEmpty(list) && list.size() > 0){
-            return 1;
-        }
+
         return 0;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityAdvertisingAddBo.java

@@ -1,62 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import com.zhongzheng.common.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-
-/**
- * 广告发布储存添加对象 activity_advertising
- *
- * @author change
- * @date 2021-05-17
- */
-@Data
-@ApiModel("广告发布储存添加对象")
-public class ActivityAdvertisingAddBo {
-
-    /** 广告图片 */
-    @ApiModelProperty("广告图片")
-    @NotNull(message = "广告图片 不能为空")
-    private String adverUrl;
-    /** 跳转url */
-    @ApiModelProperty("跳转url")
-    private String jumpUrl;
-
-    @ApiModelProperty("跳转url")
-    private String sourceUrl;
-    /** 创建时间 */
-    @ApiModelProperty("创建时间")
-    private Long createTime;
-    /** 修改时间 */
-    @ApiModelProperty("修改时间")
-    private Long updateTime;
-    /** 有效时间开始时间 */
-    @ApiModelProperty("有效时间开始时间")
-    @NotNull(message = "有效时间开始时间 不能为空")
-    private Long startTime;
-    /** 有效期过期时间 */
-    @ApiModelProperty("有效期过期时间")
-    @NotNull(message = "有效期过期时间 不能为空")
-    private Long endTime;
-    /** 备注 */
-    @ApiModelProperty("备注")
-    private String remarks;
-    /** 0 手动发布 1定时发布 */
-    @ApiModelProperty("0 手动发布 1定时发布")
-    @NotNull(message = "发布方式 不能为空")
-    private Integer reStatus;
-    /** 0删除 1待发布 2 撤回 3发布成功 */
-    @ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
-    private Integer status;
-    /** 广告名称 */
-    @ApiModelProperty("广告名称")
-    @NotNull(message = "广告名称 不能为空")
-    private String advName;
-    /** 广告类型 1学习中心 2求职 */
-    @ApiModelProperty("广告类型 1学习中心 2求职")
-    private Integer type;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityAdvertisingEditBo.java

@@ -1,66 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-/**
- * 广告发布储存编辑对象 activity_advertising
- *
- * @author change
- * @date 2021-05-17
- */
-@Data
-@ApiModel("广告发布储存编辑对象")
-public class ActivityAdvertisingEditBo {
-
-
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-    private Long id;
-
-    /** 广告图片 */
-    @ApiModelProperty("广告图片")
-    private String adverUrl;
-
-    /** 跳转url */
-    @ApiModelProperty("跳转url")
-    private String jumpUrl;
-
-    @ApiModelProperty("跳转url")
-    private String sourceUrl;
-
-    /** 修改时间 */
-    @ApiModelProperty("修改时间")
-    private Long updateTime;
-
-    /** 有效时间开始时间 */
-    @ApiModelProperty("有效时间开始时间")
-    private Long startTime;
-
-    /** 有效期过期时间 */
-    @ApiModelProperty("有效期过期时间")
-    private Long endTime;
-
-    /** 备注 */
-    @ApiModelProperty("备注")
-    private String remarks;
-
-    /** 0 手动发布 1定时发布 */
-    @ApiModelProperty("0 手动发布 1定时发布")
-    private Integer reStatus;
-
-    /** 0删除 1待发布 2 撤回 3发布成功 */
-    @ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
-    private Integer status;
-
-    /** 广告名称 */
-    @ApiModelProperty("广告名称")
-    private String advName;
-
-    /** 广告类型 1学习中心 2求职 */
-    @ApiModelProperty("广告类型 1学习中心 2求职")
-    private Integer type;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityAdvertisingQueryBo.java

@@ -1,77 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 广告发布储存分页查询对象 activity_advertising
- *
- * @author change
- * @date 2021-05-17
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("广告发布储存分页查询对象")
-public class ActivityAdvertisingQueryBo extends BaseEntity {
-
-	/** 分页大小 */
-	@ApiModelProperty("分页大小")
-	private Integer pageSize;
-	/** 当前页数 */
-	@ApiModelProperty("当前页数")
-	private Integer pageNum;
-	/** 排序列 */
-	@ApiModelProperty("排序列")
-	private String orderByColumn;
-	/** 排序的方向desc或者asc */
-	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
-	private String isAsc;
-
-
-	/** 广告图片 */
-	@ApiModelProperty("广告图片")
-	private String adverUrl;
-	/** 跳转url */
-	@ApiModelProperty("跳转url")
-	private String jumpUrl;
-
-	@ApiModelProperty("跳转url")
-	private String sourceUrl;
-	/** 有效时间开始时间 */
-	@ApiModelProperty("有效时间开始时间")
-	private Long startTime;
-	/** 有效期过期时间 */
-	@ApiModelProperty("有效期过期时间")
-	private Long endTime;
-	/** 备注 */
-	@ApiModelProperty("备注")
-	private String remarks;
-	/** 0 手动发布 1定时发布 */
-	@ApiModelProperty("0 手动发布 1定时发布")
-	private Integer reStatus;
-	/** 0删除 1待发布 2 撤回 3发布成功 */
-	@ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
-	private Integer status;
-	/** 广告名称 */
-	@ApiModelProperty("广告名称")
-	private String advName;
-
-	@ApiModelProperty("添加范围开始时间")
-	private Long startCreateTime;
-	/** 有效期过期时间 */
-	@ApiModelProperty("添加范围结束时间")
-	private Long endCreateTime;
-
-	@ApiModelProperty("发布时间开始")
-	private Long starIssueTime;
-	/** 有效期过期时间 */
-	@ApiModelProperty("发布时间结束")
-	private Long endIssueTime;
-	/** 广告类型 1学习中心 2求职 */
-	@ApiModelProperty("广告类型 1学习中心 2求职")
-	private Integer type;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationAddBo.java

@@ -1,95 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.zhongzheng.common.annotation.Excel;
-import com.zhongzheng.modules.course.domain.Course;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 活动配置添加对象 activity_configuration
- *
- * @author change
- * @date 2021-05-17
- */
-@Data
-@ApiModel("活动配置添加对象")
-public class ActivityConfigurationAddBo {
-
-    /** 活动名称 */
-    @ApiModelProperty("活动名称")
-    @NotNull(message = "活动名称 不能为空")
-    private String activityName;
-    /** 活动类型 */
-    @ApiModelProperty("活动类型 0 优惠券 1折扣券 2线上直播 3定价 4优惠 5折扣")
-    @NotNull(message = "活动类型 不能为空")
-    private Integer activityType;
-    /** 活动介绍备注说明 */
-    @ApiModelProperty("活动介绍备注说明")
-    private String description;
-    /** 活动开始时间 */
-    @ApiModelProperty("活动开始时间")
-    @NotNull(message = "活动开始时间 不能为空")
-    private Long startTime;
-    /** 活动结束时间 */
-    @ApiModelProperty("活动结束时间")
-    @NotNull(message = "活动结束时间 不能为空")
-    private Long endTime;
-    /** 定价（适用于优惠券） */
-    @ApiModelProperty("定价（金额，折扣，优惠金额）")
-    private BigDecimal price;
-    /** 发放数量 */
-    @ApiModelProperty("发放数量")
-    private Integer quantity;
-    /** 直播内容（适用直播） */
-    @ApiModelProperty("直播内容（适用直播）")
-    private String liveContent;
-    /** 活动地址 */
-    @ApiModelProperty("活动地址")
-    private String liveAdress;
-    /** 创建时间 */
-    @ApiModelProperty("创建时间")
-    private Long createTime;
-    /** 修改时间 */
-    @ApiModelProperty("修改时间")
-    private Long updateTime;
-    /** 0删除 1结束 2 撤回 3开始 4未开始 */
-    @ApiModelProperty("0删除 1结束 2 撤回 3开始 4未开始")
-    private Integer status;
-
-    /** 修改时间 */
-    @ApiModelProperty("有效期几个月")
-    private Integer couponEnd;
-
-    /** 活动图标 */
-    @Excel(name = "活动图标")
-    @ApiModelProperty("活动图标")
-    private String activityLogo;
-
-
-
-    /** 活动地址 */
-    @Excel(name = "活动地址")
-    @ApiModelProperty("活动地址")
-    private String activityUrl;
-
-    /** 活动详情 */
-    @Excel(name = "活动详情")
-    @ApiModelProperty("活动详情")
-    private String activityContentUrl;
-
-    /** 绑定课程 */
-    @Excel(name = "绑定课程")
-    @ApiModelProperty("绑定课程")
-    private String[] coursesId;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationCourseAddBo.java

@@ -1,27 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 活动配置关联课程包含范围添加对象 activity_configuration_course
- *
- * @author change
- * @date 2021-05-19
- */
-@Data
-@ApiModel("活动配置关联课程包含范围添加对象")
-public class ActivityConfigurationCourseAddBo {
-    /** 活动配置id */
-    @ApiModelProperty("活动配置id")
-    private Long configurationId;
-
-    /** 关联课程id */
-    @ApiModelProperty("关联课程id")
-    private Long courseId;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationCourseEditBo.java

@@ -1,28 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-/**
- * 活动配置关联课程包含范围编辑对象 activity_configuration_course
- *
- * @author change
- * @date 2021-05-19
- */
-@Data
-@ApiModel("活动配置关联课程包含范围编辑对象")
-public class ActivityConfigurationCourseEditBo {
-
-
-    /** 活动配置id */
-    @ApiModelProperty("活动配置id")
-    private Long configurationId;
-
-    /** 关联课程id */
-    @ApiModelProperty("关联课程id")
-    private Long courseId;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationCourseQueryBo.java

@@ -1,40 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
-
-/**
- * 活动配置关联课程包含范围分页查询对象 activity_configuration_course
- *
- * @author change
- * @date 2021-05-19
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("活动配置关联课程包含范围分页查询对象")
-public class ActivityConfigurationCourseQueryBo extends BaseEntity {
-
-	/** 分页大小 */
-	@ApiModelProperty("分页大小")
-	private Integer pageSize;
-	/** 当前页数 */
-	@ApiModelProperty("当前页数")
-	private Integer pageNum;
-	/** 排序列 */
-	@ApiModelProperty("排序列")
-	private String orderByColumn;
-	/** 排序的方向desc或者asc */
-	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
-	private String isAsc;
-
-
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationEditBo.java

@@ -1,98 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import com.zhongzheng.common.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-
-/**
- * 活动配置编辑对象 activity_configuration
- *
- * @author change
- * @date 2021-05-17
- */
-@Data
-@ApiModel("活动配置编辑对象")
-public class ActivityConfigurationEditBo {
-
-
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-    private Long id;
-
-    /** 活动名称 */
-    @ApiModelProperty("活动名称")
-    private String activityName;
-
-    /** 活动类型 */
-    @ApiModelProperty("活动类型 0 优惠券 1折扣券 2线上直播 3定价 4优惠 5折扣")
-    private Integer activityType;
-
-    /** 活动介绍备注说明 */
-    @ApiModelProperty("活动介绍备注说明")
-    private String description;
-
-    /** 活动开始时间 */
-    @ApiModelProperty("活动开始时间")
-    private Long startTime;
-
-    /** 活动结束时间 */
-    @ApiModelProperty("活动结束时间")
-    private Long endTime;
-
-    /** 定价（适用于优惠券） */
-    @ApiModelProperty("定价（金额，折扣，优惠金额）")
-    private BigDecimal price;
-
-    /** 发放数量 */
-    @ApiModelProperty("发放数量")
-    private Integer quantity;
-
-
-    /** 直播内容（适用直播） */
-    @ApiModelProperty("直播内容（适用直播）")
-    private String liveContent;
-
-    /** 活动地址 */
-    @ApiModelProperty("活动地址")
-    private String liveAdress;
-
-    /** 修改时间 */
-    @ApiModelProperty("修改时间")
-    private Long updateTime;
-
-    /** 0删除 1结束 2 撤回 3开始 4未开始 */
-    @ApiModelProperty("0删除 1结束 2 撤回 3开始 4未开始")
-    private Integer status;
-
-    /** 绑定课程 */
-    @ApiModelProperty("绑定课程")
-    private String[] coursesId;
-
-    /** 修改时间 */
-    @ApiModelProperty("有效期几个月")
-    private Integer couponEnd;
-
-    /** 活动图标 */
-    @Excel(name = "活动图标")
-    @ApiModelProperty("活动图标")
-    private String activityLogo;
-
-    /** 活动详情 */
-    @Excel(name = "活动详情")
-    @ApiModelProperty("活动详情")
-    private String activityContentUrl;
-
-
-
-    /** 活动地址 */
-    @Excel(name = "活动地址")
-    @ApiModelProperty("活动地址")
-    private String activityUrl;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationQueryBo.java

@@ -1,103 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import com.zhongzheng.common.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
-
-/**
- * 活动配置分页查询对象 activity_configuration
- *
- * @author change
- * @date 2021-05-17
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("活动配置分页查询对象")
-public class ActivityConfigurationQueryBo extends BaseEntity {
-
-	/** 分页大小 */
-	@ApiModelProperty("分页大小")
-	private Integer pageSize;
-	/** 当前页数 */
-	@ApiModelProperty("当前页数")
-	private Integer pageNum;
-	/** 排序列 */
-	@ApiModelProperty("排序列")
-	private String orderByColumn;
-	/** 排序的方向desc或者asc */
-	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
-	private String isAsc;
-
-
-	/** 活动名称 */
-	@ApiModelProperty("Typeids获得活动类型数据，活动类型 0 优惠券 1折扣券 2线上直播 3定价 4优惠 5折扣")
-	private String[] typeIds;
-
-	/** 活动名称 */
-	@ApiModelProperty("用户UserId")
-	private int userId;
-
-	/** 活动名称 */
-	@ApiModelProperty("id")
-	private Integer id;
-	/** 活动名称 */
-	@ApiModelProperty("活动名称")
-	private String activityName;
-	/** 活动类型 */
-	@ApiModelProperty("活动类型 0 优惠券 1折扣券 2线上直播 3定价 4优惠 5折扣")
-	private Integer activityType;
-	/** 活动介绍备注说明 */
-	@ApiModelProperty("活动介绍备注说明")
-	private String description;
-	/** 活动开始时间 */
-	@ApiModelProperty("活动开始时间")
-	private Long startTime;
-	/** 活动结束时间 */
-	@ApiModelProperty("活动结束时间")
-	private Long endTime;
-	/** 定价（金额，折扣，优惠金额） */
-	@ApiModelProperty("定价（金额，折扣，优惠金额）")
-	private BigDecimal price;
-	/** 发放数量 */
-	@ApiModelProperty("发放数量")
-	private Integer quantity;
-
-	/** 直播内容（适用直播） */
-	@ApiModelProperty("直播内容（适用直播）")
-	private String liveContent;
-	/** 活动地址 */
-	@ApiModelProperty("活动地址")
-	private String liveAdress;
-	/** 0删除 1结束 2 撤回 3开始 4未开始 */
-	@ApiModelProperty("0删除 1结束 2 撤回 3开始 4未开始")
-	private Integer status;
-
-	/** 修改时间 */
-	@ApiModelProperty("有效期几个月")
-	private Integer couponEnd;
-
-	/** 活动图标 */
-	@Excel(name = "活动图标")
-	@ApiModelProperty("活动图标")
-	private String activityLogo;
-
-	/** 活动详情 */
-	@Excel(name = "活动详情")
-	@ApiModelProperty("活动详情")
-	private String activityContentUrl;
-
-	/** 活动地址 */
-	@Excel(name = "活动地址")
-	@ApiModelProperty("活动地址")
-	private String activityUrl;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationUseAddBo.java

@@ -1,45 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 【请填写功能名称】添加对象 activity_configuration_use
- *
- * @author change
- * @date 2021-06-15
- */
-@Data
-@ApiModel("【请填写功能名称】添加对象")
-public class ActivityConfigurationUseAddBo {
-
-
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-    private Long userId;
-
-    /** 已领取，活动配置id */
-    @ApiModelProperty("已领取，活动配置id")
-    private Long configurationId;
-
-    /** 已领取活动类型 0 优惠券 1折扣券 2线上直播 3定价 4优惠 5折扣 */
-    @ApiModelProperty("已领取活动类型 0 优惠券 1折扣券 2线上直播 3定价 4优惠 5折扣")
-    private Integer activityType;
-    /** 是否已使用该次活动   0未使用  1已使用   线上直播 3 */
-    @ApiModelProperty("是否已使用该次活动   0未使用  1已使用   线上直播 3")
-    private Integer useStatus;
-
-    /** 领取时间 */
-    @ApiModelProperty("领取时间")
-    private Long createTime;
-
-    /** 领取时间 */
-    @ApiModelProperty("领取时间")
-    private Long updateTime;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationUseEditBo.java

@@ -1,40 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-/**
- * 【请填写功能名称】编辑对象 activity_configuration_use
- *
- * @author change
- * @date 2021-06-15
- */
-@Data
-@ApiModel("【请填写功能名称】编辑对象")
-public class ActivityConfigurationUseEditBo {
-
-
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-    private Long userId;
-
-    /** 已领取，活动配置id */
-    @ApiModelProperty("已领取，活动配置id")
-    private Long configurationId;
-
-    /** 已领取活动类型 0 优惠券 1折扣券 2线上直播 3定价 4优惠 5折扣 */
-    @ApiModelProperty("已领取活动类型 0 优惠券 1折扣券 2线上直播 3定价 4优惠 5折扣")
-    private Integer activityType;
-
-    /** 是否已使用该次活动   0未使用  1已使用   线上直播 3 */
-    @ApiModelProperty("是否已使用该次活动   0未使用  1已使用   线上直播 3")
-    private Integer useStatus;
-
-    /** 领取时间 */
-    @ApiModelProperty("领取时间")
-    private Long createTime;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationUseQueryBo.java

@@ -1,47 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
-
-/**
- * 【请填写功能名称】分页查询对象 activity_configuration_use
- *
- * @author change
- * @date 2021-06-15
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("【请填写功能名称】分页查询对象")
-public class ActivityConfigurationUseQueryBo extends BaseEntity {
-
-	/** 分页大小 */
-	@ApiModelProperty("分页大小")
-	private Integer pageSize;
-	/** 当前页数 */
-	@ApiModelProperty("当前页数")
-	private Integer pageNum;
-	/** 排序列 */
-	@ApiModelProperty("排序列")
-	private String orderByColumn;
-	/** 排序的方向desc或者asc */
-	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
-	private String isAsc;
-
-
-	/** 已领取活动类型 0 优惠券 1折扣券 2线上直播 3定价 4优惠 5折扣 */
-	@ApiModelProperty("已领取活动类型 0 优惠券 1折扣券 2线上直播 3定价 4优惠 5折扣")
-	private Integer activityType;
-	/** 是否已使用该次活动   0未使用  1已使用   线上直播 3 */
-	@ApiModelProperty("是否已使用该次活动   0未使用  1已使用   线上直播 3")
-	private Integer useStatus;
-
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradeAddBo.java

@@ -1,49 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import com.zhongzheng.common.annotation.Excel;
-import com.zhongzheng.modules.activity.vo.ActivityGradePrivilegeVo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 等级积分添加对象 activity_grade
- *
- * @author change
- * @date 2021-05-19
- */
-@Data
-@ApiModel("等级积分添加对象")
-public class ActivityGradeAddBo {
-
-
-    /** 等级 */
-    @ApiModelProperty("等级")
-    private Integer grade;
-    /** 等级名称 */
-    @ApiModelProperty("等级名称")
-    private String gradeName;
-    /** 需要最低积分 */
-    @ApiModelProperty("需要最低积分")
-    private Integer needIntegralStart;
-    /** 最高积分 */
-    @ApiModelProperty("最高积分")
-    private Integer needIntegralEnd;
-    /** 说明备注 */
-    @ApiModelProperty("说明备注")
-    private String remarks;
-    /** 创建时间 */
-    @ApiModelProperty("创建时间")
-    private Long createTime;
-    /** 修改时间 */
-    @ApiModelProperty("修改时间")
-    private Long updateTime;
-
-    @Excel(name = "关联特权类型")
-    @ApiModelProperty("关联特权类型")
-    private List<ActivityGradePrivilegeAddBo> activityGradePrivilegeAddBos;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradeEditBo.java

@@ -1,56 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import com.zhongzheng.common.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 等级积分编辑对象 activity_grade
- *
- * @author change
- * @date 2021-05-19
- */
-@Data
-@ApiModel("等级积分编辑对象")
-public class ActivityGradeEditBo {
-
-
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-    private Long id;
-
-    /** 等级 */
-    @ApiModelProperty("等级")
-    private Integer grade;
-
-    /** 等级名称 */
-    @ApiModelProperty("等级名称")
-    private String gradeName;
-
-    /** 需要最低积分 */
-    @ApiModelProperty("需要最低积分")
-    private Integer needIntegralStart;
-
-    /** 最高积分 */
-    @ApiModelProperty("最高积分")
-    private Integer needIntegralEnd;
-
-    /** 说明备注 */
-    @ApiModelProperty("说明备注")
-    private String remarks;
-
-    /** 修改时间 */
-    @ApiModelProperty("修改时间")
-    private Long updateTime;
-
-    @Excel(name = "关联特权类型")
-    @ApiModelProperty("关联特权类型")
-    private List<ActivityGradePrivilegeEditBo> activityGradePrivilegeEditBos;
-
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradePrivilegeAddBo.java

@@ -1,50 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 等级积分特权类型：优惠券，折扣券等类型添加对象 activity_grade_privilege
- *
- * @author change
- * @date 2021-05-20
- */
-@Data
-@ApiModel("等级积分特权类型：优惠券，折扣券等类型添加对象")
-public class ActivityGradePrivilegeAddBo {
-
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-    @TableId()
-    private Long id;
-    /** 关联积分表id */
-    @ApiModelProperty("关联积分表id")
-    private Long gradeId;
-    /** 特权类型 0优惠券 1折扣券 2解锁题库  3解锁课程 */
-    @ApiModelProperty("特权类型 0优惠券 1折扣券 2解锁题库  3解锁课程")
-    private String priType;
-    /** 优惠券金额或折扣 */
-    @ApiModelProperty("优惠券金额或折扣")
-    private Long couponPrice;
-
-    /** 有效期几个月 */
-    @ApiModelProperty("有效期几个月")
-    private Integer endTimeSum;
-    /** 发放数量 */
-    @ApiModelProperty("发放数量")
-    private Integer quantity;
-
-    /** 绑定课程 */
-    @ApiModelProperty("绑定课程")
-    private String[] courseIds;
-
-    /** 0删除 1使用 */
-    @ApiModelProperty("0删除 1使用")
-    private Integer status;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradePrivilegeCouresAddBo.java

@@ -1,27 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 积分关联特权的范围课程添加对象 activity_grade_privilege_coures
- *
- * @author change
- * @date 2021-05-20
- */
-@Data
-@ApiModel("积分关联特权的范围课程添加对象")
-public class ActivityGradePrivilegeCouresAddBo {
-    /** 活动配置id */
-    @ApiModelProperty("活动配置id")
-    private Long privilegeId;
-
-    /** 关联课程id */
-    @ApiModelProperty("关联课程id")
-    private Long courseId;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradePrivilegeCouresEditBo.java

@@ -1,28 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-/**
- * 积分关联特权的范围课程编辑对象 activity_grade_privilege_coures
- *
- * @author change
- * @date 2021-05-20
- */
-@Data
-@ApiModel("积分关联特权的范围课程编辑对象")
-public class ActivityGradePrivilegeCouresEditBo {
-
-
-    /** 活动配置id */
-    @ApiModelProperty("活动配置id")
-    private Long privilegeId;
-
-    /** 关联课程id */
-    @ApiModelProperty("关联课程id")
-    private Long courseId;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradePrivilegeCouresQueryBo.java

@@ -1,40 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
-
-/**
- * 积分关联特权的范围课程分页查询对象 activity_grade_privilege_coures
- *
- * @author change
- * @date 2021-05-20
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("积分关联特权的范围课程分页查询对象")
-public class ActivityGradePrivilegeCouresQueryBo extends BaseEntity {
-
-	/** 分页大小 */
-	@ApiModelProperty("分页大小")
-	private Integer pageSize;
-	/** 当前页数 */
-	@ApiModelProperty("当前页数")
-	private Integer pageNum;
-	/** 排序列 */
-	@ApiModelProperty("排序列")
-	private String orderByColumn;
-	/** 排序的方向desc或者asc */
-	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
-	private String isAsc;
-
-
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradePrivilegeEditBo.java

@@ -1,53 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-/**
- * 等级积分特权类型：优惠券，折扣券等类型编辑对象 activity_grade_privilege
- *
- * @author change
- * @date 2021-05-20
- */
-@Data
-@ApiModel("等级积分特权类型：优惠券，折扣券等类型编辑对象")
-public class ActivityGradePrivilegeEditBo {
-
-
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-    private Long id;
-
-    /** 关联积分表id */
-    @ApiModelProperty("关联积分表id")
-    private Long gradeId;
-
-    /** 特权类型 0优惠券 1折扣券 2解锁题库  3解锁课程 */
-    @ApiModelProperty("特权类型 0优惠券 1折扣券 2解锁题库  3解锁课程")
-    private String priType;
-
-    /** 优惠券金额 */
-    @ApiModelProperty("优惠券金额或折扣")
-    private Long couponPrice;
-
-
-    /** 有效期几个月 */
-    @ApiModelProperty("有效期几个月")
-    private Integer endTimeSum;
-
-    /** 发放数量 */
-    @ApiModelProperty("发放数量")
-    private Integer quantity;
-
-    /** 绑定课程 */
-    @ApiModelProperty("绑定课程")
-    private String[] courseIds;
-
-    /** 0删除 1使用 */
-    @ApiModelProperty("0删除 1使用")
-    private Integer status;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradePrivilegeQueryBo.java

@@ -1,58 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
-
-/**
- * 等级积分特权类型：优惠券，折扣券等类型分页查询对象 activity_grade_privilege
- *
- * @author change
- * @date 2021-05-20
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("等级积分特权类型：优惠券，折扣券等类型分页查询对象")
-public class ActivityGradePrivilegeQueryBo extends BaseEntity {
-
-	/** 分页大小 */
-	@ApiModelProperty("分页大小")
-	private Integer pageSize;
-	/** 当前页数 */
-	@ApiModelProperty("当前页数")
-	private Integer pageNum;
-	/** 排序列 */
-	@ApiModelProperty("排序列")
-	private String orderByColumn;
-	/** 排序的方向desc或者asc */
-	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
-	private String isAsc;
-
-
-	/** 关联积分表id */
-	@ApiModelProperty("关联积分表id")
-	private Long gradeId;
-	/** 特权类型 0优惠券 1折扣券 2解锁题库  3解锁课程 */
-	@ApiModelProperty("特权类型 0优惠券 1折扣券 2解锁题库  3解锁课程")
-	private String priType;
-	/** 优惠券金额 */
-	@ApiModelProperty("优惠券金额或折扣")
-	private Long couponPrice;
-	/** 有效期几个月 */
-	@ApiModelProperty("有效期几个月")
-	private Integer endTimeSum;
-	/** 发放数量 */
-	@ApiModelProperty("发放数量")
-	private Integer quantity;
-	/** 0删除 1使用 */
-	@ApiModelProperty("0删除 1使用")
-	private Integer status;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradeQueryBo.java

@@ -1,55 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
-
-/**
- * 等级积分分页查询对象 activity_grade
- *
- * @author change
- * @date 2021-05-19
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("等级积分分页查询对象")
-public class ActivityGradeQueryBo extends BaseEntity {
-
-	/** 分页大小 */
-	@ApiModelProperty("分页大小")
-	private Integer pageSize;
-	/** 当前页数 */
-	@ApiModelProperty("当前页数")
-	private Integer pageNum;
-	/** 排序列 */
-	@ApiModelProperty("排序列")
-	private String orderByColumn;
-	/** 排序的方向desc或者asc */
-	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
-	private String isAsc;
-
-
-	/** 等级 */
-	@ApiModelProperty("等级")
-	private Integer grade;
-	/** 等级名称 */
-	@ApiModelProperty("等级名称")
-	private String gradeName;
-	/** 需要最低积分 */
-	@ApiModelProperty("需要最低积分")
-	private Integer needIntegralStart;
-	/** 最高积分 */
-	@ApiModelProperty("最高积分")
-	private Integer needIntegralEnd;
-	/** 说明备注 */
-	@ApiModelProperty("说明备注")
-	private String remarks;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskAddBo.java

@@ -1,67 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import com.zhongzheng.common.annotation.Excel;
-import com.zhongzheng.modules.activity.domain.ActivityTaskTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 任务存储添加对象 activity_task
- *
- * @author change
- * @date 2021-05-19
- */
-@Data
-@ApiModel("任务存储添加对象")
-public class ActivityTaskAddBo {
-
-    /** 任务名称 */
-    @ApiModelProperty("任务名称  0每日签到 1完善信息 2邀请好友 3每日分享\n" +
-            "4视频学习 5模拟考试")
-    private Integer taskType;
-    /** 奖励积分 */
-    @ApiModelProperty("奖励积分或初始积分")
-    private Integer startIntegral;
-    /** 积分上限 */
-    @ApiModelProperty("签到积分上限")
-    private Integer endIntegral;
-    /** 备注 */
-    @ApiModelProperty("备注")
-    private String remarks;
-    /** 说明 */
-    @ApiModelProperty("说明")
-    private String description;
-    /** 累加积分 */
-    @ApiModelProperty("增加加积分")
-    private Integer accIntegral;
-    /** 最短视频时间分钟单位 */
-    @ApiModelProperty("最短时长")
-    private Integer longTime;
-    /** 每天奖励次数 */
-    @ApiModelProperty("每日分享或模拟考试奖励次数")
-    private Integer countDay;
-    /** 创建时间 */
-    @ApiModelProperty("创建时间")
-    private Long createTime;
-    /** 修改时间 */
-    @ApiModelProperty("修改时间")
-    private Long updateTime;
-    /** 0 停用 1启用 */
-    @ApiModelProperty("0 停用 1启用")
-    private Integer status;
-
-    /** 分数范围 适用与考试积分获得 */
-    @Excel(name = "分数范围 适用与考试积分获得")
-    @ApiModelProperty("分数范围 适用与考试积分获得")
-    private List<ActivityTaskTimeAddBo> activityTaskTimeAddBo;
-
-    /** 最低分数 */
-    @Excel(name = "最低分数")
-    @ApiModelProperty("最低分数")
-    private Integer minNum;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskEditBo.java

@@ -1,77 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import com.zhongzheng.common.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 任务存储编辑对象 activity_task
- *
- * @author change
- * @date 2021-05-19
- */
-@Data
-@ApiModel("任务存储编辑对象")
-public class ActivityTaskEditBo {
-
-
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-    private Long id;
-
-    /** 任务名称 */
-    @ApiModelProperty("任务名称  0每日签到 1完善信息 2邀请好友 3每日分享\n" +
-            "4视频学习 5模拟考试")
-    private Integer taskType;
-
-    /** 奖励积分 */
-    @ApiModelProperty("奖励积分或初始积分")
-    private Integer startIntegral;
-
-    /** 积分上限 */
-    @ApiModelProperty("签到积分上限")
-    private Integer endIntegral;
-
-    /** 备注 */
-    @ApiModelProperty("备注")
-    private String remarks;
-
-    /** 说明 */
-    @ApiModelProperty("说明")
-    private String description;
-
-    /** 累加积分 */
-    @ApiModelProperty("增加加积分")
-    private Integer accIntegral;
-
-    /** 最短视频时间分钟单位 */
-    @ApiModelProperty("最短时长")
-    private Integer longTime;
-
-    /** 每天奖励次数 */
-    @ApiModelProperty("每日分享或模拟考试奖励次数")
-    private Integer countDay;
-
-    /** 修改时间 */
-    @ApiModelProperty("修改时间")
-    private Long updateTime;
-
-    /** 0 停用 1启用 */
-    @ApiModelProperty("0 停用 1启用")
-    private Integer status;
-
-    /** 分数范围 适用与考试积分获得 */
-    @Excel(name = "分数范围 适用与考试积分获得")
-    @ApiModelProperty("分数范围 适用与考试积分获得")
-    private List<ActivityTaskTimeEditBo> activityTaskTimeEditBoList;
-
-    /** 最低分数 */
-    @Excel(name = "最低分数")
-    @ApiModelProperty("最低分数")
-    private Integer minNum;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskQueryBo.java

@@ -1,76 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import com.zhongzheng.common.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
-
-/**
- * 任务存储分页查询对象 activity_task
- *
- * @author change
- * @date 2021-05-19
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("任务存储分页查询对象")
-public class ActivityTaskQueryBo extends BaseEntity {
-
-	/** 分页大小 */
-	@ApiModelProperty("分页大小")
-	private Integer pageSize;
-	/** 当前页数 */
-	@ApiModelProperty("当前页数")
-	private Integer pageNum;
-	/** 排序列 */
-	@ApiModelProperty("排序列")
-	private String orderByColumn;
-	/** 排序的方向desc或者asc */
-	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
-	private String isAsc;
-
-
-	/** 任务名称 */
-	@ApiModelProperty("任务名称  0每日签到 1完善信息 2邀请好友 3每日分享\n" +
-			"4视频学习 5模拟考试")
-	private Integer taskType;
-	/** 奖励积分 */
-	@ApiModelProperty("奖励积分或初始积分")
-	private Integer startIntegral;
-	/** 积分上限 */
-	@ApiModelProperty("签到积分上限")
-	private Integer endIntegral;
-	/** 备注 */
-	@ApiModelProperty("备注")
-	private String remarks;
-	/** 说明 */
-	@ApiModelProperty("说明")
-	private String description;
-	/** 累加积分 */
-	@ApiModelProperty("增加加积分")
-	private Integer accIntegral;
-	/** 最短视频时间分钟单位 */
-	@ApiModelProperty("最短时长")
-	private Integer longTime;
-	/** 每天奖励次数 */
-	@ApiModelProperty("每日分享或模拟考试奖励次数")
-	private Integer countDay;
-	/** 0 停用 1启用 */
-	@ApiModelProperty("0 停用 1启用")
-	private Integer status;
-
-	@ApiModelProperty("0 停用 1启用")
-	private Long userId;
-
-	/** 最低分数 */
-	@ApiModelProperty("最低分数")
-	private Integer minNum;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskTimeAddBo.java

@@ -1,30 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 模拟考试分数给予积分关联添加对象 activity_task_time
- *
- * @author change
- * @date 2021-05-20
- */
-@Data
-@ApiModel("模拟考试分数给予积分关联添加对象")
-public class ActivityTaskTimeAddBo {
-
-    /** 分数最低范围 */
-    @ApiModelProperty("分数最低范围")
-    private Integer startRange;
-    /** 分数最高范围 */
-    @ApiModelProperty("分数最高范围")
-    private Integer endRange;
-    /** 奖励积分 */
-    @ApiModelProperty("奖励积分")
-    private Integer integral;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskTimeEditBo.java

@@ -1,36 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-/**
- * 模拟考试分数给予积分关联编辑对象 activity_task_time
- *
- * @author change
- * @date 2021-05-20
- */
-@Data
-@ApiModel("模拟考试分数给予积分关联编辑对象")
-public class ActivityTaskTimeEditBo {
-
-
-    /** 任务ID */
-    @ApiModelProperty("任务ID")
-    private Long taskId;
-
-    /** 分数最低范围 */
-    @ApiModelProperty("分数最低范围")
-    private Integer startRange;
-
-    /** 分数最高范围 */
-    @ApiModelProperty("分数最高范围")
-    private Integer endRange;
-
-    /** 奖励积分 */
-    @ApiModelProperty("奖励积分")
-    private Integer integral;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskTimeQueryBo.java

@@ -1,49 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
-
-/**
- * 模拟考试分数给予积分关联分页查询对象 activity_task_time
- *
- * @author change
- * @date 2021-05-20
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("模拟考试分数给予积分关联分页查询对象")
-public class ActivityTaskTimeQueryBo extends BaseEntity {
-
-	/** 分页大小 */
-	@ApiModelProperty("分页大小")
-	private Integer pageSize;
-	/** 当前页数 */
-	@ApiModelProperty("当前页数")
-	private Integer pageNum;
-	/** 排序列 */
-	@ApiModelProperty("排序列")
-	private String orderByColumn;
-	/** 排序的方向desc或者asc */
-	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
-	private String isAsc;
-
-
-	/** 分数最低范围 */
-	@ApiModelProperty("分数最低范围")
-	private Integer startRange;
-	/** 分数最高范围 */
-	@ApiModelProperty("分数最高范围")
-	private Integer endRange;
-	/** 奖励积分 */
-	@ApiModelProperty("奖励积分")
-	private Integer integral;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskUserAddBo.java

@@ -1,45 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-
-
-/**
- * 用户领取记录添加对象 activity_task_user
- *
- * @author change
- * @date 2021-06-16
- */
-@Data
-@ApiModel("用户领取记录添加对象")
-public class ActivityTaskUserAddBo {
-
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-    private Long createTime;
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-    private Long updateTime;
-    /** 领取分数 */
-    @ApiModelProperty("领取分数")
-    private String score;
-    /** 任务名称  0每日签到 1完善信息 2邀请好友 3每日分享
-4视频学习 5模拟考试 */
-    @ApiModelProperty("任务名称  0每日签到 1完善信息 2邀请好友 3每日分享 4视频学习 5模拟考试")
-    @NotNull(message = "任务名称类型不能为空")
-    private Integer taskType;
-
-    /** 用户id*/
-    @ApiModelProperty("用户id")
-    @NotNull(message = "用户ID不能为空")
-    private Long UserId;
-
-    /** 任务ID*/
-    @ApiModelProperty("任务ID")
-    private Long taskId;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskUserEditBo.java

@@ -1,40 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-/**
- * 用户领取记录编辑对象 activity_task_user
- *
- * @author change
- * @date 2021-06-16
- */
-@Data
-@ApiModel("用户领取记录编辑对象")
-public class ActivityTaskUserEditBo {
-
-
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-    private Long userId;
-
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-    private Long taskId;
-
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-    private Long updateTime;
-
-    /** 领取分数 */
-    @ApiModelProperty("领取分数")
-    private String score;
-
-    /** 任务名称  0每日签到 1完善信息 2邀请好友 3每日分享4视频学习 5模拟考试 */
-    @ApiModelProperty("任务名称  0每日签到 1完善信息 2邀请好友 3每日分享 4视频学习 5模拟考试")
-    private Integer taskType;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskUserQueryBo.java

@@ -1,47 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
-
-/**
- * 用户领取记录分页查询对象 activity_task_user
- *
- * @author change
- * @date 2021-06-16
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("用户领取记录分页查询对象")
-public class ActivityTaskUserQueryBo extends BaseEntity {
-
-	/** 分页大小 */
-	@ApiModelProperty("分页大小")
-	private Integer pageSize;
-	/** 当前页数 */
-	@ApiModelProperty("当前页数")
-	private Integer pageNum;
-	/** 排序列 */
-	@ApiModelProperty("排序列")
-	private String orderByColumn;
-	/** 排序的方向desc或者asc */
-	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
-	private String isAsc;
-
-
-	/** 领取分数 */
-	@ApiModelProperty("领取分数")
-	private String score;
-	/** 任务名称  0每日签到 1完善信息 2邀请好友 3每日分享
-4视频学习 5模拟考试 */
-	@ApiModelProperty("任务名称  0每日签到 1完善信息 2邀请好友 3每日分享 4视频学习 5模拟考试")
-	private Integer taskType;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/UserTaskAddBo.java

@@ -1,25 +0,0 @@
-package com.zhongzheng.modules.activity.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author change
- * @date 2021年06月16日 9:12
- */
-@Data
-@ApiModel("【積分】添加对象")
-public class UserTaskAddBo {
-
-    /** 任务名称 */
-    @ApiModelProperty("任务名称  0每日签到 1完善信息 2邀请好友 3每日分享\n" +
-            "4视频学习 5模拟考试")
-    private Integer taskType;
-
-    @ApiModelProperty("用戶userId")
-    private Long userId;
-
-    @ApiModelProperty("模擬考試分數，當任務類型為5才傳")
-    private String score;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityAdvertising.java

@@ -1,71 +0,0 @@
-package com.zhongzheng.modules.activity.domain;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 广告发布储存对象 activity_advertising
- *
- * @author change
- * @date 2021-05-17
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("activity_advertising")
-public class ActivityAdvertising implements Serializable {
-
-private static final long serialVersionUID=1L;
-
-
-    /** $column.columnComment */
-    @TableId(value = "id")
-    private Long id;
-
-    /** 广告图片 */
-    private String adverUrl;
-
-    /** 跳转url */
-    private String jumpUrl;
-
-    /** 跳转url */
-    private String sourceUrl;
-
-    /** 创建时间 */
-    @TableField(fill = FieldFill.INSERT)
-    private Long createTime;
-
-    /** 修改时间 */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Long updateTime;
-
-    /** 有效时间开始时间 */
-    private Long startTime;
-
-    /** 有效期过期时间 */
-    private Long endTime;
-
-    /** 备注 */
-    private String remarks;
-
-    /** 0 手动发布 1定时发布 */
-    private Integer reStatus;
-
-    /** 0删除 1待发布 2 撤回 3发布成功 */
-    private Integer status;
-
-    /** 广告名称 */
-    private String advName;
-
-    /** 广告类型 1学习中心 2求职 */
-    private Integer type;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityConfiguration.java

@@ -1,85 +0,0 @@
-package com.zhongzheng.modules.activity.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
-
-/**
- * 活动配置对象 activity_configuration
- * 
- * @author change
- * @date 2021-05-17
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("activity_configuration")
-public class ActivityConfiguration implements Serializable {
-
-private static final long serialVersionUID=1L;
-
-
-    /** $column.columnComment */
-    @TableId(value = "id",type = IdType.AUTO)
-    private Long id;
-
-    /** 活动名称 */
-    private String activityName;
-
-    /** 活动类型 0 优惠券 1折扣券 2线上直播 3定价 4优惠 5折扣 */
-    private Integer activityType;
-
-    /** 活动介绍备注说明 */
-    private String description;
-
-    /** 活动开始时间 */
-    private Long startTime;
-
-    /** 活动结束时间 */
-    private Long endTime;
-
-    /** 定价（金额，折扣，优惠金额） */
-    @ApiModelProperty("定价（金额，折扣，优惠金额）")
-    private BigDecimal price;
-
-    /** 发放数量 */
-    private Integer quantity;
-
-    /** 直播内容（适用直播） */
-    private String liveContent;
-
-    /** 活动地址 */
-    private String liveAdress;
-
-    /** 创建时间 */
-    @TableField(fill = FieldFill.INSERT)
-    private Long createTime;
-
-    /** 修改时间 */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Long updateTime;
-
-    /** 0删除 1结束 2 撤回 3开始 4未开始 */
-    private Integer status;
-
-    /** 修改时间 */
-    private Integer couponEnd;
-
-    /** 活动图标 */
-    private String activityLogo;
-
-
-
-    /** 活动地址 */
-    private String activityUrl;
-
-    /** 活动详情 */
-    private String activityContentUrl;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityConfigurationCourse.java

@@ -1,34 +0,0 @@
-package com.zhongzheng.modules.activity.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
-
-/**
- * 活动配置关联课程包含范围对象 activity_configuration_course
- * 
- * @author change
- * @date 2021-05-19
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("activity_configuration_course")
-public class ActivityConfigurationCourse implements Serializable {
-
-private static final long serialVersionUID=1L;
-
-
-    /** 活动配置id */
-    @TableId(value = "configuration_id")
-    private Long configurationId;
-
-    /** 关联课程id */
-    private Long courseId;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityConfigurationUse.java

@@ -1,45 +0,0 @@
-package com.zhongzheng.modules.activity.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
-
-/**
- * 【请填写功能名称】对象 activity_configuration_use
- * 
- * @author change
- * @date 2021-06-15
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("activity_configuration_use")
-public class ActivityConfigurationUse implements Serializable {
-
-private static final long serialVersionUID=1L;
-
-
-    /** $column.columnComment */
-    private Long userId;
-
-    /** 已领取，活动配置id */
-    private Long configurationId;
-
-    /** 已领取活动类型 0 优惠券 1折扣券 2线上直播 3定价 4优惠 5折扣 */
-    private Integer activityType;
-
-    /** 是否已使用该次活动   0未使用  1已使用   线上直播 3 */
-    private Integer useStatus;
-
-    /** 领取时间 */
-    private Long createTime;
-
-    /** 领取时间 */
-    private Long updateTime;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityGrade.java

@@ -1,54 +0,0 @@
-package com.zhongzheng.modules.activity.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
-
-/**
- * 等级积分对象 activity_grade
- * 
- * @author change
- * @date 2021-05-19
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("activity_grade")
-public class ActivityGrade implements Serializable {
-
-private static final long serialVersionUID=1L;
-
-
-    /** $column.columnComment */
-    @TableId(value = "id")
-    private Long id;
-
-    /** 等级 */
-    private Integer grade;
-
-    /** 等级名称 */
-    private String gradeName;
-
-    /** 需要最低积分 */
-    private Integer needIntegralStart;
-
-    /** 最高积分 */
-    private Integer needIntegralEnd;
-
-    /** 说明备注 */
-    private String remarks;
-
-    /** 创建时间 */
-    @TableField(fill = FieldFill.INSERT)
-    private Long createTime;
-
-    /** 修改时间 */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Long updateTime;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityGradePrivilege.java

@@ -1,54 +0,0 @@
-package com.zhongzheng.modules.activity.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
-
-/**
- * 等级积分特权类型：优惠券，折扣券等类型对象 activity_grade_privilege
- * 
- * @author change
- * @date 2021-05-20
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("activity_grade_privilege")
-public class ActivityGradePrivilege implements Serializable {
-
-private static final long serialVersionUID=1L;
-
-
-    /** $column.columnComment */
-    @TableId(value = "id")
-    private Long id;
-
-    /** 关联积分表id */
-    private Long gradeId;
-
-    /** 特权类型 0优惠券 1折扣券 2解锁题库  3解锁课程 */
-    private String priType;
-
-    /** 优惠券金额或折扣 */
-    private Long couponPrice;
-
-    /** 折扣 */
-    private Integer discount;
-
-    /** 有效期几个月 */
-    private Integer endTimeSum;
-
-    /** 发放数量 */
-    private Integer quantity;
-
-    /** 0删除 1使用 */
-    @ApiModelProperty("0删除 1使用")
-    private Integer status;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityGradePrivilegeCoures.java

@@ -1,39 +0,0 @@
-package com.zhongzheng.modules.activity.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.models.auth.In;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
-
-/**
- * 积分关联特权的范围课程对象 activity_grade_privilege_coures
- * 
- * @author change
- * @date 2021-05-20
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("activity_grade_privilege_coures")
-public class ActivityGradePrivilegeCoures implements Serializable {
-
-private static final long serialVersionUID=1L;
-
-
-    /** 活动配置id */
-    @TableId(value = "privilege_id")
-    private Long privilegeId;
-
-    /** 关联课程id */
-    private Long courseId;
-
-
-    /** 所属类型 */
-    private Integer status;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityTask.java

@@ -1,71 +0,0 @@
-package com.zhongzheng.modules.activity.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
-
-/**
- * 任务存储对象 activity_task
- * 
- * @author change
- * @date 2021-05-19
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("activity_task")
-public class ActivityTask implements Serializable {
-
-private static final long serialVersionUID=1L;
-
-
-    /** $column.columnComment */
-    @TableId(value = "id")
-    private Long id;
-
-    /** 任务名称 任务名称  0每日签到 1完善信息 2邀请好友 3每日分享
-     4视频学习 5模拟考试*/
-    private Integer taskType;
-
-    /** 奖励积分 */
-    private Integer startIntegral;
-
-    /** 积分上限 */
-    private Integer endIntegral;
-
-    /** 备注 */
-    private String remarks;
-
-    /** 说明 */
-    private String description;
-
-    /** 累加积分 */
-    private Integer accIntegral;
-
-    /** 最短视频时间分钟单位 */
-    private Integer longTime;
-
-    /** 每日分享或模拟考试奖励次数 */
-    private Integer countDay;
-
-    /** 创建时间 */
-    @TableField(fill = FieldFill.INSERT)
-    private Long createTime;
-
-    /** 修改时间 */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Long updateTime;
-
-    /** 0 停用 1启用 */
-    private Integer status;
-
-    /** 最低分数 */
-    private Integer minNum;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityTaskTime.java

@@ -1,40 +0,0 @@
-package com.zhongzheng.modules.activity.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
-
-/**
- * 模拟考试分数给予积分关联对象 activity_task_time
- * 
- * @author change
- * @date 2021-05-20
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("activity_task_time")
-public class ActivityTaskTime implements Serializable {
-
-private static final long serialVersionUID=1L;
-
-
-    /** 任务ID */
-    @TableId(value = "task_id")
-    private Long taskId;
-
-    /** 分数最低范围 */
-    private Integer startRange;
-
-    /** 分数最高范围 */
-    private Integer endRange;
-
-    /** 奖励积分 */
-    private Integer integral;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityTaskUser.java

@@ -1,48 +0,0 @@
-package com.zhongzheng.modules.activity.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
-
-/**
- * 用户领取记录对象 activity_task_user
- * 
- * @author change
- * @date 2021-06-16
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("activity_task_user")
-public class ActivityTaskUser implements Serializable {
-
-private static final long serialVersionUID=1L;
-
-
-    /** $column.columnComment */
-    private Long userId;
-
-    /** $column.columnComment */
-    private Long taskId;
-
-    /** $column.columnComment */
-    @TableField(fill = FieldFill.INSERT)
-    private Long createTime;
-
-    /** $column.columnComment */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Long updateTime;
-
-    /** 领取分数 */
-    private String score;
-
-    /** 任务名称  0每日签到 1完善信息 2邀请好友 3每日分享
-4视频学习 5模拟考试 */
-    private Integer taskType;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityAdvertisingMapper.java

@@ -1,26 +0,0 @@
-package com.zhongzheng.modules.activity.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.activity.bo.ActivityAdvertisingQueryBo;
-import com.zhongzheng.modules.activity.domain.ActivityAdvertising;
-import com.zhongzheng.modules.activity.vo.ActivityAdvertisingVo;
-
-import java.util.List;
-
-/**
- * 广告发布储存Mapper接口
- *
- * @author change
- * @date 2021-05-17
- */
-public interface ActivityAdvertisingMapper extends BaseMapper<ActivityAdvertising> {
-
-
-    /**
-     * 查找已发布的广告
-     *
-     * @param bo 课程绑定
-     *@return 广告信息
-     */
-    List<ActivityAdvertisingVo> queryIssueList(ActivityAdvertisingQueryBo bo);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityConfigurationCourseMapper.java

@@ -1,25 +0,0 @@
-package com.zhongzheng.modules.activity.mapper;
-
-import com.zhongzheng.modules.activity.domain.ActivityConfigurationCourse;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
-
-/**
- * 活动配置关联课程包含范围Mapper接口
- *
- * @author change
- * @date 2021-05-19
- */
-public interface ActivityConfigurationCourseMapper extends BaseMapper<ActivityConfigurationCourse> {
-
-    /**
-     * 添加课程
-     *
-     * @param activityConfigurationCourse 课程绑定
-     *
-     */
-    void insertCourse(ActivityConfigurationCourse activityConfigurationCourse);
-
-    List<Long> selectConfiguraList(Long id);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityConfigurationMapper.java

@@ -1,67 +0,0 @@
-package com.zhongzheng.modules.activity.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationQueryBo;
-import com.zhongzheng.modules.activity.domain.ActivityConfiguration;
-import com.zhongzheng.modules.activity.vo.ActivityConfigurationVo;
-import com.zhongzheng.modules.course.bo.CourseQueryBo;
-import com.zhongzheng.modules.course.vo.CourseConfigurationVo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 活动配置Mapper接口
- *
- * @author change
- * @date 2021-05-17
- */
-public interface ActivityConfigurationMapper extends BaseMapper<ActivityConfiguration> {
-
-    /**
-     * 查询配置分页
-     *
-     * @param bo 配置信息
-     * @return 配置信息集合信息
-     */
-    Collection<ActivityConfigurationVo> selectConfiguraList(ActivityConfigurationQueryBo bo);
-
-    /**
-     * 详细配置
-     *
-     * @param id 详细配置信息
-     * @return 详细配置
-     */
-    ActivityConfigurationVo selectConfigures(Long id);
-
-
-    /**
-     * 查询用户能做的活动
-     *
-     * @param bo 详细配置信息
-     * @return Collection<CourseConfigurationVo> 详细配置
-     */
-    List<ActivityConfigurationVo> selectConfiguraIssueList(ActivityConfigurationQueryBo bo);
-
-
-    /**
-     * 查询课程能做的活动
-     *
-     * @param bo 详细配置信息
-     * @return Collection<CourseConfigurationVo> 详细配置
-     */
-    List<ActivityConfigurationVo> selectlistConfiguration(CourseQueryBo bo);
-
-    /**
-     *
-     * @author change
-     * @date 2021/7/1 16:14
-     * @param goodsId
-     * @param activity
-     * @return int
-     */
-    int selectCountActivity(@Param("goodsId") Long goodsId, @Param("activityId") Long activity);
-
-    long selectConfiguraCount(ActivityConfigurationQueryBo bo);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityConfigurationUseMapper.java

@@ -1,18 +0,0 @@
-package com.zhongzheng.modules.activity.mapper;
-
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationUseAddBo;
-import com.zhongzheng.modules.activity.domain.ActivityConfigurationUse;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 【请填写功能名称】Mapper接口
- *
- * @author change
- * @date 2021-06-15
- */
-public interface ActivityConfigurationUseMapper extends BaseMapper<ActivityConfigurationUse> {
-
-    Integer queryByUse(ActivityConfigurationUseAddBo bo);
-
-    Integer countConfig(Long id);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityGradeMapper.java

@@ -1,35 +0,0 @@
-package com.zhongzheng.modules.activity.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.activity.bo.ActivityGradeQueryBo;
-import com.zhongzheng.modules.activity.bo.ActivityTaskUserAddBo;
-import com.zhongzheng.modules.activity.domain.ActivityGrade;
-import com.zhongzheng.modules.activity.vo.ActivityGradeVo;
-
-import java.util.Collection;
-
-/**
- * 等级积分Mapper接口
- *
- * @author change
- * @date 2021-05-19
- */
-public interface ActivityGradeMapper extends BaseMapper<ActivityGrade> {
-
-    /**
-     * 查询等级分页
-     *
-     * @param bo 等级信息
-     * @return 等级信息集合信息
-     */
-    Collection<ActivityGradeVo> selectGradeList(ActivityGradeQueryBo bo);
-
-
-    /**
-     * 查询等级分页
-     *
-     * @param bo 等级信息
-     * @return 等级信息集合信息
-     */
-    ActivityGradeVo queryByInteger(Long bo);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityGradePrivilegeCouresMapper.java

@@ -1,21 +0,0 @@
-package com.zhongzheng.modules.activity.mapper;
-
-import com.zhongzheng.modules.activity.domain.ActivityGradePrivilegeCoures;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 积分关联特权的范围课程Mapper接口
- *
- * @author change
- * @date 2021-05-20
- */
-public interface ActivityGradePrivilegeCouresMapper extends BaseMapper<ActivityGradePrivilegeCoures> {
-
-    /**
-     * 添加课程
-     *
-     * @param setCourseId 课程绑定
-     *
-     */
-    int insertCouse(ActivityGradePrivilegeCoures setCourseId);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityGradePrivilegeMapper.java

@@ -1,26 +0,0 @@
-package com.zhongzheng.modules.activity.mapper;
-
-import com.zhongzheng.modules.activity.domain.ActivityGradePrivilege;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.activity.vo.ActivityGradePrivilegeVo;
-
-import java.util.List;
-
-/**
- * 等级积分特权类型：优惠券，折扣券等类型Mapper接口
- *
- * @author change
- * @date 2021-05-20
- */
-public interface ActivityGradePrivilegeMapper extends BaseMapper<ActivityGradePrivilege> {
-
-    /**
-     * 查询特技权限
-     *
-     * @param id 权限id
-     *
-     */
-    List<ActivityGradePrivilegeVo> selectGradePriList(Long id);
-
-    void deleteByGrade(Long id);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityTaskMapper.java

@@ -1,21 +0,0 @@
-package com.zhongzheng.modules.activity.mapper;
-
-import com.zhongzheng.modules.activity.domain.ActivityTask;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 任务存储Mapper接口
- *
- * @author change
- * @date 2021-05-19
- */
-public interface ActivityTaskMapper extends BaseMapper<ActivityTask> {
-
-    /**
-     * 查询类型活动
-     *
-     * @param taskId 类型id
-     *
-     */
-    ActivityTask queryByTaskId(Long taskId);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityTaskTimeMapper.java

@@ -1,32 +0,0 @@
-package com.zhongzheng.modules.activity.mapper;
-
-import com.zhongzheng.modules.activity.bo.ActivityTaskUserAddBo;
-import com.zhongzheng.modules.activity.domain.ActivityTaskTime;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.activity.vo.ActivityTaskTimeVo;
-
-/**
- * 模拟考试分数给予积分关联Mapper接口
- *
- * @author change
- * @date 2021-05-20
- */
-public interface ActivityTaskTimeMapper extends BaseMapper<ActivityTaskTime> {
-
-    /**
-     * 添加考试范围时间段
-     *
-     * @param toBean 时间范围分数
-     *
-     */
-    void inserTaskTime(ActivityTaskTime toBean);
-
-
-    /**
-     * 查询积分分数
-     *
-     * @param bo 时间范围分数
-     *
-     */
-    ActivityTaskTimeVo queryPractice(ActivityTaskUserAddBo bo);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityTaskUserMapper.java

@@ -1,16 +0,0 @@
-package com.zhongzheng.modules.activity.mapper;
-
-import com.zhongzheng.modules.activity.domain.ActivityTaskUser;
-import com.zhongzheng.modules.activity.domain.ActivityTaskUser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 用户领取记录Mapper接口
- *
- * @author change
- * @date 2021-06-16
- */
-public interface ActivityTaskUserMapper extends BaseMapper<ActivityTaskUser> {
-
-    int insertAdd(ActivityTaskUser add);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityAdvertisingService.java

@@ -1,63 +0,0 @@
-package com.zhongzheng.modules.activity.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.activity.bo.ActivityAdvertisingAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityAdvertisingEditBo;
-import com.zhongzheng.modules.activity.bo.ActivityAdvertisingQueryBo;
-import com.zhongzheng.modules.activity.domain.ActivityAdvertising;
-import com.zhongzheng.modules.activity.vo.ActivityAdvertisingVo;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 广告发布储存Service接口
- *
- * @author change
- * @date 2021-05-17
- */
-public interface IActivityAdvertisingService extends IService<ActivityAdvertising> {
-	/**
-	 * 查询单个
-	 * @param id 广告发布储存新增业务对象
-	 * @return ActivityAdvertisingVo
-	 */
-	ActivityAdvertisingVo queryById(Long id);
-
-	/**
-	 * 查询列表
-	 * @param bo 广告发布储存新增业务对象
-	 * @return ActivityAdvertisingVo
-	 */
-	List<ActivityAdvertisingVo> queryList(ActivityAdvertisingQueryBo bo);
-
-	/**
-	 * 根据新增业务对象插入广告发布储存
-	 * @param bo 广告发布储存新增业务对象
-	 * @return
-	 */
-	long insertByAddBo(ActivityAdvertisingAddBo bo);
-
-	/**
-	 * 根据编辑业务对象修改广告发布储存
-	 * @param bo 广告发布储存编辑业务对象
-	 * @return
-	 */
-	ActivityAdvertisingVo updateByEditBo(ActivityAdvertisingEditBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-
-	/**
-	 * 查询列表
-	 * @param bo 广告发布储存新增业务对象
-	 * @return ActivityAdvertisingVo
-	 */
-    List<ActivityAdvertisingVo> queryIssueList(ActivityAdvertisingQueryBo bo);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityConfigurationCourseService.java

@@ -1,54 +0,0 @@
-package com.zhongzheng.modules.activity.service;
-
-import com.zhongzheng.modules.activity.domain.ActivityConfigurationCourse;
-import com.zhongzheng.modules.activity.vo.ActivityConfigurationCourseVo;
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationCourseQueryBo;
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationCourseAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationCourseEditBo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 活动配置关联课程包含范围Service接口
- *
- * @author change
- * @date 2021-05-19
- */
-public interface IActivityConfigurationCourseService extends IService<ActivityConfigurationCourse> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	ActivityConfigurationCourseVo queryById(Long configurationId);
-
-	/**
-	 * 查询列表
-	 */
-	List<ActivityConfigurationCourseVo> queryList(ActivityConfigurationCourseQueryBo bo);
-
-	/**
-	 * 根据新增业务对象插入活动配置关联课程包含范围
-	 * @param bo 活动配置关联课程包含范围新增业务对象
-	 * @return
-	 */
-	Boolean insertByAddBo(ActivityConfigurationCourseAddBo bo);
-
-	/**
-	 * 根据编辑业务对象修改活动配置关联课程包含范围
-	 * @param bo 活动配置关联课程包含范围编辑业务对象
-	 * @return
-	 */
-	Boolean updateByEditBo(ActivityConfigurationCourseEditBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-
-    List<Long> selectConfiguraList(Long id);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityConfigurationService.java

@@ -1,73 +0,0 @@
-package com.zhongzheng.modules.activity.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationEditBo;
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationQueryBo;
-import com.zhongzheng.modules.activity.domain.ActivityConfiguration;
-import com.zhongzheng.modules.activity.vo.ActivityConfigurationVo;
-import com.zhongzheng.modules.course.bo.CourseQueryBo;
-import com.zhongzheng.modules.course.vo.CourseConfigurationVo;
-
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 活动配置Service接口
- *
- * @author change
- * @date 2021-05-17
- */
-public interface IActivityConfigurationService extends IService<ActivityConfiguration> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	ActivityConfigurationVo queryById(Long id);
-
-	/**
-	 * 查询列表
-	 */
-	TableDataInfo<ActivityConfigurationVo> queryList(ActivityConfigurationQueryBo bo);
-
-	/**
-	 * 根据新增业务对象插入活动配置
-	 * @param bo 活动配置新增业务对象
-	 * @return
-	 */
-	Boolean insertByAddBo(ActivityConfigurationAddBo bo);
-
-	/**
-	 * 根据编辑业务对象修改活动配置
-	 * @param bo 活动配置编辑业务对象
-	 * @return
-	 */
-	Boolean updateByEditBo(ActivityConfigurationEditBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-
-
-	/**
-	 * 查询活动课程
-	 * @param bo
-	 * @return List<CourseConfigurationVo>
-	 */
-    List<ActivityConfigurationVo> queryIssueList(ActivityConfigurationQueryBo bo);
-
-	/**
-	 * 查询活动课程
-	 * @param bo
-	 * @return List<ActivityConfigurationVo>
-	 */
-    List<ActivityConfigurationVo> listConfiguration(CourseQueryBo bo);
-
-    int selectCount(Long goodsId, Long activity);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityConfigurationUseService.java

@@ -1,65 +0,0 @@
-package com.zhongzheng.modules.activity.service;
-
-import com.zhongzheng.modules.activity.domain.ActivityConfigurationUse;
-import com.zhongzheng.modules.activity.vo.ActivityConfigurationUseVo;
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationUseQueryBo;
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationUseAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationUseEditBo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 【请填写功能名称】Service接口
- *
- * @author change
- * @date 2021-06-15
- */
-public interface IActivityConfigurationUseService extends IService<ActivityConfigurationUse> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	ActivityConfigurationUseVo queryById(Long userId);
-
-	/**
-	 * 查询列表
-	 */
-	List<ActivityConfigurationUseVo> queryList(ActivityConfigurationUseQueryBo bo);
-
-	/**
-	 * 根据新增业务对象插入【请填写功能名称】
-	 * @param bo 【请填写功能名称】新增业务对象
-	 * @return
-	 */
-	Boolean insertByAddBo(ActivityConfigurationUseAddBo bo);
-
-	/**
-	 * 根据编辑业务对象修改【请填写功能名称】
-	 * @param bo 【请填写功能名称】编辑业务对象
-	 * @return
-	 */
-	Boolean updateByEditBo(ActivityConfigurationUseEditBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-
-
-
-	/**
-	 * 查询是否已领取
-	 * @param bo 主键集合
-	 * @return boolean
-	 */
-	boolean receive(ActivityConfigurationUseAddBo bo);
-
-    Integer countConfig(Long id);
-
-	Integer queryByCount(Long userId);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityGradePrivilegeCouresService.java

@@ -1,52 +0,0 @@
-package com.zhongzheng.modules.activity.service;
-
-import com.zhongzheng.modules.activity.domain.ActivityGradePrivilegeCoures;
-import com.zhongzheng.modules.activity.vo.ActivityGradePrivilegeCouresVo;
-import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeCouresQueryBo;
-import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeCouresAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeCouresEditBo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 积分关联特权的范围课程Service接口
- *
- * @author change
- * @date 2021-05-20
- */
-public interface IActivityGradePrivilegeCouresService extends IService<ActivityGradePrivilegeCoures> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	ActivityGradePrivilegeCouresVo queryById(Long privilegeId);
-
-	/**
-	 * 查询列表
-	 */
-	List<ActivityGradePrivilegeCouresVo> queryList(ActivityGradePrivilegeCouresQueryBo bo);
-
-	/**
-	 * 根据新增业务对象插入积分关联特权的范围课程
-	 * @param bo 积分关联特权的范围课程新增业务对象
-	 * @return
-	 */
-	Boolean insertByAddBo(ActivityGradePrivilegeCouresAddBo bo);
-
-	/**
-	 * 根据编辑业务对象修改积分关联特权的范围课程
-	 * @param bo 积分关联特权的范围课程编辑业务对象
-	 * @return
-	 */
-	Boolean updateByEditBo(ActivityGradePrivilegeCouresEditBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityGradePrivilegeService.java

@@ -1,54 +0,0 @@
-package com.zhongzheng.modules.activity.service;
-
-import com.zhongzheng.modules.activity.domain.ActivityGradePrivilege;
-import com.zhongzheng.modules.activity.vo.ActivityGradePrivilegeVo;
-import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeQueryBo;
-import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeEditBo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 等级积分特权类型：优惠券，折扣券等类型Service接口
- *
- * @author change
- * @date 2021-05-20
- */
-public interface IActivityGradePrivilegeService extends IService<ActivityGradePrivilege> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	ActivityGradePrivilegeVo queryById(Long id);
-
-	/**
-	 * 查询列表
-	 */
-	List<ActivityGradePrivilegeVo> queryList(ActivityGradePrivilegeQueryBo bo);
-
-	/**
-	 * 根据新增业务对象插入等级积分特权类型：优惠券，折扣券等类型
-	 * @param bo 等级积分特权类型：优惠券，折扣券等类型新增业务对象
-	 * @return
-	 */
-	Boolean insertByAddBo(ActivityGradePrivilegeAddBo bo);
-
-	/**
-	 * 根据编辑业务对象修改等级积分特权类型：优惠券，折扣券等类型
-	 * @param bo 等级积分特权类型：优惠券，折扣券等类型编辑业务对象
-	 * @return
-	 */
-	Boolean updateByEditBo(ActivityGradePrivilegeEditBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-
-    void removeByGrade(Long id);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityGradeService.java

@@ -1,56 +0,0 @@
-package com.zhongzheng.modules.activity.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.modules.activity.bo.ActivityGradeAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityGradeEditBo;
-import com.zhongzheng.modules.activity.bo.ActivityGradeQueryBo;
-import com.zhongzheng.modules.activity.bo.ActivityTaskUserAddBo;
-import com.zhongzheng.modules.activity.domain.ActivityGrade;
-import com.zhongzheng.modules.activity.vo.ActivityGradeVo;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 等级积分Service接口
- *
- * @author change
- * @date 2021-05-19
- */
-public interface IActivityGradeService extends IService<ActivityGrade> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	ActivityGradeVo queryById(Long id);
-
-	/**
-	 * 查询列表
-	 */
-	TableDataInfo<ActivityGradeVo> queryList(ActivityGradeQueryBo bo);
-
-	/**
-	 * 根据新增业务对象插入等级积分
-	 * @param bo 等级积分新增业务对象
-	 * @return
-	 */
-	Boolean insertByAddBo(ActivityGradeAddBo bo);
-
-	/**
-	 * 根据编辑业务对象修改等级积分
-	 * @param bo 等级积分编辑业务对象
-	 * @return
-	 */
-	Boolean updateByEditBo(ActivityGradeEditBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-
-    ActivityGradeVo queryByInteger(Long bo);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityTaskService.java

@@ -1,62 +0,0 @@
-package com.zhongzheng.modules.activity.service;
-
-import com.zhongzheng.modules.activity.domain.ActivityTask;
-import com.zhongzheng.modules.activity.vo.ActivityTaskVo;
-import com.zhongzheng.modules.activity.bo.ActivityTaskQueryBo;
-import com.zhongzheng.modules.activity.bo.ActivityTaskAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityTaskEditBo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 任务存储Service接口
- *
- * @author change
- * @date 2021-05-19
- */
-public interface IActivityTaskService extends IService<ActivityTask> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	ActivityTaskVo queryById(Long id);
-
-	/**
-	 * 查询列表
-	 */
-	List<ActivityTaskVo> queryList(ActivityTaskQueryBo bo);
-
-	/**
-	 * 根据新增业务对象插入任务存储
-	 * @param bo 任务存储新增业务对象
-	 * @return
-	 */
-	Boolean insertByAddBo(ActivityTaskAddBo bo);
-
-	/**
-	 * 根据编辑业务对象修改任务存储
-	 * @param bo 任务存储编辑业务对象
-	 * @return
-	 */
-	Boolean updateByEditBo(ActivityTaskEditBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-
-
-	/**
-	 * 查询当前做的任务类型
-	 * @param taskId 主键集合
-	 * @return
-	 */
-    ActivityTaskVo queryByTaskId(Long taskId);
-
-	List<ActivityTaskVo> querylistUser(ActivityTaskQueryBo bo);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityTaskTimeService.java

@@ -1,57 +0,0 @@
-package com.zhongzheng.modules.activity.service;
-
-import com.zhongzheng.modules.activity.bo.ActivityTaskUserAddBo;
-import com.zhongzheng.modules.activity.domain.ActivityTaskTime;
-import com.zhongzheng.modules.activity.vo.ActivityTaskTimeVo;
-import com.zhongzheng.modules.activity.bo.ActivityTaskTimeQueryBo;
-import com.zhongzheng.modules.activity.bo.ActivityTaskTimeAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityTaskTimeEditBo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 模拟考试分数给予积分关联Service接口
- *
- * @author change
- * @date 2021-05-20
- */
-public interface IActivityTaskTimeService extends IService<ActivityTaskTime> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	ActivityTaskTimeVo queryById(Long taskId);
-
-	/**
-	 * 查询列表
-	 */
-	List<ActivityTaskTimeVo> queryList(ActivityTaskTimeQueryBo bo);
-
-	/**
-	 * 根据新增业务对象插入模拟考试分数给予积分关联
-	 * @param bo 模拟考试分数给予积分关联新增业务对象
-	 * @return
-	 */
-	Boolean insertByAddBo(ActivityTaskTimeAddBo bo);
-
-	/**
-	 * 根据编辑业务对象修改模拟考试分数给予积分关联
-	 * @param bo 模拟考试分数给予积分关联编辑业务对象
-	 * @return
-	 */
-	Boolean updateByEditBo(ActivityTaskTimeEditBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-
-    void inserTaskTime(ActivityTaskTime toBean);
-
-    ActivityTaskTimeVo queryPractice(ActivityTaskUserAddBo bo);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityTaskUserService.java

@@ -1,98 +0,0 @@
-package com.zhongzheng.modules.activity.service;
-
-import com.zhongzheng.modules.activity.bo.ActivityTaskUserAddBo;
-import com.zhongzheng.modules.activity.domain.ActivityTaskUser;
-import com.zhongzheng.modules.activity.vo.ActivityTaskUserVo;
-import com.zhongzheng.modules.activity.bo.ActivityTaskUserQueryBo;
-import com.zhongzheng.modules.activity.bo.ActivityTaskUserEditBo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 用户领取记录Service接口
- *
- * @author change
- * @date 2021-06-16
- */
-public interface IActivityTaskUserService extends IService<ActivityTaskUser> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	ActivityTaskUserVo queryById(Long userId);
-
-	/**
-	 * 查询列表
-	 */
-	List<ActivityTaskUserVo> queryList(ActivityTaskUserQueryBo bo);
-
-	/**
-	 * 根据新增业务对象插入用户领取记录
-	 * @param bo 用户领取记录新增业务对象
-	 * @return
-	 */
-	Boolean insertByAddBo(ActivityTaskUserAddBo bo);
-
-	/**
-	 * 根据编辑业务对象修改用户领取记录
-	 * @param bo 用户领取记录编辑业务对象
-	 * @return
-	 */
-	Boolean updateByEditBo(ActivityTaskUserEditBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-
-
-	/**
-	 * 签到
-	 * @param bo 签到参数
-	 * @return
-	 */
-    boolean userTask(ActivityTaskUserAddBo bo);
-
-
-	/**
-	 * 完善信息
-	 * @param bo 参数
-	 * @return
-	 */
-    boolean information(ActivityTaskUserAddBo bo) throws IllegalAccessException;
-
-
-	/**
-	 * 邀请好友
-	 * @param bo 参数
-	 * @return
-	 */
-	boolean invitation(ActivityTaskUserAddBo bo);
-
-
-	/**
-	 * 每日分享
-	 * @param bo 参数
-	 * @return
-	 */
-	boolean share(ActivityTaskUserAddBo bo);
-
-	/**
-	 * 学习时长
-	 * @param bo 参数
-	 * @return
-	 */
-	Integer learnTime(ActivityTaskUserAddBo bo);
-
-	/**
-	 * 模拟考试
-	 * @param bo 参数
-	 * @return
-	 */
-	boolean practiceTest(ActivityTaskUserAddBo bo);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityAdvertisingServiceImpl.java

@@ -1,129 +0,0 @@
-package com.zhongzheng.modules.activity.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.Page;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.activity.bo.ActivityAdvertisingAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityAdvertisingEditBo;
-import com.zhongzheng.modules.activity.bo.ActivityAdvertisingQueryBo;
-import com.zhongzheng.modules.activity.domain.ActivityAdvertising;
-import com.zhongzheng.modules.activity.mapper.ActivityAdvertisingMapper;
-import com.zhongzheng.modules.activity.service.IActivityAdvertisingService;
-import com.zhongzheng.modules.activity.vo.ActivityAdvertisingVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 广告发布储存Service业务层处理
- *
- * @author change
- * @date 2021-05-17
- */
-@Service
-public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertisingMapper, ActivityAdvertising> implements IActivityAdvertisingService {
-
-    @Autowired
-    private IActivityAdvertisingService activityAdvertisingService;
-
-    @Override
-    public ActivityAdvertisingVo queryById(Long id){
-        ActivityAdvertising db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, ActivityAdvertisingVo.class);
-    }
-
-    @Override
-    public List<ActivityAdvertisingVo> queryList(ActivityAdvertisingQueryBo bo) {
-        LambdaQueryWrapper<ActivityAdvertising> lqw = Wrappers.lambdaQuery();
-        lqw.ne(bo.getStatus() == null,ActivityAdvertising::getStatus,0);
-        lqw.eq(StrUtil.isNotBlank(bo.getAdverUrl()), ActivityAdvertising::getAdverUrl, bo.getAdverUrl());
-        lqw.eq(StrUtil.isNotBlank(bo.getJumpUrl()), ActivityAdvertising::getJumpUrl, bo.getJumpUrl());
-        lqw.eq(StrUtil.isNotBlank(bo.getRemarks()), ActivityAdvertising::getRemarks, bo.getRemarks());
-        lqw.eq(bo.getReStatus() != null, ActivityAdvertising::getReStatus, bo.getReStatus());
-        lqw.eq(bo.getStatus() != null, ActivityAdvertising::getStatus, bo.getStatus());
-        lqw.like(StrUtil.isNotBlank(bo.getAdvName()), ActivityAdvertising::getAdvName, bo.getAdvName());
-        lqw.apply(bo.getStartCreateTime() != null,"create_time BETWEEN {0} and {1}",bo.getStartCreateTime(),bo.getEndCreateTime());
-        lqw.apply(bo.getEndTime() != null,"end_time BETWEEN {0} and {1}",bo.getStartTime(),bo.getEndTime());
-        lqw.apply(bo.getStarIssueTime() != null,"start_time BETWEEN {0} and {1}",bo.getStarIssueTime(),bo.getEndIssueTime());
-        lqw.orderByDesc(ActivityAdvertising::getUpdateTime);
-        List<ActivityAdvertising> list = this.list(lqw);
-        lqw.eq(bo.getType() != null, ActivityAdvertising::getType, bo.getType());
-        return entity2Vo(list);
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<ActivityAdvertisingVo> entity2Vo(Collection<ActivityAdvertising> collection) {
-        List<ActivityAdvertisingVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, ActivityAdvertisingVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<ActivityAdvertising> page = (Page<ActivityAdvertising>)collection;
-            Page<ActivityAdvertisingVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public long insertByAddBo(ActivityAdvertisingAddBo bo) {
-        ActivityAdvertising add = BeanUtil.toBean(bo, ActivityAdvertising.class);
-        validEntityBeforeSave(add);
-        add.setStatus(1);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        return activityAdvertisingService.save(add)?add.getId():0;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public ActivityAdvertisingVo updateByEditBo(ActivityAdvertisingEditBo bo) {
-        ActivityAdvertising update = BeanUtil.toBean(bo, ActivityAdvertising.class);
-        ActivityAdvertisingVo activityAdvertisingVo = this.queryById(update.getId());
-        validEntityBeforeSave(update);
-        update.setUpdateTime(DateUtils.getNowTime());
-        activityAdvertisingService.updateById(update);
-        return activityAdvertisingVo;
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(ActivityAdvertising entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        ArrayList<ActivityAdvertising> activityAdvertisingList = new ArrayList<>();
-        ids.stream().forEach(id -> activityAdvertisingList.add(new ActivityAdvertising().setId(id).setStatus(0).setUpdateTime(DateUtils.getNowTime())));
-        return activityAdvertisingService.updateBatchById(activityAdvertisingList);
-    }
-
-    @Override
-    public List<ActivityAdvertisingVo> queryIssueList(ActivityAdvertisingQueryBo bo) {
-        bo.setStartTime(DateUtils.getNowTime());
-        List<ActivityAdvertisingVo> activityAdvertisingVos = baseMapper.queryIssueList(bo);
-        return activityAdvertisingVos;
-    }
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityConfigurationCourseServiceImpl.java

@@ -1,99 +0,0 @@
-package com.zhongzheng.modules.activity.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationCourseAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationCourseQueryBo;
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationCourseEditBo;
-import com.zhongzheng.modules.activity.domain.ActivityConfigurationCourse;
-import com.zhongzheng.modules.activity.mapper.ActivityConfigurationCourseMapper;
-import com.zhongzheng.modules.activity.vo.ActivityConfigurationCourseVo;
-import com.zhongzheng.modules.activity.service.IActivityConfigurationCourseService;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 活动配置关联课程包含范围Service业务层处理
- *
- * @author change
- * @date 2021-05-19
- */
-@Service
-public class ActivityConfigurationCourseServiceImpl extends ServiceImpl<ActivityConfigurationCourseMapper, ActivityConfigurationCourse> implements IActivityConfigurationCourseService {
-
-    @Override
-    public ActivityConfigurationCourseVo queryById(Long configurationId){
-        ActivityConfigurationCourse db = this.baseMapper.selectById(configurationId);
-        return BeanUtil.toBean(db, ActivityConfigurationCourseVo.class);
-    }
-
-    @Override
-    public List<ActivityConfigurationCourseVo> queryList(ActivityConfigurationCourseQueryBo bo) {
-        LambdaQueryWrapper<ActivityConfigurationCourse> lqw = Wrappers.lambdaQuery();
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<ActivityConfigurationCourseVo> entity2Vo(Collection<ActivityConfigurationCourse> collection) {
-        List<ActivityConfigurationCourseVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, ActivityConfigurationCourseVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<ActivityConfigurationCourse> page = (Page<ActivityConfigurationCourse>)collection;
-            Page<ActivityConfigurationCourseVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(ActivityConfigurationCourseAddBo bo) {
-        ActivityConfigurationCourse add = BeanUtil.toBean(bo, ActivityConfigurationCourse.class);
-        validEntityBeforeSave(add);
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(ActivityConfigurationCourseEditBo bo) {
-        ActivityConfigurationCourse update = BeanUtil.toBean(bo, ActivityConfigurationCourse.class);
-        validEntityBeforeSave(update);
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(ActivityConfigurationCourse entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-
-    @Override
-    public List<Long> selectConfiguraList(Long id) {
-        return baseMapper.selectConfiguraList(id);
-    }
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityConfigurationServiceImpl.java

@@ -1,205 +0,0 @@
-package com.zhongzheng.modules.activity.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpStatus;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationEditBo;
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationQueryBo;
-import com.zhongzheng.modules.activity.domain.ActivityConfiguration;
-import com.zhongzheng.modules.activity.domain.ActivityConfigurationCourse;
-import com.zhongzheng.modules.activity.mapper.ActivityConfigurationCourseMapper;
-import com.zhongzheng.modules.activity.mapper.ActivityConfigurationMapper;
-import com.zhongzheng.modules.activity.service.IActivityConfigurationCourseService;
-import com.zhongzheng.modules.activity.service.IActivityConfigurationService;
-import com.zhongzheng.modules.activity.service.IActivityConfigurationUseService;
-import com.zhongzheng.modules.activity.vo.ActivityConfigurationVo;
-import com.zhongzheng.modules.course.bo.CourseQueryBo;
-import com.zhongzheng.modules.course.vo.CourseConfigurationVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
-import org.springframework.transaction.annotation.Transactional;
-
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 活动配置Service业务层处理
- *
- * @author change
- * @date 2021-05-17
- */
-@Service
-public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfigurationMapper, ActivityConfiguration> implements IActivityConfigurationService {
-
-    @Autowired
-    private ActivityConfigurationCourseMapper activityConfigurationCourseMapper;
-
-    @Autowired
-    private IActivityConfigurationUseService activityConfigurationUseService;
-
-    @Autowired
-    private IActivityConfigurationCourseService activityConfigurationCourseService;
-
-    @Autowired
-    private  IActivityConfigurationService iActivityConfigurationService;
-
-    @Override
-    public ActivityConfigurationVo queryById(Long id){
-        ActivityConfigurationVo activityConfigurationVo = baseMapper.selectConfigures(id);
-        Integer num  = activityConfigurationUseService.countConfig(activityConfigurationVo.getId());
-        activityConfigurationVo.setUserNumber(num);
-        List<Long> course = activityConfigurationCourseService.selectConfiguraList(activityConfigurationVo.getId());
-        activityConfigurationVo.setCourses(course);
-        return activityConfigurationVo;
-
-    }
-
-    @Override
-    public TableDataInfo<ActivityConfigurationVo> queryList(ActivityConfigurationQueryBo bo) {
-        Collection<ActivityConfigurationVo> activityConfigurationVos = baseMapper.selectConfiguraList(bo);
-        for (ActivityConfigurationVo activityConfigurationVo : activityConfigurationVos) {
-            Integer num  = activityConfigurationUseService.countConfig(activityConfigurationVo.getId());
-            activityConfigurationVo.setUserNumber(num);
-            List<Long> course = activityConfigurationCourseService.selectConfiguraList(activityConfigurationVo.getId());
-            activityConfigurationVo.setCourses(course);
-        }
-
-        TableDataInfo<ActivityConfigurationVo> list = new TableDataInfo<>();
-        list.setRows(entity2Vo(activityConfigurationVos));
-        list.setCode(HttpStatus.HTTP_OK);
-        list.setMsg("查询成功");
-        list.setTotal(baseMapper.selectConfiguraCount(bo));
-        return list;
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<ActivityConfigurationVo> entity2Vo(Collection<ActivityConfigurationVo> collection) {
-        List<ActivityConfigurationVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, ActivityConfigurationVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<ActivityConfigurationVo> page = (Page<ActivityConfigurationVo>)collection;
-            Page<ActivityConfigurationVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean insertByAddBo(ActivityConfigurationAddBo bo) {
-        //新增活动
-        ActivityConfiguration activityConfiguration = BeanUtil.toBean(bo, ActivityConfiguration.class);
-        activityConfiguration.setCreateTime(DateUtils.getNowTime());
-        activityConfiguration.setUpdateTime(DateUtils.getNowTime());
-        activityConfiguration.setStatus(4);
-        int insert = baseMapper.insert(activityConfiguration);
-        if (bo.getCoursesId() != null) {
-            //绑定课程
-            insertConfigCourse(activityConfiguration.getId(), bo.getCoursesId());
-        }
-        return true;
-    }
-
-    private void insertConfigCourse(Long id, String[] coursesId) {
-        Arrays.stream(coursesId).forEach(e -> {
-            ActivityConfigurationCourse activityConfigurationCourse = new ActivityConfigurationCourse()
-                    .setConfigurationId(id).setCourseId(Convert.toLong(e));
-            activityConfigurationCourseMapper.insertCourse(activityConfigurationCourse);
-        });
-    }
-
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean updateByEditBo(ActivityConfigurationEditBo bo) {
-        ActivityConfiguration update = BeanUtil.toBean(bo, ActivityConfiguration.class);
-        update.setUpdateTime(DateUtils.getNowTime());
-        //修改绑定课程
-        if (bo.getCoursesId() != null){
-            updateConfigCourse(bo);
-        }
-        return iActivityConfigurationService.updateById(update);
-    }
-
-    private void updateConfigCourse(ActivityConfigurationEditBo bo) {
-        activityConfigurationCourseMapper.deleteById(bo.getId());
-        Arrays.stream(bo.getCoursesId()).forEach(e ->{
-            ActivityConfigurationCourse activityConfigurationCourse = new ActivityConfigurationCourse()
-                    .setConfigurationId(bo.getId()).setCourseId(Convert.toLong(e));
-            activityConfigurationCourseMapper.insertCourse(activityConfigurationCourse);
-        });
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(ActivityConfiguration entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        ArrayList<ActivityConfiguration> activityConfigurations = new ArrayList<>();
-        ids.stream().forEach(id -> activityConfigurations.add(new ActivityConfiguration().setId(id).setStatus(0).setUpdateTime(DateUtils.getNowTime())));
-        return iActivityConfigurationService.updateBatchById(activityConfigurations);
-    }
-
-    @Override
-    public List<ActivityConfigurationVo> queryIssueList(ActivityConfigurationQueryBo bo) {
-        bo.setStartTime(DateUtils.getNowTime());
-        List<ActivityConfigurationVo> courseConfigurationVos = baseMapper.selectConfiguraIssueList(bo);
-        return courseConfigurationVos;
-    }
-
-    @Override
-    public List<ActivityConfigurationVo> listConfiguration(CourseQueryBo bo) {
-    //    bo.setStartTime(DateUtils.getNowTime());
-        List<ActivityConfigurationVo> activityConfigurations =baseMapper.selectlistConfiguration(bo) ;
-        return activityConfigurations;
-    }
-
-    @Override
-    public int selectCount(Long goodsId, Long activity) {
-        return baseMapper.selectCountActivity(goodsId,activity);
-    }
-
-    /**
-     * 实体类转化成视图对象
-     *
-     * @param collection 实体类集合
-     * @return
-     */
-    private List<ActivityConfigurationVo> entityCourseVo(Collection<ActivityConfigurationVo> collection) {
-        List<ActivityConfigurationVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, ActivityConfigurationVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<ActivityConfigurationVo> page = (Page<ActivityConfigurationVo>)collection;
-            Page<ActivityConfigurationVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityConfigurationUseServiceImpl.java

@@ -1,176 +0,0 @@
-package com.zhongzheng.modules.activity.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.date.DateUtil;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.activity.service.IActivityConfigurationService;
-import com.zhongzheng.modules.activity.vo.ActivityConfigurationVo;
-import com.zhongzheng.modules.order.bo.CouponAddBo;
-import com.zhongzheng.modules.order.service.ICouponService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationUseAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationUseQueryBo;
-import com.zhongzheng.modules.activity.bo.ActivityConfigurationUseEditBo;
-import com.zhongzheng.modules.activity.domain.ActivityConfigurationUse;
-import com.zhongzheng.modules.activity.mapper.ActivityConfigurationUseMapper;
-import com.zhongzheng.modules.activity.vo.ActivityConfigurationUseVo;
-import com.zhongzheng.modules.activity.service.IActivityConfigurationUseService;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 【请填写功能名称】Service业务层处理
- *
- * @author change
- * @date 2021-06-15
- */
-@Service
-public class ActivityConfigurationUseServiceImpl extends ServiceImpl<ActivityConfigurationUseMapper, ActivityConfigurationUse> implements IActivityConfigurationUseService {
-
-    @Autowired
-    private IActivityConfigurationService activityConfigurationService;
-
-    @Autowired
-    private ICouponService couponService;
-
-    @Autowired
-    private IActivityConfigurationUseService activityConfigurationUseService;
-
-    @Override
-    public ActivityConfigurationUseVo queryById(Long userId){
-        ActivityConfigurationUse db = this.baseMapper.selectById(userId);
-        return BeanUtil.toBean(db, ActivityConfigurationUseVo.class);
-    }
-
-    @Override
-    public List<ActivityConfigurationUseVo> queryList(ActivityConfigurationUseQueryBo bo) {
-        LambdaQueryWrapper<ActivityConfigurationUse> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getActivityType() != null, ActivityConfigurationUse::getActivityType, bo.getActivityType());
-        lqw.eq(bo.getUseStatus() != null, ActivityConfigurationUse::getUseStatus, bo.getUseStatus());
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<ActivityConfigurationUseVo> entity2Vo(Collection<ActivityConfigurationUse> collection) {
-        List<ActivityConfigurationUseVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, ActivityConfigurationUseVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<ActivityConfigurationUse> page = (Page<ActivityConfigurationUse>)collection;
-            Page<ActivityConfigurationUseVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(ActivityConfigurationUseAddBo bo) {
-        ActivityConfigurationUse add = BeanUtil.toBean(bo, ActivityConfigurationUse.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(ActivityConfigurationUseEditBo bo) {
-        ActivityConfigurationUse update = BeanUtil.toBean(bo, ActivityConfigurationUse.class);
-        validEntityBeforeSave(update);
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(ActivityConfigurationUse entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public boolean receive(ActivityConfigurationUseAddBo bo) {
-        //判断用户是否领取过活动
-        if (baseMapper.queryByUse(bo) > 0){
-            throw new IllegalArgumentException("已领取活动，请勿重复领取");
-        }
-        if (bo.getConfigurationId() == null){
-            throw new IllegalArgumentException("活动ID为空");
-        }
-        //未领取过领取活动
-        bo.setCreateTime(DateUtils.getNowTime());
-        ActivityConfigurationVo activityConfigurationVo = activityConfigurationService.queryById(bo.getConfigurationId());
-        if (activityConfigurationUseService.countConfig(activityConfigurationVo.getId()).equals(activityConfigurationVo.getQuantity())){
-            throw new IllegalArgumentException("活动已领取结束");
-        }
-
-        bo.setActivityType(Convert.toInt(activityConfigurationVo.getActivityType()));
-        switch (bo.getActivityType()){
-            case 3:
-            case 4:
-            case 2:
-            case 5:
-                bo.setUseStatus(1);
-                break;
-            //向卡券表中生成优惠券或折扣券
-            default:
-                bo.setUseStatus(0);
-                CouponAddBo couponAddBo = new CouponAddBo();
-                couponAddBo.setPrice(activityConfigurationVo.getPrice());
-                couponAddBo.setEndTime(afterSixMonthDate(new Date(),activityConfigurationVo.getCouponEnd()));
-                couponAddBo.setUserId(bo.getUserId());
-                couponAddBo.setUserStatus(0);
-                couponAddBo.setConfigurationId(bo.getConfigurationId());
-                couponAddBo.setCouponType(Convert.toInt(activityConfigurationVo.getActivityType()));
-                couponService.insertByAddBo(couponAddBo);
-        }
-        return this.insertByAddBo(bo);
-    }
-
-    @Override
-    public Integer countConfig(Long id) {
-        Integer num = baseMapper.countConfig(id);
-        return num;
-    }
-
-    @Override
-    public Integer queryByCount(Long userId) {
-        ActivityConfigurationUseAddBo activityConfigurationUseAddBo = new ActivityConfigurationUseAddBo();
-        activityConfigurationUseAddBo.setUserId(userId);
-        return baseMapper.queryByUse(activityConfigurationUseAddBo);
-    }
-
-    public Long afterSixMonthDate(Date currentDate,Integer amount){
-        Calendar c = Calendar.getInstance();
-        c.setTime(currentDate);
-        c.add(Calendar.MONTH, amount);
-        Date m3 = c.getTime();
-        return m3.getTime()/1000;
-    }
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityGradePrivilegeCouresServiceImpl.java

@@ -1,94 +0,0 @@
-package com.zhongzheng.modules.activity.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
-import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeCouresAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeCouresQueryBo;
-import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeCouresEditBo;
-import com.zhongzheng.modules.activity.domain.ActivityGradePrivilegeCoures;
-import com.zhongzheng.modules.activity.mapper.ActivityGradePrivilegeCouresMapper;
-import com.zhongzheng.modules.activity.vo.ActivityGradePrivilegeCouresVo;
-import com.zhongzheng.modules.activity.service.IActivityGradePrivilegeCouresService;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 积分关联特权的范围课程Service业务层处理
- *
- * @author change
- * @date 2021-05-20
- */
-@Service
-public class ActivityGradePrivilegeCouresServiceImpl extends ServiceImpl<ActivityGradePrivilegeCouresMapper, ActivityGradePrivilegeCoures> implements IActivityGradePrivilegeCouresService {
-
-    @Override
-    public ActivityGradePrivilegeCouresVo queryById(Long privilegeId){
-        ActivityGradePrivilegeCoures db = this.baseMapper.selectById(privilegeId);
-        return BeanUtil.toBean(db, ActivityGradePrivilegeCouresVo.class);
-    }
-
-    @Override
-    public List<ActivityGradePrivilegeCouresVo> queryList(ActivityGradePrivilegeCouresQueryBo bo) {
-        LambdaQueryWrapper<ActivityGradePrivilegeCoures> lqw = Wrappers.lambdaQuery();
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<ActivityGradePrivilegeCouresVo> entity2Vo(Collection<ActivityGradePrivilegeCoures> collection) {
-        List<ActivityGradePrivilegeCouresVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, ActivityGradePrivilegeCouresVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<ActivityGradePrivilegeCoures> page = (Page<ActivityGradePrivilegeCoures>)collection;
-            Page<ActivityGradePrivilegeCouresVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(ActivityGradePrivilegeCouresAddBo bo) {
-        ActivityGradePrivilegeCoures add = BeanUtil.toBean(bo, ActivityGradePrivilegeCoures.class);
-        validEntityBeforeSave(add);
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(ActivityGradePrivilegeCouresEditBo bo) {
-        ActivityGradePrivilegeCoures update = BeanUtil.toBean(bo, ActivityGradePrivilegeCoures.class);
-        validEntityBeforeSave(update);
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(ActivityGradePrivilegeCoures entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityGradePrivilegeServiceImpl.java

@@ -1,104 +0,0 @@
-package com.zhongzheng.modules.activity.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
-import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeQueryBo;
-import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeEditBo;
-import com.zhongzheng.modules.activity.domain.ActivityGradePrivilege;
-import com.zhongzheng.modules.activity.mapper.ActivityGradePrivilegeMapper;
-import com.zhongzheng.modules.activity.vo.ActivityGradePrivilegeVo;
-import com.zhongzheng.modules.activity.service.IActivityGradePrivilegeService;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 等级积分特权类型：优惠券，折扣券等类型Service业务层处理
- *
- * @author change
- * @date 2021-05-20
- */
-@Service
-public class ActivityGradePrivilegeServiceImpl extends ServiceImpl<ActivityGradePrivilegeMapper, ActivityGradePrivilege> implements IActivityGradePrivilegeService {
-
-    @Override
-    public ActivityGradePrivilegeVo queryById(Long id){
-        ActivityGradePrivilege db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, ActivityGradePrivilegeVo.class);
-    }
-
-    @Override
-    public List<ActivityGradePrivilegeVo> queryList(ActivityGradePrivilegeQueryBo bo) {
-        LambdaQueryWrapper<ActivityGradePrivilege> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getGradeId() != null, ActivityGradePrivilege::getGradeId, bo.getGradeId());
-        lqw.eq(StrUtil.isNotBlank(bo.getPriType()), ActivityGradePrivilege::getPriType, bo.getPriType());
-        lqw.eq(bo.getCouponPrice() != null, ActivityGradePrivilege::getCouponPrice, bo.getCouponPrice());
-        lqw.eq(bo.getEndTimeSum() != null, ActivityGradePrivilege::getEndTimeSum, bo.getEndTimeSum());
-        lqw.eq(bo.getQuantity() != null, ActivityGradePrivilege::getQuantity, bo.getQuantity());
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<ActivityGradePrivilegeVo> entity2Vo(Collection<ActivityGradePrivilege> collection) {
-        List<ActivityGradePrivilegeVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, ActivityGradePrivilegeVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<ActivityGradePrivilege> page = (Page<ActivityGradePrivilege>)collection;
-            Page<ActivityGradePrivilegeVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(ActivityGradePrivilegeAddBo bo) {
-        ActivityGradePrivilege add = BeanUtil.toBean(bo, ActivityGradePrivilege.class);
-        validEntityBeforeSave(add);
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(ActivityGradePrivilegeEditBo bo) {
-        ActivityGradePrivilege update = BeanUtil.toBean(bo, ActivityGradePrivilege.class);
-        validEntityBeforeSave(update);
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(ActivityGradePrivilege entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-
-    @Override
-    public void removeByGrade(Long id) {
-        baseMapper.deleteByGrade(id);
-    }
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityGradeServiceImpl.java

@@ -1,228 +0,0 @@
-package com.zhongzheng.modules.activity.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.activity.bo.*;
-import com.zhongzheng.modules.activity.domain.ActivityConfiguration;
-import com.zhongzheng.modules.activity.domain.ActivityGrade;
-import com.zhongzheng.modules.activity.domain.ActivityGradePrivilege;
-import com.zhongzheng.modules.activity.domain.ActivityGradePrivilegeCoures;
-import com.zhongzheng.modules.activity.mapper.ActivityGradeMapper;
-import com.zhongzheng.modules.activity.mapper.ActivityGradePrivilegeCouresMapper;
-import com.zhongzheng.modules.activity.mapper.ActivityGradePrivilegeMapper;
-import com.zhongzheng.modules.activity.service.IActivityGradePrivilegeCouresService;
-import com.zhongzheng.modules.activity.service.IActivityGradePrivilegeService;
-import com.zhongzheng.modules.activity.service.IActivityGradeService;
-import com.zhongzheng.modules.activity.vo.ActivityGradeVo;
-import com.zhongzheng.modules.user.service.IUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 等级积分Service业务层处理
- *
- * @author change
- * @date 2021-05-19
- */
-@Service
-public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, ActivityGrade> implements IActivityGradeService {
-
-    @Autowired
-    private ActivityGradePrivilegeCouresMapper activityGradePrivilegeCouresMapper;
-
-    @Autowired
-    private IActivityGradePrivilegeService activityGradePrivilegeService;
-
-    @Autowired
-    private IActivityGradePrivilegeCouresService activityGradePrivilegeCouresService;
-
-    @Autowired
-    private ActivityGradePrivilegeMapper activityGradePrivilegeMapper;
-
-    @Autowired
-    private IUserService userService;
-
-    @Autowired
-    private  IActivityGradeService iActivityGradeService;
-
-    @Override
-    public ActivityGradeVo queryById(Long id){
-        ActivityGrade db = this.baseMapper.selectById(id);
-        ActivityGradeVo activityGradeVo = BeanUtil.toBean(db, ActivityGradeVo.class);
-        activityGradeVo.setActivityGradePrivilegesVo(activityGradePrivilegeMapper.selectGradePriList(activityGradeVo.getId()));
-        return activityGradeVo;
-    }
-
-    @Override
-    public TableDataInfo<ActivityGradeVo> queryList(ActivityGradeQueryBo bo) {
-        LambdaQueryWrapper<ActivityGrade> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getGrade() != null, ActivityGrade::getGrade, bo.getGrade());
-        lqw.like(StrUtil.isNotBlank(bo.getGradeName()), ActivityGrade::getGradeName, bo.getGradeName());
-        lqw.eq(bo.getNeedIntegralStart() != null, ActivityGrade::getNeedIntegralStart, bo.getNeedIntegralStart());
-        lqw.eq(bo.getNeedIntegralEnd() != null, ActivityGrade::getNeedIntegralEnd, bo.getNeedIntegralEnd());
-        lqw.eq(StrUtil.isNotBlank(bo.getRemarks()), ActivityGrade::getRemarks, bo.getRemarks());
-        lqw.orderByDesc(ActivityGrade::getUpdateTime);
-        List<ActivityGrade> list = this.list(lqw);
-        List<ActivityGradeVo> activityGradeVos = selectGradeCourse(list);
-        List<ActivityGradeVo> activityGradeVos1 = entity2Vo(activityGradeVos);
-        TableDataInfo<ActivityGradeVo> listData = new TableDataInfo<>();
-        listData.setCode(200);
-        listData.setMsg("查询成功");
-        listData.setRows(activityGradeVos1);
-        listData.setTotal(baseMapper.selectCount(lqw));
-        return listData;
-    }
-
-    /**
-     * 实体类转化成视图对象
-     *
-     * @param collection 实体类集合
-     * @return
-     */
-    private List<ActivityGradeVo> entity2GradeVo(Collection<ActivityGrade> collection) {
-        List<ActivityGradeVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, ActivityGradeVo.class))
-                .collect(Collectors.toList());
-        return voList;
-    }
-
-    private List<ActivityGradeVo> selectGradeCourse(List<ActivityGrade> list) {
-        List<ActivityGradeVo> activityGradeVos = entity2GradeVo(list);
-        for (ActivityGradeVo activityGradeVo : activityGradeVos) {
-            Integer num = userService.selectUserNum(activityGradeVo.getGrade());
-            activityGradeVo.setUserNum(num);
-        }
-        activityGradeVos.stream().forEach(a -> {
-            a.setActivityGradePrivilegesVo(activityGradePrivilegeMapper.selectGradePriList(a.getId()));
-
-        });
-
-        return activityGradeVos;
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<ActivityGradeVo> entity2Vo(Collection<ActivityGradeVo> collection) {
-        List<ActivityGradeVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, ActivityGradeVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<ActivityGradeVo> page = (Page<ActivityGradeVo>)collection;
-            Page<ActivityGradeVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean insertByAddBo(ActivityGradeAddBo bo) {
-        ActivityGrade add = BeanUtil.toBean(bo, ActivityGrade.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        boolean save = iActivityGradeService.save(add);
-        //添加特权类型
-        if (!CollectionUtils.isEmpty(bo.getActivityGradePrivilegeAddBos())) {
-            bo.getActivityGradePrivilegeAddBos().stream().forEach(p ->{
-                ActivityGradePrivilege activityGradePrivilege = BeanUtil.toBean(p, ActivityGradePrivilege.class);
-                activityGradePrivilege.setGradeId(add.getId());
-                activityGradePrivilegeService.save(activityGradePrivilege);
-                Arrays.stream(p.getCourseIds()).forEach(c -> {
-                    ActivityGradePrivilegeCoures activityGradePrivilegeCoures = new ActivityGradePrivilegeCoures();
-                    activityGradePrivilegeCoures.setPrivilegeId(activityGradePrivilege.getId());
-                    if ("2".equals(p.getPriType())){
-                        activityGradePrivilegeCoures.setStatus(2);
-                    }else {
-                        activityGradePrivilegeCoures.setStatus(1);
-                    }
-                    activityGradePrivilegeCoures.setCourseId(Convert.toLong(c));
-                    activityGradePrivilegeCouresMapper.insertCouse(activityGradePrivilegeCoures);
-
-                });
-            });
-        }
-        //添加特权绑定的
-        return save;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean updateByEditBo(ActivityGradeEditBo bo) {
-        ActivityGrade update = BeanUtil.toBean(bo, ActivityGrade.class);
-        update.setUpdateTime(DateUtils.getNowTime());
-        validEntityBeforeSave(update);
-        //修改特权类型
-        activityGradePrivilegeService.removeByGrade(bo.getId());
-        if (!CollectionUtils.isEmpty(bo.getActivityGradePrivilegeEditBos())) {
-            updateGradePrivilege(bo);
-        }
-        return iActivityGradeService.updateById(update);
-    }
-
-    private void updateGradePrivilege(ActivityGradeEditBo bo) {
-
-        bo.getActivityGradePrivilegeEditBos().stream().forEach(p ->{
-                //修改
-                    ActivityGradePrivilege activityGradePrivilege = BeanUtil.toBean(p, ActivityGradePrivilege.class);
-                    activityGradePrivilege.setGradeId(bo.getId());
-                    activityGradePrivilege.setStatus(1);
-                    activityGradePrivilegeService.save(activityGradePrivilege);
-                    if (p.getCourseIds() != null ) {
-                        Arrays.stream(p.getCourseIds()).forEach(c -> activityGradePrivilegeCouresMapper
-                                .insertCouse(new ActivityGradePrivilegeCoures().setPrivilegeId(activityGradePrivilege.getId())
-                                        .setCourseId(Convert.toLong(c))));
-                    }
-            });
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param bo 实体类数据
-     */
-    private void validEntityBeforeSave(ActivityGrade bo){
-        //TODO 做一些数据校验,如唯一约束
-        LambdaQueryWrapper<ActivityGrade> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getGrade() != null, ActivityGrade::getGrade, bo.getGrade());
-
-        List<ActivityGrade> list = this.list(lqw);
-        if (!CollectionUtils.isEmpty(list)){
-            throw new IllegalArgumentException("该等级已存在");
-        }
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        ArrayList<ActivityGrade> activityGradeArrayList = new ArrayList<>();
-        ids.stream().forEach(id -> activityGradeArrayList.add(new ActivityGrade().setId(id)));
-        return iActivityGradeService.updateBatchById(activityGradeArrayList);
-    }
-
-    @Override
-    public ActivityGradeVo queryByInteger(Long bo) {
-
-        return baseMapper.queryByInteger(bo);
-    }
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityTaskServiceImpl.java

@@ -1,296 +0,0 @@
-package com.zhongzheng.modules.activity.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.activity.domain.ActivityTaskTime;
-import com.zhongzheng.modules.activity.domain.ActivityTaskUser;
-import com.zhongzheng.modules.activity.service.IActivityTaskTimeService;
-import com.zhongzheng.modules.activity.service.IActivityTaskUserService;
-import com.zhongzheng.modules.activity.vo.ActivityTaskTimeVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
-import com.zhongzheng.modules.activity.bo.ActivityTaskAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityTaskQueryBo;
-import com.zhongzheng.modules.activity.bo.ActivityTaskEditBo;
-import com.zhongzheng.modules.activity.domain.ActivityTask;
-import com.zhongzheng.modules.activity.mapper.ActivityTaskMapper;
-import com.zhongzheng.modules.activity.vo.ActivityTaskVo;
-import com.zhongzheng.modules.activity.service.IActivityTaskService;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 任务存储Service业务层处理
- *
- * @author change
- * @date 2021-05-19
- */
-@Service
-public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, ActivityTask> implements IActivityTaskService {
-
-    @Autowired
-    private IActivityTaskTimeService activityTaskTimeService;
-
-    @Autowired
-    private IActivityTaskUserService activityTaskUserService;
-
-    @Autowired
-    private IActivityTaskService iActivityTaskService;
-
-    @Override
-    public ActivityTaskVo queryById(Long id){
-        ActivityTask db = this.baseMapper.selectById(id);
-
-        ActivityTaskVo activityTaskTimeMove = activityTaskTimeMove(db);
-
-        return activityTaskTimeMove;
-    }
-
-    private ActivityTaskVo activityTaskTimeMove(ActivityTask db) {
-        ActivityTaskVo activityTaskVo = BeanUtil.toBean(db, ActivityTaskVo.class);
-        if (activityTaskVo.getId() != null && activityTaskVo.getTaskType() == 5) {
-            LambdaQueryWrapper<ActivityTaskTime> lqwTime = Wrappers.lambdaQuery();
-            lqwTime.eq(db.getId() != null,ActivityTaskTime::getTaskId,db.getId());
-            List<ActivityTaskTimeVo> activityTaskTimeVo = entity2TimeActivityVo(activityTaskTimeService.list(lqwTime));
-            activityTaskVo.setActivityTaskTimeVo(activityTaskTimeVo);
-        }
-        return activityTaskVo;
-    }
-    /**
-     * 实体类转化成视图对象
-     *
-     * @param collection 实体类集合
-     * @return
-     */
-    private List<ActivityTaskTimeVo> entity2TimeActivityVo(Collection<ActivityTaskTime> collection) {
-        List<ActivityTaskTimeVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, ActivityTaskTimeVo.class))
-                .collect(Collectors.toList());
-        return voList;
-    }
-    @Override
-    public List<ActivityTaskVo> queryList(ActivityTaskQueryBo bo) {
-        LambdaQueryWrapper<ActivityTask> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getTaskType() != null, ActivityTask::getTaskType, bo.getTaskType());
-        lqw.eq(bo.getStartIntegral() != null, ActivityTask::getStartIntegral, bo.getStartIntegral());
-        lqw.eq(bo.getEndIntegral() != null, ActivityTask::getEndIntegral, bo.getEndIntegral());
-        lqw.eq(StrUtil.isNotBlank(bo.getRemarks()), ActivityTask::getRemarks, bo.getRemarks());
-        lqw.eq(StrUtil.isNotBlank(bo.getDescription()), ActivityTask::getDescription, bo.getDescription());
-        lqw.eq(bo.getAccIntegral() != null, ActivityTask::getAccIntegral, bo.getAccIntegral());
-        lqw.eq(bo.getLongTime() != null, ActivityTask::getLongTime, bo.getLongTime());
-        lqw.eq(bo.getCountDay() != null, ActivityTask::getCountDay, bo.getCountDay());
-        lqw.eq(bo.getStatus() != null, ActivityTask::getStatus, bo.getStatus());
-        List<ActivityTaskVo> activityTaskVos = entity2Vo(this.list(lqw));
-        activityTaskVos.stream().forEach(l -> {
-            if (l.getId() != null && l.getTaskType() == 5) {
-                LambdaQueryWrapper<ActivityTaskTime> lqwTime = Wrappers.lambdaQuery();
-                lqwTime.eq(l.getId() != null,ActivityTaskTime::getTaskId,l.getId());
-                List<ActivityTaskTimeVo> activityTaskTimeVo = entity2TimeActivityVo(activityTaskTimeService.list(lqwTime));
-                l.setActivityTaskTimeVo(activityTaskTimeVo);
-            }
-        });
-        return activityTaskVos;
-    }
-
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<ActivityTaskVo> entity2Vo(Collection<ActivityTask> collection) {
-        List<ActivityTaskVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, ActivityTaskVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<ActivityTask> page = (Page<ActivityTask>)collection;
-            Page<ActivityTaskVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean insertByAddBo(ActivityTaskAddBo bo) {
-        ActivityTask add = BeanUtil.toBean(bo, ActivityTask.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        boolean save = iActivityTaskService.save(add);
-        if (bo.getTaskType() != null && bo.getTaskType() == 5){
-            bo.getActivityTaskTimeAddBo().stream().forEach(t -> activityTaskTimeService.inserTaskTime(BeanUtil.toBean(t,ActivityTaskTime.class).setTaskId(add.getId())));
-        }
-        return save;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean updateByEditBo(ActivityTaskEditBo bo) {
-        ActivityTask update = BeanUtil.toBean(bo, ActivityTask.class);
-        update.setUpdateTime(DateUtils.getNowTime());
-        validEntityBeforeSave(update);
-        //活动为考试时有分数区域得到等级分数
-        if (bo.getTaskType() != null && bo.getTaskType() == 5){
-            activityTaskTimeService.removeById(bo.getId());
-            bo.getActivityTaskTimeEditBoList().stream().forEach(t -> activityTaskTimeService.inserTaskTime(BeanUtil.toBean(t,ActivityTaskTime.class).setTaskId(bo.getId())));
-        }
-        return iActivityTaskService.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(ActivityTask entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return iActivityTaskService.removeByIds(ids);
-    }
-
-    @Override
-    public ActivityTaskVo queryByTaskId(Long taskId) {
-        ActivityTask db = baseMapper.queryByTaskId(taskId);
-        return BeanUtil.toBean(db,ActivityTaskVo.class);
-    }
-
-    @Override
-    public List<ActivityTaskVo> querylistUser(ActivityTaskQueryBo bo) {
-        LambdaQueryWrapper<ActivityTask> lqwActivity = Wrappers.lambdaQuery();
-        lqwActivity.eq(ActivityTask::getStatus, 1);
-        List<ActivityTaskVo> activityTaskVos = entity2Vo(this.list(lqwActivity));
-        activityTaskVos.stream().forEach(l -> {
-            if (l.getId() != null && l.getTaskType() == 5) {
-                LambdaQueryWrapper<ActivityTaskTime> lqwTime = Wrappers.lambdaQuery();
-                lqwTime.eq(l.getId() != null,ActivityTaskTime::getTaskId,l.getId());
-                List<ActivityTaskTimeVo> activityTaskTimeVo = entity2TimeActivityVo(activityTaskTimeService.list(lqwTime));
-                l.setActivityTaskTimeVo(activityTaskTimeVo);
-            }
-            ActivityTaskVo activityTaskVo = queryByTaskId(Convert.toLong(l.getTaskType()));
-            l.setUserStatus(0);
-            switch (l.getTaskType()){
-                //每日签到逻辑，当日有领取即无法签到
-                case 0:
-                    LambdaQueryWrapper<ActivityTaskUser> lqw = Wrappers.lambdaQuery();
-                    lqw.eq(bo.getTaskType() !=null,ActivityTaskUser::getTaskType,bo.getTaskType());
-                    lqw.eq(bo.getUserId() !=null,ActivityTaskUser::getUserId,bo.getUserId());
-                    lqw.between(ActivityTaskUser::getCreateTime,getTimesmorning(),getTimesnight());
-                    List<ActivityTaskUser> list = activityTaskUserService.list(lqw);
-                    if (!CollectionUtils.isEmpty(list) && list.size() > 0){
-                        l.setUserStatus(1);
-                    }
-                    break;
-                //完善信息  按照百分比求得乘以分数得到奖励分数
-                case 1:
-                    LambdaQueryWrapper<ActivityTaskUser> useWan = Wrappers.lambdaQuery();
-                    useWan.eq(bo.getTaskType() !=null,ActivityTaskUser::getTaskType,bo.getTaskType());
-                    useWan.eq(bo.getUserId() !=null,ActivityTaskUser::getUserId,bo.getUserId());
-                    List<ActivityTaskUser> listWan = activityTaskUserService.list(useWan);
-                    BigDecimal bigDecimal = new BigDecimal("0");
-                    for (ActivityTaskUser activityTaskUser : listWan) {
-                        bigDecimal = bigDecimal.add(new BigDecimal(activityTaskUser.getScore()));
-                    }
-                    if (bigDecimal.compareTo(new BigDecimal(activityTaskVo.getStartIntegral())) == 0){
-                        l.setUserStatus(1);
-                    }
-                    break;
-                case 2:
-                    l.setUserStatus(0);
-                    break;
-                case 3:
-                    //每日分享，大于三次达到上线
-                    LambdaQueryWrapper<ActivityTaskUser> useMei = Wrappers.lambdaQuery();
-                    useMei.eq(bo.getTaskType() !=null,ActivityTaskUser::getTaskType,bo.getTaskType());
-                    useMei.eq(bo.getUserId() !=null,ActivityTaskUser::getUserId,bo.getUserId());
-                    useMei.between(ActivityTaskUser::getCreateTime,getTimesmorning(),getTimesnight());
-                    List<ActivityTaskUser> listMei = activityTaskUserService.list(useMei);
-                    if (!CollectionUtils.isEmpty(listMei) && listMei.size() == 3){
-                        l.setUserStatus(1);
-                    }
-                    break;
-                case 4:
-                    //连续学习，大于三次达到上线
-                    LambdaQueryWrapper<ActivityTaskUser> study = Wrappers.lambdaQuery();
-                    study.eq(bo.getTaskType() !=null,ActivityTaskUser::getTaskType,bo.getTaskType());
-                    study.eq(bo.getUserId() !=null,ActivityTaskUser::getUserId,bo.getUserId());
-                    study.between(ActivityTaskUser::getCreateTime,getTimesmorning(),getTimesnight());
-                    List<ActivityTaskUser> listStudy = activityTaskUserService.list(study);
-                    Integer score = 0;
-                    for (ActivityTaskUser activityTaskUser : listStudy) {
-                        score = score+ Convert.toInt(activityTaskUser.getScore());
-                    }
-                    if (!CollectionUtils.isEmpty(listStudy) && activityTaskVo.getEndIntegral().equals(score)){
-                        l.setUserStatus(1);
-                    }
-                    break;
-                case 5:
-                    LambdaQueryWrapper<ActivityTaskUser> practice = Wrappers.lambdaQuery();
-                    practice.eq(bo.getTaskType() !=null,ActivityTaskUser::getTaskType,bo.getTaskType());
-                    practice.eq(bo.getUserId() !=null,ActivityTaskUser::getUserId,bo.getUserId());
-                    practice.between(ActivityTaskUser::getCreateTime,getTimesmorning(),getTimesnight());
-                    List<ActivityTaskUser> listPractice = activityTaskUserService.list(practice);
-                    if (!CollectionUtils.isEmpty(listPractice) && listPractice.size() > 0){
-                        l.setUserStatus(1);
-                    }
-                    break;
-
-            }
-        });
-
-        return activityTaskVos;
-
-    }
-
-    //获得今天时间的0点
-    public static int getTimesmorning(){
-        Calendar cal = Calendar.getInstance();
-
-        cal.set(Calendar.HOUR_OF_DAY, 0);
-
-        cal.set(Calendar.SECOND, 0);
-
-        cal.set(Calendar.MINUTE, 0);
-
-        cal.set(Calendar.MILLISECOND, 0);
-
-        return (int) (cal.getTimeInMillis()/1000);
-
-    }
-
-    //获得当天24点时间
-    public static int getTimesnight(){
-        Calendar cal = Calendar.getInstance();
-
-        cal.set(Calendar.HOUR_OF_DAY, 24);
-
-        cal.set(Calendar.SECOND, 0);
-
-        cal.set(Calendar.MINUTE, 0);
-
-        cal.set(Calendar.MILLISECOND, 0);
-
-        return (int) (cal.getTimeInMillis()/1000);
-
-    }
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityTaskTimeServiceImpl.java

@@ -1,108 +0,0 @@
-package com.zhongzheng.modules.activity.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.modules.activity.bo.ActivityTaskUserAddBo;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
-import com.zhongzheng.modules.activity.bo.ActivityTaskTimeAddBo;
-import com.zhongzheng.modules.activity.bo.ActivityTaskTimeQueryBo;
-import com.zhongzheng.modules.activity.bo.ActivityTaskTimeEditBo;
-import com.zhongzheng.modules.activity.domain.ActivityTaskTime;
-import com.zhongzheng.modules.activity.mapper.ActivityTaskTimeMapper;
-import com.zhongzheng.modules.activity.vo.ActivityTaskTimeVo;
-import com.zhongzheng.modules.activity.service.IActivityTaskTimeService;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 模拟考试分数给予积分关联Service业务层处理
- *
- * @author change
- * @date 2021-05-20
- */
-@Service
-public class ActivityTaskTimeServiceImpl extends ServiceImpl<ActivityTaskTimeMapper, ActivityTaskTime> implements IActivityTaskTimeService {
-
-    @Override
-    public ActivityTaskTimeVo queryById(Long taskId){
-        ActivityTaskTime db = this.baseMapper.selectById(taskId);
-        return BeanUtil.toBean(db, ActivityTaskTimeVo.class);
-    }
-
-    @Override
-    public List<ActivityTaskTimeVo> queryList(ActivityTaskTimeQueryBo bo) {
-        LambdaQueryWrapper<ActivityTaskTime> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getStartRange() != null, ActivityTaskTime::getStartRange, bo.getStartRange());
-        lqw.eq(bo.getEndRange() != null, ActivityTaskTime::getEndRange, bo.getEndRange());
-        lqw.eq(bo.getIntegral() != null, ActivityTaskTime::getIntegral, bo.getIntegral());
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<ActivityTaskTimeVo> entity2Vo(Collection<ActivityTaskTime> collection) {
-        List<ActivityTaskTimeVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, ActivityTaskTimeVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<ActivityTaskTime> page = (Page<ActivityTaskTime>)collection;
-            Page<ActivityTaskTimeVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(ActivityTaskTimeAddBo bo) {
-        ActivityTaskTime add = BeanUtil.toBean(bo, ActivityTaskTime.class);
-        validEntityBeforeSave(add);
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(ActivityTaskTimeEditBo bo) {
-        ActivityTaskTime update = BeanUtil.toBean(bo, ActivityTaskTime.class);
-        validEntityBeforeSave(update);
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(ActivityTaskTime entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-
-    @Override
-    public void inserTaskTime(ActivityTaskTime toBean) {
-        baseMapper.inserTaskTime(toBean);
-    }
-
-    @Override
-    public ActivityTaskTimeVo queryPractice(ActivityTaskUserAddBo bo) {
-        return baseMapper.queryPractice(bo);
-    }
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityTaskUserServiceImpl.java

@@ -1,611 +0,0 @@
-package com.zhongzheng.modules.activity.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.activity.bo.ActivityTaskUserAddBo;
-import com.zhongzheng.modules.activity.domain.ActivityGrade;
-import com.zhongzheng.modules.activity.service.IActivityGradeService;
-import com.zhongzheng.modules.activity.service.IActivityTaskService;
-import com.zhongzheng.modules.activity.service.IActivityTaskTimeService;
-import com.zhongzheng.modules.activity.vo.ActivityGradeVo;
-import com.zhongzheng.modules.activity.vo.ActivityTaskTimeVo;
-import com.zhongzheng.modules.activity.vo.ActivityTaskVo;
-import com.zhongzheng.modules.user.domain.User;
-import com.zhongzheng.modules.user.service.IUserService;
-import com.zhongzheng.modules.user.vo.UserVo;
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
-import com.zhongzheng.modules.activity.bo.ActivityTaskUserQueryBo;
-import com.zhongzheng.modules.activity.bo.ActivityTaskUserEditBo;
-import com.zhongzheng.modules.activity.domain.ActivityTaskUser;
-import com.zhongzheng.modules.activity.mapper.ActivityTaskUserMapper;
-import com.zhongzheng.modules.activity.vo.ActivityTaskUserVo;
-import com.zhongzheng.modules.activity.service.IActivityTaskUserService;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 用户领取记录Service业务层处理
- *
- * @author ruoyi
- * @date 2021-06-16
- */
-@Service
-public class ActivityTaskUserServiceImpl extends ServiceImpl<ActivityTaskUserMapper, ActivityTaskUser> implements IActivityTaskUserService {
-
-    @Autowired
-    private IUserService userService;
-
-    @Autowired
-    private IActivityGradeService activityGradeService;
-
-    @Autowired
-    private IActivityTaskService activityTaskService;
-
-    @Autowired
-    private IActivityTaskTimeService activityTaskTimeService;
-
-
-    @Override
-    public ActivityTaskUserVo queryById(Long userId){
-        ActivityTaskUser db = this.baseMapper.selectById(userId);
-        return BeanUtil.toBean(db, ActivityTaskUserVo.class);
-    }
-
-    @Override
-    public List<ActivityTaskUserVo> queryList(ActivityTaskUserQueryBo bo) {
-        LambdaQueryWrapper<ActivityTaskUser> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StrUtil.isNotBlank(bo.getScore()), ActivityTaskUser::getScore, bo.getScore());
-        lqw.eq(bo.getTaskType() != null, ActivityTaskUser::getTaskType, bo.getTaskType());
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<ActivityTaskUserVo> entity2Vo(Collection<ActivityTaskUser> collection) {
-        List<ActivityTaskUserVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, ActivityTaskUserVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<ActivityTaskUser> page = (Page<ActivityTaskUser>)collection;
-            Page<ActivityTaskUserVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(ActivityTaskUserAddBo bo) {
-        ActivityTaskUser add = BeanUtil.toBean(bo, ActivityTaskUser.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(ActivityTaskUserEditBo bo) {
-        ActivityTaskUser update = BeanUtil.toBean(bo, ActivityTaskUser.class);
-        validEntityBeforeSave(update);
-        update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(ActivityTaskUser entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-
-    /**
-     * 签到领取积分
-     *
-     * @param bo
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public boolean userTask(ActivityTaskUserAddBo bo) {
-        //判断是否是签到
-        if (bo.getTaskType() != 0){
-            throw new IllegalArgumentException("该请求是签到请求");
-        }
-
-        //判断是否领过过
-        validReceiver(bo);
-
-        //增加用户积分，并判断是否达到对应等级，更新等级
-        UserVo userVo = userService.queryById(bo.getUserId());
-        ActivityTaskVo activityTaskVo = activityTaskService.queryByTaskId(Convert.toLong(bo.getTaskType()));
-
-        //签到逻辑连续签到获得累加积分，断了为初始积分
-        LambdaQueryWrapper<ActivityTaskUser> lqw =Wrappers.lambdaQuery();;
-        lqw.eq(bo.getUserId() != null,ActivityTaskUser::getUserId,bo.getUserId());
-        lqw.eq(bo.getTaskType() != null, ActivityTaskUser::getTaskType, bo.getTaskType());
-        lqw.between( ActivityTaskUser::getCreateTime, getDateOne(),DateUtils.getNowTime());
-        List<ActivityTaskUser> list = this.list(lqw);
-        List<SignIn> signIn = new ArrayList<>();
-        list.forEach(s -> {
-            try {
-                signIn.add(new SignIn(s.getCreateTime().toString()));
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-        });
-
-        //连续签到的天数，不包括今天，即第一天1积分第二天2积分
-        int continuousSignInDay = getContinuousSignInDay(signIn);
-        //天数*每次累加分数得出今天分数
-        if (continuousSignInDay == 0){
-            continuousSignInDay =1;
-        }
-        int fen = activityTaskVo.getAccIntegral()*continuousSignInDay;
-        if (userVo.getIntegral() == null){
-            userVo.setIntegral(0L);
-        }
-        Long score = userVo.getIntegral()+fen;
-
-        //分数达到的等级赋予学生等级
-        //增加用户领取记录
-        ActivityTaskUser add = BeanUtil.toBean(bo, ActivityTaskUser.class);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        ActivityGradeVo list1 = activityGradeService.queryByInteger(score);
-        add.setScore(Convert.toStr(fen));
-
-        //增加用户积分和等级
-        userVo.setUserLevel(list1.getGrade());
-        increaseUser(userVo,score);
-        add.setUserId(bo.getUserId());
-        add.setTaskId(activityTaskVo.getId());
-
-        return this.save(add);
-    }
-
-
-
-    /**
-     * 完善信息领取积分
-     *
-     * @param bo
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public boolean information(ActivityTaskUserAddBo bo) throws IllegalAccessException {
-        //判断是否是完善信息
-        if (bo.getTaskType() != 1){
-            throw new IllegalArgumentException("该请求是完善信息");
-        }
-        validReceiver(bo);
-
-        ActivityTaskVo activityTaskVo = activityTaskService.queryById(bo.getTaskId());
-
-       //得出已领取的分数是多少
-        LambdaQueryWrapper<ActivityTaskUser> lqw =Wrappers.lambdaQuery();;
-        lqw.eq(bo.getUserId() != null,ActivityTaskUser::getUserId,bo.getUserId());
-        lqw.eq(bo.getTaskType() != null, ActivityTaskUser::getTaskType, bo.getTaskType());
-        List<ActivityTaskUser> list = this.list(lqw);
-        BigDecimal bigDecimal = new BigDecimal("0");
-        if (!CollectionUtils.isEmpty(list)) {
-            for (ActivityTaskUser activityTaskUser : list) {
-                bigDecimal = bigDecimal.add(new BigDecimal(activityTaskUser.getScore()));
-            }
-        }
-
-        //userVO用户  有参值/总数 得出比例 乘以分数 四舍五入
-        UserVo userVo = userService.queryById(bo.getUserId());
-        Field[] field = userVo.getClass().getDeclaredFields();
-        Integer integer = countUser(userVo);
-        String num = String.valueOf(integer/ field.length);
-        BigDecimal result5 = new BigDecimal(activityTaskVo.getEndIntegral().toString()).divide(new BigDecimal(num),BigDecimal.ROUND_HALF_UP);
-
-        //增加用户领取记录
-        ActivityTaskUser add = BeanUtil.toBean(bo, ActivityTaskUser.class);
-        add.setScore(bigDecimal.subtract(result5).toString());
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-
-        //增加用户积分更新等级
-        Long Integer = userVo.getIntegral()+ Convert.toLong(bigDecimal.subtract(result5));
-        ActivityGradeVo list1 = activityGradeService.queryByInteger(Integer);
-        userVo.setUserLevel(list1.getGrade());
-        increaseUser(userVo,Integer);
-
-        return this.save(add);
-    }
-
-    /**
-     * 邀请好友
-     *
-     * @param bo
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public boolean invitation(ActivityTaskUserAddBo bo) {
-        //判断是否是邀请好友
-        if (bo.getTaskType() != 2){
-            throw new IllegalArgumentException("该请求是邀请好友");
-        }
-        validReceiver(bo);
-
-        ActivityTaskVo activityTaskVo = activityTaskService.queryByTaskId(Convert.toLong(bo.getTaskType()));
-
-        //增加用户积分
-        UserVo userVo = userService.queryById(bo.getUserId());
-        ActivityGradeVo list1 = activityGradeService.queryByInteger(userVo.getIntegral()+activityTaskVo.getStartIntegral());
-        userVo.setUserLevel(list1.getGrade());
-        increaseUser(userVo,userVo.getIntegral()+activityTaskVo.getStartIntegral());
-
-        //增加领取记录
-        ActivityTaskUser add = BeanUtil.toBean(bo, ActivityTaskUser.class);
-        add.setScore(Convert.toStr(activityTaskVo.getStartIntegral()));
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        add.setUserId(bo.getUserId());
-        add.setTaskId(activityTaskVo.getId());
-        return this.save(add);
-    }
-
-
-    /**
-     * 每日分享
-     *
-     * @param bo
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public boolean share(ActivityTaskUserAddBo bo) {
-        //判断是否是每日分享
-        if (bo.getTaskType() != 3){
-            throw new IllegalArgumentException("该请求是完善信息");
-        }
-        validReceiver(bo);
-
-        ActivityTaskVo activityTaskVo = activityTaskService.queryByTaskId(Convert.toLong(bo.getTaskType()));
-
-        //增加用户积分
-        UserVo userVo = userService.queryById(bo.getUserId());
-        ActivityGradeVo list1 = activityGradeService.queryByInteger(userVo.getIntegral()+activityTaskVo.getStartIntegral());
-        userVo.setUserLevel(list1.getGrade());
-        increaseUser(userVo,userVo.getIntegral()+activityTaskVo.getStartIntegral());
-
-        //增加领取记录
-        ActivityTaskUser add = BeanUtil.toBean(bo, ActivityTaskUser.class);
-        add.setScore(Convert.toStr(activityTaskVo.getStartIntegral()));
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        add.setUserId(bo.getUserId());
-        add.setTaskId(activityTaskVo.getId());
-        return this.save(add);
-    }
-
-
-    /**
-     * 学习时长
-     *
-     * @param bo
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Integer learnTime(ActivityTaskUserAddBo bo) {
-        //判断是否是每日分享
-        if (bo.getTaskType() != 4){
-            throw new IllegalArgumentException("该请求是学习时长");
-        }
-        if (validReceiver(bo) == false){
-            return 0;
-        }
-
-        ActivityTaskVo activityTaskVo = activityTaskService.queryByTaskId(Convert.toLong(bo.getTaskType()));
-        if (activityTaskVo == null || activityTaskVo.getLongTime() == null){
-            return 0;
-        }
-        //增加用户积分
-        if ((activityTaskVo.getLongTime()*60) > Convert.toInt(bo.getScore())) {
-            return 0;
-        }
-        Integer integer = (int)Math.ceil(Convert.toInt(bo.getScore())/(activityTaskVo.getLongTime()*60));
-
-            UserVo userVo = userService.queryById(bo.getUserId());
-            Long socor = 0L;
-            if (userVo.getIntegral() != null) {
-                socor = userVo.getIntegral() + (activityTaskVo.getStartIntegral() * integer);
-            }else {
-                socor =  Convert.toLong(activityTaskVo.getStartIntegral() * integer);
-
-            }
-        ActivityGradeVo list1 = activityGradeService.queryByInteger(socor);
-            userVo.setUserLevel(list1.getGrade());
-            increaseUser(userVo, socor);
-
-        //增加领取记录
-        ActivityTaskUser add = BeanUtil.toBean(bo, ActivityTaskUser.class);
-        add.setScore(Convert.toStr(activityTaskVo.getStartIntegral()));
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        add.setTaskType(bo.getTaskType());
-        add.setUserId(bo.getUserId());
-        add.setTaskId(activityTaskVo.getId());
-        this.save(add);
-        return (activityTaskVo.getStartIntegral()*integer);
-    }
-
-
-    /**
-     * 模拟考试
-     *
-     * @param bo
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public boolean practiceTest(ActivityTaskUserAddBo bo) {
-        //判断是否是模拟考试
-        if (bo.getTaskType() != 5){
-            throw new IllegalArgumentException("该请求是模拟考试");
-        }
-        validReceiver(bo);
-
-        ActivityTaskVo activityTaskVo = activityTaskService.queryById(bo.getTaskId());
-        bo.setTaskId(activityTaskVo.getId());
-        ActivityTaskTimeVo activityTaskTimeVo = activityTaskTimeService.queryPractice(bo);
-
-        //增加用户积分
-        UserVo userVo = userService.queryById(bo.getUserId());
-        ActivityGradeVo list1 = activityGradeService.queryByInteger(userVo.getIntegral()+activityTaskVo.getStartIntegral());
-        userVo.setUserLevel(list1.getGrade());
-        increaseUser(userVo,userVo.getIntegral()+Convert.toLong(activityTaskTimeVo.getIntegral()));
-
-        //增加领取记录
-        ActivityTaskUser add = BeanUtil.toBean(bo, ActivityTaskUser.class);
-        add.setScore(Convert.toStr(activityTaskVo.getStartIntegral()));
-        return this.save(add);
-    }
-
-    private Boolean increaseUser(UserVo userVo,Long score){
-        User user = BeanUtil.toBean(userVo, User.class);
-        user.setIntegral(score);
-        user.setUpdateTime(DateUtils.getNowTime());
-        return userService.updateById(user);
-    }
-
-    /**
-     *
-     * @author change
-     * @date 2021/6/23 14:38
-     * @param userVo
-     * @return Integer
-     */
-    public Integer  countUser(UserVo userVo) throws IllegalAccessException {
-        // Java的反射
-        Field[] field = userVo.getClass().getDeclaredFields();
-        int count = 0;
-        for(int i=0; i<field.length; i++){
-            Field f = field[i];
-            f.setAccessible(true);
-            if (f.get(userVo) != null){
-                count++;
-            }
-        }
-        return count;
-    }
-
-
-
-    //获得过去七天的日期
-    private Long getDateOne(){
-        Calendar c = Calendar.getInstance();
-        //过去七天
-        c.setTime(new Date());
-        c.add(Calendar.DATE, - 7);
-        Date d = c.getTime();
-
-        return d.getTime();
-    }
-
-
-    private Boolean validReceiver(ActivityTaskUserAddBo bo) {
-        ActivityTaskVo activityTaskVo = activityTaskService.queryByTaskId(bo.getTaskId());
-        switch (bo.getTaskType()){
-            //每日签到逻辑，当日有领取即无法签到
-            case 0:
-                LambdaQueryWrapper<ActivityTaskUser> lqw = Wrappers.lambdaQuery();
-                lqw.eq(bo.getTaskType() !=null,ActivityTaskUser::getTaskType,bo.getTaskType());
-                lqw.eq(bo.getUserId() !=null,ActivityTaskUser::getUserId,bo.getUserId());
-                lqw.between(ActivityTaskUser::getCreateTime,getTimesmorning(),getTimesnight());
-                List<ActivityTaskUser> list = this.list(lqw);
-                if (!CollectionUtils.isEmpty(list) && list.size() > 0){
-                    throw new IllegalArgumentException("已签到请勿重复签到");
-                }
-                break;
-                //完善信息  按照百分比求得乘以分数得到奖励分数
-            case 1:
-                LambdaQueryWrapper<ActivityTaskUser> useWan = Wrappers.lambdaQuery();
-                useWan.eq(bo.getTaskType() !=null,ActivityTaskUser::getTaskType,bo.getTaskType());
-                useWan.eq(bo.getUserId() !=null,ActivityTaskUser::getUserId,bo.getUserId());
-                List<ActivityTaskUser> listWan = this.list(useWan);
-                BigDecimal bigDecimal = new BigDecimal("0");
-                for (ActivityTaskUser activityTaskUser : listWan) {
-                    bigDecimal = bigDecimal.add(new BigDecimal(activityTaskUser.getScore()));
-                }
-                if (bigDecimal.compareTo(new BigDecimal(activityTaskVo.getAccIntegral())) != 0){
-                    throw new IllegalArgumentException("已完善信息领取完成，无法再次领取");
-                }
-                break;
-            case 2:
-                break;
-            case 3:
-                //每日分享，大于三次达到上线
-                LambdaQueryWrapper<ActivityTaskUser> useMei = Wrappers.lambdaQuery();
-                useMei.eq(bo.getTaskType() !=null,ActivityTaskUser::getTaskType,bo.getTaskType());
-                useMei.eq(bo.getUserId() !=null,ActivityTaskUser::getUserId,bo.getUserId());
-                useMei.between(ActivityTaskUser::getCreateTime,getTimesmorning(),getTimesnight());
-                List<ActivityTaskUser> listMei = this.list(useMei);
-                if (!CollectionUtils.isEmpty(listMei) && listMei.size() == 3){
-                    throw new IllegalArgumentException("当日分享已达上线");
-                }
-                break;
-            case 4:
-                //连续学习，大于三次达到上线
-                LambdaQueryWrapper<ActivityTaskUser> study = Wrappers.lambdaQuery();
-                study.eq(bo.getTaskType() !=null,ActivityTaskUser::getTaskType,bo.getTaskType());
-                study.eq(bo.getUserId() !=null,ActivityTaskUser::getUserId,bo.getUserId());
-                study.between(ActivityTaskUser::getCreateTime,getTimesmorning(),getTimesnight());
-                List<ActivityTaskUser> listStudy = this.list(study);
-                Integer score = 0;
-                for (ActivityTaskUser activityTaskUser : listStudy) {
-                     score = score+Convert.toInt(activityTaskUser.getScore());
-                }
-                if (!CollectionUtils.isEmpty(listStudy) && activityTaskVo.getEndIntegral().equals(score)){
-                    return false;
-                }
-                break;
-            case 5:
-                LambdaQueryWrapper<ActivityTaskUser> practice = Wrappers.lambdaQuery();
-                practice.eq(bo.getTaskType() !=null,ActivityTaskUser::getTaskType,bo.getTaskType());
-                practice.eq(bo.getUserId() !=null,ActivityTaskUser::getUserId,bo.getUserId());
-                practice.between(ActivityTaskUser::getCreateTime,getTimesmorning(),getTimesnight());
-                List<ActivityTaskUser> listPractice = this.list(practice);
-                if (!CollectionUtils.isEmpty(listPractice) && listPractice.size() > 0){
-                    throw new IllegalArgumentException("当日领取连续模拟考试积分已达上线");
-                }
-                break;
-        }
-        return true;
-    }
-
-
-    //获得今天时间的0点
-    public static int getTimesmorning(){
-        Calendar cal = Calendar.getInstance();
-
-        cal.set(Calendar.HOUR_OF_DAY, 0);
-
-        cal.set(Calendar.SECOND, 0);
-
-        cal.set(Calendar.MINUTE, 0);
-
-        cal.set(Calendar.MILLISECOND, 0);
-
-        return (int) (cal.getTimeInMillis()/1000);
-
-    }
-
-    //获得当天24点时间
-    public static int getTimesnight(){
-        Calendar cal = Calendar.getInstance();
-
-        cal.set(Calendar.HOUR_OF_DAY, 24);
-
-        cal.set(Calendar.SECOND, 0);
-
-        cal.set(Calendar.MINUTE, 0);
-
-        cal.set(Calendar.MILLISECOND, 0);
-
-        return (int) (cal.getTimeInMillis()/1000);
-
-    }
-
-    /**
-     * 连续签到天数
-     *
-     * @return int
-     * @Author change
-     * @Date 2021-06-23
-     * @Param
-     **/
-    private static int getContinuousSignInDay(List<SignIn> signInList) {
-        //continuousDay 连续签到数
-        int continuousDay = 1;
-        boolean todaySignIn = true;
-        Date today = new Date();
-        for (int i = 0; i < signInList.size(); i++) {
-            SignIn signIn = signInList.get(i);
-            int intervalDay = distanceDay(today, signIn.getSignInDay());
-            //当天签到
-            if (intervalDay == 0 && i == 0) {
-                todaySignIn = true;
-            }
-            else if (intervalDay == continuousDay) {
-                continuousDay++;
-            }else {
-                //不连续，终止判断
-                break;
-            }
-        }
-        if (!todaySignIn) {
-            continuousDay--;
-        }
-        return continuousDay;
-    }
-
-    /**
-     * 两个日期对比间隔天数
-     *
-     * @param smallDay
-     * @return boolean
-     * @Author change
-     * @Date 2021-06-23
-     * @Param largeDay
-     **/
-    private static int distanceDay(Date largeDay, Date smallDay) {
-        int day = (int) ((largeDay.getTime() - smallDay.getTime()) / (1000 * 60 * 60 * 24));
-        return day;
-    }
-
-    @Data
-    static
-    class SignIn{
-        private Date signInDay;
-
-        public SignIn(){
-
-        }
-
-        public SignIn(String day) throws ParseException {
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            String sd = sdf.format(new Date(Long.parseLong(String.valueOf(day))));
-            signInDay = sdf.parse(day);
-        }
-    }
-
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityAdvertisingVo.java

@@ -1,71 +0,0 @@
-package com.zhongzheng.modules.activity.vo;
-
-import com.zhongzheng.common.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-/**
- * 广告发布储存视图对象 mall_package
- *
- * @author change
- * @date 2021-05-17
- */
-@Data
-@ApiModel("广告发布储存视图对象")
-public class ActivityAdvertisingVo {
-	private static final long serialVersionUID = 1L;
-
-	/** $pkColumn.columnComment */
-	@ApiModelProperty("$pkColumn.columnComment")
-	private Long id;
-
-	/** 广告图片 */
-	@Excel(name = "广告图片")
-	@ApiModelProperty("广告图片")
-	private String adverUrl;
-	/** 跳转url */
-	@Excel(name = "跳转url")
-	@ApiModelProperty("跳转url")
-	private String jumpUrl;
-
-	@Excel(name = "跳转url")
-	@ApiModelProperty("跳转url")
-	private String sourceUrl;
-	/** 有效时间开始时间 */
-	@Excel(name = "有效时间开始时间")
-	@ApiModelProperty("有效时间开始时间")
-	private Long startTime;
-	/** 有效期过期时间 */
-	@Excel(name = "有效期过期时间")
-	@ApiModelProperty("有效期过期时间")
-	private Long endTime;
-	/** 备注 */
-	@Excel(name = "备注")
-	@ApiModelProperty("备注")
-	private String remarks;
-	/** 0 手动发布 1定时发布 */
-	@Excel(name = "0 手动发布 1定时发布")
-	@ApiModelProperty("0 手动发布 1定时发布")
-	private Integer reStatus;
-	/** 0删除 1待发布 2 撤回 3发布成功 */
-	@Excel(name = "0删除 1待发布 2 撤回 3发布成功 4已到期")
-	@ApiModelProperty("0删除 1待发布 2 撤回 3发布成功 4已到期")
-	private Integer status;
-
-	/** 广告名称 */
-	@Excel(name = "广告名称")
-	@ApiModelProperty("广告名称")
-	private String advName;
-
-
-	/** 创建时间 */
-	@Excel(name = "创建时间")
-	@ApiModelProperty("创建时间")
-	private Long createTime;
-	/** 1学习中心 2求职 */
-	@Excel(name = "1学习中心 2求职")
-	@ApiModelProperty("广告类型 1学习中心 2求职")
-	private Integer type;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityConfigurationCourseVo.java

@@ -1,28 +0,0 @@
-package com.zhongzheng.modules.activity.vo;
-
-import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 活动配置关联课程包含范围视图对象 mall_package
- *
- * @author change
- * @date 2021-05-19
- */
-@Data
-@ApiModel("活动配置关联课程包含范围视图对象")
-public class ActivityConfigurationCourseVo {
-	private static final long serialVersionUID = 1L;
-
-	/** 活动配置id */
-	@ApiModelProperty("活动配置id")
-	private Long configurationId;
-
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityConfigurationUseVo.java

@@ -1,41 +0,0 @@
-package com.zhongzheng.modules.activity.vo;
-
-import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 【请填写功能名称】视图对象 mall_package
- *
- * @author change
- * @date 2021-06-15
- */
-@Data
-@ApiModel("【请填写功能名称】视图对象")
-public class ActivityConfigurationUseVo {
-	private static final long serialVersionUID = 1L;
-
-	/** $pkColumn.columnComment */
-	@ApiModelProperty("$pkColumn.columnComment")
-	private Long userId;
-
-	/** 已领取活动类型 0 优惠券 1折扣券 2线上直播 3定价 4优惠 5折扣 */
-	@Excel(name = "已领取活动类型 0 优惠券 1折扣券 2线上直播 3定价 4优惠 5折扣")
-	@ApiModelProperty("已领取活动类型 0 优惠券 1折扣券 2线上直播 3定价 4优惠 5折扣")
-	private Integer activityType;
-	/** 是否已使用该次活动   0未使用  1已使用   线上直播 3 */
-	@Excel(name = "是否已使用该次活动   0未使用  1已使用   线上直播 3")
-	@ApiModelProperty("是否已使用该次活动   0未使用  1已使用   线上直播 3")
-	private Integer useStatus;
-
-	/** 领取时间 */
-	@Excel(name = "领取时间")
-	@ApiModelProperty("领取时间")
-	private Long createTime;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityConfigurationVo.java

@@ -1,128 +0,0 @@
-package com.zhongzheng.modules.activity.vo;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zhongzheng.modules.course.domain.Course;
-import com.zhongzheng.modules.course.vo.CourseVo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 活动配置视图对象 mall_package
- *
- * @author change
- * @date 2021-05-17
- */
-@Data
-@ApiModel("活动配置视图对象")
-public class ActivityConfigurationVo {
-	private static final long serialVersionUID = 1L;
-
-	/** $pkColumn.columnComment */
-	@ApiModelProperty("$pkColumn.columnComment")
-	private Long id;
-
-	/** 活动名称 */
-	@Excel(name = "活动名称")
-	@ApiModelProperty("活动名称")
-	private String activityName;
-	/** 活动类型 */
-	@Excel(name = "活动类型 0 优惠券 1折扣券 2线上直播 3定价 4优惠 5折扣")
-	@ApiModelProperty("活动类型")
-	private Integer activityType;
-	/** 活动介绍备注说明 */
-	@Excel(name = "活动介绍备注说明")
-	@ApiModelProperty("活动介绍备注说明")
-	private String description;
-	/** 活动开始时间 */
-	@Excel(name = "活动开始时间")
-	@ApiModelProperty("活动开始时间")
-	private Long startTime;
-	/** 活动结束时间 */
-	@Excel(name = "活动结束时间")
-	@ApiModelProperty("活动结束时间")
-	private Long endTime;
-	/** 定价（金额，折扣，优惠金额） */
-	@ApiModelProperty("定价（金额，折扣，优惠金额）")
-	private BigDecimal price;
-	/** 发放数量 */
-	@Excel(name = "发放数量")
-	@ApiModelProperty("发放数量")
-	private Integer quantity;
-
-
-	@Excel(name = "参与人数")
-	@ApiModelProperty("参与人数")
-	private Integer userNumber;
-
-	@Excel(name = "是否参与过活动 yes 参与 no未参与")
-	@ApiModelProperty("是否参与过活动 yes 参与 no未参与")
-	private String useStatus;
-
-	/** 直播内容（适用直播） */
-	@Excel(name = "直播内容" , readConverterExp = "适=用直播")
-	@ApiModelProperty("直播内容（适用直播）")
-	private String liveContent;
-	/** 活动地址 */
-	@Excel(name = "活动地址")
-	@ApiModelProperty("活动地址")
-	private String liveAdress;
-	/** 0删除 1结束 2 撤回 3开始 4未开始 */
-	@Excel(name = "0删除 1结束 2 撤回 3开始 4未开始")
-	@ApiModelProperty("0删除 1结束 2 撤回 3开始 4未开始")
-	private Integer status;
-
-	/** 创建时间 */
-	@Excel(name = "创建时间")
-	@ApiModelProperty("创建时间")
-	private Long createTime;
-
-	/** 修改时间 */
-	@Excel(name = "修改时间")
-	@ApiModelProperty("修改时间")
-	private Long updateTime;
-
-	/** 修改时间 */
-	@Excel(name = "有效期几个月")
-	@ApiModelProperty("有效期几个月")
-	private Integer couponEnd;
-
-
-
-	/** 活动图标 */
-	@Excel(name = "活动图标")
-	@ApiModelProperty("活动图标")
-	private String activityLogo;
-
-
-
-	/** 活动地址 */
-	@Excel(name = "活动地址")
-	@ApiModelProperty("活动地址")
-	private String activityUrl;
-
-	/** 活动详情 */
-	@Excel(name = "活动详情")
-	@ApiModelProperty("活动详情")
-	private String activityContentUrl;
-
-
-	/** 绑定课程 */
-	@Excel(name = "绑定课程")
-	@ApiModelProperty("绑定课程")
-	private List<CourseVo> courseList;
-
-
-	@Excel(name = "绑定课程")
-	@ApiModelProperty("绑定课程")
-	private List<Long> courses;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityGradePrivilegeCouresVo.java

@@ -1,28 +0,0 @@
-package com.zhongzheng.modules.activity.vo;
-
-import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 积分关联特权的范围课程视图对象 mall_package
- *
- * @author change
- * @date 2021-05-20
- */
-@Data
-@ApiModel("积分关联特权的范围课程视图对象")
-public class ActivityGradePrivilegeCouresVo {
-	private static final long serialVersionUID = 1L;
-
-	/** 活动配置id */
-	@ApiModelProperty("活动配置id")
-	private Long privilegeId;
-
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityGradePrivilegeVo.java

@@ -1,58 +0,0 @@
-package com.zhongzheng.modules.activity.vo;
-
-import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zhongzheng.modules.activity.domain.ActivityGradePrivilege;
-import com.zhongzheng.modules.course.vo.CourseVo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 等级积分特权类型：优惠券，折扣券等类型视图对象 mall_package
- *
- * @author change
- * @date 2021-05-20
- */
-@Data
-@ApiModel("等级积分特权类型：优惠券，折扣券等类型视图对象")
-public class ActivityGradePrivilegeVo {
-	private static final long serialVersionUID = 1L;
-
-	/** $pkColumn.columnComment */
-	@ApiModelProperty("$pkColumn.columnComment")
-	private Long id;
-
-	/** 关联积分表id */
-	@Excel(name = "关联积分表id")
-	@ApiModelProperty("关联积分表id")
-	private Long gradeId;
-	/** 特权类型 0优惠券 1折扣券 2解锁题库  3解锁课程 */
-	@Excel(name = "特权类型 0优惠券 1折扣券 2解锁题库  3解锁课程")
-	@ApiModelProperty("特权类型")
-	private String priType;
-	/** 优惠券金额 */
-	@Excel(name = "优惠券金额或折扣")
-	@ApiModelProperty("优惠券金额或折扣")
-	private Long couponPrice;
-	/** 有效期几个月 */
-	@Excel(name = "有效期几个月")
-	@ApiModelProperty("有效期几个月")
-	private Integer endTimeSum;
-	/** 发放数量 */
-	@Excel(name = "发放数量")
-	@ApiModelProperty("发放数量")
-	private Integer quantity;
-
-	@Excel(name = "关联优惠课程")
-	@ApiModelProperty("关联优惠课程")
-	private List<Long> courseVo;
-
-	/** 0删除 1使用 */
-	@ApiModelProperty("0删除 1使用")
-	private Integer status;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityGradeVo.java

@@ -1,69 +0,0 @@
-package com.zhongzheng.modules.activity.vo;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zhongzheng.modules.activity.domain.ActivityGradePrivilege;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 等级积分视图对象 mall_package
- *
- * @author change
- * @date 2021-05-19
- */
-@Data
-@ApiModel("等级积分视图对象")
-public class ActivityGradeVo {
-	private static final long serialVersionUID = 1L;
-
-	/** $pkColumn.columnComment */
-	@ApiModelProperty("$pkColumn.columnComment")
-	private Long id;
-
-	/** 等级 */
-	@Excel(name = "等级")
-	@ApiModelProperty("等级")
-	private Integer grade;
-	/** 等级名称 */
-	@Excel(name = "等级名称")
-	@ApiModelProperty("等级名称")
-	private String gradeName;
-	/** 需要最低积分 */
-	@Excel(name = "需要最低积分")
-	@ApiModelProperty("需要最低积分")
-	private Integer needIntegralStart;
-	/** 最高积分 */
-	@Excel(name = "最高积分")
-	@ApiModelProperty("最高积分")
-	private Integer needIntegralEnd;
-	/** 说明备注 */
-	@Excel(name = "说明备注")
-	@ApiModelProperty("说明备注")
-	private String remarks;
-
-
-	/** 用户数量 */
-	@Excel(name = "用户数量")
-	@ApiModelProperty("用户数量")
-	private Integer userNum;
-
-	/** 创建时间 */
-	@TableField(fill = FieldFill.INSERT)
-	private Long createTime;
-
-	/** 修改时间 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private Long updateTime;
-
-	@Excel(name = "关联特权类型")
-	@ApiModelProperty("关联特权类型")
-	private List<ActivityGradePrivilegeVo> activityGradePrivilegesVo;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityTaskTimeVo.java

@@ -1,40 +0,0 @@
-package com.zhongzheng.modules.activity.vo;
-
-import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 模拟考试分数给予积分关联视图对象 mall_package
- *
- * @author change
- * @date 2021-05-20
- */
-@Data
-@ApiModel("模拟考试分数给予积分关联视图对象")
-public class ActivityTaskTimeVo {
-	private static final long serialVersionUID = 1L;
-
-	/** 任务ID */
-	@ApiModelProperty("任务ID")
-	private Long taskId;
-
-	/** 分数最低范围 */
-	@Excel(name = "分数最低范围")
-	@ApiModelProperty("分数最低范围")
-	private Integer startRange;
-	/** 分数最高范围 */
-	@Excel(name = "分数最高范围")
-	@ApiModelProperty("分数最高范围")
-	private Integer endRange;
-	/** 奖励积分 */
-	@Excel(name = "奖励积分")
-	@ApiModelProperty("奖励积分")
-	private Integer integral;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityTaskUserVo.java

@@ -1,36 +0,0 @@
-package com.zhongzheng.modules.activity.vo;
-
-import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 用户领取记录视图对象 mall_package
- *
- * @author change
- * @date 2021-06-16
- */
-@Data
-@ApiModel("用户领取记录视图对象")
-public class ActivityTaskUserVo {
-	private static final long serialVersionUID = 1L;
-
-	/** $pkColumn.columnComment */
-	@ApiModelProperty("$pkColumn.columnComment")
-	private Long userId;
-
-	/** 领取分数 */
-	@Excel(name = "领取分数")
-	@ApiModelProperty("领取分数")
-	private String score;
-	/** 任务名称  0每日签到 1完善信息 2邀请好友 3每日分享4视频学习 5模拟考试 */
-	@Excel(name = "任务名称  0每日签到 1完善信息 2邀请好友 3每日分享 4视频学习 5模拟考试")
-	@ApiModelProperty("任务名称  0每日签到 1完善信息 2邀请好友 3每日分享 4视频学习 5模拟考试")
-	private Integer taskType;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityTaskVo.java

@@ -1,81 +0,0 @@
-package com.zhongzheng.modules.activity.vo;
-
-import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zhongzheng.modules.activity.domain.ActivityTaskTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 任务存储视图对象 mall_package
- *
- * @author change
- * @date 2021-05-19
- */
-@Data
-@ApiModel("任务存储视图对象")
-public class ActivityTaskVo {
-	private static final long serialVersionUID = 1L;
-
-	/** $pkColumn.columnComment */
-	@ApiModelProperty("$pkColumn.columnComment")
-	private Long id;
-
-	/** 任务名称 */
-	@Excel(name = "任务名称  0每日签到 1完善信息 2邀请好友 3每日分享\n" +
-			"4视频学习 5模拟考试")
-	@ApiModelProperty("任务名称  0每日签到 1完善信息 2邀请好友 3每日分享\n" +
-			"4视频学习 5模拟考试")
-	private Integer taskType;
-	/** 奖励积分 */
-	@Excel(name = "奖励积分或初始积分")
-	@ApiModelProperty("奖励积分或初始积分")
-	private Integer startIntegral;
-	/** 积分上限 */
-	@Excel(name = "签到积分上限")
-	@ApiModelProperty("签到积分上限")
-	private Integer endIntegral;
-	/** 备注 */
-	@Excel(name = "备注")
-	@ApiModelProperty("备注")
-	private String remarks;
-	/** 说明 */
-	@Excel(name = "说明")
-	@ApiModelProperty("说明")
-	private String description;
-	/** 累加积分 */
-	@Excel(name = "增加加积分")
-	@ApiModelProperty("增加加积分")
-	private Integer accIntegral;
-	/** 最短视频时间分钟单位 */
-	@Excel(name = "最短时长")
-	@ApiModelProperty("最短时长")
-	private Integer longTime;
-	/** 每天奖励次数 */
-	@Excel(name = "每日分享或模拟考试奖励次数")
-	@ApiModelProperty("每日分享或模拟考试奖励次数")
-	private Integer countDay;
-	/** 0 停用 1启用 */
-	@Excel(name = "0 停用 1启用")
-	@ApiModelProperty("0 停用 1启用")
-	private Integer status;
-
-	@Excel(name = "0 未完成 1 已完成")
-	@ApiModelProperty("0 未完成 1 已完成")
-	private Integer userStatus;
-
-	/** 分数范围 适用与考试积分获得 */
-	@Excel(name = "分数范围 适用与考试积分获得")
-	@ApiModelProperty("分数范围 适用与考试积分获得")
-	private List<ActivityTaskTimeVo> activityTaskTimeVo;
-
-
-	/** 最低分数 */
-	@Excel(name = "最低分数")
-	@ApiModelProperty("最低分数")
-	private Integer minNum;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionAddBo.java

@@ -1,14 +1,9 @@
 package com.zhongzheng.modules.bank.bo;
 
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 import java.util.Date;
 
 
@@ -17,7 +12,7 @@ import java.util.Date;
  * 题库题目添加对象 question
  *
  * @author hjl
- * @date 2021-05-20
+ * @date 2021-10-21
  */
 @Data
 @ApiModel("题库题目添加对象")
@@ -28,17 +23,12 @@ public class QuestionAddBo {
     private String content;
     /** 类型 1单选 2多选 3判断题 4案列题 */
     @ApiModelProperty("类型 1单选 2多选 3判断题 4案列题")
-    @NotNull(message = "类型不能为空")
-    private Integer type;
+    private String type;
     /** 判断题答案 1正确 0错误 */
     @ApiModelProperty("判断题答案 1正确 0错误")
     private Integer answerQuestion;
-    /** 题库小节ID */
-    @ApiModelProperty("题库小节ID")
-    private Long bankSectionId;
     /**  状态 1正常 0关闭 */
     @ApiModelProperty(" 状态 1正常 0关闭")
-    @NotNull(message = "状态不能为空")
     private Integer status;
     /** 创建时间 */
     @ApiModelProperty("创建时间")
@@ -46,20 +36,37 @@ public class QuestionAddBo {
     /** 更新时间 */
     @ApiModelProperty("更新时间")
     private Long updateTime;
-    /** 解析文本 */
-    @ApiModelProperty("解析文本")
-    private String analysisContent;
-    /** 题库试卷ID */
-    @ApiModelProperty("题库试卷ID")
-    private Long examId;
-    /** 父类型 1普通练习 2试卷练习 3真题练习 */
-    @ApiModelProperty("父类型 1普通练习 2试卷练习 3真题练习")
-    @NotNull(message = "父类型不能为空")
-    private Long parentType;
     /** 图片地址，多个,拼接 */
     @ApiModelProperty("图片地址，多个,拼接")
     private String imgUrl;
-    @ApiModelProperty("题目详情JSON内容")
-    @NotBlank(message = "题目详情不能为空")
+    /** 解析文本 */
+    @ApiModelProperty("解析文本")
+    private String analysisContent;
+    /** 问题内容 */
+    @ApiModelProperty("问题内容")
     private String jsonStr;
+    /** 前缀名称 */
+    @ApiModelProperty("前缀名称")
+    private String prefixName;
+    /** 知识点id用,拼接 */
+    @ApiModelProperty("知识点id用,拼接")
+    private String knowledgeIds;
+    /** 发布状态 1发布 0未发布 */
+    @ApiModelProperty("发布状态 1发布 0未发布")
+    private Integer publishStatus;
+    /** 教育类型ID */
+    @ApiModelProperty("教育类型ID")
+    private Long educationTypeId;
+    /** 业务层次id */
+    @ApiModelProperty("业务层次id")
+    private Long businessId;
+    /** 科目id */
+    @ApiModelProperty("科目id")
+    private Long subjectId;
+    /** 项目ID */
+    @ApiModelProperty("项目ID")
+    private Long projectId;
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBankAddBo.java

@@ -1,67 +0,0 @@
-package com.zhongzheng.modules.bank.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-
-import java.math.BigDecimal;
-
-/**
- * 题库添加对象 question_bank
- *
- * @author hjl
- * @date 2021-05-21
- */
-@Data
-@ApiModel("题库添加对象")
-public class QuestionBankAddBo {
-
-    /** 类目ID */
-    @ApiModelProperty("类目ID")
-    @Min(value = 1, message = "类目ID错误")
-    private Long categoryId;
-    /** 题库名称 */
-    @ApiModelProperty("题库名称")
-    @NotBlank(message = "题库名称不能为空")
-    private String bankName;
-    /** 价格 */
-    @ApiModelProperty("价格")
-    private BigDecimal price;
-    /** 开始时间 */
-    @ApiModelProperty("开始时间")
-    private Long startTime;
-    /** 结束时间 */
-    @ApiModelProperty("结束时间")
-    private Long endTime;
-    /** 封面地址 */
-    @ApiModelProperty("封面地址")
-    private String coverUrl;
-    /** 简介 */
-    @ApiModelProperty("简介")
-    private String introduction;
-    /** 添加时间 */
-    @ApiModelProperty("添加时间")
-    private Long createTime;
-    /** 修改时间 */
-    @ApiModelProperty("修改时间")
-    private Long updateTime;
-    /** 状态 1正常 0关闭 */
-    @ApiModelProperty("状态 1正常 0关闭")
-    @NotNull(message = "状态不能为空")
-    private Integer status;
-    /** 练习类型 1普通练习 2试卷练习 3真题 */
-    @ApiModelProperty("练习类型 1普通练习 2试卷练习 3真题")
-    private Long typeId;
-    /** 教师ID拼接，用,拼接 */
-    @ApiModelProperty("教师ID拼接，用,拼接")
-    private String teacherIds;
-    @ApiModelProperty("排序")
-    private Integer sort;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBankChapterAddBo.java

@@ -1,39 +0,0 @@
-package com.zhongzheng.modules.bank.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 题库大章添加对象 question_bank_chapter
- *
- * @author hjl
- * @date 2021-05-20
- */
-@Data
-@ApiModel("题库大章添加对象")
-public class QuestionBankChapterAddBo {
-
-    /** 题库ID */
-    @ApiModelProperty("题库ID")
-    private Long bankId;
-    /** 名称 */
-    @ApiModelProperty("名称")
-    private String name;
-    /** 排序 */
-    @ApiModelProperty("排序")
-    private Long sort;
-    /** 添加时间 */
-    @ApiModelProperty("添加时间")
-    private Long createTime;
-    /** 修改时间 */
-    @ApiModelProperty("修改时间")
-    private Long updateTime;
-    /** 状态 1正常 0关闭 */
-    @ApiModelProperty("状态 1正常 0关闭")
-    private Integer status;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBankChapterEditBo.java

@@ -1,44 +0,0 @@
-package com.zhongzheng.modules.bank.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-/**
- * 题库大章编辑对象 question_bank_chapter
- *
- * @author hjl
- * @date 2021-05-20
- */
-@Data
-@ApiModel("题库大章编辑对象")
-public class QuestionBankChapterEditBo {
-
-
-    /** 题库章ID */
-    @ApiModelProperty("题库章ID")
-    private Long bankChapterId;
-
-    /** 题库ID */
-    @ApiModelProperty("题库ID")
-    private Long bankId;
-
-    /** 名称 */
-    @ApiModelProperty("名称")
-    private String name;
-
-    /** 排序 */
-    @ApiModelProperty("排序")
-    private Long sort;
-
-    /** 修改时间 */
-    @ApiModelProperty("修改时间")
-    private Long updateTime;
-
-    /** 状态 1正常 0关闭 */
-    @ApiModelProperty("状态 1正常 0关闭")
-    private Integer status;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBankChapterQueryBo.java

@@ -1,53 +0,0 @@
-package com.zhongzheng.modules.bank.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
-
-/**
- * 题库大章分页查询对象 question_bank_chapter
- *
- * @author hjl
- * @date 2021-05-20
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("题库大章分页查询对象")
-public class QuestionBankChapterQueryBo extends BaseEntity {
-
-	/** 分页大小 */
-	@ApiModelProperty("分页大小")
-	private Integer pageSize;
-	/** 当前页数 */
-	@ApiModelProperty("当前页数")
-	private Integer pageNum;
-	/** 排序列 */
-	@ApiModelProperty("排序列")
-	private String orderByColumn;
-	/** 排序的方向desc或者asc */
-	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
-	private String isAsc;
-
-
-	/** 题库ID */
-	@ApiModelProperty("题库ID")
-	private Long bankId;
-	/** 名称 */
-	@ApiModelProperty("名称")
-	private String name;
-	/** 排序 */
-	@ApiModelProperty("排序")
-	private Long sort;
-	/** 状态 1正常 0关闭 */
-	@ApiModelProperty("状态 1正常 0关闭")
-	private List<Integer> status;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBankEditBo.java

@@ -1,76 +0,0 @@
-package com.zhongzheng.modules.bank.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import java.util.Date;
-
-import java.math.BigDecimal;
-
-/**
- * 题库编辑对象 question_bank
- *
- * @author hjl
- * @date 2021-05-21
- */
-@Data
-@ApiModel("题库编辑对象")
-public class QuestionBankEditBo {
-
-
-    /** 题库ID */
-    @ApiModelProperty("题库ID")
-    private Long bankId;
-
-    /** 类目ID */
-    @ApiModelProperty("类目ID")
-    @Min(value = 1, message = "类目ID错误")
-    private Long categoryId;
-
-    /** 题库名称 */
-    @ApiModelProperty("题库名称")
-    @NotBlank(message = "题库名称不能为空")
-    private String bankName;
-
-    /** 价格 */
-    @ApiModelProperty("价格")
-    private BigDecimal price;
-
-    /** 开始时间 */
-    @ApiModelProperty("开始时间")
-    private Long startTime;
-
-    /** 结束时间 */
-    @ApiModelProperty("结束时间")
-    private Long endTime;
-
-    /** 封面地址 */
-    @ApiModelProperty("封面地址")
-    private String coverUrl;
-
-    /** 简介 */
-    @ApiModelProperty("简介")
-    private String introduction;
-
-    /** 修改时间 */
-    @ApiModelProperty("修改时间")
-    private Long updateTime;
-
-    /** 状态 1正常 0关闭 */
-    @ApiModelProperty("状态 1正常 0关闭")
-    private Integer status;
-
-    /** 练习类型 1普通练习 2试卷练习 3真题 */
-    @ApiModelProperty("练习类型 1普通练习 2试卷练习 3真题")
-    private Long typeId;
-
-    /** 教师ID拼接，用,拼接 */
-    @ApiModelProperty("教师ID拼接，用,拼接")
-    private String teacherIds;
-    @ApiModelProperty("排序")
-    private Integer sort;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBankExamAddBo.java

@@ -1,39 +0,0 @@
-package com.zhongzheng.modules.bank.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 题库试卷添加对象 question_bank_exam
- *
- * @author hjl
- * @date 2021-05-20
- */
-@Data
-@ApiModel("题库试卷添加对象")
-public class QuestionBankExamAddBo {
-
-    /** 题库ID */
-    @ApiModelProperty("题库ID")
-    private Long bankId;
-    /** 名称 */
-    @ApiModelProperty("名称")
-    private String name;
-    /** 排序 */
-    @ApiModelProperty("排序")
-    private Long sort;
-    /** 添加时间 */
-    @ApiModelProperty("添加时间")
-    private Long createTime;
-    /** 修改时间 */
-    @ApiModelProperty("修改时间")
-    private Long updateTime;
-    /** 状态 1正常 0关闭 */
-    @ApiModelProperty("状态 1正常 0关闭")
-    private Integer status;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBankExamEditBo.java

@@ -1,44 +0,0 @@
-package com.zhongzheng.modules.bank.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-/**
- * 题库试卷编辑对象 question_bank_exam
- *
- * @author hjl
- * @date 2021-05-20
- */
-@Data
-@ApiModel("题库试卷编辑对象")
-public class QuestionBankExamEditBo {
-
-
-    /** 题库试卷ID */
-    @ApiModelProperty("题库试卷ID")
-    private Long examId;
-
-    /** 题库ID */
-    @ApiModelProperty("题库ID")
-    private Long bankId;
-
-    /** 名称 */
-    @ApiModelProperty("名称")
-    private String name;
-
-    /** 排序 */
-    @ApiModelProperty("排序")
-    private Long sort;
-
-    /** 修改时间 */
-    @ApiModelProperty("修改时间")
-    private Long updateTime;
-
-    /** 状态 1正常 0关闭 */
-    @ApiModelProperty("状态 1正常 0关闭")
-    private Integer status;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBankExamQueryBo.java

@@ -1,53 +0,0 @@
-package com.zhongzheng.modules.bank.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
-
-/**
- * 题库试卷分页查询对象 question_bank_exam
- *
- * @author hjl
- * @date 2021-05-20
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("题库试卷分页查询对象")
-public class QuestionBankExamQueryBo extends BaseEntity {
-
-	/** 分页大小 */
-	@ApiModelProperty("分页大小")
-	private Integer pageSize;
-	/** 当前页数 */
-	@ApiModelProperty("当前页数")
-	private Integer pageNum;
-	/** 排序列 */
-	@ApiModelProperty("排序列")
-	private String orderByColumn;
-	/** 排序的方向desc或者asc */
-	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
-	private String isAsc;
-
-
-	/** 题库ID */
-	@ApiModelProperty("题库ID")
-	private Long bankId;
-	/** 名称 */
-	@ApiModelProperty("名称")
-	private String name;
-	/** 排序 */
-	@ApiModelProperty("排序")
-	private Long sort;
-	/** 状态 1正常 0关闭 */
-	@ApiModelProperty("状态 1正常 0关闭")
-	private List<Integer> status;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBankQueryBo.java

@@ -1,74 +0,0 @@
-package com.zhongzheng.modules.bank.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-
-import java.math.BigDecimal;
-import com.zhongzheng.common.core.domain.BaseEntity;
-
-/**
- * 题库分页查询对象 question_bank
- *
- * @author hjl
- * @date 2021-05-21
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("题库分页查询对象")
-public class QuestionBankQueryBo extends BaseEntity {
-
-	private Long bankId;
-
-	/** 分页大小 */
-	@ApiModelProperty("分页大小")
-	private Integer pageSize;
-	/** 当前页数 */
-	@ApiModelProperty("当前页数")
-	private Integer pageNum;
-	/** 排序列 */
-	@ApiModelProperty("排序列")
-	private String orderByColumn;
-	/** 排序的方向desc或者asc */
-	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
-	private String isAsc;
-
-
-	/** 类目ID */
-	@ApiModelProperty("类目ID")
-	private Long categoryId;
-	/** 题库名称 */
-	@ApiModelProperty("题库名称")
-	private String bankName;
-	/** 价格 */
-	@ApiModelProperty("价格")
-	private BigDecimal price;
-	/** 开始时间 */
-	@ApiModelProperty("开始时间")
-	private Long startTime;
-	/** 结束时间 */
-	@ApiModelProperty("结束时间")
-	private Long endTime;
-	/** 封面地址 */
-	@ApiModelProperty("封面地址")
-	private String coverUrl;
-	/** 简介 */
-	@ApiModelProperty("简介")
-	private String introduction;
-	/** 状态 1正常 0关闭 */
-	@ApiModelProperty("状态 1正常 0关闭")
-	private List<Integer> status;
-	/** 练习类型 1普通练习 2试卷练习 3真题 */
-	@ApiModelProperty("练习类型 1普通练习 2试卷练习 3真题")
-	private Long typeId;
-	/** 教师ID拼接，用,拼接 */
-	@ApiModelProperty("教师ID拼接，用,拼接")
-	private String teacherIds;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBankSectionAddBo.java

@@ -1,39 +0,0 @@
-package com.zhongzheng.modules.bank.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 题库小节添加对象 question_bank_section
- *
- * @author hjl
- * @date 2021-05-20
- */
-@Data
-@ApiModel("题库小节添加对象")
-public class QuestionBankSectionAddBo {
-
-    /** 题库大章ID */
-    @ApiModelProperty("题库大章ID")
-    private Long bankChapterId;
-    /** 名称 */
-    @ApiModelProperty("名称")
-    private String name;
-    /** 添加时间 */
-    @ApiModelProperty("添加时间")
-    private Long createTime;
-    /** 修改时间 */
-    @ApiModelProperty("修改时间")
-    private Long updateTime;
-    /** 状态 1正常 0关闭 */
-    @ApiModelProperty("状态 1正常 0关闭")
-    private Integer status;
-    /** 排序 */
-    @ApiModelProperty("排序")
-    private Long sort;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBankSectionEditBo.java

@@ -1,44 +0,0 @@
-package com.zhongzheng.modules.bank.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-/**
- * 题库小节编辑对象 question_bank_section
- *
- * @author hjl
- * @date 2021-05-20
- */
-@Data
-@ApiModel("题库小节编辑对象")
-public class QuestionBankSectionEditBo {
-
-
-    /** 题库节ID */
-    @ApiModelProperty("题库节ID")
-    private Long bankSectionId;
-
-    /** 题库大章ID */
-    @ApiModelProperty("题库大章ID")
-    private Long bankChapterId;
-
-    /** 名称 */
-    @ApiModelProperty("名称")
-    private String name;
-
-    /** 修改时间 */
-    @ApiModelProperty("修改时间")
-    private Long updateTime;
-
-    /** 状态 1正常 0关闭 */
-    @ApiModelProperty("状态 1正常 0关闭")
-    private Integer status;
-
-    /** 排序 */
-    @ApiModelProperty("排序")
-    private Long sort;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBankSectionQueryBo.java

@@ -1,53 +0,0 @@
-package com.zhongzheng.modules.bank.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
-
-/**
- * 题库小节分页查询对象 question_bank_section
- *
- * @author hjl
- * @date 2021-05-20
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("题库小节分页查询对象")
-public class QuestionBankSectionQueryBo extends BaseEntity {
-
-	/** 分页大小 */
-	@ApiModelProperty("分页大小")
-	private Integer pageSize;
-	/** 当前页数 */
-	@ApiModelProperty("当前页数")
-	private Integer pageNum;
-	/** 排序列 */
-	@ApiModelProperty("排序列")
-	private String orderByColumn;
-	/** 排序的方向desc或者asc */
-	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
-	private String isAsc;
-
-
-	/** 题库大章ID */
-	@ApiModelProperty("题库大章ID")
-	private Long bankChapterId;
-	/** 名称 */
-	@ApiModelProperty("名称")
-	private String name;
-	/** 状态 1正常 0关闭 */
-	@ApiModelProperty("状态 1正常 0关闭")
-	private List<Integer> status;
-	/** 排序 */
-	@ApiModelProperty("排序")
-	private Long sort;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionDetailAddBo.java

@@ -1,54 +0,0 @@
-package com.zhongzheng.modules.bank.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 题目详情添加对象 question_detail
- *
- * @author hjl
- * @date 2021-05-20
- */
-@Data
-@ApiModel("题目详情添加对象")
-public class QuestionDetailAddBo {
-
-    /** 题目ID */
-    @ApiModelProperty("题目ID")
-    private Long questionId;
-    /** 选择题正文 */
-    @ApiModelProperty("选择题正文")
-    private String content;
-    /** 图片 */
-    @ApiModelProperty("图片")
-    private String imgUrl;
-    /** 选型答案  1正确  0错误 */
-    @ApiModelProperty("选型答案  1正确  0错误")
-    private Integer optionAnswer;
-    /** 解析文本 */
-    @ApiModelProperty("解析文本")
-    private String analysisContent;
-    /** 父ID */
-    @ApiModelProperty("父ID")
-    private Long pid;
-    /** 类型 1单选 2多选 3判断题 4问答题 */
-    @ApiModelProperty("类型 0无类型 1单选 2多选 3判断题 4问答题")
-    private Integer type;
-    /** 判断题答案 1正确 0错误 */
-    @ApiModelProperty("判断题答案 1正确 0错误")
-    private Integer itemAnswerQuestion;
-    /**  状态 1正常 0关闭 */
-    @ApiModelProperty(" 状态 1正常 0关闭")
-    private Integer status;
-    /** 创建时间 */
-    @ApiModelProperty("创建时间")
-    private Long createTime;
-    /** 更新时间 */
-    @ApiModelProperty("更新时间")
-    private Long updateTime;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionDetailEditBo.java

@@ -1,64 +0,0 @@
-package com.zhongzheng.modules.bank.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-/**
- * 题目详情编辑对象 question_detail
- *
- * @author hjl
- * @date 2021-05-20
- */
-@Data
-@ApiModel("题目详情编辑对象")
-public class QuestionDetailEditBo {
-
-
-    /** 详情ID */
-    @ApiModelProperty("详情ID")
-    private Long questionDetailId;
-
-    /** 题目ID */
-    @ApiModelProperty("题目ID")
-    private Long questionId;
-
-    /** 选择题正文 */
-    @ApiModelProperty("选择题正文")
-    private String content;
-
-    /** 图片 */
-    @ApiModelProperty("图片")
-    private String imgUrl;
-
-    /** 选型答案  1正确  0错误 */
-    @ApiModelProperty("选型答案  1正确  0错误")
-    private Integer optionAnswer;
-
-    /** 解析文本 */
-    @ApiModelProperty("解析文本")
-    private String analysisContent;
-
-    /** 父ID */
-    @ApiModelProperty("父ID")
-    private Long pid;
-
-    /** 类型  0无类型 1单选 2多选 3判断题 4问答题 */
-    @ApiModelProperty("类型 0无类型 1单选 2多选 3判断题 4问答题")
-    private Integer type;
-
-    /** 判断题答案 1正确 0错误 */
-    @ApiModelProperty("判断题答案 1正确 0错误")
-    private Integer itemAnswerQuestion;
-
-    /**  状态 1正常 0关闭 */
-    @ApiModelProperty(" 状态 1正常 0关闭")
-    private Integer status;
-
-    /** 更新时间 */
-    @ApiModelProperty("更新时间")
-    private Long updateTime;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionDetailQueryBo.java

@@ -1,67 +0,0 @@
-package com.zhongzheng.modules.bank.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
-
-/**
- * 题目详情分页查询对象 question_detail
- *
- * @author hjl
- * @date 2021-05-20
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("题目详情分页查询对象")
-public class QuestionDetailQueryBo extends BaseEntity {
-
-	/** 分页大小 */
-	@ApiModelProperty("分页大小")
-	private Integer pageSize;
-	/** 当前页数 */
-	@ApiModelProperty("当前页数")
-	private Integer pageNum;
-	/** 排序列 */
-	@ApiModelProperty("排序列")
-	private String orderByColumn;
-	/** 排序的方向desc或者asc */
-	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
-	private String isAsc;
-
-
-	/** 题目ID */
-	@ApiModelProperty("题目ID")
-	private Long questionId;
-	/** 选择题正文 */
-	@ApiModelProperty("选择题正文")
-	private String content;
-	/** 图片 */
-	@ApiModelProperty("图片")
-	private String imgUrl;
-	/** 选型答案  1正确  0错误 */
-	@ApiModelProperty("选型答案  1正确  0错误")
-	private Integer optionAnswer;
-	/** 解析文本 */
-	@ApiModelProperty("解析文本")
-	private String analysisContent;
-	/** 父ID */
-	@ApiModelProperty("父ID")
-	private Long pid;
-	/** 类型  0无类型1单选 2多选 3判断题 4问答题 */
-	@ApiModelProperty("类型 0无类型 1单选 2多选 3判断题 4问答题")
-	private Integer type;
-	/** 判断题答案 1正确 0错误 */
-	@ApiModelProperty("判断题答案 1正确 0错误")
-	private Integer itemAnswerQuestion;
-	/**  状态 1正常 0关闭 */
-	@ApiModelProperty(" 状态 1正常 0关闭")
-	private Integer status;
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionEditBo.java

@@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-
-import javax.validation.constraints.Min;
 import java.util.Date;
 
 
@@ -13,13 +11,12 @@ import java.util.Date;
  * 题库题目编辑对象 question
  *
  * @author hjl
- * @date 2021-05-20
+ * @date 2021-10-21
  */
 @Data
 @ApiModel("题库题目编辑对象")
 public class QuestionEditBo {
 
-
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
     private Long questionId;
@@ -30,16 +27,12 @@ public class QuestionEditBo {
 
     /** 类型 1单选 2多选 3判断题 4案列题 */
     @ApiModelProperty("类型 1单选 2多选 3判断题 4案列题")
-    private Integer type;
+    private String type;
 
     /** 判断题答案 1正确 0错误 */
     @ApiModelProperty("判断题答案 1正确 0错误")
     private Integer answerQuestion;
 
-    /** 题库小节ID */
-    @ApiModelProperty("题库小节ID")
-    private Long bankSectionId;
-
     /**  状态 1正常 0关闭 */
     @ApiModelProperty(" 状态 1正常 0关闭")
     private Integer status;
@@ -48,22 +41,47 @@ public class QuestionEditBo {
     @ApiModelProperty("更新时间")
     private Long updateTime;
 
+    /** 图片地址，多个,拼接 */
+    @ApiModelProperty("图片地址，多个,拼接")
+    private String imgUrl;
+
     /** 解析文本 */
     @ApiModelProperty("解析文本")
     private String analysisContent;
 
-    /** 题库试卷ID */
-    @ApiModelProperty("题库试卷ID")
-    private Long examId;
+    /** 问题内容 */
+    @ApiModelProperty("问题内容")
+    private String jsonStr;
+
+
+    /** 前缀名称 */
+    @ApiModelProperty("前缀名称")
+    private String prefixName;
+
+    /** 知识点id用,拼接 */
+    @ApiModelProperty("知识点id用,拼接")
+    private String knowledgeIds;
+
+    /** 发布状态 1发布 0未发布 */
+    @ApiModelProperty("发布状态 1发布 0未发布")
+    private Integer publishStatus;
+
+    /** 教育类型ID */
+    @ApiModelProperty("教育类型ID")
+    private Long educationTypeId;
+
+    /** 业务层次id */
+    @ApiModelProperty("业务层次id")
+    private Long businessId;
+
+    /** 科目id */
+    @ApiModelProperty("科目id")
+    private Long subjectId;
+
+    /** 项目ID */
+    @ApiModelProperty("项目ID")
+    private Long projectId;
+
 
-    /** 父类型 1普通练习 2试卷练习 3真题练习 */
-    @ApiModelProperty("父类型 1普通练习 2试卷练习 3真题练习")
-    @Min(value = 1, message = "父类型为正整数")
-    private Long parentType;
 
-    /** 图片地址，多个,拼接 */
-    @ApiModelProperty("图片地址，多个,拼接")
-    private String imgUrl;
-    @ApiModelProperty("题目详情JSON内容")
-    private String jsonStr;
 }