Merge branch 'master' of git.dayaedu.com:yonge/mec

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysUserDao.java

@@ -3,6 +3,7 @@ package com.ym.mec.auth.dal.dao;
 import com.ym.mec.auth.api.entity.SysMenu;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.page.PageInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -28,4 +29,11 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * @param password
 	 */
 	void updatePassword(@Param("mobile") String mobile, @Param("password") String password);
+
+	/**
+	 * 获取用户基本信息
+	 * @param userId
+	 * @return
+	 */
+    ImUserModel getBasic(Integer userId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysUserService.java

@@ -2,6 +2,7 @@ package com.ym.mec.auth.service;
 
 import com.ym.mec.auth.api.dto.SysUserInfo;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.service.BaseService;
 
 public interface SysUserService extends BaseService<Integer, SysUser> {
@@ -54,4 +55,11 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	 * @return
 	 */
     Integer add(SysUser sysUser);
+
+	/**
+	 * 获取用户基本信息
+	 * @param userId
+	 * @return
+	 */
+	ImUserModel getBasic(Integer userId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -114,4 +114,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 		return sysUser.getId();
 	}
 
+	@Override
+	public ImUserModel getBasic(Integer userId) {
+		return sysUserDao.getBasic(userId);
+	}
+
 }

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

@@ -10,10 +10,7 @@ import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.security.AuthUser;
 import com.ym.mec.common.security.SecurityUtils;
 import com.ym.mec.common.validcode.SmsCodeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -55,6 +52,16 @@ public class UserController extends BaseController {
 		return failed();
 	}
 
+	@ApiOperation(value = "根据用户编号获取用户基本信息")
+	@GetMapping("/get/{userId}")
+	@ApiParam(value = "用户编号", required = true)
+	public Object getBasic(@PathVariable("userId") Integer userId) {
+		if(userId == null){
+			return failed("参数校验异常");
+		}
+		return succeed(sysUserService.getBasic(userId));
+	}
+
 	@GetMapping(value = "/queryUserByPhone")
 	public SysUser queryUserByPhone(String mobile) {
 		return sysUserService.queryByPhone(mobile);

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -165,4 +165,12 @@
     <select id="queryByPhone" resultMap="SysUser">
 		select * from sys_user where phone_ = #{phone} OR username_ = #{phone}
 	</select>
+    <resultMap id="ImUserModel" type="com.ym.mec.common.entity.ImUserModel">
+        <result column="id_" property="id"/>
+        <result property="name" column="username_"/>
+        <result property="portrait" column="avatar_"/>
+    </resultMap>
+    <select id="getBasic" resultMap="ImUserModel">
+        select * from sys_user where id_ = #{userId}
+    </select>
 </mapper>

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

@@ -9,6 +9,7 @@ import com.ym.mec.common.dal.BaseDAO;
 
 import com.ym.mec.common.entity.ImGroupModel;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.security.core.parameters.P;
 
 import java.util.List;
 import java.util.Map;
@@ -104,9 +105,10 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     /**
      * 获取学员所在群组信息
      * @param userId
+     * @param search
      * @return
      */
-    List<ImGroupModel> queryUserGroups(Integer userId);
+    List<ImGroupModel> queryUserGroups(@Param("userId") Integer userId, @Param("search") String search);
 
     /**
      * 获取vip课的学生名称列表

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

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.entity.ImGroupModel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -47,4 +48,18 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @return
      */
     List<BasicUserDto> findTeachersByStuId(Integer studentId);
+
+    /**
+     * 获取用户所在乐团
+     * @param userId
+     * @return
+     */
+    List<ImGroupModel> queryUserGroups(@Param("userId") Integer userId,@Param("search") String search);
+
+    /**
+     * 获取乐团总人数
+     * @param musicGroupId
+     * @return
+     */
+    Integer countMusicGroupUserNum(String musicGroupId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroup.java

@@ -10,7 +10,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 /**
  * 对应数据库表(music_group):
  */
-public class 	MusicGroup {
+public class MusicGroup {
 
 	/**  */
 	private String id;
@@ -87,6 +87,17 @@ public class 	MusicGroup {
 	@ApiModelProperty(value = "缴费月份（多个用,分开）",required = false)
 	private String paymentMonths;
 
+	@ApiModelProperty(value = "乐团图片",required = false)
+	private String img;
+
+	public String getImg() {
+		return img;
+	}
+
+	public void setImg(String img) {
+		this.img = img;
+	}
+
 	public String getPaymentMonths() {
 		return paymentMonths;
 	}

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

@@ -126,7 +126,8 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
     /**
      * 获取学员所在群组信息
      * @param userId
+     * @param search
      * @return
      */
-    List<ImGroupModel> queryUserGroups(Integer userId);
+    List<ImGroupModel> queryUserGroups(Integer userId,String search);
 }

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

@@ -1,7 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.ClassGroupDao;
-import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
+import com.ym.mec.biz.dal.dao.MusicGroupDao;
 import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.*;
@@ -33,7 +33,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Autowired
     private TeacherDao teacherDao;
     @Autowired
-    private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
+    private MusicGroupDao musicGroupDao;
     @Autowired
     private ClassGroupRelationService classGroupRelationService;
     @Autowired
@@ -349,7 +349,21 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
 
     @Override
-    public List<ImGroupModel> queryUserGroups(Integer userId) {
-        return classGroupDao.queryUserGroups(userId);
+    public List<ImGroupModel> queryUserGroups(Integer userId,String search) {
+        List<ImGroupModel> imGroupModels = musicGroupDao.queryUserGroups(userId,search);
+        List<ImGroupModel> imGroupModels1 = classGroupDao.queryUserGroups(userId,search);
+        if(imGroupModels.size() < 1 || imGroupModels == null){
+            return imGroupModels1;
+        }else {
+            imGroupModels.forEach(e->{
+                e.setCount(musicGroupDao.countMusicGroupUserNum(e.getId()));
+                e.setId("mg" + e.getId());
+            });
+            imGroupModels1.forEach(e->{
+                e.setId("cg" + e.getId());
+            });
+            imGroupModels.addAll(imGroupModels1);
+            return imGroupModels;
+        }
     }
 }

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

@@ -71,7 +71,7 @@
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="ClassGroup">
-        UPDATE class_group SET WHERE id_ = #{id}
+        SELECT * FROM class_group WHERE id_ = #{id}
     </select>
 
     <!-- 全查询 -->
@@ -289,12 +289,20 @@
     <resultMap id="imGroupModel" type="com.ym.mec.common.entity.ImGroupModel">
         <result column="id_" property="id"/>
         <result column="name_" property="name"/>
-        <result column="student_num_" property="minute"/>
+        <result column="student_num_" property="count"/>
+        <result column="img_" property="img"/>
     </resultMap>
     <select id="queryUserGroups" resultMap="imGroupModel">
-        SELECT cg.id_,cg.name_,cg.student_num_ FROM class_group_student_mapper cgsm
+        SELECT cg.id_,cg.name_,cg.student_num_,cg.img_ FROM class_group_student_mapper cgsm
         LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
-        WHERE cgsm.user_id_ = #{userId}
+        <where>
+            <if test="userId != null">
+                cgsm.user_id_ = #{userId}
+            </if>
+            <if test="search != null and search != ''">
+                AND cg.name_ LIKE CONCAT('%',#{search},'%')
+            </if>
+        </where>
     </select>
     <select id="findVipStuNames" resultType="java.lang.String">
         SELECT su.username_ FROM vip_group_class_group_mapper vgcgm

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

@@ -24,6 +24,7 @@
 		<result column="cooperation_organ_id_" property="cooperationOrganId" />
 		<result column="enlightenment_course_time_" property="enlightenmentCourseTime" />
 		<result column="parent_meeting_time_" property="parentMeetingTime" />
+		<result column="img_" property="img" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -41,11 +42,12 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroup"
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
-			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO music_group
-		(id_,name_,organ_id_,school_id_,apply_expire_date_,team_teacher_id_,educational_teacher_id_,charge_type_id_,course_form_,create_time_,update_time_,status_,bill_start_date_,improvent_classes_num_,enroll_classes_,payment_expire_date_,is_extra_class_,cooperation_organ_id_,enlightenment_course_time_,parent_meeting_time_)
-		VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseForm},now(),now(),#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{billStartDate},#{improventClassesNum},#{enrollClasses},#{paymentExpireDate},#{isExtraClass, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{cooperationOrganId},#{enlightenmentCourseTime},#{parentMeetingTime})
+		(id_,name_,organ_id_,school_id_,apply_expire_date_,team_teacher_id_,educational_teacher_id_,charge_type_id_,course_form_,create_time_,update_time_,status_,
+		bill_start_date_,improvent_classes_num_,enroll_classes_,payment_expire_date_,is_extra_class_,cooperation_organ_id_,enlightenment_course_time_,parent_meeting_time_,img_)
+		VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseForm},now(),now(),
+		#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{billStartDate},#{improventClassesNum},#{enrollClasses},#{paymentExpireDate},
+		#{isExtraClass, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{cooperationOrganId},#{enlightenmentCourseTime},#{parentMeetingTime},#{img})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -106,6 +108,9 @@
 			<if test="parentMeetingTime != null">
 				parent_meeting_time_ = #{parentMeetingTime},
 			</if>
+			<if test="img != null">
+				img_ = #{img},
+			</if>
 		</set>
 		WHERE id_ = #{id}
 	</update>
@@ -174,6 +179,7 @@
 		<result column="head_url_" property="headUrl" />
 		<result column="gender_" property="gender"/>
 	</resultMap>
+
 	<select id="findTeachersByStuId" resultMap="BasicUserDto">
 		SELECT username_,id_ user_id_,avatar_ head_url_,gender_ FROM sys_user
 		WHERE id_ IN (SELECT DISTINCT(su.id_) FROM class_group_student_mapper cgsp
@@ -182,4 +188,21 @@
 		LEFT JOIN sys_user su ON cgtm.user_id_ = su.id_
 		WHERE cgsp.user_id_ = #{studentId})
 	</select>
+
+    <select id="queryUserGroups" resultMap="com.ym.mec.biz.dal.dao.ClassGroupDao.imGroupModel">
+        SELECT mg.id_,mg.name_,mg.img_
+		FROM student_registration sr
+		LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
+		<where>
+			<if test="userId != null">
+				sr.user_id_ = #{userId}
+			</if>
+			<if test="search != null">
+				AND mg.name_ LIKE CONCAT('%',#{search},'%')
+			</if>
+		</where>
+	</select>
+    <select id="countMusicGroupUserNum" resultType="java.lang.Integer">
+		SELECT SUM(student_num_) FROM class_group WHERE music_group_id_ = #{musicGroupId}
+    </select>
 </mapper>

mec-common/common-core/src/main/java/com/ym/mec/common/entity/ImGroupModel.java

@@ -4,12 +4,22 @@ public class ImGroupModel {
     private String id;
     private ImGroupMember[] members;
     private String name;
+    private String img;
     private Integer minute;
+    private Integer count;
     private Integer status;
 
     public ImGroupModel() {
     }
 
+    public Integer getCount() {
+        return count;
+    }
+
+    public void setCount(Integer count) {
+        this.count = count;
+    }
+
     public ImGroupModel(String id, ImGroupMember[] members, String name, Integer minute) {
         this.id = id;
         this.members = members;
@@ -22,6 +32,14 @@ public class ImGroupModel {
         this.status = status;
     }
 
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+
     public String getId() {
         return this.id;
     }

mec-education/src/main/java/com/ym/mec/education/EducationApplication.java

@@ -1,30 +1,43 @@
 package com.ym.mec.education;
 
 import com.spring4all.swagger.EnableSwagger2Doc;
+import com.ym.mec.common.redis.service.RedisCache;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.client.RestTemplate;
 
-@MapperScan("com.ym.mec.education.mapper")
+@MapperScan({"com.ym.mec.education.mapper", "com.ym.mec.biz.dal.dao"})
 @SpringBootApplication
 @EnableDiscoveryClient
 @ComponentScan(basePackages = "com.ym.mec")
 @Configuration
 @EnableSwagger2Doc
 public class EducationApplication {
-	public static void main(String[] args) {
-		SpringApplication.run(EducationApplication.class, args);
-	}
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
 
-	@Bean
-	@LoadBalanced
-	public RestTemplate restTemplate() {
-		return new RestTemplate();
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(EducationApplication.class, args);
+    }
+
+    @Bean
+    @LoadBalanced
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
+
+    @Bean
+    @ConditionalOnBean(RedisTemplate.class)
+    public RedisCache<String, Object> redisCache() {
+        return new RedisCache<String, Object>(redisTemplate);
+    }
 }

mec-education/src/main/java/com/ym/mec/education/controller/EducationDemoGroupController.java

@@ -1,6 +1,5 @@
 package com.ym.mec.education.controller;
 
-import com.ym.mec.biz.dal.page.StudentDemoGroupQueryInfo;
 import com.ym.mec.biz.service.DemoGroupService;
 import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;

mec-education/src/main/java/com/ym/mec/education/service/impl/ChargeTypeServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IChargeTypeService")
 public class ChargeTypeServiceImpl extends ServiceImpl<ChargeTypeMapper, ChargeType> implements IChargeTypeService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/ChargeTypeSubjectMapperServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IChargeTypeSubjectMapperService")
 public class ChargeTypeSubjectMapperServiceImpl extends ServiceImpl<ChargeTypeSubjectMapperMapper, ChargeTypeSubjectMapper> implements IChargeTypeSubjectMapperService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/ClassGroupRelationServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IClassGroupRelationService")
 public class ClassGroupRelationServiceImpl extends ServiceImpl<ClassGroupRelationMapper, ClassGroupRelation> implements IClassGroupRelationService {
 
 }

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

@@ -27,7 +27,7 @@ import java.util.Objects;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IClassGroupService")
 public class ClassGroupServiceImpl extends ServiceImpl<ClassGroupMapper, ClassGroup> implements IClassGroupService {
 
     @Autowired

mec-education/src/main/java/com/ym/mec/education/service/impl/ClassGroupStudentMapperServiceImpl.java

@@ -30,7 +30,7 @@ import java.util.List;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IClassGroupStudentMapperService")
 public class ClassGroupStudentMapperServiceImpl extends ServiceImpl<ClassGroupStudentMapperMapper, ClassGroupStudentMapper> implements IClassGroupStudentMapperService {
 
     @Autowired

mec-education/src/main/java/com/ym/mec/education/service/impl/ClassGroupTeacherMapperServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IClassGroupTeacherMapperService")
 public class ClassGroupTeacherMapperServiceImpl extends ServiceImpl<ClassGroupTeacherMapperMapper, ClassGroupTeacherMapper> implements IClassGroupTeacherMapperService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/ClassGroupTeacherSalaryServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IClassGroupTeacherSalaryService")
 public class ClassGroupTeacherSalaryServiceImpl extends ServiceImpl<ClassGroupTeacherSalaryMapper, ClassGroupTeacherSalary> implements IClassGroupTeacherSalaryService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/CooperationOrganServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ICooperationOrganService")
 public class CooperationOrganServiceImpl extends ServiceImpl<CooperationOrganMapper, CooperationOrgan> implements ICooperationOrganService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/CourseHomeworkServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ICourseHomeworkService")
 public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkMapper, CourseHomework> implements ICourseHomeworkService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/CourseHomeworkTemplateServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ICourseHomeworkTemplateService")
 public class CourseHomeworkTemplateServiceImpl extends ServiceImpl<CourseHomeworkTemplateMapper, CourseHomeworkTemplate> implements ICourseHomeworkTemplateService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/CourseScheduleServiceImpl.java

@@ -33,7 +33,7 @@ import java.util.Objects;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ICourseScheduleService")
 public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleMapper, CourseSchedule> implements ICourseScheduleService {
 
     @Autowired

mec-education/src/main/java/com/ym/mec/education/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ICourseScheduleTeacherSalaryService")
 public class CourseScheduleTeacherSalaryServiceImpl extends ServiceImpl<CourseScheduleTeacherSalaryMapper, CourseScheduleTeacherSalary> implements ICourseScheduleTeacherSalaryService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/DemoGroupClassGroupMapperServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IDemoGroupClassGroupMapperService")
 public class DemoGroupClassGroupMapperServiceImpl extends ServiceImpl<DemoGroupClassGroupMapperMapper, DemoGroupClassGroupMapper> implements IDemoGroupClassGroupMapperService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/DemoGroupCoursesPlanServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IDemoGroupCoursesPlanService")
 public class DemoGroupCoursesPlanServiceImpl extends ServiceImpl<DemoGroupCoursesPlanMapper, DemoGroupCoursesPlan> implements IDemoGroupCoursesPlanService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/DemoGroupServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IDemoGroupService")
 public class DemoGroupServiceImpl extends ServiceImpl<DemoGroupMapper, DemoGroup> implements IDemoGroupService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/EmployeeServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IEmployeeService")
 public class EmployeeServiceImpl extends ServiceImpl<EmployeeMapper, Employee> implements IEmployeeService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/GoodsCategoryServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IGoodsCategoryService")
 public class GoodsCategoryServiceImpl extends ServiceImpl<GoodsCategoryMapper, GoodsCategory> implements IGoodsCategoryService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/GoodsOrderItemServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IGoodsOrderItemService")
 public class GoodsOrderItemServiceImpl extends ServiceImpl<GoodsOrderItemMapper, GoodsOrderItem> implements IGoodsOrderItemService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/GoodsOrderPaymentServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IGoodsOrderPaymentService")
 public class GoodsOrderPaymentServiceImpl extends ServiceImpl<GoodsOrderPaymentMapper, GoodsOrderPayment> implements IGoodsOrderPaymentService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/GoodsOrderServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IGoodsOrderService")
 public class GoodsOrderServiceImpl extends ServiceImpl<GoodsOrderMapper, GoodsOrder> implements IGoodsOrderService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/GoodsServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IGoodsService")
 public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements IGoodsService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/HotWordsLabelServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IHotWordsLabelService")
 public class HotWordsLabelServiceImpl extends ServiceImpl<HotWordsLabelMapper, HotWordsLabel> implements IHotWordsLabelService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/LeaveCategoryServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ILeaveCategoryService")
 public class LeaveCategoryServiceImpl extends ServiceImpl<LeaveCategoryMapper, LeaveCategory> implements ILeaveCategoryService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/MusicGroupBuildLogServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IMusicGroupBuildLogService")
 public class MusicGroupBuildLogServiceImpl extends ServiceImpl<MusicGroupBuildLogMapper, MusicGroupBuildLog> implements IMusicGroupBuildLogService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/MusicGroupPaymentCalenderServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IMusicGroupPaymentCalenderService")
 public class MusicGroupPaymentCalenderServiceImpl extends ServiceImpl<MusicGroupPaymentCalenderMapper, MusicGroupPaymentCalender> implements IMusicGroupPaymentCalenderService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/MusicGroupPaymentEntitiesServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IMusicGroupPaymentEntitiesService")
 public class MusicGroupPaymentEntitiesServiceImpl extends ServiceImpl<MusicGroupPaymentEntitiesMapper, MusicGroupPaymentEntities> implements IMusicGroupPaymentEntitiesService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/MusicGroupPurchaseListServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IMusicGroupPurchaseListService")
 public class MusicGroupPurchaseListServiceImpl extends ServiceImpl<MusicGroupPurchaseListMapper, MusicGroupPurchaseList> implements IMusicGroupPurchaseListService {
 
 }

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

@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IMusicGroupService")
 public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGroup> implements IMusicGroupService {
 
     @Autowired

mec-education/src/main/java/com/ym/mec/education/service/impl/MusicGroupStudentFeeServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IMusicGroupStudentFeeService")
 public class MusicGroupStudentFeeServiceImpl extends ServiceImpl<MusicGroupStudentFeeMapper, MusicGroupStudentFee> implements IMusicGroupStudentFeeService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/MusicGroupSubjectGoodsGroupServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IMusicGroupSubjectGoodsGroupService")
 public class MusicGroupSubjectGoodsGroupServiceImpl extends ServiceImpl<MusicGroupSubjectGoodsGroupMapper, MusicGroupSubjectGoodsGroup> implements IMusicGroupSubjectGoodsGroupService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/MusicGroupSubjectPlanServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IMusicGroupSubjectPlanService")
 public class MusicGroupSubjectPlanServiceImpl extends ServiceImpl<MusicGroupSubjectPlanMapper, MusicGroupSubjectPlan> implements IMusicGroupSubjectPlanService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/OrganizationServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IOrganizationService")
 public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Organization> implements IOrganizationService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/RongyunRoomMemberServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IRongyunRoomMemberService")
 public class RongyunRoomMemberServiceImpl extends ServiceImpl<RongyunRoomMemberMapper, RongyunRoomMember> implements IRongyunRoomMemberService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/RongyunRoomServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IRongyunRoomService")
 public class RongyunRoomServiceImpl extends ServiceImpl<RongyunRoomMapper, RongyunRoom> implements IRongyunRoomService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/RongyunUserServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IRongyunUserService")
 public class RongyunUserServiceImpl extends ServiceImpl<RongyunUserMapper, RongyunUser> implements IRongyunUserService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/RongyunWhiteboardServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IRongyunWhiteboardService")
 public class RongyunWhiteboardServiceImpl extends ServiceImpl<RongyunWhiteboardMapper, RongyunWhiteboard> implements IRongyunWhiteboardService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SchoolServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISchoolService")
 public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> implements ISchoolService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentApplyRefundsServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IStudentApplyRefundsService")
 public class StudentApplyRefundsServiceImpl extends ServiceImpl<StudentApplyRefundsMapper, StudentApplyRefunds> implements IStudentApplyRefundsService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentAttendanceServiceImpl.java

@@ -32,7 +32,7 @@ import java.util.Objects;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service("iStudentAttendanceService")
+@Service("IStudentAttendanceService")
 public class StudentAttendanceServiceImpl extends ServiceImpl<StudentAttendanceMapper, StudentAttendance> implements IStudentAttendanceService {
 
     @Autowired

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentCourseHomeworkReplyServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IStudentCourseHomeworkReplyService")
 public class StudentCourseHomeworkReplyServiceImpl extends ServiceImpl<StudentCourseHomeworkReplyMapper, StudentCourseHomeworkReply> implements IStudentCourseHomeworkReplyService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentCourseHomeworkServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IStudentCourseHomeworkService")
 public class StudentCourseHomeworkServiceImpl extends ServiceImpl<StudentCourseHomeworkMapper, StudentCourseHomework> implements IStudentCourseHomeworkService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentPaymentOrderDetailServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IStudentPaymentOrderDetailService")
 public class StudentPaymentOrderDetailServiceImpl extends ServiceImpl<StudentPaymentOrderDetailMapper, StudentPaymentOrderDetail> implements IStudentPaymentOrderDetailService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentPaymentOrderServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IStudentPaymentOrderService")
 public class StudentPaymentOrderServiceImpl extends ServiceImpl<StudentPaymentOrderMapper, StudentPaymentOrder> implements IStudentPaymentOrderService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentRechargeServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IStudentRechargeService")
 public class StudentRechargeServiceImpl extends ServiceImpl<StudentRechargeMapper, StudentRecharge> implements IStudentRechargeService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentRegistrationServiceImpl.java

@@ -14,6 +14,6 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IStudentRegistrationService")
 public class StudentRegistrationServiceImpl extends ServiceImpl<StudentRegistrationMapper, StudentRegistration> implements IStudentRegistrationService {
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentWithdrawServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IStudentWithdrawService")
 public class StudentWithdrawServiceImpl extends ServiceImpl<StudentWithdrawMapper, StudentWithdraw> implements IStudentWithdrawService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SubjectGoodsMapperServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISubjectGoodsMapperService")
 public class SubjectGoodsMapperServiceImpl extends ServiceImpl<SubjectGoodsMapperMapper, SubjectGoodsMapper> implements ISubjectGoodsMapperService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SubjectServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISubjectService")
 public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> implements ISubjectService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SysAreaServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISysAreaService")
 public class SysAreaServiceImpl extends ServiceImpl<SysAreaMapper, SysArea> implements ISysAreaService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SysAuditLogServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISysAuditLogService")
 public class SysAuditLogServiceImpl extends ServiceImpl<SysAuditLogMapper, SysAuditLog> implements ISysAuditLogService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SysMenuServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISysMenuService")
 public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> implements ISysMenuService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SysMessageConfigServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISysMessageConfigService")
 public class SysMessageConfigServiceImpl extends ServiceImpl<SysMessageConfigMapper, SysMessageConfig> implements ISysMessageConfigService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SysMessageServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISysMessageService")
 public class SysMessageServiceImpl extends ServiceImpl<SysMessageMapper, SysMessage> implements ISysMessageService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SysNewsInformationServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISysNewsInformationService")
 public class SysNewsInformationServiceImpl extends ServiceImpl<SysNewsInformationMapper, SysNewsInformation> implements ISysNewsInformationService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SysOauthClientDetailsServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISysOauthClientDetailsService")
 public class SysOauthClientDetailsServiceImpl extends ServiceImpl<SysOauthClientDetailsMapper, SysOauthClientDetails> implements ISysOauthClientDetailsService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SysRoleMenuServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISysRoleMenuService")
 public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRoleMenu> implements ISysRoleMenuService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SysRoleServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISysRoleService")
 public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SysSuggestionServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISysSuggestionService")
 public class SysSuggestionServiceImpl extends ServiceImpl<SysSuggestionMapper, SysSuggestion> implements ISysSuggestionService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SysTaskServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISysTaskService")
 public class SysTaskServiceImpl extends ServiceImpl<SysTaskMapper, SysTask> implements ISysTaskService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SysUserBankCardServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISysUserBankCardService")
 public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMapper, SysUserBankCard> implements ISysUserBankCardService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SysUserCashAccountDetailServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISysUserCashAccountDetailService")
 public class SysUserCashAccountDetailServiceImpl extends ServiceImpl<SysUserCashAccountDetailMapper, SysUserCashAccountDetail> implements ISysUserCashAccountDetailService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SysUserCashAccountServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISysUserCashAccountService")
 public class SysUserCashAccountServiceImpl extends ServiceImpl<SysUserCashAccountMapper, SysUserCashAccount> implements ISysUserCashAccountService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SysUserLoginLogServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISysUserLoginLogService")
 public class SysUserLoginLogServiceImpl extends ServiceImpl<SysUserLoginLogMapper, SysUserLoginLog> implements ISysUserLoginLogService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SysUserLoginServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISysUserLoginService")
 public class SysUserLoginServiceImpl extends ServiceImpl<SysUserLoginMapper, SysUserLogin> implements ISysUserLoginService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SysUserRoleServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISysUserRoleService")
 public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUserRole> implements ISysUserRoleService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SysUserServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ISysUserService")
 public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/TeacherAttendanceServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ITeacherAttendanceService")
 public class TeacherAttendanceServiceImpl extends ServiceImpl<TeacherAttendanceMapper, TeacherAttendance> implements ITeacherAttendanceService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/TeacherDefaultMusicGroupSalaryServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ITeacherDefaultMusicGroupSalaryService")
 public class TeacherDefaultMusicGroupSalaryServiceImpl extends ServiceImpl<TeacherDefaultMusicGroupSalaryMapper, TeacherDefaultMusicGroupSalary> implements ITeacherDefaultMusicGroupSalaryService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/TeacherDefaultVipGroupSalaryServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ITeacherDefaultVipGroupSalaryService")
 public class TeacherDefaultVipGroupSalaryServiceImpl extends ServiceImpl<TeacherDefaultVipGroupSalaryMapper, TeacherDefaultVipGroupSalary> implements ITeacherDefaultVipGroupSalaryService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/TeacherLeaveRecordServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ITeacherLeaveRecordService")
 public class TeacherLeaveRecordServiceImpl extends ServiceImpl<TeacherLeaveRecordMapper, TeacherLeaveRecord> implements ITeacherLeaveRecordService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/TeacherSchoolServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ITeacherSchoolService")
 public class TeacherSchoolServiceImpl extends ServiceImpl<TeacherSchoolMapper, TeacherSchool> implements ITeacherSchoolService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/TeacherServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("ITeacherService")
 public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> implements ITeacherService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/VipGroupCategoryServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IVipGroupCategoryService")
 public class VipGroupCategoryServiceImpl extends ServiceImpl<VipGroupCategoryMapper, VipGroupCategory> implements IVipGroupCategoryService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/VipGroupClassGroupMapperServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IVipGroupClassGroupMapperService")
 public class VipGroupClassGroupMapperServiceImpl extends ServiceImpl<VipGroupClassGroupMapperMapper, VipGroupClassGroupMapper> implements IVipGroupClassGroupMapperService {
 
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/VipGroupServiceImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author lemeng
  * @since 2019-09-25
  */
-@Service
+@Service("IVipGroupService")
 public class VipGroupServiceImpl extends ServiceImpl<VipGroupMapper, VipGroup> implements IVipGroupService {
 
 }

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

@@ -3,9 +3,11 @@ package com.ym.mec.student.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.service.ClassGroupService;
+import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,6 +21,8 @@ public class CourseController extends BaseController {
     @Autowired
     private ClassGroupService classGroupService;
     @Autowired
+    private MusicGroupService musicGroupService;
+    @Autowired
     private SysUserFeignService sysUserFeignService;
 
     @ApiOperation("获取学生所购买课程列表")
@@ -33,21 +37,23 @@ public class CourseController extends BaseController {
 
     @ApiOperation("获取学员所有聊天群组")
     @GetMapping(value = "/queryUserGroups")
-    public Object queryUserGroups(){
+    public Object queryUserGroups(String search){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
             return failed("获取用户信息失败");
         }
-        return succeed(classGroupService.queryUserGroups(sysUser.getId()));
+        return succeed(classGroupService.queryUserGroups(sysUser.getId(),search));
     }
 
-    /*@ApiOperation(value = "根据群编号，获取群组基本信息")
+    @ApiOperation(value = "根据群编号，获取群组基本信息")
     @GetMapping("/findGroupById")
-    public Object findGroupById(Integer classGroupId){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
-            return failed("获取用户信息失败");
+    public Object findGroupById(String groupId){
+        if(StringUtils.isEmpty(groupId)){
+            return failed("参数校验错误");
+        }
+        if(groupId.startsWith("mg")){
+            return succeed(musicGroupService.get(groupId.substring(2)));
         }
-        return succeed(musicGroupService.findTeachersByStuId(sysUser.getId()));
-    }*/
+        return succeed(classGroupService.get(Integer.parseInt(groupId.substring(2))));
+    }
 }