增加用户协议签署记录

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/AdminSysUserContractRecordController.java

@@ -0,0 +1,28 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.biz.dal.service.SysUserContractRecordService;
+import com.yonge.cooleshow.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 用户协议记录表-一个用户一种协议一个版本一条记录(SysUserContractRecord)表控制层
+ *
+ * @author hgw
+ * @since 2022-05-07 15:04:05
+ */
+@Api(tags = "用户协议记录表-一个用户一种协议一个版本一条记录")
+@RestController
+@RequestMapping("/sysUserContractRecord")
+public class AdminSysUserContractRecordController extends BaseController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private SysUserContractRecordService sysUserContractRecordService;
+
+}
+

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/SysUserContractsController.java

@@ -1,39 +0,0 @@
-package com.yonge.cooleshow.admin.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.yonge.cooleshow.biz.dal.entity.SysUserContracts;
-import com.yonge.cooleshow.biz.dal.service.SysUserContractsService;
-import com.yonge.cooleshow.common.controller.BaseController;
-import com.yonge.cooleshow.common.entity.HttpResponseResult;
-
-@RequestMapping("sysUserContracts")
-@Api(tags = "用户协议服务")
-@RestController
-public class SysUserContractsController extends BaseController {
-
-	@Autowired
-	private SysUserContractsService sysUserContractsService;
-	
-    @ApiOperation(value = "查询学生最新协议")
-    @GetMapping("/getLatest")
-    @PreAuthorize("@pcs.hasPermissions('sysUserContracts/getLatest')")
-	public HttpResponseResult<SysUserContracts> getLatest(Long userId) {
-		
-		SysUserContracts sysUserContracts = sysUserContractsService.getLatestUserContract(userId);
-
-		if(sysUserContracts == null){
-			return failed("该学员尚未签署协议");
-		}
-
-		return succeed(sysUserContracts);
-	}
-
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SysUserContractRecordDao.java

@@ -0,0 +1,20 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yonge.cooleshow.biz.dal.entity.SysUserContractRecord;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 用户协议记录表-一个用户一种协议一个版本一条记录(SysUserContractRecord)表数据库访问层
+ *
+ * @author hgw
+ * @since 2022-05-07 15:04:05
+ */
+public interface SysUserContractRecordDao extends BaseMapper<SysUserContractRecord> {
+
+    int insertBatch(@Param("entities") List<SysUserContractRecord> entities);
+
+}
+

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SysUserContractsDao.java

@@ -1,31 +0,0 @@
-package com.yonge.cooleshow.biz.dal.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yonge.cooleshow.biz.dal.entity.SysUserContracts;
-import com.yonge.toolset.mybatis.dal.BaseDAO;
-
-public interface SysUserContractsDao extends BaseDAO<Long, SysUserContracts> {
-
-    /**
-     * @describe 获取用户指定类型的协议记录
-     * @author Joburgess
-     * @date 2020.09.18
-     * @param userId:
-     * @param contractType:
-     * @return java.util.List<com.yonge.cooleshow.biz.dal.entity.SysUserContracts>
-     */
-    List<SysUserContracts> getUserContractWithType(@Param("userId") Long userId,
-                                                   @Param("contractType") SysUserContracts.ContractType contractType,
-                                                   @Param("version") Integer version);
-
-    /**
-     * 获取最近一次的协议
-     * @param userId
-     * @return
-     */
-    SysUserContracts getLatestUserContract(Long userId);
-
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/SysUserContractRecord.java

@@ -0,0 +1,117 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 用户协议记录表-一个用户一种协议一个版本一条记录(SysUserContractRecord)表实体类
+ *
+ * @author hgw
+ * @since 2022-05-07 15:21:18
+ */
+@ApiModel(value = "sys_user_contract_record-用户协议记录表-一个用户一种协议一个版本一条记录")
+public class SysUserContractRecord implements Serializable {
+    @TableId(value = "id_", type = IdType.AUTO)
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @TableField("user_id_")
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    @TableField("user_type_")
+    @ApiModelProperty(value = "用户类型")
+    private String userType;
+
+    @TableField("contract_id_")
+    @ApiModelProperty(value = "协议模板对应的id")
+    private Integer contractId;
+
+    @TableField("url_")
+    @ApiModelProperty(value = "协议地址")
+    private String url;
+
+    @TableField("created_time_")
+    @ApiModelProperty(value = "创建时间")
+    private Date createdTime;
+
+    @TableField("contract_no_")
+    @ApiModelProperty(value = "合同编号")
+    private String contractNo;
+
+    @TableField("remark_")
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
+    public Integer getContractId() {
+        return contractId;
+    }
+
+    public void setContractId(Integer contractId) {
+        this.contractId = contractId;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public Date getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(Date createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public String getContractNo() {
+        return contractNo;
+    }
+
+    public void setContractNo(String contractNo) {
+        this.contractNo = contractNo;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+}
+

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/SysUserContracts.java

@@ -1,125 +0,0 @@
-package com.yonge.cooleshow.biz.dal.entity;
-
-import com.yonge.toolset.base.enums.BaseEnum;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_user_contracts):
- */
-public class SysUserContracts {
-
-	public enum ContractType implements BaseEnum<String, ContractType> {
-
-		REGISTER("注册"),
-		COURSES("课程购买"),
-		PRODUCT("产品");
-
-		private String desc;
-
-		private ContractType(String desc) {
-			this.desc = desc;
-		}
-
-		@Override
-		public String getCode() {
-			return name();
-		}
-
-		public String getDesc() {
-			return desc;
-		}
-	}
-
-	/**  */
-	private Long id;
-
-	/**  */
-	private Long userId;
-
-	/** 合同号 */
-	private String contractNo;
-
-	/** 协议类型 */
-	private ContractType type;
-
-	/** 协议地址 */
-	private String url;
-
-	/** 备注 */
-	private String memo;
-
-	private Integer version;
-
-	/** 创建时间 */
-	private java.util.Date createTime;
-
-	public Integer getVersion() {
-		return version;
-	}
-
-	public void setVersion(Integer version) {
-		this.version = version;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getId() {
-		return this.id;
-	}
-
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-
-	public Long getUserId() {
-		return this.userId;
-	}
-
-	public void setContractNo(String contractNo) {
-		this.contractNo = contractNo;
-	}
-
-	public String getContractNo() {
-		return this.contractNo;
-	}
-
-	public void setType(ContractType type) {
-		this.type = type;
-	}
-
-	public ContractType getType() {
-		return this.type;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	public String getUrl() {
-		return this.url;
-	}
-
-	public void setMemo(String memo) {
-		this.memo = memo;
-	}
-
-	public String getMemo() {
-		return this.memo;
-	}
-
-	public void setCreateTime(java.util.Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public java.util.Date getCreateTime() {
-		return this.createTime;
-	}
-
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SysUserContractRecordService.java

@@ -0,0 +1,17 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.dao.SysUserContractRecordDao;
+import com.yonge.cooleshow.biz.dal.entity.SysUserContractRecord;
+
+/**
+ * 用户协议记录表-一个用户一种协议一个版本一条记录(SysUserContractRecord)表服务接口
+ *
+ * @author hgw
+ * @since 2022-05-07 15:04:06
+ */
+public interface SysUserContractRecordService extends IService<SysUserContractRecord> {
+
+    SysUserContractRecordDao getDao();
+}
+

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SysUserContractsService.java

@@ -1,27 +0,0 @@
-package com.yonge.cooleshow.biz.dal.service;
-
-import java.util.List;
-
-import com.yonge.cooleshow.biz.dal.entity.SysUserContracts;
-import com.yonge.toolset.mybatis.service.BaseService;
-
-public interface SysUserContractsService extends BaseService<Long, SysUserContracts> {
-
-    /**
-     * @describe 获取用户指定类型的协议记录
-     * @author Joburgess
-     * @date 2020.09.18
-     * @param userId:
-     * @param contractType:
-     * @return java.util.List<com.yonge.cooleshow.biz.dal.entity.SysUserContracts>
-     */
-    List<SysUserContracts> getUserContractWithType(Long userId, SysUserContracts.ContractType contractType, Integer contractVersion);
-
-    /**
-     * 获取最近一次的协议
-     * @param userId
-     * @return
-     */
-    SysUserContracts getLatestUserContract(Long userId);
-
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysUserContractRecordServiceImpl.java

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.biz.dal.dao.SysUserContractRecordDao;
+import com.yonge.cooleshow.biz.dal.entity.SysUserContractRecord;
+import com.yonge.cooleshow.biz.dal.service.SysUserContractRecordService;
+import org.springframework.stereotype.Service;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 用户协议记录表-一个用户一种协议一个版本一条记录(SysUserContractRecord)表服务实现类
+ *
+ * @author hgw
+ * @since 2022-05-07 15:04:06
+ */
+@Service("sysUserContractRecordService")
+public class SysUserContractRecordServiceImpl extends ServiceImpl<SysUserContractRecordDao, SysUserContractRecord> implements SysUserContractRecordService {
+
+    private final static Logger log = LoggerFactory.getLogger(SysUserContractRecordServiceImpl.class);
+
+    @Override
+    public SysUserContractRecordDao getDao() {
+        return this.baseMapper;
+    }
+
+}
+

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysUserContractsServiceImpl.java

@@ -1,35 +0,0 @@
-package com.yonge.cooleshow.biz.dal.service.impl;
-
-import java.util.List;
-
-import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.yonge.cooleshow.biz.dal.dao.SysUserContractsDao;
-import com.yonge.cooleshow.biz.dal.entity.SysUserContracts;
-import com.yonge.cooleshow.biz.dal.service.SysUserContractsService;
-import com.yonge.toolset.mybatis.dal.BaseDAO;
-
-@Service
-public class SysUserContractsServiceImpl extends BaseServiceImpl<Long, SysUserContracts> implements SysUserContractsService {
-	
-	@Autowired
-	private SysUserContractsDao sysUserContractsDao;
-
-	@Override
-	public BaseDAO<Long, SysUserContracts> getDAO() {
-		return sysUserContractsDao;
-	}
-
-	@Override
-	public List<SysUserContracts> getUserContractWithType(Long userId, SysUserContracts.ContractType contractType, Integer contractVersion) {
-		return sysUserContractsDao.getUserContractWithType(userId, contractType, contractVersion);
-	}
-
-	@Override
-	public SysUserContracts getLatestUserContract(Long userId) {
-		return sysUserContractsDao.getLatestUserContract(userId);
-	}
-
-}

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysUserContractRecordMapper.xml

@@ -0,0 +1,31 @@
+<?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.yonge.cooleshow.biz.dal.dao.SysUserContractRecordDao">
+    <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.SysUserContractRecord">
+        <id column="id_" jdbcType="INTEGER" property="id"/>
+        <result column="user_id_" jdbcType="INTEGER" property="userId"/>
+        <result column="user_type_" jdbcType="VARCHAR" property="userType"/>
+        <result column="contract_id_" jdbcType="INTEGER" property="contractId"/>
+        <result column="url_" jdbcType="VARCHAR" property="url"/>
+        <result column="created_time_" jdbcType="TIMESTAMP" property="createdTime"/>
+        <result column="contract_no_" jdbcType="VARCHAR" property="contractNo"/>
+        <result column="remark_" jdbcType="VARCHAR" property="remark"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id_
+        , user_id_, user_type_, contract_id_, url_, created_time_, contract_no_, remark_
+    </sql>
+
+    <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
+            parameterType="com.yonge.cooleshow.biz.dal.entity.SysUserContractRecord">
+        insert into sys_user_contract_record(user_id_, user_type_, contract_id_, url_, created_time_, contract_no_,
+        remark_)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.userId}, #{entity.userType}, #{entity.contractId}, #{entity.url}, #{entity.createdTime},
+            #{entity.contractNo}, #{entity.remark})
+        </foreach>
+    </insert>
+
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysUserContractsMapper.xml

@@ -1,101 +0,0 @@
-<?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.yonge.cooleshow.biz.dal.dao.SysUserContractsDao">
-
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.SysUserContracts"
-			   id="SysUserContracts">
-		<result column="id_" property="id" />
-		<result column="user_id_" property="userId" />
-		<result column="contract_no_" property="contractNo" />
-		<result column="type_" property="type" />
-		<result column="url_" property="url" />
-		<result column="memo_" property="memo" />
-		<result column="create_time_" property="createTime" />
-		<result column="version_" property="version" />
-	</resultMap>
-
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="SysUserContracts">
-		SELECT * FROM
-		sys_user_contracts WHERE id_ = #{id}
-	</select>
-
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="SysUserContracts">
-		SELECT * FROM sys_user_contracts
-		ORDER BY id_
-	</select>
-
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.SysUserContracts"
-			useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
-			AS ID FROM DUAL </selectKey> -->
-		INSERT INTO sys_user_contracts
-		(id_,user_id_,contract_no_,type_,url_,memo_,create_time_,version_)
-		VALUES(#{id},#{userId},#{contractNo},#{type},#{url},#{memo},#{createTime},#{version})
-	</insert>
-
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.SysUserContracts">
-		UPDATE sys_user_contracts
-		<set>
-			<if test="userId != null">
-				user_id_ = #{userId},
-			</if>
-			<if test="id != null">
-				id_ = #{id},
-			</if>
-			<if test="url != null">
-				url_ = #{url},
-			</if>
-			<if test="memo != null">
-				memo_ = #{memo},
-			</if>
-			<if test="contractNo != null">
-				contract_no_ = #{contractNo},
-			</if>
-			<if test="type != null">
-				type_ = #{type},
-			</if>
-			<if test="createTime != null">
-				create_time_ = #{createTime},
-			</if>
-		</set>
-		WHERE id_ = #{id}
-	</update>
-
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete">
-		DELETE FROM sys_user_contracts WHERE id_ =
-		#{id}
-	</delete>
-
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="SysUserContracts"
-			parameterType="map">
-		SELECT * FROM sys_user_contracts ORDER BY id_
-		<include refid="global.limit" />
-	</select>
-
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM
-		sys_user_contracts
-	</select>
-
-	<select id="getUserContractWithType" resultMap="SysUserContracts">
-		SELECT * FROM sys_user_contracts
-		WHERE user_id_=#{userId}
-		  AND type_=#{contractType}
-		  <if test="version!=null">
-			  AND version_=#{version}
-		  </if>
-	</select>
-
-	<select id="getLatestUserContract" resultMap="SysUserContracts">
-		SELECT * FROM sys_user_contracts WHERE user_id_=#{userId} order by id_ desc limit 0,1
-	</select>
-
-</mapper>

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/StudentSysUserContractRecordController.java

@@ -0,0 +1,28 @@
+package com.yonge.cooleshow.student.controller;
+
+import com.yonge.cooleshow.biz.dal.entity.SysUserContractRecord;
+import com.yonge.cooleshow.biz.dal.service.SysUserContractRecordService;
+import org.springframework.web.bind.annotation.*;
+import com.yonge.cooleshow.common.controller.BaseController;
+import io.swagger.annotations.Api;
+
+import javax.annotation.Resource;
+
+/**
+ * 用户协议记录表-一个用户一种协议一个版本一条记录(SysUserContractRecord)表控制层
+ *
+ * @author hgw
+ * @since 2022-05-07 15:04:05
+ */
+@Api(tags = "用户协议记录表-一个用户一种协议一个版本一条记录")
+@RestController
+@RequestMapping("/sysUserContractRecord")
+public class StudentSysUserContractRecordController extends BaseController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private SysUserContractRecordService sysUserContractRecordService;
+
+}
+

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherSysUserContractRecordController.java

@@ -0,0 +1,28 @@
+package com.yonge.cooleshow.teacher.controller;
+
+import com.yonge.cooleshow.biz.dal.service.SysUserContractRecordService;
+import com.yonge.cooleshow.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 用户协议记录表-一个用户一种协议一个版本一条记录(SysUserContractRecord)表控制层
+ *
+ * @author hgw
+ * @since 2022-05-07 15:04:05
+ */
+@Api(tags = "用户协议记录表-一个用户一种协议一个版本一条记录")
+@RestController
+@RequestMapping("/sysUserContractRecord")
+public class TeacherSysUserContractRecordController extends BaseController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private SysUserContractRecordService sysUserContractRecordService;
+
+}
+