Merge branch 'online1'

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

@@ -24,6 +24,8 @@ public class MusicXmlBasicInfo {
 	private String behaviorId;
 
 	private String platform;
+	
+	private String partIndex;
 
 	private int speed;
 
@@ -101,6 +103,14 @@ public class MusicXmlBasicInfo {
 		this.platform = platform;
 	}
 
+	public void setPartIndex(String partIndex) {
+		this.partIndex = partIndex;
+	}
+
+	public String getPartIndex() {
+		return partIndex;
+	}
+
 	public int getSpeed() {
 		return speed;
 	}

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

@@ -147,6 +147,7 @@ public class AudioCompareHandler implements MessageHandler {
 				sysMusicCompareRecord.setClientId(musicXmlBasicInfo.getClientId());
 				sysMusicCompareRecord.setDeviceType(DeviceTypeEnum.valueOf(musicXmlBasicInfo.getPlatform()));
 				sysMusicCompareRecord.setSpeed(musicXmlBasicInfo.getSpeed());
+				sysMusicCompareRecord.setPartIndex(musicXmlBasicInfo.getPartIndex());
 				
 				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/entity/SysMusicCompareRecord.java

@@ -4,6 +4,7 @@ import com.ym.mec.biz.dal.enums.DeviceTypeEnum;
 import com.ym.mec.biz.dal.enums.FeatureType;
 import com.ym.mec.biz.dal.enums.HeardLevelEnum;
 import com.ym.mec.util.date.DateUtil;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
@@ -70,6 +71,8 @@ public class SysMusicCompareRecord {
 	private int speed = 90;
 
 	private String clientId;
+	
+	private String partIndex;
 
 	public SysMusicCompareRecord() {
 	}
@@ -254,6 +257,14 @@ public class SysMusicCompareRecord {
 		return this.createTime;
 	}
 			
+	public String getPartIndex() {
+		return partIndex;
+	}
+
+	public void setPartIndex(String partIndex) {
+		this.partIndex = partIndex;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -166,6 +166,7 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 		jsonObject.put("integrity", userLastEvaluationData.getIntegrity());
 		jsonObject.put("heardLevel", userLastEvaluationData.getHeardLevel());
 		jsonObject.put("videoFilePath", userLastEvaluationData.getVideoFilePath());
+		jsonObject.put("partIndex", userLastEvaluationData.getPartIndex());
 
 		SysMusicScore sysMusicScore = sysMusicScoreDao.get(userLastEvaluationData.getSysMusicScoreId());
 		if(Objects.nonNull(sysMusicScore)){

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

@@ -29,6 +29,7 @@
 		<result column="feature_" property="feature" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
 		<result column="monday_" property="monday"/>
 		<result column="create_time_" property="createTime" />
+		<result column="part_index_" property="partIndex" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -45,11 +46,11 @@
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicCompareRecord" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_music_compare_record (id_,user_id_,sys_music_score_id_,heard_level_,behavior_id_,score_data_,score_,intonation_,cadence_,integrity_,
 		                                      record_file_path_,video_file_path_,device_type_,client_id_,play_time_,speed_,monday_,
-												source_time_,feature_,create_time_,update_time_)
+												source_time_,feature_,create_time_,update_time_,part_index_)
 		VALUES(#{id},#{userId},#{sysMusicScoreId},#{heardLevel,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{behaviorId},#{scoreData},
 		       #{score},#{intonation},#{cadence},#{integrity},
 		       #{recordFilePath},#{videoFilePath},#{deviceType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{clientId},#{playTime},#{speed},#{monday},
-		       #{sourceTime},#{feature,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, NOW(), NOW())
+		       #{sourceTime},#{feature,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, NOW(), NOW(),#{partIndex})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -103,6 +104,9 @@
 		<if test="monday != null">
 			monday_ = #{monday},
 		</if>
+		<if test="partIndex != null">
+			part_index_ = #{partIndex},
+		</if>
 		<if test="feature!=null">
 			feature_ = #{feature,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		</if>