计划生成修改

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -9,6 +9,7 @@ import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.framework.web.service.WxTokenService;
 import com.zhongzheng.modules.course.vo.CourseVo;
+import com.zhongzheng.modules.user.bo.RanKingUserQuery;
 import com.zhongzheng.modules.user.bo.UserAddBo;
 import com.zhongzheng.modules.user.bo.UserEditBo;
 import com.zhongzheng.modules.user.bo.UserQueryBo;
@@ -79,7 +80,7 @@ public class UserController extends BaseController {
      */
     @ApiOperation("排行榜")
     @GetMapping("/rankingList")
-    public AjaxResult<RanKingUser> rankingList(UserQueryBo bo) {
+    public AjaxResult<RanKingUser> rankingList(RanKingUserQuery bo) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         RanKingUser list = iUserService.rankingList(bo);

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

@@ -15,6 +15,7 @@ import com.zhongzheng.modules.collect.domain.CollectNote;
 import com.zhongzheng.modules.collect.mapper.CollectBankMapper;
 import com.zhongzheng.modules.collect.mapper.CollectCourseMapper;
 import com.zhongzheng.modules.collect.mapper.CollectNoteMapper;
+import com.zhongzheng.modules.user.bo.RanKingUserQuery;
 import com.zhongzheng.modules.user.bo.UserAddBo;
 import com.zhongzheng.modules.user.bo.UserEditBo;
 import com.zhongzheng.modules.user.bo.UserQueryBo;
@@ -28,7 +29,9 @@ import com.zhongzheng.modules.user.vo.UserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Calendar;
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -165,9 +168,50 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     }
 
     @Override
-    public RanKingUser rankingList(UserQueryBo bo) {
+    public RanKingUser rankingList(RanKingUserQuery query) {
         RanKingUser ranKingUser = new RanKingUser();
+
+        Calendar cal = Calendar.getInstance();
+        int month = cal.get(Calendar.MONTH) + 1;
+        Long firstDayOfMonth = getFirstDayOfMonth(month);
+        Long lastDayOfMonth = getLastDayOfMonth(month);
         return ranKingUser;
 
     }
+
+    /**
+     * 获取当前月第一天
+     * @param month
+     * @return
+     */
+    public static Long getFirstDayOfMonth(int month) {
+        Calendar calendar = Calendar.getInstance();
+        // 设置月份
+        calendar.set(Calendar.MONTH, month - 1);
+        // 获取某月最小天数
+        int firstDay = calendar.getActualMinimum(Calendar.DAY_OF_MONTH);
+        // 设置日历中月份的最小天数
+        calendar.set(Calendar.DAY_OF_MONTH, firstDay);
+
+        Date time = calendar.getTime();
+        return time.getTime() / 1000;
+    }
+
+    public static Long getLastDayOfMonth(int month) {
+        Calendar calendar = Calendar.getInstance();
+        // 设置月份
+        calendar.set(Calendar.MONTH, month - 1);
+        // 获取某月最大天数
+        int lastDay=0;
+        //2月的平年瑞年天数
+        if(month==2) {
+            lastDay = calendar.getLeastMaximum(Calendar.DAY_OF_MONTH);
+        }else {
+            lastDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
+        }
+        // 设置日历中月份的最大天数
+        calendar.set(Calendar.DAY_OF_MONTH, lastDay);
+        Date time = calendar.getTime();
+        return time.getTime() / 1000;
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/RanKingUserQuery.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.user.bo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.zhongzheng.modules.user.vo.UserVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 用户视图对象 mall_package
+ *
+ * @author change
+ * @date 2021-05-25
+ */
+@Data
+@ApiModel("排行榜获得")
+public class RanKingUserQuery {
+    private static final long serialVersionUID = 1L;
+
+
+    @Excel(name = "0 日榜  1月榜")
+    @ApiModelProperty("0 日榜  1月榜")
+    private Long status;
+
+
+    @Excel(name = "用户id")
+    @ApiModelProperty("用户id")
+    private Long userId;
+
+
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserService.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.user.service;
 
+import com.zhongzheng.modules.user.bo.RanKingUserQuery;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.vo.RanKingUser;
 import com.zhongzheng.modules.user.vo.UserVo;
@@ -58,5 +59,5 @@ public interface IUserService extends IService<User> {
 
 	Integer getCollectTotal(Long userId);
 
-	RanKingUser rankingList(UserQueryBo bo);
+	RanKingUser rankingList(RanKingUserQuery bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/CoursePlanVo.java

@@ -27,6 +27,38 @@ public class CoursePlanVo {
 	@Excel(name = "分类ID")
 	@ApiModelProperty("分类ID")
 	private Long categoryId;
+	/** 价格 */
+	@Excel(name = "价格")
+	@ApiModelProperty("价格")
+	private BigDecimal price;
+	/** 时长(秒) */
+	@Excel(name = "时长(秒)")
+	@ApiModelProperty("时长(秒)")
+	private Long duration;
+	/** 开始时间 */
+	@Excel(name = "开始时间")
+	@ApiModelProperty("开始时间")
+	private Long startTime;
+	/** 结束时间 */
+	@Excel(name = "结束时间")
+	@ApiModelProperty("结束时间")
+	private Long endTime;
+	/** 封面地址 */
+	@Excel(name = "封面地址")
+	@ApiModelProperty("封面地址")
+	private String coverUrl;
+	/** 简介 */
+	@Excel(name = "简介")
+	@ApiModelProperty("简介")
+	private String introduction;
+	/** 状态 1正常 0关闭 */
+	@Excel(name = "状态 1正常 0关闭")
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+	/** 教师ID拼接，用,拼接 */
+	@Excel(name = "教师ID拼接，用,拼接")
+	@ApiModelProperty("教师ID拼接，用,拼接")
+	private String teacherIds;
 	/** 课程名称 */
 	@Excel(name = "课程名称")
 	@ApiModelProperty("课程名称")
@@ -37,10 +69,6 @@ public class CoursePlanVo {
 	private Integer sectionNum;
 	@ApiModelProperty("分类名")
 	private String categoryName;
-
-	@ApiModelProperty("当天学习的节数")
-	private String sectionDayNum;
-
 	/** 计划Id */
 	@Excel(name = "计划Id")
 	@ApiModelProperty("计划Id")

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/RanKingUser.java

@@ -21,130 +21,13 @@ import java.util.List;
 public class RanKingUser {
     private static final long serialVersionUID = 1L;
 
-    /** $pkColumn.columnComment */
-    @ApiModelProperty("$pkColumn.columnComment")
-    private Long userId;
 
-    /** 账号 */
-    @Excel(name = "账号")
-    @ApiModelProperty("账号")
-    private String userAccout;
     /** 昵称 */
     @Excel(name = "昵称")
     @ApiModelProperty("昵称")
     private String nickname;
-    /** 真实姓名 */
-    @Excel(name = "真实姓名")
-    @ApiModelProperty("真实姓名")
-    private String realname;
-    /** 性别 */
-    @Excel(name = "性别")
-    @ApiModelProperty("性别")
-    private Integer sex;
-    /** 身份证号 */
-    @Excel(name = "身份证号")
-    @ApiModelProperty("身份证号")
-    private String idCard;
-    /** 手机号码 */
-    @Excel(name = "手机号码")
-    @ApiModelProperty("手机号码")
-    private String telphone;
-    /** 用户等级 */
-    @Excel(name = "用户等级")
-    @ApiModelProperty("用户等级")
-    private Integer userLevel;
-    /** 出生日期 */
-    @Excel(name = "出生日期")
-    @ApiModelProperty("出生日期")
-    private String userBirth;
-    /** 教育层次 */
-    @Excel(name = "教育层次")
-    @ApiModelProperty("教育层次")
-    private String eduLevel;
-    /** 学校ID */
-    @Excel(name = "学校ID")
-    @ApiModelProperty("学校ID")
-    private Long schoolId;
-    /** 专业 */
-    @Excel(name = "专业")
-    @ApiModelProperty("专业")
-    private String major;
-    /** 入学时间 */
-    @Excel(name = "入学时间")
-    @ApiModelProperty("入学时间")
-    private Long entranceTime;
-    /** $column.columnComment */
-    @Excel(name = "入学时间")
-    @ApiModelProperty("$column.columnComment")
-    private String openId;
-    /** 学籍证明照片 */
-    @Excel(name = "学籍证明照片")
-    @ApiModelProperty("学籍证明照片")
-    private String studentCertificateImg;
-    /** 身份证人像照 */
-    @Excel(name = "身份证人像照")
-    @ApiModelProperty("身份证人像照")
-    private String idCardImg1;
-    /** 身份证国徽照 */
-    @Excel(name = "身份证国徽照")
-    @ApiModelProperty("身份证国徽照")
-    private String idCardImg2;
-    /** 国家 */
-    @Excel(name = "国家")
-    @ApiModelProperty("国家")
-    private String country;
-    /** 省份 */
-    @Excel(name = "省份")
-    @ApiModelProperty("省份")
-    private String province;
-    /** 城市 */
-    @Excel(name = "城市")
-    @ApiModelProperty("城市")
-    private String city;
-    /** 用户积分 */
-    @Excel(name = "用户积分")
-    @ApiModelProperty("用户积分")
-    private Long integral;
-    /** 状态 1正常 0关闭 */
-    @Excel(name = "状态 1正常 0关闭")
-    @ApiModelProperty("状态 1正常 0关闭")
-    private Integer status;
-    @ApiModelProperty("是否人脸认证成功  1成功 0没有")
-    private Integer certified;
-    @ApiModelProperty("人脸认证时间")
-    private Long certifiedTime;
-    /** 区 */
-    @Excel(name = "区")
-    @ApiModelProperty("区")
-    private String district;
-    /** 结婚状态 */
-    @Excel(name = "结婚状态")
-    @ApiModelProperty("结婚状态")
-    private String marry;
-    /** 户籍省份 */
-    @Excel(name = "户籍省份")
-    @ApiModelProperty("户籍省份")
-    private String houseProvince;
-    /** 户籍城市 */
-    @Excel(name = "户籍城市")
-    @ApiModelProperty("户籍城市")
-    private String houseCity;
-    /** 户籍区 */
-    @Excel(name = "户籍区")
-    @ApiModelProperty("户籍区")
-    private String houseDistrict;
-    /** 一寸照片 */
-    @Excel(name = "一寸照片")
-    @ApiModelProperty("一寸照片")
-    private String oneInchPhotos;
-    /** 政治面貌 */
-    @Excel(name = "政治面貌")
-    @ApiModelProperty("政治面貌")
-    private String politic;
-    /** 邮箱 */
-    @Excel(name = "邮箱")
-    @ApiModelProperty("邮箱")
-    private String email;
+
+
     /** 头像 */
     @Excel(name = "头像")
     @ApiModelProperty("头像")
@@ -156,16 +39,11 @@ public class RanKingUser {
     @ApiModelProperty("排行榜")
     private List<UserVo> userVo;
 
-    public void setNull(){
-        this.setOpenId(null);
-        this.setIdCardImg1(null);
-        this.setIdCardImg2(null);
-        this.setCertifiedTime(null);
-        if(this.getTelphone()!=null){
-            this.setTelphone(TelPhoneUtils.hideTelPhone(this.getTelphone()));
-        }
-		/*if(this.getIdCard()!=null){
-			this.setIdCard(TelPhoneUtils.hideTelPhone(this.getIdCard()));
-		}*/
-    }
+    /** 头像 */
+    @Excel(name = "头像")
+    @ApiModelProperty("头像")
+    private Integer hourse;
+
+    private List<RanKingUser> ranKingUsers;
+
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserPlanMapper.xml

@@ -24,6 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.zhongzheng.modules.user.vo.CoursePlanVo" id="CourseResult">
         <result property="courseId" column="course_id"/>
         <result property="categoryId" column="category_id"/>
+        <result property="price" column="price"/>
+        <result property="duration" column="duration"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="coverUrl" column="cover_url"/>
+        <result property="introduction" column="introduction"/>
+        <result property="status" column="status"/>
+        <result property="teacherIds" column="teacher_ids"/>
         <result property="courseName" column="course_name"/>
         <result property="chapterNum" column="chapter_num"/>
         <result property="sectionNum" column="section_num"/>
@@ -38,8 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectByCourse" parameterType="com.zhongzheng.modules.user.bo.UserPlanQueryBo"  resultMap="CourseResult">
-        SELECT rs.course_name,
-        rs.course_id,rs.status,sum(section_num) as section_num,count(chapter_id)
+        SELECT rs.*,sum(section_num) as section_num,count(chapter_id)
         as chapter_num,mc.category_name,mc.category_id,sum(total_time) as duration from
         (SELECT c.*,count(cs.section_id) as section_num,cs.chapter_id,IFNULL(sum(cs.video_time),0) as total_time
         FROM course c LEFT JOIN course_chapter cc on c.course_id = cc.course_id
@@ -73,8 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectByListCourse" parameterType="com.zhongzheng.modules.user.bo.UserPlanQueryBo"  resultMap="CourseResult">
-        SELECT rs.course_name,
-        rs.course_id,rs.status,sum(section_num) as section_num,count(chapter_id)
+        SELECT rs.*,sum(section_num) as section_num,count(chapter_id)
         as chapter_num,mc.category_name,mc.category_id,sum(total_time) as duration from
         (SELECT c.*,count(cs.section_id) as section_num,cs.chapter_id,IFNULL(sum(cs.video_time),0) as total_time
         FROM course c LEFT JOIN course_chapter cc on c.course_id = cc.course_id