update

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -69,7 +69,6 @@ public class UserController extends BaseController {
 	@ApiOperation(value = "新增用户")
 	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_JSON_VALUE)
 	public Object add(@RequestBody SysUser sysUser) {
-//		sysUser.setPassword(new BCryptPasswordEncoder().encode(sysUser.getPassword()));
 		return succeed(sysUserService.add(sysUser));
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupDao.java

@@ -94,10 +94,10 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
 
     /**
      * 获取学生所购买课程列表
-     * @param userId
+     * @param params
      * @return
      */
-    List<CourseListDto> queryCoursePage(Integer userId);
+    List<CourseListDto> queryCoursePage(Map<String, Object> params);
 
     /**
      * 获取学员所在群组信息
@@ -134,4 +134,11 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @return
      */
     List<StudentPayInfoDto> queryStudentPayLog(Map<String, Object> params);
+
+    /**
+     * COUNT学员购买列表
+     * @param params
+     * @return
+     */
+    int countCoursePage(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseListDto.java

@@ -1,12 +1,15 @@
 package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
+import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
 
 public class CourseListDto {
 
+    @ApiModelProperty(value = "班级类型", required = true)
+    private ClassGroupTypeEnum type;
+
     @ApiModelProperty(value = "乐团、vip课编号",required = true)
     private String musicGroupId;
 
@@ -37,6 +40,14 @@ public class CourseListDto {
     @ApiModelProperty(value = "0待续费，1已续费",required = true)
     private Integer renewStatus = 0;
 
+    public ClassGroupTypeEnum getType() {
+        return type;
+    }
+
+    public void setType(ClassGroupTypeEnum type) {
+        this.type = type;
+    }
+
     public Integer getRenewStatus() {
         return renewStatus;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ClassGroupTypeEnum.java

@@ -6,7 +6,11 @@ import com.ym.mec.common.enums.BaseEnum;
  * 班级类型
  */
 public enum ClassGroupTypeEnum implements BaseEnum<String, ClassGroupTypeEnum> {
-	NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "提高班"), VIP("VIP", "vip课"), DEMO("demo", "试听课");
+	NORMAL("NORMAL", "普通班级"),
+	MIX("MIX", "合奏班级"),
+	HIGH("HIGH", "提高班"),
+	VIP("VIP", "vip课"),
+	DEMO("demo", "试听课");
 
 	private String code;
 

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupService.java

@@ -9,6 +9,7 @@ import com.ym.mec.biz.dal.page.VipClassQueryInfo;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 
 public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
@@ -119,9 +120,10 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * 获取学生所购买课程列表
      *
      * @param userId
+     * @param queryInfo
      * @return
      */
-    List<CourseListDto> queryCoursePage(Integer userId);
+    PageInfo<CourseListDto> queryCoursePage(QueryInfo queryInfo,Integer userId);
 
     /**
      * 获取学员所在群组信息

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -14,6 +14,7 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
@@ -331,22 +332,36 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         return classGroupAndTeachers;
     }
 
-    public List<CourseListDto> queryCoursePage(Integer userId) {
-        List<CourseListDto> courseListDtos = classGroupDao.queryCoursePage(userId);
-        courseListDtos.forEach(e->{
-            if("VIP".equals(e.getTeachMode())){
-                //获取vip课的学生名称列表
-                e.setStudentNames(classGroupDao.findVipStuNames(e.getMusicGroupId()));
-            }else {
-                //获取学员乐团课的续费状态
-                MusicGroupStudentFee musicGroupStudentFee = musicGroupStudentFeeDao.findByUser(userId,e.getMusicGroupId());
-                if(musicGroupStudentFee != null){
-                    int i = DateUtil.daysBetween(new Date(),musicGroupStudentFee.getNextPaymentDate());
-                    e.setRenewStatus(i < 8?0:1);
+    public PageInfo<CourseListDto> queryCoursePage(QueryInfo queryInfo, Integer userId) {
+        queryInfo.setSearch(userId.toString());
+        PageInfo<CourseListDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<>();
+        MapUtil.populateMap(params, queryInfo);
+        List<CourseListDto> courseListDtos = null;
+        int count = classGroupDao.countCoursePage(params);
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            courseListDtos = classGroupDao.queryCoursePage(params);
+            courseListDtos.forEach(e->{
+                if("VIP".equals(e.getTeachMode())){
+                    //获取vip课的学生名称列表
+                    e.setStudentNames(classGroupDao.findVipStuNames(e.getMusicGroupId()));
+                }else {
+                    //获取学员乐团课的续费状态
+                    MusicGroupStudentFee musicGroupStudentFee = musicGroupStudentFeeDao.findByUser(userId,e.getMusicGroupId());
+                    if(musicGroupStudentFee != null){
+                        int i = DateUtil.daysBetween(new Date(),musicGroupStudentFee.getNextPaymentDate());
+                        e.setRenewStatus(i < 8?0:1);
+                    }
                 }
-            }
-        });
-        return classGroupDao.queryCoursePage(userId);
+            });
+        }
+        if (count == 0) {
+            courseListDtos = new ArrayList<>();
+        }
+        pageInfo.setRows(courseListDtos);
+        return pageInfo;
     }
 
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -1,6 +1,5 @@
 package com.ym.mec.biz.service.impl;
 
-import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.MusicCardDto;
@@ -88,6 +87,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup>
 				e.setMusicGroupId(musicGroupId);
 				musicGroupSubjectGoodsGroupDao.insert(e);
 			});
+			//新增聊天群
+
 		}
 	}
 

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -259,7 +259,7 @@
     <resultMap type="com.ym.mec.biz.dal.dto.CourseListDto" id="CourseListDto">
         <result column="music_group_name_" property="musicGroupName"/>
         <result column="music_group_id_" property="musicGroupId"/>
-        <result column="type_" property="teachMode"/>
+        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="total_class_times_" property="totalClassTimes"/>
         <result column="current_class_times_" property="currentClassTimes"/>
         <result column="address_" property="address"/>
@@ -273,7 +273,7 @@
             LEFT JOIN class_group cg ON cg.id_ = sr.class_group_id_
             LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
             LEFT JOIN school s ON mg.school_id_ = s.id_
-            WHERE sr.user_id_ = #{userId} AND cg.type_ != 'VIP'
+            WHERE sr.user_id_ = #{search} AND cg.type_ != 'VIP'
             UNION ALL
             SELECT cg.type_,ts.address_,vg.name_ music_group_name_,
             cg.total_class_times_,cg.current_class_times_,vg.single_class_minutes_,vg.id_ music_group_id_,cg.create_time_
@@ -282,8 +282,9 @@
             LEFT JOIN vip_group_class_group_mapper vgcgm ON vgcgm.class_group_id_ = cgsm.class_group_id_
             LEFT JOIN vip_group vg ON vg.id_ = vgcgm.vip_group_id_
             LEFT JOIN teacher_school ts ON vg.teacher_school_id_ = ts.id_
-            WHERE cgsm.user_id_ = #{userId} AND cg.type_ = 'VIP') a
+            WHERE cgsm.user_id_ = #{search} AND cg.type_ = 'VIP') a
             ORDER BY a.create_time_ DESC
+            <include refid="global.limit"/>
     </select>
 
     <resultMap id="imGroupModel" type="com.ym.mec.common.entity.ImGroupModel">
@@ -354,4 +355,23 @@
         </where>
         <include refid="global.limit"/>
     </select>
+    <select id="countCoursePage" resultType="java.lang.Integer">
+        SELECT COUNT(id_) FROM (
+            SELECT cg.type_,s.address_,mg.name_ music_group_name_,
+            cg.total_class_times_,cg.current_class_times_,'' single_class_minutes_,mg.id_ music_group_id_,cg.create_time_,cg.id_
+            FROM student_registration sr
+            LEFT JOIN class_group cg ON cg.id_ = sr.class_group_id_
+            LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
+            LEFT JOIN school s ON mg.school_id_ = s.id_
+            WHERE sr.user_id_ = #{search} AND cg.type_ != 'VIP'
+            UNION ALL
+            SELECT cg.type_,ts.address_,vg.name_ music_group_name_,
+            cg.total_class_times_,cg.current_class_times_,vg.single_class_minutes_,vg.id_ music_group_id_,cg.create_time_,cg.id_
+            FROM class_group_student_mapper cgsm
+            LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
+            LEFT JOIN vip_group_class_group_mapper vgcgm ON vgcgm.class_group_id_ = cgsm.class_group_id_
+            LEFT JOIN vip_group vg ON vg.id_ = vgcgm.vip_group_id_
+            LEFT JOIN teacher_school ts ON vg.teacher_school_id_ = ts.id_
+            WHERE cgsm.user_id_ = #{search} AND cg.type_ = 'VIP') a
+    </select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/CourseController.java

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.page.StudentPayLogQueryInfo;
 import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.security.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -30,12 +31,12 @@ public class CourseController extends BaseController {
 
     @ApiOperation("获取学生所购买课程列表")
     @GetMapping(value = "/queryUserMusicGroups")
-    public Object queryCoursePage(){
+    public Object queryCoursePage(QueryInfo queryInfo){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
             return failed("获取用户信息失败");
         }
-        return succeed(classGroupService.queryCoursePage(sysUser.getId()));
+        return succeed(classGroupService.queryCoursePage(queryInfo,sysUser.getId()));
     }
 
     @ApiOperation("获取学员所有聊天群组")

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/YimeiSmsPlugin.java

@@ -1,29 +1,21 @@
 package com.ym.mec.thirdparty.message.provider;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.nacos.common.util.Md5Utils;
 import com.ym.mec.thirdparty.message.MessageSenderPlugin;
 import com.ym.mec.util.date.DateUtil;
-import com.ym.mec.util.encode.AES;
 import com.ym.mec.util.http.HttpUtil;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.codec.digest.Md5Crypt;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.tomcat.util.security.MD5Encoder;
-import org.bouncycastle.crypto.digests.MD5Digest;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import sun.security.provider.MD5;
 
-import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 
 /**
- * 极光推送
+ * 亿美短信
  */
 @Service
 public class YimeiSmsPlugin implements MessageSenderPlugin, InitializingBean {
@@ -33,10 +25,6 @@ public class YimeiSmsPlugin implements MessageSenderPlugin, InitializingBean {
 	private String secretKey;
 	@Value("${com.properties.sms-host-dev:http://bjksmtn.b2m.cn}")
 	private String host;
-	// 加密算法
-	private static String algorithm = "AES/ECB/PKCS5Padding";
-	// 是否压缩
-	static boolean isGizp = false;
 
 	public static String getName() {
 		return "yimei";
@@ -45,7 +33,7 @@ public class YimeiSmsPlugin implements MessageSenderPlugin, InitializingBean {
 	private String getParam(String subject, String content, String receiver,String host){
 		try {
 			HashMap<String,Object> param = new HashMap();
-			param.put("appId","");
+			param.put("appId",appId);
 			String timestamp = DateUtil.format(new Date(),new SimpleDateFormat("yyyyMMddHHmmss"));
 			param.put("timestamp", timestamp);
 			param.put("sign", DigestUtils.md5Hex(appId + secretKey + timestamp));