Merge branch 'zx_saas_qrLogin' of http://git.dayaedu.com/yonge/mec into test

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

@@ -147,7 +147,7 @@ public class AudioCompareHandler implements MessageHandler {
 				
 				MusicXmlNote musicXmlNote = musicXmlBasicInfo.getMusicXmlInfos().stream().max(Comparator.comparing(MusicXmlNote::getTimeStamp)).get();
 				sysMusicCompareRecord.setSourceTime((float) ((musicXmlNote.getTimeStamp()+musicXmlNote.getDuration())/1000));
-				sysMusicCompareRecordService.insert(sysMusicCompareRecord, null);
+				sysMusicCompareRecordService.insert(sysMusicCompareRecord);
 				channelContext.setRecordId(sysMusicCompareRecord.getId());
 			}
 			break;

mec-application/src/main/java/com/ym/mec/student/controller/SysMusicCompareRecordController.java

@@ -37,7 +37,7 @@ public class SysMusicCompareRecordController extends BaseController {
 
     @ApiOperation(value = "添加记录")
     @PostMapping("add")
-    public HttpResponseResult add(SysMusicCompareRecord record,Integer campId){
+    public HttpResponseResult add(SysMusicCompareRecord record){
         if(Objects.isNull(record.getFeature())){
             return failed("请设置功能点");
         }
@@ -46,9 +46,9 @@ public class SysMusicCompareRecordController extends BaseController {
         record.setClientId("student");
         record.setCreateTime(new Date());
 
-        log.warn(" add record info; record:{},campId :{}",record,campId);
+        log.warn(" add record info; record:{}",record);
         
-        sysMusicCompareRecordService.insert(record,campId);
+        sysMusicCompareRecordService.insert(record);
         
         ModelMap model = new ModelMap();
         model.put("totalPlayTimeOfCurrentDate", sysMusicCompareRecordService.queryCurrentDatePlayTimeByUserId(userId));

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

@@ -16,5 +16,7 @@ public interface TempLittleArtistTrainingCampUserRelationDao extends BaseMapper<
 
     int insertBatch(@Param("entities") List<TempLittleArtistTrainingCampUserRelation> entities);
 
+    //获取指定状态的训练营
+    List<TempLittleArtistTrainingCampUserRelation> queryByUserId(@Param("userId") Integer userId,@Param("state") String state);
 }
 

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

@@ -78,6 +78,10 @@ public class CourseSchedule  extends BaseEntity{
 	@ApiModelProperty(value = "合并课标识,0未合并，1主课，2被合并课",required = false)
 	private Integer mergeFlag = 0;
 
+	@Getter
+	@ApiModelProperty(value = "课程合并时间",required = false)
+	private Date mergeTime;
+
 	private GroupType groupType;
 
 	/**  */
@@ -243,6 +247,10 @@ public class CourseSchedule  extends BaseEntity{
 	@ApiModelProperty("直播课分享模式，默认：NO_SHARE(未分享)，OPEN（公开）,PRIVATE(私密)")
 	private ShareModeEnum shareMode;
 
+	public void setMergeTime(Date mergeTime) {
+		this.mergeTime = mergeTime;
+	}
+
 	public void setMergeFlag(Integer mergeFlag) {
 		this.mergeFlag = mergeFlag;
 	}

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

@@ -1,20 +1,16 @@
 package com.ym.mec.biz.service;
 
-import java.util.List;
-import java.util.Map;
-
 import com.ym.mec.biz.dal.dao.SysMusicCompareRecordDao;
-import com.ym.mec.biz.dal.dto.CountStudentTrainDataDto;
-import com.ym.mec.biz.dal.dto.MusicCompareRankingDto;
-import com.ym.mec.biz.dal.dto.SoundCompareHelper;
-import com.ym.mec.biz.dal.dto.StatDto;
-import com.ym.mec.biz.dal.dto.TeacherCloudTrainingDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.SysMusicCompareRecord;
 import com.ym.mec.biz.dal.page.SysMusicCompareRecordQueryInfo;
 import com.ym.mec.biz.dal.page.TeacherCloudTrainingQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.List;
+import java.util.Map;
+
 public interface SysMusicCompareRecordService extends BaseService<Long, SysMusicCompareRecord> {
 
     SysMusicCompareRecordDao getDao();
@@ -103,14 +99,5 @@ public interface SysMusicCompareRecordService extends BaseService<Long, SysMusic
     
     PageInfo<TeacherCloudTrainingDto> queryTeacherTraining(TeacherCloudTrainingQueryInfo queryInfo);
 
-
-    /**
-     * 小小训练营 保存用户评测记录
-     *
-     * @param record 评测记录
-     * @param campId 训练营id
-     */
-    boolean insert(SysMusicCompareRecord record,Integer campId);
-
     Map<Long, SysMusicCompareRecord> getMapByIds(List<Long> musicPracticeRecordIds);
 }

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

@@ -5423,6 +5423,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			}
 			courseSchedule.setNote("课程合并");
 			courseSchedule.setMergeFlag(2);
+			courseSchedule.setMergeTime(now);
+			courseSchedule.setNewCourseId(courseMergeInfo.getId());
 		}
 		List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByCourseScheduleIds(allCourseIds);
 
@@ -5452,18 +5454,17 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		List<CourseSchedule> courseSchedules=new ArrayList<>();
 		courseMergeInfo.setNewCourseId(courseMergeInfo.getId());
 		courseMergeInfo.setMergeFlag(1);
+		courseMergeInfo.setMergeTime(now);
 		courseSchedules.add(courseMergeInfo);
 		List<CourseScheduleModifyLog> insertCourseScheduleModifyLogList = new ArrayList<>();
 
-		List<CourseSchedule> mergeCourses = allCourses.stream().filter(c->courseMergeInfo.getMergeCourseIds().contains(c.getId())&&!c.getId().equals(courseMergeInfo.getId())).collect(Collectors.toList());
+		List<CourseSchedule> mergeCourses = allCourses.stream()
+				.filter(c->courseMergeInfo.getMergeCourseIds().contains(c.getId())&&!c.getId().equals(courseMergeInfo.getId())).collect(Collectors.toList());
 		for (CourseSchedule courseSchedule : mergeCourses) {
 			CourseScheduleModifyLog courseScheduleModifyLog = new CourseScheduleModifyLog();
 			courseScheduleModifyLog.setCourseScheduleId(courseSchedule.getId());
 			courseScheduleModifyLog.setCreateTime(now);
 			courseScheduleModifyLog.setPreviousCourseSchedule(JsonUtil.toJSONString(courseSchedule));
-
-			//课程信息变更
-			courseSchedule.setNewCourseId(courseMergeInfo.getId());
 			courseScheduleModifyLog.setCurrentCourseSchedule(JsonUtil.toJSONString(courseSchedule));
 			courseScheduleModifyLog.setOperatorId(courseMergeInfo.getOperatorId());
 			insertCourseScheduleModifyLogList.add(courseScheduleModifyLog);

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

@@ -69,6 +69,8 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 
     @Autowired
     private UserMusicCompareCampDayDataDao userMusicCompareCampDayDataDao;
+    @Autowired
+    private TempLittleArtistTrainingCampUserRelationService tempLittleArtistTrainingCampUserRelationService;
 
     @Autowired
     private UserMusicService userMusicService;
@@ -79,11 +81,14 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public long insert(SysMusicCompareRecord bean) {
 		long insert = super.insert(bean);
 		if(Objects.nonNull(bean.getUserId())){
 			studentDao.addStudentCloudStudySequenceDays(bean.getUserId());
 			sysMusicCompareWeekDataService.updateUserWeekTrainData(bean.getUserId(), LocalDate.now().with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()));
+
+			updateCampData(bean);
 		}
 		return insert;
 	}
@@ -151,7 +156,7 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 		
 		sysMusicCompareRecordDao.update(sysMusicCompareRecord);
 		studentDao.addStudentCloudStudySequenceDays(userId);
-        updateCampData(sysMusicCompareRecord,campId);
+        updateCampData(sysMusicCompareRecord);
 		sysMusicCompareWeekDataService
 				.updateUserWeekTrainData(userId, LocalDate.now().with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()));
 	}
@@ -532,22 +537,6 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 		return pageInfo;
 	}
 
-    /**
-     * 小小训练营 保存用户评测记录
-     *
-     * @param record 评测记录
-     * @param campId 训练营id
-     */
-    @Override
-    @Transactional
-    public boolean insert(SysMusicCompareRecord record, Integer campId) {
-        this.insert(record);
-
-        updateCampData(record, campId);
-
-        return true;
-    }
-
     @Override
     public Map<Long, SysMusicCompareRecord> getMapByIds(List<Long> musicPracticeRecordIds) {
         if (CollectionUtils.isEmpty(musicPracticeRecordIds)) {
@@ -560,21 +549,26 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 
     }
 
-    private void updateCampData(SysMusicCompareRecord record, Integer campId) {
-
-        if (campId == null) {
-            return;
-        }
-        // 保存训练营评测记录
-        int i = userMusicCompareCampDayDataDao.updateCampDayData(record.getUserId(), campId, record.getPlayTime());
-        if (i == 0) {
-            UserMusicCompareCampDayData campDayData = new UserMusicCompareCampDayData();
-            campDayData.setCampId(campId);
-            campDayData.setUserId(record.getUserId());
-            campDayData.setDay(new Date());
-            campDayData.setTrainNum(1);
-            campDayData.setTrainTime(record.getPlayTime());
-            userMusicCompareCampDayDataDao.insert(campDayData);
-        }
+    private void updateCampData(SysMusicCompareRecord record) {
+		//获取所有进行中的训练营
+		List<TempLittleArtistTrainingCampUserRelation> userRelations = tempLittleArtistTrainingCampUserRelationService.getDao()
+				.queryByUserId(record.getUserId(),"ING");
+		if (CollectionUtils.isEmpty(userRelations)) {
+			return;
+		}
+		Date date = new Date();
+		for (TempLittleArtistTrainingCampUserRelation userRelation : userRelations) {
+			// 保存训练营评测记录
+			int i = userMusicCompareCampDayDataDao.updateCampDayData(record.getUserId(), userRelation.getActivityId(), record.getPlayTime());
+			if (i == 0) {
+				UserMusicCompareCampDayData campDayData = new UserMusicCompareCampDayData();
+				campDayData.setCampId(userRelation.getActivityId());
+				campDayData.setUserId(record.getUserId());
+				campDayData.setDay(date);
+				campDayData.setTrainNum(1);
+				campDayData.setTrainTime(record.getPlayTime());
+				userMusicCompareCampDayDataDao.insert(campDayData);
+			}
+		}
     }
 }

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

@@ -360,6 +360,9 @@
             <if test="mergeFlag != null">
                 merge_flag_ = #{mergeFlag},
             </if>
+            <if test="mergeTime != null">
+                merge_time_ = #{mergeTime},
+            </if>
         </set>
         WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
@@ -1402,6 +1405,9 @@
                 <if test="item.mergeFlag != null">
                     merge_flag_ = #{item.mergeFlag},
                 </if>
+                <if test="item.mergeTime != null">
+                    merge_time_ = #{item.mergeTime},
+                </if>
                 update_time_ = NOW()
             </set>
             WHERE id_ = #{item.id} and tenant_id_ = #{item.tenantId}
@@ -3320,7 +3326,7 @@
     </update>
 
     <update id="cleanCoursMergeId">
-        UPDATE course_schedule SET new_course_id_=NULL WHERE id_ IN
+        UPDATE course_schedule SET new_course_id_ = NULL,merge_time_ = NULL WHERE id_ IN
         <foreach collection="courseIds" item="courseId" separator="," open="(" close=")">
             #{courseId}
         </foreach>

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

@@ -24,5 +24,10 @@
             (#{entity.activityId}, #{entity.userId}, #{entity.imGroupId}, #{entity.state}, #{entity.createTime},#{entity.applyTime})
         </foreach>
     </insert>
+    <select id="queryByUserId" resultMap="BaseResultMap">
+        select ur.* from temp_little_artist_training_camp_user_relation ur
+                             left join temp_little_artist_training_camp tc ON tc.id_ = ur.activity_id_
+        where tc.state_ = #{state} AND ur.user_id_ = #{userId} AND ur.state_ = 'APPLY'
+    </select>
 
 </mapper>