update

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

@@ -3,7 +3,14 @@ package com.ym.mec.biz.dal.dao;
 import com.ym.mec.biz.dal.entity.MusicGroupBuildLog;
 import com.ym.mec.common.dal.BaseDAO;
 
+import java.util.List;
+
 public interface MusicGroupBuildLogDao extends BaseDAO<Integer, MusicGroupBuildLog> {
 
-	
+    /**
+     * 获取所有日志记录
+     * @param musicGroupId
+     * @return
+     */
+    List<MusicGroupBuildLog> findById(String musicGroupId);
 }

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

@@ -14,7 +14,7 @@ public class CourseListDto {
     private String musicGroupId;
 
     @ApiModelProperty(value = "学生姓名",required = true)
-    private List<String> studentNames;
+    private String studentNames;
 
     @ApiModelProperty(value = "乐团、vip课名称",required = true)
     private String musicGroupName;
@@ -72,11 +72,11 @@ public class CourseListDto {
         this.musicGroupId = musicGroupId;
     }
 
-    public List<String> getStudentNames() {
+    public String getStudentNames() {
         return studentNames;
     }
 
-    public void setStudentNames(List<String> studentNames) {
+    public void setStudentNames(String studentNames) {
         this.studentNames = studentNames;
     }
 

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

@@ -21,6 +21,10 @@ public class ClassGroup {
 	private Integer musicGroupId;
 
 	/**  */
+	@ApiModelProperty(value = "上课模式", required = true)
+	private String teachMode;
+
+	/**  */
 	@ApiModelProperty(value = "科目编号(多个,号分割)", required = true)
 	private String subjectIdList;
 
@@ -66,6 +70,14 @@ public class ClassGroup {
 	@ApiModelProperty(value = "当前课次",required = false)
 	private Integer currentClassTimes;
 
+	public String getTeachMode() {
+		return teachMode;
+	}
+
+	public void setTeachMode(String teachMode) {
+		this.teachMode = teachMode;
+	}
+
 	public Integer getCurrentClassTimes() {
 		return currentClassTimes;
 	}

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

@@ -11,7 +11,7 @@ public class MusicGroupBuildLog {
 	private Integer id;
 	
 	/**  */
-	private Integer musicGroupId;
+	private String musicGroupId;
 	
 	/** 事件 */
 	private String event;
@@ -24,7 +24,17 @@ public class MusicGroupBuildLog {
 	
 	/**  */
 	private java.util.Date createTime;
-	
+
+	public MusicGroupBuildLog(String musicGroupId, String event, Integer operator, String memo) {
+		this.musicGroupId = musicGroupId;
+		this.event = event;
+		this.operator = operator;
+		this.memo = memo;
+	}
+
+	public MusicGroupBuildLog() {
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}
@@ -33,11 +43,11 @@ public class MusicGroupBuildLog {
 		return this.id;
 	}
 			
-	public void setMusicGroupId(Integer musicGroupId){
+	public void setMusicGroupId(String musicGroupId){
 		this.musicGroupId = musicGroupId;
 	}
 	
-	public Integer getMusicGroupId(){
+	public String getMusicGroupId(){
 		return this.musicGroupId;
 	}
 			

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

@@ -2,7 +2,16 @@ package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.entity.MusicGroupBuildLog;
 import com.ym.mec.common.service.BaseService;
+import org.w3c.dom.stylesheets.LinkStyle;
+
+import java.util.List;
 
 public interface MusicGroupBuildLogService extends BaseService<Integer, MusicGroupBuildLog> {
 
+    /**
+     * 根据乐团编号获取乐团流程记录
+     * @param musicGroupId
+     * @return
+     */
+    List<MusicGroupBuildLog> findById(String musicGroupId);
 }

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

@@ -10,19 +10,12 @@ import com.ym.mec.common.service.BaseService;
 import java.util.List;
 
 public interface MusicGroupService extends BaseService<String, MusicGroup> {
-
-    /**
-     * 建团申请，基本信息提交
-     * @param musicGroup
-     */
-    void add(MusicGroup musicGroup);
-
     /**
      * 建团申请数据提交
      * @param subFeeSettingDto
      * @Author superzou
      */
-    void createGroup(SubFeeSettingDto subFeeSettingDto);
+    void createGroup(SubFeeSettingDto subFeeSettingDto,Integer userId);
 
     /**
      * 获取学生所在乐团详情

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

@@ -18,6 +18,7 @@ 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;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -346,7 +347,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             courseListDtos.forEach(e->{
                 if("VIP".equals(e.getTeachMode())){
                     //获取vip课的学生名称列表
-                    e.setStudentNames(classGroupDao.findVipStuNames(e.getMusicGroupId()));
+                    List<String> vipStuNames = classGroupDao.findVipStuNames(e.getMusicGroupId());
+                    if(vipStuNames != null && vipStuNames.size() > 0){
+                        StringUtils.join(vipStuNames,",");
+                        e.setStudentNames(StringUtils.join());
+                    }
                 }else {
                     //获取学员乐团课的续费状态
                     MusicGroupStudentFee musicGroupStudentFee = musicGroupStudentFeeDao.findByUser(userId,e.getMusicGroupId());

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

@@ -9,6 +9,8 @@ import com.ym.mec.biz.service.MusicGroupBuildLogService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
+import java.util.List;
+
 @Service
 public class MusicGroupBuildLogServiceImpl extends BaseServiceImpl<Integer, MusicGroupBuildLog>  implements MusicGroupBuildLogService {
 	
@@ -19,5 +21,9 @@ public class MusicGroupBuildLogServiceImpl extends BaseServiceImpl<Integer, Musi
 	public BaseDAO<Integer, MusicGroupBuildLog> getDAO() {
 		return musicGroupBuildLogDao;
 	}
-	
+
+	@Override
+	public List<MusicGroupBuildLog> findById(String musicGroupId) {
+		return musicGroupBuildLogDao.findById(musicGroupId);
+	}
 }

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

@@ -8,7 +8,10 @@ import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.service.MusicGroupService;
 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.service.impl.BaseServiceImpl;
+import com.ym.mec.im.ImFeignService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,6 +32,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup>
 	private MusicGroupSubjectGoodsGroupDao musicGroupSubjectGoodsGroupDao;
 	@Autowired
 	private MusicGroupSubjectPlanDao musicGroupSubjectPlanDao;
+	@Autowired
+	private ImFeignService imFeignService;
+	@Autowired
+	private MusicGroupBuildLogDao musicGroupBuildLogDao;
 
 	@Override
 	public BaseDAO<String, MusicGroup> getDAO() {
@@ -37,21 +44,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup>
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void add(MusicGroup musicGroup) {
-		musicGroupDao.insert(musicGroup);
-		String[] split = musicGroup.getPaymentMonths().split(",");
-		MusicGroupPaymentCalender mg;
-		for (String month:split) {
-			mg = new MusicGroupPaymentCalender();
-			mg.setMusicGroupId(musicGroup.getId());
-			mg.setPaymentMonth(Integer.parseInt(month));
-			musicGroupPaymentCalenderDao.insert(mg);
-		}
-	}
-
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public void createGroup(SubFeeSettingDto subFeeSettingDto) {
+	public void createGroup(SubFeeSettingDto subFeeSettingDto,Integer userId) {
 		MusicGroup musicGroup = subFeeSettingDto.getMusicGroup();
 		List<MusicGroupPaymentEntities> musicGroupPaymentEntities = subFeeSettingDto.getMusicGroupPaymentEntities();
 		List<MusicGroupSubjectGoodsGroup> musicGroupSubjectGoodsGroups = subFeeSettingDto.getMusicGroupSubjectGoodsGroups();
@@ -88,7 +81,14 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup>
 				musicGroupSubjectGoodsGroupDao.insert(e);
 			});
 			//新增聊天群
-
+			ImGroupModel imGroupModel = new ImGroupModel(musicGroupId, musicGroup.getName());
+			//教务老师和运营主管加入群组
+			ImGroupMember[] imGroupMembers = {new ImGroupMember(musicGroup.getTeamTeacherId().toString()),
+					new ImGroupMember(musicGroup.getEducationalTeacherId().toString())};
+			//创建群组
+			imFeignService.groupCreate(new ImGroupModel(musicGroupId,imGroupMembers,musicGroup.getName()));
+			//记录创建日志
+			musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"提交建团申请",userId,""));
 		}
 	}
 

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

@@ -261,6 +261,7 @@
         <result column="music_group_id_" property="musicGroupId"/>
         <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="total_class_times_" property="totalClassTimes"/>
+        <result column="teach_mode_" property="teachMode"/>
         <result column="current_class_times_" property="currentClassTimes"/>
         <result column="address_" property="address"/>
         <result column="single_class_minutes_" property="singleClassMinutes"/>
@@ -268,7 +269,7 @@
     <select id="queryCoursePage" resultMap="CourseListDto">
         SELECT * 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.total_class_times_,cg.current_class_times_,'' single_class_minutes_,mg.id_ music_group_id_,cg.create_time_,cg.teach_mode_
             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_
@@ -276,7 +277,7 @@
             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.total_class_times_,cg.current_class_times_,vg.single_class_minutes_,vg.id_ music_group_id_,cg.create_time_,cg.teach_mode_
             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_

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

@@ -5,72 +5,69 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.biz.dal.dao.MusicGroupBuildLogDao">
-	
-	<resultMap type="com.ym.mec.biz.dal.entity.MusicGroupBuildLog" id="MusicGroupBuildLog">
-		<result column="id_" property="id" />
-		<result column="music_group_id_" property="musicGroupId" />
-		<result column="event_" property="event" />
-		<result column="operator_" property="operator" />
-		<result column="memo_" property="memo" />
-		<result column="create_time_" property="createTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="MusicGroupBuildLog" >
+
+    <resultMap type="com.ym.mec.biz.dal.entity.MusicGroupBuildLog" id="MusicGroupBuildLog">
+        <result column="id_" property="id"/>
+        <result column="music_group_id_" property="musicGroupId"/>
+        <result column="event_" property="event"/>
+        <result column="operator_" property="operator"/>
+        <result column="memo_" property="memo"/>
+        <result column="create_time_" property="createTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="MusicGroupBuildLog">
 		SELECT * FROM music_group_build_log WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="MusicGroupBuildLog">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="MusicGroupBuildLog">
 		SELECT * FROM music_group_build_log ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupBuildLog" 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_build_log (id_,music_group_id_,event_,operator_,memo_,create_time_) VALUES(#{id},#{musicGroupId},#{event},#{operator},#{memo},#{createTime})
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupBuildLog" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+		INSERT INTO music_group_build_log (music_group_id_,event_,operator_,memo_,create_time_)
+		VALUES(#{musicGroupId},#{event},#{operator},#{memo},now())
 	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MusicGroupBuildLog">
-		UPDATE music_group_build_log <set>
-<if test="operator != null">
-operator_ = #{operator},
-</if>
-<if test="event != null">
-event_ = #{event},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="memo != null">
-memo_ = #{memo},
-</if>
-<if test="musicGroupId != null">
-music_group_id_ = #{musicGroupId},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.biz.dal.entity.MusicGroupBuildLog">
+        UPDATE music_group_build_log
+        <set>
+            <if test="operator != null">
+                operator_ = #{operator},
+            </if>
+            <if test="event != null">
+                event_ = #{event},
+            </if>
+            <if test="memo != null">
+                memo_ = #{memo},
+            </if>
+            <if test="musicGroupId != null">
+                music_group_id_ = #{musicGroupId},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM music_group_build_log WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="MusicGroupBuildLog" parameterType="map">
-		SELECT * FROM music_group_build_log ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="MusicGroupBuildLog" parameterType="map">
+        SELECT * FROM music_group_build_log ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM music_group_build_log
 	</select>
+    <select id="findById" resultMap="MusicGroupBuildLog">
+		SELECT * FROM music_group_build_log WHERE music_group_id_ = #{musicGroupId}
+	</select>
 </mapper>

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

@@ -8,6 +8,12 @@ public class ImGroupMember {
     public ImGroupMember() {
     }
 
+    public ImGroupMember(String id) {
+        this.id = id;
+    }
+
+
+
     public ImGroupMember(String id, String groupId, Integer munite) {
         this.id = id;
         this.groupId = groupId;

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

@@ -1,8 +1,11 @@
 package com.ym.mec.common.entity;
 
 public class ImGroupModel {
+    //群组编号
     private String id;
+    //用户列表
     private ImGroupMember[] members;
+    //群名称
     private String name;
     private String img;
     private Integer minute;
@@ -12,6 +15,17 @@ public class ImGroupModel {
     public ImGroupModel() {
     }
 
+    public ImGroupModel(String id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public ImGroupModel(String id, ImGroupMember[] members, String name) {
+        this.id = id;
+        this.members = members;
+        this.name = name;
+    }
+
     public Integer getCount() {
         return count;
     }

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

@@ -7,7 +7,6 @@ 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;
 import org.apache.commons.lang3.StringUtils;

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

@@ -0,0 +1,25 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.biz.service.MusicGroupBuildLogService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("recharge")
+@Api(tags = "乐团流程日志记录")
+@RestController
+public class MusicGroupBuildLogController extends BaseController {
+
+    @Autowired
+    private MusicGroupBuildLogService musicGroupBuildLogService;
+
+    @ApiOperation("根据乐团编号获取乐团流程记录")
+    @GetMapping(value = "/findAll")
+    public Object findAll(String musicGroupId){
+        return succeed(musicGroupBuildLogService.findById(musicGroupId));
+    }
+}

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

@@ -1,5 +1,7 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -27,6 +29,8 @@ public class MusicGroupController extends BaseController {
 
     @Autowired
     private MusicGroupService musicGroupService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
     @ApiOperation(value = "删除乐团")
     @PostMapping("/del/{id}")
@@ -58,7 +62,11 @@ public class MusicGroupController extends BaseController {
     @ApiOperation(value = "新增乐团  建团申请数据提交")
     @PostMapping("/createGroup")
     public Object createGroup(@RequestBody SubFeeSettingDto subFeeSettingDto){
-        musicGroupService.createGroup(subFeeSettingDto);
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null || sysUser.getId() == null){
+            return failed("获取用户信息失败");
+        }
+        musicGroupService.createGroup(subFeeSettingDto,sysUser.getId());
         return succeed();
     }
 }