等级管理和任务管理接口

zhongzheng-admin/src/main/java/com/zhongzheng/controller/activity/ActivityAdvertisingController.java

@@ -31,7 +31,7 @@ import io.swagger.annotations.ApiOperation;
  * @author change
  * @date 2021-05-17
  */
-@Api(value = "广告发布储存控制器", tags = {"广告发布储存管理"})
+@Api(value = "广告发布控制器", tags = {"广告发布管理"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/advertising")

zhongzheng-admin/src/main/java/com/zhongzheng/controller/activity/ActivityGradeController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.activity;
+
+import java.util.List;
+import java.util.Arrays;
+
+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.service.IActivityGradeService;
+import com.zhongzheng.modules.activity.vo.ActivityGradeVo;
+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 com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 等级积分Controller
+ * 
+ * @author ruoyi
+ * @date 2021-05-19
+ */
+@Api(value = "等级积分控制器", tags = {"等级积分管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/grade")
+public class ActivityGradeController extends BaseController {
+
+    private final IActivityGradeService iActivityGradeService;
+
+    /**
+     * 查询等级积分列表
+     */
+    @ApiOperation("查询等级积分列表")
+    @PreAuthorize("@ss.hasPermi('system:grade:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ActivityGradeVo> list(ActivityGradeQueryBo bo) {
+        startPage();
+        List<ActivityGradeVo> list = iActivityGradeService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出等级积分列表
+     */
+/*    @ApiOperation("导出等级积分列表")
+    @PreAuthorize("@ss.hasPermi('system:grade:export')")
+    @Log(title = "等级积分", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<ActivityGradeVo> export(ActivityGradeQueryBo bo) {
+        List<ActivityGradeVo> list = iActivityGradeService.queryList(bo);
+        ExcelUtil<ActivityGradeVo> util = new ExcelUtil<ActivityGradeVo>(ActivityGradeVo.class);
+        return util.exportExcel(list, "等级积分");
+    }*/
+
+    /**
+     * 获取等级积分详细信息
+     */
+    @ApiOperation("获取等级积分详细信息")
+    @PreAuthorize("@ss.hasPermi('system:grade:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<ActivityGradeVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iActivityGradeService.queryById(id));
+    }
+
+    /**
+     * 新增等级积分
+     */
+    @ApiOperation("新增等级积分")
+    @PreAuthorize("@ss.hasPermi('system:grade:add')")
+    @Log(title = "等级积分", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody ActivityGradeAddBo bo) {
+        return toAjax(iActivityGradeService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改等级积分
+     */
+    @ApiOperation("修改等级积分")
+    @PreAuthorize("@ss.hasPermi('system:grade:edit')")
+    @Log(title = "等级积分", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody ActivityGradeEditBo bo) {
+        return toAjax(iActivityGradeService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除等级积分
+     */
+  /*  @ApiOperation("删除等级积分")
+    @PreAuthorize("@ss.hasPermi('system:grade:remove')")
+    @Log(title = "等级积分" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iActivityGradeService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }*/
+}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/activity/ActivityTaskController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.activity;
+
+import java.util.List;
+import java.util.Arrays;
+
+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 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.zhongzheng.modules.activity.service.IActivityTaskService;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 任务存储Controller
+ * 
+ * @author ruoyi
+ * @date 2021-05-19
+ */
+@Api(value = "任务存储控制器", tags = {"任务存储管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/modules.activity/task")
+public class ActivityTaskController extends BaseController {
+
+    private final IActivityTaskService iActivityTaskService;
+
+    /**
+     * 查询任务存储列表
+     */
+    @ApiOperation("查询任务存储列表")
+    @PreAuthorize("@ss.hasPermi('modules.activity:task:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ActivityTaskVo> list(ActivityTaskQueryBo bo) {
+        startPage();
+        List<ActivityTaskVo> list = iActivityTaskService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出任务存储列表
+     */
+    @ApiOperation("导出任务存储列表")
+    @PreAuthorize("@ss.hasPermi('modules.activity:task:export')")
+    @Log(title = "任务存储", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<ActivityTaskVo> export(ActivityTaskQueryBo bo) {
+        List<ActivityTaskVo> list = iActivityTaskService.queryList(bo);
+        ExcelUtil<ActivityTaskVo> util = new ExcelUtil<ActivityTaskVo>(ActivityTaskVo.class);
+        return util.exportExcel(list, "任务存储");
+    }
+
+    /**
+     * 获取任务存储详细信息
+     */
+    @ApiOperation("获取任务存储详细信息")
+    @PreAuthorize("@ss.hasPermi('modules.activity:task:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<ActivityTaskVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iActivityTaskService.queryById(id));
+    }
+
+    /**
+     * 新增任务存储
+     */
+    @ApiOperation("新增任务存储")
+    @PreAuthorize("@ss.hasPermi('modules.activity:task:add')")
+    @Log(title = "任务存储", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody ActivityTaskAddBo bo) {
+        return toAjax(iActivityTaskService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改任务存储
+     */
+    @ApiOperation("修改任务存储")
+    @PreAuthorize("@ss.hasPermi('modules.activity:task:edit')")
+    @Log(title = "任务存储", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody ActivityTaskEditBo bo) {
+        return toAjax(iActivityTaskService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除任务存储
+     */
+    @ApiOperation("删除任务存储")
+    @PreAuthorize("@ss.hasPermi('modules.activity:task:remove')")
+    @Log(title = "任务存储" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iActivityTaskService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

zhongzheng-admin/src/main/java/com/zhongzheng/core/config/OssConfig.java → zhongzheng-framework/src/main/java/com/zhongzheng/framework/config/OssConfig.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.core.config;
+package com.zhongzheng.framework.config;
 
 import com.aliyun.oss.OSSClient;
 import org.springframework.beans.factory.annotation.Value;

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

@@ -0,0 +1,42 @@
+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
+ *
+ * @author ruoyi
+ * @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;
+}

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

@@ -0,0 +1,48 @@
+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
+ *
+ * @author ruoyi
+ * @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;
+}

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

@@ -0,0 +1,55 @@
+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 ruoyi
+ * @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

@@ -0,0 +1,54 @@
+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
+ *
+ * @author ruoyi
+ * @date 2021-05-19
+ */
+@Data
+@ApiModel("任务存储添加对象")
+public class ActivityTaskAddBo {
+
+    /** 任务名称 */
+    @ApiModelProperty("任务名称")
+    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;
+}

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

@@ -0,0 +1,64 @@
+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
+ *
+ * @author ruoyi
+ * @date 2021-05-19
+ */
+@Data
+@ApiModel("任务存储编辑对象")
+public class ActivityTaskEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 任务名称 */
+    @ApiModelProperty("任务名称")
+    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;
+}

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

@@ -0,0 +1,67 @@
+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
+ *
+ * @author ruoyi
+ * @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("任务名称")
+	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;
+
+}

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

@@ -0,0 +1,54 @@
+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 ruoyi
+ * @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/ActivityTask.java

@@ -0,0 +1,66 @@
+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
+ * 
+ * @author ruoyi
+ * @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;
+
+    /** 任务名称 */
+    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;
+
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.activity.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.activity.domain.ActivityGrade;
+
+/**
+ * 等级积分Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-05-19
+ */
+public interface ActivityGradeMapper extends BaseMapper<ActivityGrade> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.activity.mapper;
+
+import com.zhongzheng.modules.activity.domain.ActivityTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 任务存储Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-05-19
+ */
+public interface ActivityTaskMapper extends BaseMapper<ActivityTask> {
+
+}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.activity.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+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.domain.ActivityGrade;
+import com.zhongzheng.modules.activity.vo.ActivityGradeVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 等级积分Service接口
+ *
+ * @author ruoyi
+ * @date 2021-05-19
+ */
+public interface IActivityGradeService extends IService<ActivityGrade> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ActivityGradeVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<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);
+}

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

@@ -0,0 +1,52 @@
+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 ruoyi
+ * @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);
+}

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

@@ -0,0 +1,101 @@
+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.ActivityGradeAddBo;
+import com.zhongzheng.modules.activity.bo.ActivityGradeEditBo;
+import com.zhongzheng.modules.activity.bo.ActivityGradeQueryBo;
+import com.zhongzheng.modules.activity.domain.ActivityConfiguration;
+import com.zhongzheng.modules.activity.domain.ActivityGrade;
+import com.zhongzheng.modules.activity.mapper.ActivityGradeMapper;
+import com.zhongzheng.modules.activity.service.IActivityGradeService;
+import com.zhongzheng.modules.activity.vo.ActivityGradeVo;
+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 java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 等级积分Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-05-19
+ */
+@Service
+public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, ActivityGrade> implements IActivityGradeService {
+
+    @Override
+    public ActivityGradeVo queryById(Long id){
+        ActivityGrade db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, ActivityGradeVo.class);
+    }
+
+    @Override
+    public List<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());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ActivityGradeVo> entity2Vo(Collection<ActivityGrade> collection) {
+        List<ActivityGradeVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ActivityGradeVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ActivityGrade> page = (Page<ActivityGrade>)collection;
+            Page<ActivityGradeVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ActivityGradeAddBo bo) {
+        ActivityGrade add = BeanUtil.toBean(bo, ActivityGrade.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ActivityGradeEditBo bo) {
+        ActivityGrade update = BeanUtil.toBean(bo, ActivityGrade.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ActivityGrade entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        ArrayList<ActivityGrade> activityGradeArrayList = new ArrayList<>();
+        ids.stream().forEach(id -> activityGradeArrayList.add(new ActivityGrade().setId(id)));
+        return this.updateBatchById(activityGradeArrayList);
+    }
+}

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

@@ -0,0 +1,103 @@
+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.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 java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 任务存储Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-05-19
+ */
+@Service
+public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, ActivityTask> implements IActivityTaskService {
+
+    @Override
+    public ActivityTaskVo queryById(Long id){
+        ActivityTask db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, ActivityTaskVo.class);
+    }
+
+    @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());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @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
+    public Boolean insertByAddBo(ActivityTaskAddBo bo) {
+        ActivityTask add = BeanUtil.toBean(bo, ActivityTask.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ActivityTaskEditBo bo) {
+        ActivityTask update = BeanUtil.toBean(bo, ActivityTask.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ActivityTask 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/vo/ActivityGradeVo.java

@@ -0,0 +1,48 @@
+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 ruoyi
+ * @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;
+
+}

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

@@ -0,0 +1,64 @@
+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 ruoyi
+ * @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 = "任务名称")
+	@ApiModelProperty("任务名称")
+	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;
+
+}

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityGradeMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.system.mapper.ActivityGradeMapper">
+
+    <resultMap type="com.zhongzheng.modules.activity.domain.ActivityGrade" id="ActivityGradeResult">
+        <result property="id" column="id"/>
+        <result property="grade" column="grade"/>
+        <result property="gradeName" column="grade_name"/>
+        <result property="needIntegralStart" column="need_integral_start"/>
+        <result property="needIntegralEnd" column="need_integral_end"/>
+        <result property="remarks" column="remarks"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityTaskMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.system.mapper.ActivityTaskMapper">
+
+    <resultMap type="com.zhongzheng.modules.activity.domain.ActivityTask" id="ActivityTaskResult">
+        <result property="id" column="id"/>
+        <result property="taskType" column="task_type"/>
+        <result property="startIntegral" column="start_integral"/>
+        <result property="endIntegral" column="end_integral"/>
+        <result property="remarks" column="remarks"/>
+        <result property="description" column="description"/>
+        <result property="accIntegral" column="acc_integral"/>
+        <result property="longTime" column="long_time"/>
+        <result property="countDay" column="count_day"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+
+</mapper>