进入班级

zhongzheng-admin/src/main/java/com/zhongzheng/controller/inform/InformController.java

@@ -54,19 +54,6 @@ public class InformController extends BaseController {
         return getDataTable(list);
     }
 
-    /**
-     * 导出【请填写功能名称】列表
-     */
-    @ApiOperation("导出【请填写功能名称】列表")
-    @PreAuthorize("@ss.hasPermi('system:inform:export')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<InformVo> export(InformQueryBo bo) {
-        List<InformVo> list = iInformService.queryList(bo);
-        ExcelUtil<InformVo> util = new ExcelUtil<InformVo>(InformVo.class);
-        return util.exportExcel(list, "【请填写功能名称】");
-    }
-
     /**
      * 获取【请填写功能名称】详细信息
      */
@@ -94,19 +81,9 @@ public class InformController extends BaseController {
     @ApiOperation("修改【请填写功能名称】")
     @PreAuthorize("@ss.hasPermi('system:inform:edit')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
-    @PutMapping()
+    @PostMapping("edit")
     public AjaxResult<Void> edit(@RequestBody InformEditBo bo) {
         return toAjax(iInformService.updateByEditBo(bo) ? 1 : 0);
     }
 
-    /**
-     * 删除【请填写功能名称】
-     */
-    @ApiOperation("删除【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:inform:remove')")
-    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{informIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] informIds) {
-        return toAjax(iInformService.deleteWithValidByIds(Arrays.asList(informIds), true) ? 1 : 0);
-    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -95,7 +95,10 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 update.setFinishStatus(bo.getFinishStatus());
             }
             if (bo.getPeriodStatus() != null) {
-                update.setPeriodStatus(bo.getFinishStatus());
+                update.setPeriodStatus(bo.getPeriodStatus());
+            }
+            if (bo.getLearnStatus() != null) {
+                update.setLearnStatus(bo.getLearnStatus());
             }
             this.updateById(update);
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformAddBo.java

@@ -51,4 +51,9 @@ public class InformAddBo {
     /** 1已发布 0未发布 -1删除 */
     @ApiModelProperty("1已发布 0未发布 -1删除")
     private Integer status;
+
+
+    /** 1已发布 0未发布 -1删除 */
+    @ApiModelProperty("添加题库")
+    private InformCourseAddBo informCourseAddBo;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformCourseAddBo.java

@@ -39,4 +39,7 @@ public class InformCourseAddBo {
     /** 章ID */
     @ApiModelProperty("章ID")
     private Long chapterId;
+    /** 题目位置 */
+    @ApiModelProperty("题目位置")
+    private Long topicNum;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformExamAddBo.java

@@ -39,4 +39,7 @@ public class InformExamAddBo {
     /** 章ID */
     @ApiModelProperty("章ID")
     private Long chapterId;
+    /** 题目位置 */
+    @ApiModelProperty("题目位置")
+    private Long topicNum;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformUserAddBo.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.inform.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 通知绑定学员添加对象 inform_user
+ *
+ * @author ruoyi
+ * @date 2021-11-23
+ */
+@Data
+@ApiModel("通知绑定学员添加对象")
+public class InformUserAddBo {
+
+    /** 用户id */
+    @ApiModelProperty("用户id")
+    private Long userId;
+    /** 发送时间 */
+    @ApiModelProperty("发送时间")
+    private Long sendTime;
+    /** 发送状态 1成功 0失败 */
+    @ApiModelProperty("发送状态 1成功 0失败")
+    private Integer sendStatus;
+    /** 已读回执 1已读 0未读 */
+    @ApiModelProperty("已读回执 1已读 0未读")
+    private Integer receiptStatus;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformUserEditBo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.inform.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 通知绑定学员编辑对象 inform_user
+ *
+ * @author ruoyi
+ * @date 2021-11-23
+ */
+@Data
+@ApiModel("通知绑定学员编辑对象")
+public class InformUserEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 用户id */
+    @ApiModelProperty("用户id")
+    private Long userId;
+
+    /** 发送时间 */
+    @ApiModelProperty("发送时间")
+    private Long sendTime;
+
+    /** 发送状态 1成功 0失败 */
+    @ApiModelProperty("发送状态 1成功 0失败")
+    private Integer sendStatus;
+
+    /** 已读回执 1已读 0未读 */
+    @ApiModelProperty("已读回执 1已读 0未读")
+    private Integer receiptStatus;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformUserQueryBo.java

@@ -0,0 +1,51 @@
+package com.zhongzheng.modules.inform.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;
+
+/**
+ * 通知绑定学员分页查询对象 inform_user
+ *
+ * @author ruoyi
+ * @date 2021-11-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("通知绑定学员分页查询对象")
+public class InformUserQueryBo 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 userId;
+	/** 发送时间 */
+	@ApiModelProperty("发送时间")
+	private Long sendTime;
+	/** 发送状态 1成功 0失败 */
+	@ApiModelProperty("发送状态 1成功 0失败")
+	private Integer sendStatus;
+	/** 已读回执 1已读 0未读 */
+	@ApiModelProperty("已读回执 1已读 0未读")
+	private Integer receiptStatus;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/domain/InformCourse.java

@@ -42,4 +42,6 @@ private static final long serialVersionUID=1L;
     private Long moduleId;
     /** 章ID */
     private Long chapterId;
+    /** 题目位置 */
+    private Long topicNum;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/domain/InformExam.java

@@ -42,4 +42,6 @@ private static final long serialVersionUID=1L;
     private Long moduleId;
     /** 章ID */
     private Long chapterId;
+    /** 题目位置 */
+    private Long topicNum;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/domain/InformUser.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.inform.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;
+
+/**
+ * 通知绑定学员对象 inform_user
+ *
+ * @author ruoyi
+ * @date 2021-11-23
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("inform_user")
+public class InformUser implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 用户id */
+    private Long userId;
+    /** 发送时间 */
+    private Long sendTime;
+    /** 发送状态 1成功 0失败 */
+    private Integer sendStatus;
+    /** 已读回执 1已读 0未读 */
+    private Integer receiptStatus;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/mapper/InformUserMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.inform.mapper;
+
+import com.zhongzheng.modules.inform.domain.InformUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 通知绑定学员Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-11-23
+ */
+public interface InformUserMapper extends BaseMapper<InformUser> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/IInformUserService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.inform.service;
+
+import com.zhongzheng.modules.inform.domain.InformUser;
+import com.zhongzheng.modules.inform.vo.InformUserVo;
+import com.zhongzheng.modules.inform.bo.InformUserQueryBo;
+import com.zhongzheng.modules.inform.bo.InformUserAddBo;
+import com.zhongzheng.modules.inform.bo.InformUserEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 通知绑定学员Service接口
+ *
+ * @author ruoyi
+ * @date 2021-11-23
+ */
+public interface IInformUserService extends IService<InformUser> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	InformUserVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<InformUserVo> queryList(InformUserQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入通知绑定学员
+	 * @param bo 通知绑定学员新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(InformUserAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改通知绑定学员
+	 * @param bo 通知绑定学员编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(InformUserEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformUserServiceImpl.java

@@ -0,0 +1,102 @@
+package com.zhongzheng.modules.inform.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+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.inform.bo.InformUserAddBo;
+import com.zhongzheng.modules.inform.bo.InformUserQueryBo;
+import com.zhongzheng.modules.inform.bo.InformUserEditBo;
+import com.zhongzheng.modules.inform.domain.InformUser;
+import com.zhongzheng.modules.inform.mapper.InformUserMapper;
+import com.zhongzheng.modules.inform.vo.InformUserVo;
+import com.zhongzheng.modules.inform.service.IInformUserService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 通知绑定学员Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-11-23
+ */
+@Service
+public class InformUserServiceImpl extends ServiceImpl<InformUserMapper, InformUser> implements IInformUserService {
+
+    @Override
+    public InformUserVo queryById(Long id){
+        InformUser db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, InformUserVo.class);
+    }
+
+    @Override
+    public List<InformUserVo> queryList(InformUserQueryBo bo) {
+        LambdaQueryWrapper<InformUser> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserId() != null, InformUser::getUserId, bo.getUserId());
+        lqw.eq(bo.getSendTime() != null, InformUser::getSendTime, bo.getSendTime());
+        lqw.eq(bo.getSendStatus() != null, InformUser::getSendStatus, bo.getSendStatus());
+        lqw.eq(bo.getReceiptStatus() != null, InformUser::getReceiptStatus, bo.getReceiptStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<InformUserVo> entity2Vo(Collection<InformUser> collection) {
+        List<InformUserVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, InformUserVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<InformUser> page = (Page<InformUser>)collection;
+            Page<InformUserVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(InformUserAddBo bo) {
+        InformUser add = BeanUtil.toBean(bo, InformUser.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(InformUserEditBo bo) {
+        InformUser update = BeanUtil.toBean(bo, InformUser.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(InformUser 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/inform/vo/InformCourseVo.java

@@ -44,4 +44,9 @@ public class InformCourseVo {
 	@Excel(name = "章ID")
 	@ApiModelProperty("章ID")
 	private Long chapterId;
+
+	/** 题目位置 */
+	@Excel(name = "题目位置")
+	@ApiModelProperty("题目位置")
+	private Long topicNum;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/vo/InformExamVo.java

@@ -44,4 +44,8 @@ public class InformExamVo {
 	@Excel(name = "章ID")
 	@ApiModelProperty("章ID")
 	private Long chapterId;
+	/** 题目位置 */
+	@Excel(name = "题目位置")
+	@ApiModelProperty("题目位置")
+	private Long topicNum;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/vo/InformUserVo.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.inform.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-11-23
+ */
+@Data
+@ApiModel("通知绑定学员视图对象")
+public class InformUserVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 用户id */
+	@Excel(name = "用户id")
+	@ApiModelProperty("用户id")
+	private Long userId;
+	/** 发送时间 */
+	@Excel(name = "发送时间")
+	@ApiModelProperty("发送时间")
+	private Long sendTime;
+	/** 发送状态 1成功 0失败 */
+	@Excel(name = "发送状态 1成功 0失败")
+	@ApiModelProperty("发送状态 1成功 0失败")
+	private Integer sendStatus;
+	/** 已读回执 1已读 0未读 */
+	@Excel(name = "已读回执 1已读 0未读")
+	@ApiModelProperty("已读回执 1已读 0未读")
+	private Integer receiptStatus;
+}

zhongzheng-system/src/main/resources/mapper/modules/inform/InformUserMapper.xml

@@ -0,0 +1,18 @@
+<?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.modules.inform.mapper.InformUserMapper">
+
+    <resultMap type="com.zhongzheng.modules.inform.domain.InformUser" id="InformUserResult">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="sendTime" column="send_time"/>
+        <result property="sendStatus" column="send_status"/>
+        <result property="receiptStatus" column="receipt_status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>