From 902a9a3d975c72afaffc5f5b41e08cc94b419385 Mon Sep 17 00:00:00 2001 From: zhujj Date: Tue, 15 Jan 2019 18:17:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E3=80=81=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 8 +- .../java/com/ruoyi/framework/jwt/JwtUtil.java | 1 + .../VipUserCertificateController.java | 126 ++++++++++++ .../VipUserCourseSectionController.java | 126 ++++++++++++ .../ruoyi/vip/domain/VipUserCertificate.java | 194 ++++++++++++++++++ .../vip/domain/VipUserCourseSection.java | 180 ++++++++++++++++ .../vip/domain/vo/VipUserCertificateVO.java | 17 ++ .../vip/mapper/VipUserCertificateMapper.java | 24 +++ .../mapper/VipUserCourseSectionMapper.java | 24 +++ .../service/IVipUserCertificateService.java | 30 +++ .../service/IVipUserCourseSectionService.java | 30 +++ .../impl/VipUserCertificateServiceImpl.java | 48 +++++ .../impl/VipUserCourseSectionServiceImpl.java | 48 +++++ .../mapper/vip/VipUserCertificateMapper.xml | 46 +++++ .../mapper/vip/VipUserCourseSectionMapper.xml | 44 ++++ .../templates/vip/vipUserCertificate/add.html | 100 +++++++++ .../vip/vipUserCertificate/edit.html | 69 +++++++ .../vipUserCertificate.html | 162 +++++++++++++++ .../vip/vipUserCourseSection/add.html | 88 ++++++++ .../vip/vipUserCourseSection/edit.html | 89 ++++++++ .../vipUserCourseSection.html | 139 +++++++++++++ 21 files changed, 1590 insertions(+), 3 deletions(-) create mode 100644 ruoyi-vip/src/main/java/com/ruoyi/vip/controller/VipUserCertificateController.java create mode 100644 ruoyi-vip/src/main/java/com/ruoyi/vip/controller/VipUserCourseSectionController.java create mode 100644 ruoyi-vip/src/main/java/com/ruoyi/vip/domain/VipUserCertificate.java create mode 100644 ruoyi-vip/src/main/java/com/ruoyi/vip/domain/VipUserCourseSection.java create mode 100644 ruoyi-vip/src/main/java/com/ruoyi/vip/domain/vo/VipUserCertificateVO.java create mode 100644 ruoyi-vip/src/main/java/com/ruoyi/vip/mapper/VipUserCertificateMapper.java create mode 100644 ruoyi-vip/src/main/java/com/ruoyi/vip/mapper/VipUserCourseSectionMapper.java create mode 100644 ruoyi-vip/src/main/java/com/ruoyi/vip/service/IVipUserCertificateService.java create mode 100644 ruoyi-vip/src/main/java/com/ruoyi/vip/service/IVipUserCourseSectionService.java create mode 100644 ruoyi-vip/src/main/java/com/ruoyi/vip/service/impl/VipUserCertificateServiceImpl.java create mode 100644 ruoyi-vip/src/main/java/com/ruoyi/vip/service/impl/VipUserCourseSectionServiceImpl.java create mode 100644 ruoyi-vip/src/main/resources/mapper/vip/VipUserCertificateMapper.xml create mode 100644 ruoyi-vip/src/main/resources/mapper/vip/VipUserCourseSectionMapper.xml create mode 100644 ruoyi-vip/src/main/resources/templates/vip/vipUserCertificate/add.html create mode 100644 ruoyi-vip/src/main/resources/templates/vip/vipUserCertificate/edit.html create mode 100644 ruoyi-vip/src/main/resources/templates/vip/vipUserCertificate/vipUserCertificate.html create mode 100644 ruoyi-vip/src/main/resources/templates/vip/vipUserCourseSection/add.html create mode 100644 ruoyi-vip/src/main/resources/templates/vip/vipUserCourseSection/edit.html create mode 100644 ruoyi-vip/src/main/resources/templates/vip/vipUserCourseSection/vipUserCourseSection.html diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index fc1aac107..41a6b8343 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -54,13 +54,15 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + serialization: + write-dates-as-timestamps: false profiles: active: druid # 文件上传 servlet: multipart: - max-file-size: 30MB - max-request-size: 30MB + max-file-size: 300MB + max-request-size: 300MB # 服务模块 devtools: restart: @@ -127,7 +129,7 @@ gen: # 作者 author: zhujj # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.train + packageName: com.ruoyi.vip # 自动去除表前缀，默认是true autoRemovePre: false # 表前缀(类名不会包含表前缀) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/jwt/JwtUtil.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/jwt/JwtUtil.java index 618ca9239..d2b17e64b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/jwt/JwtUtil.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/jwt/JwtUtil.java @@ -49,6 +49,7 @@ public class JwtUtil { try { String token = ServletUtils.getRequest().getHeader("Authorization"); DecodedJWT jwt = JWT.decode(token); +// jwt.getExpiresAt(); return jwt.getClaim("loginName").asString(); } catch (JWTDecodeException e) { return null; diff --git a/ruoyi-vip/src/main/java/com/ruoyi/vip/controller/VipUserCertificateController.java b/ruoyi-vip/src/main/java/com/ruoyi/vip/controller/VipUserCertificateController.java new file mode 100644 index 000000000..d791142ea --- /dev/null +++ b/ruoyi-vip/src/main/java/com/ruoyi/vip/controller/VipUserCertificateController.java @@ -0,0 +1,126 @@ +package com.ruoyi.vip.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.vip.domain.VipUserCertificate; +import com.ruoyi.vip.service.IVipUserCertificateService; +import com.ruoyi.framework.web.base.BaseController; +import com.ruoyi.framework.web.page.TableDataInfo; +import com.ruoyi.common.base.AjaxResult; +import com.ruoyi.common.utils.ExcelUtil; + +/** + * 我的订单 信息操作处理 + * + * @author zhujj + * @date 2019-01-15 + */ +@Controller +@RequestMapping("/vip/vipUserCertificate") +public class VipUserCertificateController extends BaseController +{ + private String prefix = "vip/vipUserCertificate"; + + @Autowired + private IVipUserCertificateService vipUserCertificateService; + + @RequiresPermissions("vip:vipUserCertificate:view") + @GetMapping() + public String vipUserCertificate() + { + return prefix + "/vipUserCertificate"; + } + + /** + * 查询我的订单列表 + */ + @RequiresPermissions("vip:vipUserCertificate:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(VipUserCertificate vipUserCertificate) + { + List list = vipUserCertificateService.selectVipUserCertificatePage(vipUserCertificate); + return getDataTable(list); + } + + + /** + * 导出我的订单列表 + */ + @RequiresPermissions("vip:vipUserCertificate:export") + @PostMapping("/export") + @ResponseBody + public AjaxResult export(VipUserCertificate vipUserCertificate) + { + List list = vipUserCertificateService.selectVipUserCertificateList(vipUserCertificate); + ExcelUtil util = new ExcelUtil(VipUserCertificate.class); + return util.exportExcel(list, "vipUserCertificate"); + } + + /** + * 新增我的订单 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存我的订单 + */ + @RequiresPermissions("vip:vipUserCertificate:add") + @Log(title = "我的订单", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(VipUserCertificate vipUserCertificate) + { + return toAjax(vipUserCertificateService.insert(vipUserCertificate)); + } + + /** + * 修改我的订单 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Integer id, ModelMap mmap) + { + VipUserCertificate vipUserCertificate = vipUserCertificateService.selectById(id); + mmap.put("vipUserCertificate", vipUserCertificate); + return prefix + "/edit"; + } + + /** + * 修改保存我的订单 + */ + @RequiresPermissions("vip:vipUserCertificate:edit") + @Log(title = "我的订单", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(VipUserCertificate vipUserCertificate) + { + return toAjax(vipUserCertificateService.updateById(vipUserCertificate)); + } + + /** + * 删除我的订单 + */ + @RequiresPermissions("vip:vipUserCertificate:remove") + @Log(title = "我的订单", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(vipUserCertificateService.deleteByIds(ids)); + } + +} diff --git a/ruoyi-vip/src/main/java/com/ruoyi/vip/controller/VipUserCourseSectionController.java b/ruoyi-vip/src/main/java/com/ruoyi/vip/controller/VipUserCourseSectionController.java new file mode 100644 index 000000000..0bbda0e91 --- /dev/null +++ b/ruoyi-vip/src/main/java/com/ruoyi/vip/controller/VipUserCourseSectionController.java @@ -0,0 +1,126 @@ +package com.ruoyi.vip.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.vip.domain.VipUserCourseSection; +import com.ruoyi.vip.service.IVipUserCourseSectionService; +import com.ruoyi.framework.web.base.BaseController; +import com.ruoyi.framework.web.page.TableDataInfo; +import com.ruoyi.common.base.AjaxResult; +import com.ruoyi.common.utils.ExcelUtil; + +/** + * 我的课程学习 信息操作处理 + * + * @author zhujj + * @date 2019-01-15 + */ +@Controller +@RequestMapping("/vip/vipUserCourseSection") +public class VipUserCourseSectionController extends BaseController +{ + private String prefix = "vip/vipUserCourseSection"; + + @Autowired + private IVipUserCourseSectionService vipUserCourseSectionService; + + @RequiresPermissions("vip:vipUserCourseSection:view") + @GetMapping() + public String vipUserCourseSection() + { + return prefix + "/vipUserCourseSection"; + } + + /** + * 查询我的课程学习列表 + */ + @RequiresPermissions("vip:vipUserCourseSection:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(VipUserCourseSection vipUserCourseSection) + { + List list = vipUserCourseSectionService.selectVipUserCourseSectionPage(vipUserCourseSection); + return getDataTable(list); + } + + + /** + * 导出我的课程学习列表 + */ + @RequiresPermissions("vip:vipUserCourseSection:export") + @PostMapping("/export") + @ResponseBody + public AjaxResult export(VipUserCourseSection vipUserCourseSection) + { + List list = vipUserCourseSectionService.selectVipUserCourseSectionList(vipUserCourseSection); + ExcelUtil util = new ExcelUtil(VipUserCourseSection.class); + return util.exportExcel(list, "vipUserCourseSection"); + } + + /** + * 新增我的课程学习 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存我的课程学习 + */ + @RequiresPermissions("vip:vipUserCourseSection:add") + @Log(title = "我的课程学习", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(VipUserCourseSection vipUserCourseSection) + { + return toAjax(vipUserCourseSectionService.insert(vipUserCourseSection)); + } + + /** + * 修改我的课程学习 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Integer id, ModelMap mmap) + { + VipUserCourseSection vipUserCourseSection = vipUserCourseSectionService.selectById(id); + mmap.put("vipUserCourseSection", vipUserCourseSection); + return prefix + "/edit"; + } + + /** + * 修改保存我的课程学习 + */ + @RequiresPermissions("vip:vipUserCourseSection:edit") + @Log(title = "我的课程学习", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(VipUserCourseSection vipUserCourseSection) + { + return toAjax(vipUserCourseSectionService.updateById(vipUserCourseSection)); + } + + /** + * 删除我的课程学习 + */ + @RequiresPermissions("vip:vipUserCourseSection:remove") + @Log(title = "我的课程学习", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(vipUserCourseSectionService.deleteByIds(ids)); + } + +} diff --git a/ruoyi-vip/src/main/java/com/ruoyi/vip/domain/VipUserCertificate.java b/ruoyi-vip/src/main/java/com/ruoyi/vip/domain/VipUserCertificate.java new file mode 100644 index 000000000..a3a51fc5e --- /dev/null +++ b/ruoyi-vip/src/main/java/com/ruoyi/vip/domain/VipUserCertificate.java @@ -0,0 +1,194 @@ +package com.ruoyi.vip.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.base.BaseEntity; + import javax.persistence.Id; + import java.util.Date; + +/** + * 我的订单表 vip_user_certificate + * + * @author zhujj + * @date 2019-01-15 + */ +public class VipUserCertificate +{ +private static final long serialVersionUID = 1L; + + /** 练习对象 */ + @Id + private Integer id; + /** 会员代码 */ + private Integer vipUserId; + /** 证书名称 */ + private String name; + /** 证书照片 */ + private String image; + /** 生效日期 */ + private Date startDate; + /** 截止日期 */ + private Date endDate; + /** 创建者 */ + private String createBy; + /** 创建时间 */ + private Date createDate; + /** 更新者 */ + private String updateBy; + /** 更新时间 */ + private Date updateDate; + /** 备注信息 */ + private String remarks; + /** 删除标记 */ + private String delFlag; + + /** 设置练习对象 */ + public void setId(Integer id) + { + this.id = id; + } + + /** 获取练习对象 */ + public Integer getId() + { + return id; + } + /** 设置会员代码 */ + public void setVipUserId(Integer vipUserId) + { + this.vipUserId = vipUserId; + } + + /** 获取会员代码 */ + public Integer getVipUserId() + { + return vipUserId; + } + /** 设置证书名称 */ + public void setName(String name) + { + this.name = name; + } + + /** 获取证书名称 */ + public String getName() + { + return name; + } + /** 设置证书照片 */ + public void setImage(String image) + { + this.image = image; + } + + /** 获取证书照片 */ + public String getImage() + { + return image; + } + /** 设置生效日期 */ + public void setStartDate(Date startDate) + { + this.startDate = startDate; + } + + /** 获取生效日期 */ + public Date getStartDate() + { + return startDate; + } + /** 设置截止日期 */ + public void setEndDate(Date endDate) + { + this.endDate = endDate; + } + + /** 获取截止日期 */ + public Date getEndDate() + { + return endDate; + } + /** 设置创建者 */ + public void setCreateBy(String createBy) + { + this.createBy = createBy; + } + + /** 获取创建者 */ + public String getCreateBy() + { + return createBy; + } + /** 设置创建时间 */ + public void setCreateDate(Date createDate) + { + this.createDate = createDate; + } + + /** 获取创建时间 */ + public Date getCreateDate() + { + return createDate; + } + /** 设置更新者 */ + public void setUpdateBy(String updateBy) + { + this.updateBy = updateBy; + } + + /** 获取更新者 */ + public String getUpdateBy() + { + return updateBy; + } + /** 设置更新时间 */ + public void setUpdateDate(Date updateDate) + { + this.updateDate = updateDate; + } + + /** 获取更新时间 */ + public Date getUpdateDate() + { + return updateDate; + } + /** 设置备注信息 */ + public void setRemarks(String remarks) + { + this.remarks = remarks; + } + + /** 获取备注信息 */ + public String getRemarks() + { + return remarks; + } + /** 设置删除标记 */ + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + /** 获取删除标记 */ + public String getDelFlag() + { + return delFlag; + } + +public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("vipUserId", getVipUserId()) + .append("name", getName()) + .append("image", getImage()) + .append("startDate", getStartDate()) + .append("endDate", getEndDate()) + .append("createBy", getCreateBy()) + .append("createDate", getCreateDate()) + .append("updateBy", getUpdateBy()) + .append("updateDate", getUpdateDate()) + .append("remarks", getRemarks()) + .append("delFlag", getDelFlag()) + .toString(); + } + } diff --git a/ruoyi-vip/src/main/java/com/ruoyi/vip/domain/VipUserCourseSection.java b/ruoyi-vip/src/main/java/com/ruoyi/vip/domain/VipUserCourseSection.java new file mode 100644 index 000000000..835f92a8f --- /dev/null +++ b/ruoyi-vip/src/main/java/com/ruoyi/vip/domain/VipUserCourseSection.java @@ -0,0 +1,180 @@ +package com.ruoyi.vip.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.base.BaseEntity; + import javax.persistence.Id; + import java.util.Date; + +/** + * 我的课程学习表 vip_user_course_section + * + * @author zhujj + * @date 2019-01-15 + */ +public class VipUserCourseSection +{ +private static final long serialVersionUID = 1L; + + /** 练习对象 */ + @Id + private Integer id; + /** 会员代码 */ + private Integer vipUserId; + /** 课程ID */ + private Integer trainCourseId; + /** 章节id */ + private Integer trainCourseSection; + /** 学习时间长度（分钟） */ + private Integer duration; + /** 创建者 */ + private String createBy; + /** 创建时间 */ + private Date createDate; + /** 更新者 */ + private String updateBy; + /** 更新时间 */ + private Date updateDate; + /** 备注信息 */ + private String remarks; + /** 删除标记 */ + private String delFlag; + + /** 设置练习对象 */ + public void setId(Integer id) + { + this.id = id; + } + + /** 获取练习对象 */ + public Integer getId() + { + return id; + } + /** 设置会员代码 */ + public void setVipUserId(Integer vipUserId) + { + this.vipUserId = vipUserId; + } + + /** 获取会员代码 */ + public Integer getVipUserId() + { + return vipUserId; + } + /** 设置课程ID */ + public void setTrainCourseId(Integer trainCourseId) + { + this.trainCourseId = trainCourseId; + } + + /** 获取课程ID */ + public Integer getTrainCourseId() + { + return trainCourseId; + } + /** 设置章节id */ + public void setTrainCourseSection(Integer trainCourseSection) + { + this.trainCourseSection = trainCourseSection; + } + + /** 获取章节id */ + public Integer getTrainCourseSection() + { + return trainCourseSection; + } + /** 设置学习时间长度（分钟） */ + public void setDuration(Integer duration) + { + this.duration = duration; + } + + /** 获取学习时间长度（分钟） */ + public Integer getDuration() + { + return duration; + } + /** 设置创建者 */ + public void setCreateBy(String createBy) + { + this.createBy = createBy; + } + + /** 获取创建者 */ + public String getCreateBy() + { + return createBy; + } + /** 设置创建时间 */ + public void setCreateDate(Date createDate) + { + this.createDate = createDate; + } + + /** 获取创建时间 */ + public Date getCreateDate() + { + return createDate; + } + /** 设置更新者 */ + public void setUpdateBy(String updateBy) + { + this.updateBy = updateBy; + } + + /** 获取更新者 */ + public String getUpdateBy() + { + return updateBy; + } + /** 设置更新时间 */ + public void setUpdateDate(Date updateDate) + { + this.updateDate = updateDate; + } + + /** 获取更新时间 */ + public Date getUpdateDate() + { + return updateDate; + } + /** 设置备注信息 */ + public void setRemarks(String remarks) + { + this.remarks = remarks; + } + + /** 获取备注信息 */ + public String getRemarks() + { + return remarks; + } + /** 设置删除标记 */ + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + /** 获取删除标记 */ + public String getDelFlag() + { + return delFlag; + } + +public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("vipUserId", getVipUserId()) + .append("trainCourseId", getTrainCourseId()) + .append("trainCourseSection", getTrainCourseSection()) + .append("duration", getDuration()) + .append("createBy", getCreateBy()) + .append("createDate", getCreateDate()) + .append("updateBy", getUpdateBy()) + .append("updateDate", getUpdateDate()) + .append("remarks", getRemarks()) + .append("delFlag", getDelFlag()) + .toString(); + } + } diff --git a/ruoyi-vip/src/main/java/com/ruoyi/vip/domain/vo/VipUserCertificateVO.java b/ruoyi-vip/src/main/java/com/ruoyi/vip/domain/vo/VipUserCertificateVO.java new file mode 100644 index 000000000..09b82b0e4 --- /dev/null +++ b/ruoyi-vip/src/main/java/com/ruoyi/vip/domain/vo/VipUserCertificateVO.java @@ -0,0 +1,17 @@ +package com.ruoyi.vip.domain.vo; + +import com.ruoyi.system.domain.SysUser; +import com.ruoyi.vip.domain.VipUserCertificate; + +/** + * @ProjectName: RuoYi + * @Package: com.ruoyi.vip.domain.vo + * @ClassName: VipUserCertificateVO + * @Description: java类作用描述 + * @Author: Zhujj + * @CreateDate: 2019/1/15 0015 17:42 + * @Version: 1.0 + */ +public class VipUserCertificateVO extends VipUserCertificate { + private SysUser user; +} diff --git a/ruoyi-vip/src/main/java/com/ruoyi/vip/mapper/VipUserCertificateMapper.java b/ruoyi-vip/src/main/java/com/ruoyi/vip/mapper/VipUserCertificateMapper.java new file mode 100644 index 000000000..7d7a29bdf --- /dev/null +++ b/ruoyi-vip/src/main/java/com/ruoyi/vip/mapper/VipUserCertificateMapper.java @@ -0,0 +1,24 @@ +package com.ruoyi.vip.mapper; + +import com.ruoyi.vip.domain.VipUserCertificate; +import java.util.List; +import com.ruoyi.framework.web.base.MyMapper; + +/** + * 我的订单 数据层 + * + * @author zhujj + * @date 2019-01-15 + */ +public interface VipUserCertificateMapper extends MyMapper +{ + + /** + * 查询我的订单列表 + * + * @param vipUserCertificate 我的订单信息 + * @return 我的订单集合 + */ + public List selectVipUserCertificateList(VipUserCertificate vipUserCertificate); + +} \ No newline at end of file diff --git a/ruoyi-vip/src/main/java/com/ruoyi/vip/mapper/VipUserCourseSectionMapper.java b/ruoyi-vip/src/main/java/com/ruoyi/vip/mapper/VipUserCourseSectionMapper.java new file mode 100644 index 000000000..d6bad1e39 --- /dev/null +++ b/ruoyi-vip/src/main/java/com/ruoyi/vip/mapper/VipUserCourseSectionMapper.java @@ -0,0 +1,24 @@ +package com.ruoyi.vip.mapper; + +import com.ruoyi.vip.domain.VipUserCourseSection; +import java.util.List; +import com.ruoyi.framework.web.base.MyMapper; + +/** + * 我的课程学习 数据层 + * + * @author zhujj + * @date 2019-01-15 + */ +public interface VipUserCourseSectionMapper extends MyMapper +{ + + /** + * 查询我的课程学习列表 + * + * @param vipUserCourseSection 我的课程学习信息 + * @return 我的课程学习集合 + */ + public List selectVipUserCourseSectionList(VipUserCourseSection vipUserCourseSection); + +} \ No newline at end of file diff --git a/ruoyi-vip/src/main/java/com/ruoyi/vip/service/IVipUserCertificateService.java b/ruoyi-vip/src/main/java/com/ruoyi/vip/service/IVipUserCertificateService.java new file mode 100644 index 000000000..420ee47b1 --- /dev/null +++ b/ruoyi-vip/src/main/java/com/ruoyi/vip/service/IVipUserCertificateService.java @@ -0,0 +1,30 @@ +package com.ruoyi.vip.service; + +import com.ruoyi.vip.domain.VipUserCertificate; +import java.util.List; +import com.ruoyi.framework.web.base.AbstractBaseService; +/** + * 我的订单 服务层 + * + * @author zhujj + * @date 2019-01-15 + */ +public interface IVipUserCertificateService extends AbstractBaseService +{ + /** + * 查询我的订单分页列表 + * + * @param vipUserCertificate 我的订单信息 + * @return 我的订单集合 + */ + public List selectVipUserCertificatePage(VipUserCertificate vipUserCertificate); + /** + * 查询我的订单列表 + * + * @param vipUserCertificate 我的订单信息 + * @return 我的订单集合 + */ + public List selectVipUserCertificateList(VipUserCertificate vipUserCertificate); + + +} diff --git a/ruoyi-vip/src/main/java/com/ruoyi/vip/service/IVipUserCourseSectionService.java b/ruoyi-vip/src/main/java/com/ruoyi/vip/service/IVipUserCourseSectionService.java new file mode 100644 index 000000000..296a1a16f --- /dev/null +++ b/ruoyi-vip/src/main/java/com/ruoyi/vip/service/IVipUserCourseSectionService.java @@ -0,0 +1,30 @@ +package com.ruoyi.vip.service; + +import com.ruoyi.vip.domain.VipUserCourseSection; +import java.util.List; +import com.ruoyi.framework.web.base.AbstractBaseService; +/** + * 我的课程学习 服务层 + * + * @author zhujj + * @date 2019-01-15 + */ +public interface IVipUserCourseSectionService extends AbstractBaseService +{ + /** + * 查询我的课程学习分页列表 + * + * @param vipUserCourseSection 我的课程学习信息 + * @return 我的课程学习集合 + */ + public List selectVipUserCourseSectionPage(VipUserCourseSection vipUserCourseSection); + /** + * 查询我的课程学习列表 + * + * @param vipUserCourseSection 我的课程学习信息 + * @return 我的课程学习集合 + */ + public List selectVipUserCourseSectionList(VipUserCourseSection vipUserCourseSection); + + +} diff --git a/ruoyi-vip/src/main/java/com/ruoyi/vip/service/impl/VipUserCertificateServiceImpl.java b/ruoyi-vip/src/main/java/com/ruoyi/vip/service/impl/VipUserCertificateServiceImpl.java new file mode 100644 index 000000000..da05e416c --- /dev/null +++ b/ruoyi-vip/src/main/java/com/ruoyi/vip/service/impl/VipUserCertificateServiceImpl.java @@ -0,0 +1,48 @@ +package com.ruoyi.vip.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.vip.mapper.VipUserCertificateMapper; +import com.ruoyi.vip.domain.VipUserCertificate; +import com.ruoyi.vip.service.IVipUserCertificateService; +import com.ruoyi.common.support.Convert; +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +/** + * 我的订单 服务层实现 + * + * @author zhujj + * @date 2019-01-15 + */ +@Service +public class VipUserCertificateServiceImpl extends AbstractBaseServiceImpl implements IVipUserCertificateService +{ + @Autowired + private VipUserCertificateMapper vipUserCertificateMapper; + + + /** + * 查询我的订单列表 + * + * @param vipUserCertificate 我的订单信息 + * @return 我的订单集合 + */ + @Override + public List selectVipUserCertificateList(VipUserCertificate vipUserCertificate) + { + return vipUserCertificateMapper.selectVipUserCertificateList(vipUserCertificate); + } + /** + * 查询我的订单分页列表 + * + * @param vipUserCertificate 我的订单信息 + * @return 我的订单集合 + */ + @Override + public List selectVipUserCertificatePage(VipUserCertificate vipUserCertificate) + { + startPage(); + return vipUserCertificateMapper.selectVipUserCertificateList(vipUserCertificate); + } + +} diff --git a/ruoyi-vip/src/main/java/com/ruoyi/vip/service/impl/VipUserCourseSectionServiceImpl.java b/ruoyi-vip/src/main/java/com/ruoyi/vip/service/impl/VipUserCourseSectionServiceImpl.java new file mode 100644 index 000000000..54cfbeeeb --- /dev/null +++ b/ruoyi-vip/src/main/java/com/ruoyi/vip/service/impl/VipUserCourseSectionServiceImpl.java @@ -0,0 +1,48 @@ +package com.ruoyi.vip.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.vip.mapper.VipUserCourseSectionMapper; +import com.ruoyi.vip.domain.VipUserCourseSection; +import com.ruoyi.vip.service.IVipUserCourseSectionService; +import com.ruoyi.common.support.Convert; +import com.ruoyi.framework.web.base.AbstractBaseServiceImpl; +/** + * 我的课程学习 服务层实现 + * + * @author zhujj + * @date 2019-01-15 + */ +@Service +public class VipUserCourseSectionServiceImpl extends AbstractBaseServiceImpl implements IVipUserCourseSectionService +{ + @Autowired + private VipUserCourseSectionMapper vipUserCourseSectionMapper; + + + /** + * 查询我的课程学习列表 + * + * @param vipUserCourseSection 我的课程学习信息 + * @return 我的课程学习集合 + */ + @Override + public List selectVipUserCourseSectionList(VipUserCourseSection vipUserCourseSection) + { + return vipUserCourseSectionMapper.selectVipUserCourseSectionList(vipUserCourseSection); + } + /** + * 查询我的课程学习分页列表 + * + * @param vipUserCourseSection 我的课程学习信息 + * @return 我的课程学习集合 + */ + @Override + public List selectVipUserCourseSectionPage(VipUserCourseSection vipUserCourseSection) + { + startPage(); + return vipUserCourseSectionMapper.selectVipUserCourseSectionList(vipUserCourseSection); + } + +} diff --git a/ruoyi-vip/src/main/resources/mapper/vip/VipUserCertificateMapper.xml b/ruoyi-vip/src/main/resources/mapper/vip/VipUserCertificateMapper.xml new file mode 100644 index 000000000..f080cfc51 --- /dev/null +++ b/ruoyi-vip/src/main/resources/mapper/vip/VipUserCertificateMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + id, vip_user_id, name, image, start_date, end_date, create_by, create_date, update_by, update_date, remarks, del_flag + + + + + \ No newline at end of file diff --git a/ruoyi-vip/src/main/resources/mapper/vip/VipUserCourseSectionMapper.xml b/ruoyi-vip/src/main/resources/mapper/vip/VipUserCourseSectionMapper.xml new file mode 100644 index 000000000..eef875322 --- /dev/null +++ b/ruoyi-vip/src/main/resources/mapper/vip/VipUserCourseSectionMapper.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + id, vip_user_id, train_course_id, train_course_section, duration, create_by, create_date, update_by, update_date, remarks, del_flag + + + + + \ No newline at end of file diff --git a/ruoyi-vip/src/main/resources/templates/vip/vipUserCertificate/add.html b/ruoyi-vip/src/main/resources/templates/vip/vipUserCertificate/add.html new file mode 100644 index 000000000..ec5abd437 --- /dev/null +++ b/ruoyi-vip/src/main/resources/templates/vip/vipUserCertificate/add.html @@ -0,0 +1,100 @@ + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+
+
+
+ +
+ +
+ +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/ruoyi-vip/src/main/resources/templates/vip/vipUserCertificate/edit.html b/ruoyi-vip/src/main/resources/templates/vip/vipUserCertificate/edit.html new file mode 100644 index 000000000..92664e7c2 --- /dev/null +++ b/ruoyi-vip/src/main/resources/templates/vip/vipUserCertificate/edit.html @@ -0,0 +1,69 @@ + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/ruoyi-vip/src/main/resources/templates/vip/vipUserCertificate/vipUserCertificate.html b/ruoyi-vip/src/main/resources/templates/vip/vipUserCertificate/vipUserCertificate.html new file mode 100644 index 000000000..f3d27b1b4 --- /dev/null +++ b/ruoyi-vip/src/main/resources/templates/vip/vipUserCertificate/vipUserCertificate.html @@ -0,0 +1,162 @@ + + + + + + +
+
+
+
+
+
    +
  • + 会员代码： +
    • + +
  • + 证书名称： +
    • + +
  • + 证书照片： +
    • + +
  • + 生效日期： +
    • + +
  • + 截止日期： +
    • + +
  • + 创建者： +
    • + +
  • + 创建时间： +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/ruoyi-vip/src/main/resources/templates/vip/vipUserCourseSection/add.html b/ruoyi-vip/src/main/resources/templates/vip/vipUserCourseSection/add.html new file mode 100644 index 000000000..f1d517cb4 --- /dev/null +++ b/ruoyi-vip/src/main/resources/templates/vip/vipUserCourseSection/add.html @@ -0,0 +1,88 @@ + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/ruoyi-vip/src/main/resources/templates/vip/vipUserCourseSection/edit.html b/ruoyi-vip/src/main/resources/templates/vip/vipUserCourseSection/edit.html new file mode 100644 index 000000000..4140e6a41 --- /dev/null +++ b/ruoyi-vip/src/main/resources/templates/vip/vipUserCourseSection/edit.html @@ -0,0 +1,89 @@ + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/ruoyi-vip/src/main/resources/templates/vip/vipUserCourseSection/vipUserCourseSection.html b/ruoyi-vip/src/main/resources/templates/vip/vipUserCourseSection/vipUserCourseSection.html new file mode 100644 index 000000000..5ba7b84da --- /dev/null +++ b/ruoyi-vip/src/main/resources/templates/vip/vipUserCourseSection/vipUserCourseSection.html @@ -0,0 +1,139 @@ + + + + + + +
+
+
+
+
+
    +
  • + 会员代码： +
    • + +
  • + 课程ID： +
    • + +
  • + 章节id： +
    • + +
  • + 学习时间长度（分钟）： +
    • + +
  • + 创建者： +
    • + +
  • + 创建时间： +
    • + +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+
+ + + \ No newline at end of file