feat:智能陪练一期

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

@@ -5,10 +5,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.StudentDao;
 import com.ym.mec.biz.dal.dao.SysMusicCompareRecordDao;
+import com.ym.mec.biz.dal.dao.SysMusicScoreDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.IndexBaseMonthData;
 import com.ym.mec.biz.dal.entity.SysMusicCompareRecord;
+import com.ym.mec.biz.dal.entity.SysMusicScore;
 import com.ym.mec.biz.dal.enums.FeatureType;
 import com.ym.mec.biz.dal.enums.IndexDataType;
 import com.ym.mec.biz.dal.page.SysMusicCompareRecordQueryInfo;
@@ -36,6 +38,8 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 	@Autowired
 	private SysMusicCompareRecordDao sysMusicCompareRecordDao;
 	@Autowired
+	private SysMusicScoreDao sysMusicScoreDao;
+	@Autowired
 	private TeacherDao teacherDao;
 	@Autowired
 	private StudentDao studentDao;
@@ -95,11 +99,22 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 		if(StringUtils.isBlank(userLastEvaluationData.getScoreData())){
 			return null;
 		}
+		HashMap<String, Object> result = new HashMap<>();
+		result.put("score", userLastEvaluationData.getScore());
+		result.put("cadence", userLastEvaluationData.getCadence());
+		result.put("intonation", userLastEvaluationData.getIntonation());
+		result.put("integrity", userLastEvaluationData.getIntegrity());
+
+		SysMusicScore sysMusicScore = sysMusicScoreDao.get(userLastEvaluationData.getSysMusicScoreId());
+		if(Objects.nonNull(sysMusicScore)){
+			result.put("sysMusicScoreName", sysMusicScore.getName());
+		}
+
 		JSONObject jsonObject = JSON.parseObject(userLastEvaluationData.getScoreData());
-		if(!jsonObject.containsKey("musicalNotesPlayStats")){
-			return null;
+		if(jsonObject.containsKey("musicalNotesPlayStats")){
+			result.put("musicalNotesPlayStats", jsonObject.get("musicalNotesPlayStats"));
 		}
-		return jsonObject.get("musicalNotesPlayStats");
+		return result;
 	}
 
 	@Override

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

@@ -379,6 +379,6 @@
 	</select>
 
     <select id="getUserLastEvaluationData" resultMap="SysMusicCompareRecord">
-		SELECT * FROM sys_music_compare_record WHERE user_id_=#{userId} ORDER BY create_time_ DESC LIMIT 1
+		SELECT * FROM sys_music_compare_record WHERE user_id_=#{userId} AND feature_ = 'CLOUD_STUDY_EVALUATION' ORDER BY create_time_ DESC LIMIT 1
 	</select>
 </mapper>

mec-websocket/src/main/java/com/ym/mec/web/config/ResourceServerConfig.java

@@ -33,11 +33,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                 .authorizeRequests()
                 .antMatchers("/task/**")
                 .hasIpAddress("0.0.0.0/0")
-                .antMatchers("/v2/api-docs", "/classGroup/highClassGroups", "/code/*", "/api/*", "/appVersionInfo/queryByPlatform", "/eduDegree/*",
-                        "/uploadFile", "/eduContracts/queryProduceContract", "/activity/doubleEleven2020Statis", "/replacementInstrument/queryPage",
-                        "/replacementInstrumentActivity/queryReplacementsStat", "/eduStudentRegistration/queryPreApplyList",
-                        "/eduSubject/findSubSubjects", "/eduFinancialExpenditure/batchAdd", "/eduSendNotice/*",
-                        "/oaContracts/*", "/eduStudent/organStudentOverView").permitAll().anyRequest().authenticated().and().httpBasic();
+                .antMatchers("/v2/api-docs").permitAll().anyRequest().authenticated().and().httpBasic();
     }
 
     @Override