Merge remote-tracking branch 'origin/saas' into saas

audio-analysis/src/main/java/com/yonge/netty/entity/MusicXmlBasicInfo.java

@@ -10,6 +10,8 @@ import java.util.stream.Collectors;
 public class MusicXmlBasicInfo {
 
 	private Integer id;
+	
+	private Integer tenantId;
 
 	private Integer subjectId;
 	
@@ -47,6 +49,14 @@ public class MusicXmlBasicInfo {
 		this.id = id;
 	}
 
+	public Integer getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(Integer tenantId) {
+		this.tenantId = tenantId;
+	}
+
 	public Integer getSubjectId() {
 		return subjectId;
 	}

audio-analysis/src/main/java/com/yonge/netty/server/service/AudioCompareHandler.java

@@ -154,8 +154,8 @@ public class AudioCompareHandler implements MessageHandler {
 				sysMusicCompareRecord.setSpeed(musicXmlBasicInfo.getSpeed());
 				sysMusicCompareRecord.setPartIndex(musicXmlBasicInfo.getPartIndex());
 				
-				SysUser sysUser = sysUserFeignService.queryUserById(sysMusicCompareRecord.getUserId());
-				sysMusicCompareRecord.setTenantId(sysUser.getTenantId());
+				//SysUser sysUser = sysUserFeignService.queryUserById(sysMusicCompareRecord.getUserId());
+				sysMusicCompareRecord.setTenantId(musicXmlBasicInfo.getTenantId());
 				
 				MusicXmlNote musicXmlNote = musicXmlBasicInfo.getMusicXmlInfos().stream().max(Comparator.comparing(MusicXmlNote::getTimeStamp)).get();
 				sysMusicCompareRecord.setSourceTime((float) ((musicXmlNote.getTimeStamp()+musicXmlNote.getDuration())/1000));

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

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.dto.SysMusicScoreTranscod;
 import com.ym.mec.biz.dal.entity.SysMusicScore;
 import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
 import com.ym.mec.common.dal.BaseDAO;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -22,4 +23,5 @@ public interface SysMusicScoreDao extends BaseDAO<Integer, SysMusicScore> {
 
     int updateAccompanimentBySongId(@Param("param") SysMusicScoreAccompaniment param);
 
+    int updateExtStyleConfigJson(@Param("id") Integer id, @Param("extStyleConfigJson") String extStyleConfigJson);
 }

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

@@ -234,6 +234,15 @@ public class MusicGroup extends BaseEntity {
 	@ApiModelProperty(value = "毕业年级",required = false)
 	private Integer graduateGrade;
 	
+	@ApiModelProperty(value = "学生基数",required = false)
+	private Integer basicStudentNum;
+	
+	@ApiModelProperty(value = "缴费方(学生、学校、第三方)",required = false)
+	private String paymentUserType;
+	
+	@ApiModelProperty(value = "计费方式（缴费方为第三方或学校时，选择学员计费、老师计费）",required = false)
+	private String chargeMode;
+	
 	public String getMusicalInstrumentsProvideTime() {
 		return musicalInstrumentsProvideTime;
 	}
@@ -811,4 +820,28 @@ public class MusicGroup extends BaseEntity {
 	public void setGraduateGrade(Integer graduateGrade) {
 		this.graduateGrade = graduateGrade;
 	}
+
+	public Integer getBasicStudentNum() {
+		return basicStudentNum;
+	}
+
+	public void setBasicStudentNum(Integer basicStudentNum) {
+		this.basicStudentNum = basicStudentNum;
+	}
+
+	public String getPaymentUserType() {
+		return paymentUserType;
+	}
+
+	public void setPaymentUserType(String paymentUserType) {
+		this.paymentUserType = paymentUserType;
+	}
+
+	public String getChargeMode() {
+		return chargeMode;
+	}
+
+	public void setChargeMode(String chargeMode) {
+		this.chargeMode = chargeMode;
+	}
 }

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

@@ -32,6 +32,8 @@ public class SysMusicScore {
 	}
 
 	private String extConfigJson;
+	
+	private String extStyleConfigJson;
 
 	/**  */
 	private Integer id;
@@ -129,6 +131,14 @@ public class SysMusicScore {
 		this.extConfigJson = extConfigJson;
 	}
 
+	public String getExtStyleConfigJson() {
+		return extStyleConfigJson;
+	}
+
+	public void setExtStyleConfigJson(String extStyleConfigJson) {
+		this.extStyleConfigJson = extStyleConfigJson;
+	}
+
 	public String getTypeName() {
 		return typeName;
 	}

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

@@ -88,6 +88,8 @@ public class SysMusicScoreAccompaniment {
 	private String track;
 
 	private String extConfigJson;
+	
+	private String extStyleConfigJson;
 
 	public String getExtConfigJson() {
 		return extConfigJson;
@@ -97,6 +99,14 @@ public class SysMusicScoreAccompaniment {
 		this.extConfigJson = extConfigJson;
 	}
 
+	public String getExtStyleConfigJson() {
+		return extStyleConfigJson;
+	}
+
+	public void setExtStyleConfigJson(String extStyleConfigJson) {
+		this.extStyleConfigJson = extStyleConfigJson;
+	}
+
 	public String getMetronomeUrl() {
 		return metronomeUrl;
 	}

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

@@ -1,15 +1,14 @@
 package com.ym.mec.biz.service;
 
 
+import java.util.List;
+
 import com.ym.mec.biz.dal.dto.MusicScoreDto;
-import com.ym.mec.biz.dal.dto.SysMusicScoreTranscod;
 import com.ym.mec.biz.dal.entity.SysMusicScore;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
-import java.util.List;
-
 public interface SysMusicScoreService extends BaseService<Integer, SysMusicScore> {
 
     void updateMusicScore(MusicScoreDto musicScoreDto);
@@ -25,4 +24,6 @@ public interface SysMusicScoreService extends BaseService<Integer, SysMusicScore
     PageInfo<SysMusicScore> queryMusicScorePageInfo(SysExamSongQueryInfo queryInfo);
 
     void transcod(Integer sysMusicScoreId);
+
+    int updateExtStyleConfigJson(Integer id, String extStyleConfigJson);
 }

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

@@ -27,6 +27,7 @@ import com.ym.mec.common.entity.UploadReturnBean;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.util.file.FileUtil;
 import com.ym.mec.util.shell.ScriptUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -348,7 +349,12 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         sysMusicScoreChangeLogDao.insert(log);
     }
 
-    /**
+    @Override
+	public int updateExtStyleConfigJson(Integer id, String extStyleConfigJson) {
+		return sysMusicScoreDao.updateExtStyleConfigJson(id, extStyleConfigJson);
+	}
+
+	/**
      * 进行转码
      *
      * @param fileUrl

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

@@ -57,6 +57,9 @@
         <result column="course_plan_" property="coursePlan"/>
         <result column="sale_activity_desc_" property="saleActivityDesc"/>
         <result column="graduate_grade_" property="graduateGrade"/>
+        <result column="basic_student_num_" property="basicStudentNum"/>
+        <result column="payment_user_type_" property="paymentUserType"/>
+        <result column="charge_mode_" property="chargeMode"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.MusicGroupBasicDto" id="MusicGroupBasicDto" extends="MusicGroup">
@@ -117,7 +120,7 @@
                  parent_meeting_time_, img_, director_user_id_, is_classroom_lessons_, memo_, expect_start_group_date_,
                  ownership_type_, repair_user_id_, del_flag_, payment_valid_start_date_, payment_valid_end_date_,
                  payment_pattern_, course_view_type_, transaction_teacher_id_,homework_push_flag_,member_course_show_flag_,tenant_id_,is_give_accessories_,extracurricular_teacher_,first_course_start_time_,
-                 music_group_plan_making_id_,first_recruit_grade_,default_charge_standard_,single_train_minutes_,course_plan_,sale_activity_desc_,graduate_grade_)
+                 music_group_plan_making_id_,first_recruit_grade_,default_charge_standard_,single_train_minutes_,course_plan_,sale_activity_desc_,graduate_grade_,basic_student_num_,payment_user_type_,charge_mode_)
         VALUES (#{id}, #{name}, #{organId}, #{schoolId}, #{applyExpireDate}, #{preApplyExpireDate}, #{teamTeacherId},
                 #{educationalTeacherId},
                 #{chargeTypeId}, #{courseForm}, now(), now(),
@@ -131,7 +134,7 @@
                 #{delFlag}, #{paymentValidStartDate}, #{paymentValidEndDate}, #{paymentPattern},
                 #{courseViewType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{transactionTeacherId},#{homeworkPushFlag},#{memberCourseShowFlag},#{tenantId},#{isGiveAccessories},
                 #{extracurricularTeacher,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{firstCourseStartTime},
-                #{musicGroupPlanMakingId},#{firstRecruitGrade},#{defaultChargeStandard},#{singleTrainMinutes},#{coursePlan},#{saleActivityDesc},#{graduateGrade})
+                #{musicGroupPlanMakingId},#{firstRecruitGrade},#{defaultChargeStandard},#{singleTrainMinutes},#{coursePlan},#{saleActivityDesc},#{graduateGrade},#{basicStudentNum},#{paymentUserType},#{chargeMode})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -276,6 +279,15 @@
             <if test="graduateGrade != null">
                 graduate_grade_ = #{graduateGrade},
             </if>
+            <if test="basicStudentNum != null">
+                basic_student_num_ = #{basicStudentNum},
+            </if>
+            <if test="paymentUserType != null">
+                payment_user_type_ = #{paymentUserType},
+            </if>
+            <if test="chargeMode != null">
+                charge_mode_ = #{chargeMode},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

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

@@ -38,6 +38,7 @@
 		<result column="muse_score_memo_" property="museScoreMemo" />
 		<result column="track_" property="track" />
 		<result column="ext_config_json_" property="extConfigJson" />
+		<result column="ext_style_config_json_" property="extStyleConfigJson" />
 	</resultMap>
 
 	<delete id="deleteBySongId">
@@ -145,7 +146,7 @@
 		SELECT
 		    sesa.*,ses.name_,ses.type_,ses.url_,
 		       s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_,sesc.parent_id_ parent_categories_id_,ses.client_type_,
-		ses.rank_ids_,ses.render_from_,ses.enable_evaluation_,ses.metronome_url_,ses.midi_url_,ses.play_mode_,ses.render_from_,ses.ext_config_json_
+		ses.rank_ids_,ses.render_from_,ses.enable_evaluation_,ses.metronome_url_,ses.midi_url_,ses.play_mode_,ses.render_from_,ses.ext_config_json_,ses.ext_style_config_json_
 		FROM sys_music_score ses
 		LEFT JOIN sys_music_score_accompaniment sesa ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
@@ -181,7 +182,7 @@
 	</select>
 	<select id="queryAccPage" resultMap="SysMusicScoreAccompaniment">
 		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_,sesc.parent_id_ parent_categories_id_,ses.client_type_,
-		ses.enable_evaluation_,ses.metronome_url_,ses.midi_url_,ses.play_mode_,ses.render_from_,ses.ext_config_json_
+		ses.enable_evaluation_,ses.metronome_url_,ses.midi_url_,ses.play_mode_,ses.render_from_,ses.ext_config_json_,ses.ext_style_config_json_
 		FROM sys_music_score ses
 		LEFT JOIN sys_music_score_accompaniment sesa ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_

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

@@ -38,6 +38,7 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
 		<result column="ext_config_json_" property="extConfigJson" />
+		<result column="ext_style_config_json_" property="extStyleConfigJson" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -50,10 +51,10 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicScore" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_music_score (music_score_categories_id_,name_,type_,speed_,url_,metronome_url_,midi_url_,create_user_id_,order_,
-		                             update_time_,create_time_,client_type_,rank_ids_,render_from_,enable_evaluation_,show_flag_,play_mode_,muse_score_url_,muse_score_memo_,ext_config_json_)
+		                             update_time_,create_time_,client_type_,rank_ids_,render_from_,enable_evaluation_,show_flag_,play_mode_,muse_score_url_,muse_score_memo_,ext_config_json_,ext_style_config_json_)
 		VALUES(#{musicScoreCategoriesId},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		       #{speed},#{url},#{metronomeUrl},#{midiUrl},#{createUserId},#{order},NOW(),NOW(),#{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		       #{rankIds},#{renderFrom},#{enableEvaluation},#{showFlag},#{playMode},#{museScoreUrl},#{museScoreMemo},#{extConfigJson})
+		       #{rankIds},#{renderFrom},#{enableEvaluation},#{showFlag},#{playMode},#{museScoreUrl},#{museScoreMemo},#{extConfigJson},#{extStyleConfigJson})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -67,6 +68,7 @@
 				client_type_ = #{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 			</if>
 				ext_config_json_ = #{extConfigJson},
+				ext_style_config_json_ = #{extStyleConfigJson},
 				rank_ids_ = #{rankIds},
 			<if test="renderFrom != null">
 				render_from_ = #{renderFrom},
@@ -194,6 +196,11 @@
 		where t.exam_song_id_ = #{param.examSongId} and t.del_flag_ = 0
 	</update>
 
+	<update id="updateExtStyleConfigJson">
+		update sys_music_score ms set ms.ext_style_config_json_ = #{extStyleConfigJson}
+		where ms.id_ = #{id}
+	</update>
+
 	<sql id="queryPageSql">
 		<where>
 			ses.del_flag_ = 0

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

@@ -1,23 +1,26 @@
 package com.ym.mec.web.controller;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.ym.mec.biz.dal.dto.MusicScoreDto;
 import com.ym.mec.biz.dal.entity.SysMusicScore;
 import com.ym.mec.biz.dal.entity.SysMusicScoreCategories;
 import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
-import com.ym.mec.biz.service.OrganizationService;
-import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
 import com.ym.mec.biz.service.SysMusicScoreService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.exception.BizException;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
 
 @RequestMapping("sysMusicScore")
 @Api(tags = "曲库")
@@ -35,6 +38,14 @@ public class SysMusicScoreController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "修改样式")
+    @PostMapping("/updateExtStyleConfigJson")
+    @PreAuthorize("@pcs.hasPermissions('sysMusicScore/updateExtStyleConfigJson')")
+    public Object updateExtStyleConfigJson(Integer sysMusicScoreId,String extStyleConfigJson) {
+        sysMusicScoreService.updateExtStyleConfigJson(sysMusicScoreId, extStyleConfigJson);
+        return succeed();
+    }
+
     @ApiOperation(value = "启用/停用")
     @PostMapping("/show")
     @PreAuthorize("@pcs.hasPermissions('sysMusicScore/show')")