Merge remote-tracking branch 'origin/master'

cms/src/main/resources/application.yml

@@ -59,4 +59,9 @@ management:
         include: "*"
   endpoint:
     health:
-      show-details: ALWAYS
+      show-details: ALWAYS
+      
+
+ribbon:  
+    ReadTimeout: 60000  
+    ConnectTimeout: 60000

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

@@ -13,6 +13,7 @@ import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -121,7 +122,10 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 	@Override
 	public void updateBaseInfo(SysUser sysUser) {
 		sysUserDao.update(sysUser);
-		imFeignService.register(new ImUserModel(sysUser.getId().toString(),sysUser.getUsername(),sysUser.getAvatar()));
+		if(StringUtils.isEmpty(sysUser.getAvatar())){
+			sysUser.setAvatar("https://daya-online.oss-cn-beijing.aliyuncs.com/201910/RgHwgKc.jpg");
+		}
+		imFeignService.update(new ImUserModel(sysUser.getId().toString(),sysUser.getUsername(),sysUser.getAvatar()));
 	}
 
 }

mec-auth/mec-auth-server/src/main/resources/application.yml

@@ -66,4 +66,9 @@ management:
         include: "*"
   endpoint:
     health:
-      show-details: ALWAYS
+      show-details: ALWAYS
+      
+
+ribbon:  
+    ReadTimeout: 60000  
+    ConnectTimeout: 60000

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

@@ -6,7 +6,9 @@ import java.util.Date;
 public class musicGroupStudentApplyDto {
     private Integer userId;
 
-    private String name;
+    private String userName;
+
+    private String paymentStatus;
 
     private String currentGrade;
 
@@ -22,6 +24,14 @@ public class musicGroupStudentApplyDto {
 
     private Date payTime;
 
+    public String getPaymentStatus() {
+        return paymentStatus;
+    }
+
+    public void setPaymentStatus(String paymentStatus) {
+        this.paymentStatus = paymentStatus;
+    }
+
     public Integer getUserId() {
         return userId;
     }
@@ -30,12 +40,12 @@ public class musicGroupStudentApplyDto {
         this.userId = userId;
     }
 
-    public String getName() {
-        return name;
+    public String getUserName() {
+        return userName;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setUserName(String userName) {
+        this.userName = userName;
     }
 
     public String getCurrentGrade() {

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

@@ -15,6 +15,8 @@ import com.ym.mec.biz.dal.entity.ApprovalStatus;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.page.MusicGroupQueryInfo;
+import com.ym.mec.common.entity.ImGroupMember;
+import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
@@ -171,4 +173,11 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @return
 	 */
 	MusicGroup getMusicGroupDetail(String musicGroupId);
+
+	/**
+	 * 获取乐团老师列表
+	 * @param musicGroupId
+	 * @return
+	 */
+	List<ImGroupMember> queryMusicGroupTeachers(String musicGroupId);
 }

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

@@ -53,6 +53,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Autowired
     private MusicGroupDao musicGroupDao;
     @Autowired
+    private MusicGroupService musicGroupService;
+    @Autowired
     private ClassGroupRelationService classGroupRelationService;
     @Autowired
     private ClassGroupStudentMapperDao classGroupStudentMapperDao;
@@ -160,11 +162,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             studentRegistrationDao.updateByUserIdAndMusicGroupId(studentRegistration);
             imGroupMemberList.add(new ImGroupMember(userId));
         }
-
+        imGroupMemberList.addAll(musicGroupService.queryMusicGroupTeachers(classGroup.getMusicGroupId()));
         classGroupStudentMapperDao.classGroupStudentsInsert(classGroupStudentList);
         ImGroupMember[] imGroupMembers = imGroupMemberList.toArray(new ImGroupMember[imGroupMemberList.size()]);
         // 创建群组
-        imFeignService.groupCreate(new ImGroupModel(2,classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
+        imFeignService.groupCreate(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
         return classGroup;
     }
 
@@ -214,10 +216,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             classGroupRelationList.add(classGroupRelation);
         }
         classGroupRelationService.classGroupRelationsInsert(classGroupRelationList);
-
+        imGroupMemberList.addAll(musicGroupService.queryMusicGroupTeachers(classGroup.getMusicGroupId()));
         ImGroupMember[] imGroupMembers = imGroupMemberList.toArray(new ImGroupMember[imGroupMemberList.size()]);
         // 创建群组
-        imFeignService.groupCreate(new ImGroupModel(2,classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
+        imFeignService.groupCreate(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
         return classGroup;
     }
 
@@ -300,10 +302,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 }
             }
             courseScheduleDao.batchAddCourseSchedules(courseScheduleList);
-
-            ImGroupMember[] imGroupMembers = {new ImGroupMember(classGroupTeacherMapper.getUserId().toString())};
+            List<ImGroupMember> groupMembers = musicGroupService.queryMusicGroupTeachers(highClassGroup.getMusicGroupId());
+            groupMembers.add(new ImGroupMember(classGroupTeacherMapper.getUserId().toString()));
+            ImGroupMember[] imGroupMembers = groupMembers.toArray(new ImGroupMember[groupMembers.size()]);
             // 创建群组
-            imFeignService.groupCreate(new ImGroupModel(2,highClassGroup.getId().toString(), imGroupMembers, highClassGroup.getName()));
+            imFeignService.groupCreate(new ImGroupModel(highClassGroup.getId().toString(), imGroupMembers, highClassGroup.getName()));
         }
         return highClassGroupList;
     }
@@ -495,7 +498,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 //获取乐团群用户总数
                 BigDecimal count = musicGroupUserNumMap.get(e.getId());
                 e.setCount(count == null ? 0 : count.intValue() + teachers.size());
-                e.setId("mg" + e.getId());
             }
         } else {
             imGroupModels = new ArrayList<>();
@@ -509,7 +511,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             imGroupModels1.forEach(e -> {
                 Integer num = numsMap.get(e.getId());
                 e.setCount(num == null ? 0 : num + e.getCount());
-                e.setId("cg" + e.getId());
             });
             imGroupModels.addAll(imGroupModels1);
         }
@@ -518,9 +519,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
     @Override
     public List<ImUserModel> findGroupUsers(String groupId) {
-        if (groupId.startsWith("mg")) {
-            return musicGroupDao.findGroupUsers(groupId.substring(2));
-        }
         return classGroupDao.findGroupUsers(groupId.substring(2));
     }
 

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

@@ -71,7 +71,7 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
         ImGroupMember[] imGroupMembers = {new ImGroupMember(userId.toString())};
         // 退出群组
-        imFeignService.groupQuit(new ImGroupModel(2,classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
+        imFeignService.groupQuit(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
         return true;
     }
 

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

@@ -72,7 +72,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
                 imGroupMemberList.add(new ImGroupMember(classGroupTeacherMapper.getUserId().toString()));
                 ImGroupMember[] imGroupMembers = imGroupMemberList.toArray(new ImGroupMember[imGroupMemberList.size()]);
                 // 加入群组
-                imFeignService.groupJoin(new ImGroupModel(2,classGroupTeacherMapper.getClassGroupId().toString(), imGroupMembers, classGroup.getName()));
+                imFeignService.groupJoin(new ImGroupModel(classGroupTeacherMapper.getClassGroupId().toString(), imGroupMembers, classGroup.getName()));
             }
         }
         classGroupTeacherMapperDao.delMusicGroupTeacherMapper(classGroupTeacherMapperList);

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

@@ -11,12 +11,11 @@ import com.ym.mec.biz.dal.page.MusicGroupQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImGroupMember;
-import com.ym.mec.common.entity.ImGroupModel;
+import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
-import com.ym.mec.im.ImFeignService;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
@@ -54,8 +53,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     @Autowired
     private MusicGroupSubjectPlanDao musicGroupSubjectPlanDao;
     @Autowired
-    private ImFeignService imFeignService;
-    @Autowired
     private MusicGroupBuildLogDao musicGroupBuildLogDao;
 
     @Autowired
@@ -165,10 +162,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             musicGroupSubjectGoodsGroupDao.batchInsert(musicGroupSubjectGoodsGroups,musicGroupId);
         }
         // 教务老师和运营主管加入群组
-        ImGroupMember[] imGroupMembers = { new ImGroupMember(musicGroup.getTeamTeacherId().toString()),
-                new ImGroupMember(musicGroup.getEducationalTeacherId().toString()) };
-        // 创建群组
-        imFeignService.groupCreate(new ImGroupModel(1,musicGroupId, imGroupMembers, musicGroup.getName()));
+//        ImGroupMember[] imGroupMembers = { new ImGroupMember(musicGroup.getTeamTeacherId().toString()),
+//                new ImGroupMember(musicGroup.getEducationalTeacherId().toString()) };
+//        // 创建群组
+//        imFeignService.groupCreate(new ImGroupModel(1,musicGroupId, imGroupMembers, musicGroup.getName()));
         // 记录创建日志
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "提交建团申请", userId, ""));
         return musicGroupId;
@@ -693,4 +690,20 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
         return musicGroup;
     }
+
+    @Override
+    public List<ImGroupMember> queryMusicGroupTeachers(String musicGroupId) {
+        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+        List<ImGroupMember> groupMembers = new ArrayList<>();
+        Set teacherIds = new HashSet(4);
+        teacherIds.add(musicGroup.getEducationalTeacherId());
+        teacherIds.add(musicGroup.getTeamTeacherId());
+        teacherIds.add(musicGroup.getOperatorUserId());
+        teacherIds.add(musicGroup.getDirectorUserId());
+        teacherIds.removeAll(null);
+        for (Object teacherId:teacherIds) {
+            groupMembers.add(new ImGroupMember(teacherId.toString()));
+        }
+        return groupMembers;
+    }
 }

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

@@ -109,6 +109,10 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		teacher.setUpdateTime(new Date());
 		teacherDao.update(teacher);
 		teacherDao.updateUser(teacher);
+		if(StringUtils.isEmpty(teacher.getAvatar())){
+			teacher.setAvatar("https://daya-online.oss-cn-beijing.aliyuncs.com/201910/RgHwgKc.jpg");
+		}
+		imFeignService.update(new ImUserModel(teacher.getId().toString(),teacher.getUsername(),teacher.getAvatar()));
 	}
 
 	@Override

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

@@ -215,7 +215,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		// 指导老师加入群组
 		ImGroupMember[] imGroupMembers = { new ImGroupMember(vipGroup.getVipGroupApplyBaseInfo().getUserId().toString())};
 		// 创建群组
-		imFeignService.groupCreate(new ImGroupModel(2,classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
+		imFeignService.groupCreate(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
 
 		//创建班级老师关联记录
 		ClassGroupTeacherMapper classGroupTeacherMapper=new ClassGroupTeacherMapper();

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

@@ -402,11 +402,20 @@
         select real_name_ FROM sys_user s WHERE id_ = #{userId}
     </select>
     <resultMap id="musicGroupStudentApplyDto" type="com.ym.mec.biz.dal.dto.musicGroupStudentApplyDto">
-
+        <result property="userId" column="user_id_"/>
+        <result property="userName" column="username_"/>
+        <result property="currentClass" column="current_class_"/>
+        <result property="currentGrade" column="current_grade_"/>
+        <result property="subjectName" column="subject_name_"/>
+        <result property="subjectId" column="actual_subject_id_"/>
+        <result property="paymentAmount" column="actual_amount_"/>
+        <result property="payTime" column="pay_time_"/>
+        <result property="paymentStatus" column="payment_status_"/>
+        <result property="remark" column="remark_"/>
     </resultMap>
-    <select id="queryMusicGroupStudentApply" resultType="com.ym.mec.biz.dal.dto.musicGroupStudentApplyDto">
+    <select id="queryMusicGroupStudentApply" resultMap="musicGroupStudentApplyDto">
         SELECT sr.user_id_,su.username_,sr.current_class_,sr.current_grade_,s.name_ subject_name_,sr.remark_,
-        spo.actual_amount_,spo.pay_time_,sr.payment_status_
+        spo.actual_amount_,spo.pay_time_,sr.payment_status_,sr.actual_subject_id_
         FROM student_registration sr
         LEFT JOIN sys_user su ON sr.user_id_ = su.id_
         LEFT JOIN `subject` s ON sr.actual_subject_id_ = s.id_

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

@@ -12,16 +12,6 @@ public class ImGroupModel {
     private Integer minute;
     private Integer count;
     private Integer status;
-    //区分班级和乐团1表示乐团，2表示班级
-    private Integer type;
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
 
     public ImGroupModel() {
     }
@@ -31,12 +21,7 @@ public class ImGroupModel {
         this.name = name;
     }
 
-    public ImGroupModel(Integer type,String id, ImGroupMember[] members, String name) {
-        if(type == 1){
-            this.id = "mg" + id;
-        }else {
-            this.id = "cg" + id;
-        }
+    public ImGroupModel(String id, ImGroupMember[] members, String name) {
         this.id = id;
         this.members = members;
         this.name = name;

mec-education/src/main/resources/application.yml

@@ -77,6 +77,7 @@ management:
     health:
       show-details: ALWAYS
 
-feign:
-  hystrix:
-    enabled: true
+
+ribbon:  
+    ReadTimeout: 60000  
+    ConnectTimeout: 60000

mec-task/src/main/resources/application.yml

@@ -71,6 +71,7 @@ security:
 swagger:
   base-package: com.ym.mec.task.controller
   
-feign:
-  hystrix:
-    enabled: true
+
+ribbon:  
+    ReadTimeout: 60000  
+    ConnectTimeout: 60000

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/provider/TsignPlugin.java

@@ -54,12 +54,12 @@ public class TsignPlugin implements ESealPlugin, InitializingBean, DisposableBea
 		projectconfig.setItsmApiUrl(apisUrl);
 		Result result = ServiceClientManager.registClient(projectconfig, null, null);
 		if (result.getErrCode() != 0) {
-//			throw new ThirdpartyException("e签宝客户端注册失败");
+			throw new ThirdpartyException("e签宝客户端注册失败");
 		}
 
 		serviceClient = ServiceClientManager.get(projectId);
 		if (serviceClient == null) {
-//			throw new ThirdpartyException("获取e签宝客户端失败");
+			throw new ThirdpartyException("获取e签宝客户端失败");
 		}
 	}
 

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupController.java

@@ -84,13 +84,11 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation(value = "开启乐团缴费功能")
     @PostMapping("/openPay")
-    //@PreAuthorize("@pcs.hasPermissions('musicGroup/openPay')")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
             @ApiImplicitParam(name = "expireDate", value = "截止缴费日期", required = true, dataType = "String")
     })
     public Object openPay(String musicGroupId, String expireDate) {
-
         return succeed(musicGroupService.openPay(musicGroupId,expireDate));
     }
 

mec-web/src/main/resources/application.yml

@@ -81,6 +81,7 @@ management:
     health:
       show-details: ALWAYS
   
-feign:
-  hystrix:
-    enabled: true
+
+ribbon:  
+    ReadTimeout: 60000  
+    ConnectTimeout: 60000

mec-workflow/src/main/resources/application.yml

@@ -77,4 +77,9 @@ management:
         include: "*"
   endpoint:
     health:
-      show-details: ALWAYS
+      show-details: ALWAYS
+      
+
+ribbon:  
+    ReadTimeout: 60000  
+    ConnectTimeout: 60000