Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_2023_03

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

@@ -14,6 +14,8 @@ public class MusicXmlBasicInfo {
 	private Integer tenantId;
 
 	private Integer subjectId;
+
+    private Integer campId;
 	
 	private String clientId;
 
@@ -41,7 +43,16 @@ public class MusicXmlBasicInfo {
 
 	private Map<Integer, MusicXmlSection> musicXmlSectionMap = new HashMap<Integer, MusicXmlSection>();
 
-	public Integer getId() {
+
+    public Integer getCampId() {
+        return campId;
+    }
+
+    public void setCampId(Integer campId) {
+        this.campId = campId;
+    }
+
+    public Integer getId() {
 		return id;
 	}
 

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

@@ -159,7 +159,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);
+				sysMusicCompareRecordService.insert(sysMusicCompareRecord,musicXmlBasicInfo.getCampId());
 				channelContext.setRecordId(sysMusicCompareRecord.getId());
 			}
 			break;

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

@@ -362,4 +362,7 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
     List<TempCampUserTrainingSequenceVo> getStudentCloudStudySequenceDays(@Param("studentIds") List<Integer> studentIds,
                                                                           @Param("startTime") String startTime,
                                                                           @Param("endTime") String endTime);
+
+
+    List<TempCampUserTrainingSequenceVo> getStudentCloudStudySequenceDaysV2(@Param("studentIds") List<Integer> studentIds,@Param("campId") String campId);
 }

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

@@ -25,6 +25,8 @@ public interface TempLittleArtistTrainingCampDao extends BaseMapper<TempLittleAr
 
     <T> List<T> queryUserTrainingTime(@Param("param") Map<String, Object> param);
 
+    <T> List<T> queryUserTrainingTimeV2(@Param("param") Map<String, Object> param);
+
     List<Integer> queryAllUserId();
 
     <T> IPage<T> queryCampUser(Page<T> page, @Param("param") Map<String, Object> param);
@@ -35,6 +37,8 @@ public interface TempLittleArtistTrainingCampDao extends BaseMapper<TempLittleAr
      */
     <T> IPage<T> queryUserTrainingDetail(Page<T> page, @Param("param") Map<String, Object> param);
 
+    <T> IPage<T> queryUserTrainingDetailV2(Page<T> page, @Param("param") Map<String, Object> param);
+
     List<ImGroup> queryCampImGroup(String imGroupIds);
 
     Integer queryUserTrainingPlayTime(@Param("param") Map<String, Object> param);

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

@@ -0,0 +1,17 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ym.mec.biz.dal.entity.UserMusicCompareCampDayData;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2023-03-23
+ */
+@Repository
+public interface UserMusicCompareCampDayDataDao extends BaseMapper<UserMusicCompareCampDayData> {
+    int updateCampDayData(@Param("userId") Integer userId, @Param("campId") Integer campId, @Param("playTime") float playTime);
+}

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

@@ -0,0 +1,90 @@
+package com.ym.mec.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2023-03-23
+ */
+@TableName("user_music_compare_camp_day_data")
+@ApiModel(value = "UserMusicCompareCampDayData对象", description = "")
+public class UserMusicCompareCampDayData implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @ApiModelProperty("用户编号 ")
+    @TableField(value = "user_id_")
+    private Integer userId;
+    @ApiModelProperty("训练营id ")
+    @TableField(value = "camp_id_")
+    private Integer campId;
+    @ApiModelProperty("日期 ")
+    @TableField(value = "day_")
+    private Date day;
+    @ApiModelProperty("训练次数 ")
+    @TableField(value = "train_num_")
+    private Integer trainNum;
+    @ApiModelProperty("训练时长 ")
+    @TableField(value = "train_time_")
+    private Float trainTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public Integer getCampId() {
+        return campId;
+    }
+
+    public void setCampId(Integer campId) {
+        this.campId = campId;
+    }
+
+    public Date getDay() {
+        return day;
+    }
+
+    public void setDay(Date day) {
+        this.day = day;
+    }
+
+    public Integer getTrainNum() {
+        return trainNum;
+    }
+
+    public void setTrainNum(Integer trainNum) {
+        this.trainNum = trainNum;
+    }
+
+    public Float getTrainTime() {
+        return trainTime;
+    }
+
+    public void setTrainTime(Float trainTime) {
+        this.trainTime = trainTime;
+    }
+
+
+}

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

@@ -101,4 +101,13 @@ public interface SysMusicCompareRecordService extends BaseService<Long, SysMusic
     void initSysMusicCompareDayData();
     
     PageInfo<TeacherCloudTrainingDto> queryTeacherTraining(TeacherCloudTrainingQueryInfo queryInfo);
+
+
+    /**
+     * 小小训练营 保存用户评测记录
+     *
+     * @param record 评测记录
+     * @param campId 训练营id
+     */
+    boolean insert(SysMusicCompareRecord record,Integer campId);
 }

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

@@ -0,0 +1,14 @@
+package com.ym.mec.biz.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ym.mec.biz.dal.entity.UserMusicCompareCampDayData;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2023-03-23
+ */
+public interface UserMusicCompareCampDayDataService extends IService<UserMusicCompareCampDayData> {
+}

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

@@ -9,6 +9,7 @@ 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.entity.UserMusicCompareCampDayData;
 import com.ym.mec.biz.dal.enums.FeatureType;
 import com.ym.mec.biz.dal.enums.HeardLevelEnum;
 import com.ym.mec.biz.dal.enums.IndexDataType;
@@ -68,6 +69,9 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 	@Autowired
 	private StudentTeacherMapperDao studentTeacherMapperDao;
 
+    @Autowired
+    private UserMusicCompareCampDayDataDao userMusicCompareCampDayDataDao;
+
 	@Override
 	public BaseDAO<Long, SysMusicCompareRecord> getDAO() {
 		return sysMusicCompareRecordDao;
@@ -499,4 +503,32 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 		pageInfo.setRows(dataList);
 		return pageInfo;
 	}
+
+    /**
+     * 小小训练营 保存用户评测记录
+     *
+     * @param record 评测记录
+     * @param campId 训练营id
+     */
+    @Override
+    public boolean insert(SysMusicCompareRecord record, Integer campId) {
+        this.insert(record);
+
+        if (campId == null) {
+            return true;
+        }
+        // 保存训练营评测记录
+        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);
+        }
+
+        return true;
+    }
 }

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

@@ -249,7 +249,8 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
         //查询每日训练时长
         param.put("startTime", startDateStr + " 00:00:00");
         param.put("endTime", endDateStr + " 23:59:59");
-        List<TempUserTrainingTimeDetailVo> userTrainingTimeList = baseMapper.queryUserTrainingTime(param);
+        param.put("campId", camp.getId());
+        List<TempUserTrainingTimeDetailVo> userTrainingTimeList = baseMapper.queryUserTrainingTimeV2(param);
         //拼接数据
         if (CollectionUtils.isNotEmpty(userTrainingTimeList)) {
             Map<String, BigDecimal> nowTrainingTime = userTrainingTimeList.stream()
@@ -283,15 +284,14 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
         //训练营详情-查询条件时间设置
         queryUserTrainingDetailOpsParam(param);
         Page<TempCampUserTrainingDetailVo> page = PageUtil.getPageInfo(param);
-        page.setDesc("b.playDay");
-        IPage<TempCampUserTrainingDetailVo> vos = baseMapper.queryUserTrainingDetail(page, param);
+        page.setDesc("t.playDay");
+        IPage<TempCampUserTrainingDetailVo> vos = baseMapper.queryUserTrainingDetailV2(page, param);
         List<TempCampUserTrainingDetailVo> records = vos.getRecords();
         if(CollectionUtils.isNotEmpty(records)){
             List<Integer> studentIds = records.stream().map(e -> e.getId()).collect(Collectors.toList());
             Map<Integer,String> subjectMap = MapUtil.convertIntegerMap(studentDao.getStudentSubjectMapList(studentIds));
             Map<Integer,String> groupNameMap = MapUtil.convertMybatisMap(musicGroupDao.queryNormalGroupName(studentIds));
-            List<TempCampUserTrainingSequenceVo> sequenceDays = studentDao.getStudentCloudStudySequenceDays(studentIds,
-                    param.get("startTime").toString(),param.get("endTime").toString());
+            List<TempCampUserTrainingSequenceVo> sequenceDays = studentDao.getStudentCloudStudySequenceDaysV2(studentIds, param.get("campId").toString());
             Map<Integer, List<Long>> listMap = sequenceDays.stream().collect(Collectors.groupingBy(e -> e.getUserId(),
                     Collectors.collectingAndThen(Collectors.toList(),v->v.stream().map(e->e.getDayNum()).collect(Collectors.toList()))));
             Integer standardDays = Integer.parseInt(param.get("standardDays").toString());
@@ -630,8 +630,8 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
         OutputStream outputStream = response.getOutputStream();
         HSSFWorkbook workbook = null;
         try {
-            String[] header = {"学员编号", "学员姓名",  "学员声部",  "乐团", "手机号", "群组", "打卡天数", "训练时长（分钟）", "打卡状态"};
-            String[] body = {"id", "username",  "subjectName",  "musicGroupName", "phone", "imGroupName", "playDay", "playTime", "standardFlag?'达标':'未达标'"};
+            String[] header = {"学员编号", "学员姓名",  "学员声部",  "乐团", "手机号", "群组", "打卡天数","最高连续打卡", "训练时长（分钟）", "打卡状态"};
+            String[] body = {"id", "username",  "subjectName",  "musicGroupName", "phone", "imGroupName", "playDay","cloudStudySequenceDays", "playTime", "standardFlag?'达标':'未达标'"};
             workbook = POIUtil.exportExcel(header, body, list);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=replacement-" + DateUtil.getDate(new Date()) + ".xls");

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

@@ -0,0 +1,19 @@
+package com.ym.mec.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ym.mec.biz.dal.dao.UserMusicCompareCampDayDataDao;
+import com.ym.mec.biz.dal.entity.UserMusicCompareCampDayData;
+import com.ym.mec.biz.service.UserMusicCompareCampDayDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2023-03-23
+ */
+@Service
+public class UserMusicCompareCampDayDataServiceImpl extends ServiceImpl<UserMusicCompareCampDayDataDao, UserMusicCompareCampDayData>
+     implements UserMusicCompareCampDayDataService {
+
+}

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

@@ -1273,6 +1273,18 @@
         </foreach>
         group by user_id_,DATE_FORMAT(create_time_,'%Y-%m-%d')
     </select>
+
+    <select id="getStudentCloudStudySequenceDaysV2" resultType="com.ym.mec.biz.dal.vo.TempCampUserTrainingSequenceVo">
+        select ucamp.user_id_ userId,TO_DAYS(DATE_FORMAT(ucamp.day_,'%Y-%m-%d')) dayNum
+        from user_music_compare_camp_day_data ucamp
+        left join temp_little_artist_training_camp camp on camp.id_ = ucamp.camp_id_
+        where ucamp.camp_id_ = #{campId}
+        and ucamp.user_id_ IN
+        <foreach collection="studentIds" open="(" close=")" item="userId" separator=",">
+            #{userId}
+        </foreach>
+        and ucamp.train_time_ &gt;= camp.sign_standard_ * 60
+    </select>
     <sql id="queryStudentBasicInfoSql">
         <where>
             AND su.lock_flag_ = 0 AND su.del_flag_ = 0

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

@@ -76,6 +76,35 @@
         GROUP BY a.user_id_, a.create_time_
     </select>
 
+    <select id="queryUserTrainingTimeV2" resultType="com.ym.mec.biz.dal.vo.TempUserTrainingTimeDetailVo" parameterType="java.util.Map">
+        SELECT
+        user_id_ as userId,
+        ifnull(train_time_, 0) AS playTime,
+        date_format(day_, '%Y-%m-%d') AS trainingDate
+        FROM user_music_compare_camp_day_data
+        <where>
+            <if test="param.startTime != null">
+                AND day_ &gt;= #{param.startTime}
+            </if>
+            <if test="param.campId != null">
+                AND camp_id_ = #{param.campId}
+            </if>
+            <if test="param.endTime != null">
+                AND day_ &lt;= #{param.endTime}
+            </if>
+            <if test="param.userId != null">
+                AND user_id_ = #{param.userId}
+            </if>
+            <if test="param.userIdList !=null and param.userIdList.size()>0">
+                AND user_id_ IN
+                <foreach collection="param.userIdList" item="userId" open="(" close=")" separator=",">
+                    #{userId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+
     <select id="queryAllUserId" resultType="java.lang.Integer">
         SELECT
         distinct user_id_
@@ -159,6 +188,47 @@
         </where>
     </select>
 
+
+    <select id="queryUserTrainingDetailV2" parameterType="java.util.Map" resultType="com.ym.mec.biz.dal.vo.TempCampUserTrainingDetailVo">
+        select * from (SELECT
+        a.user_id_ AS id,
+        d.username_ AS username,
+        d.phone_ AS phone,
+        e.name_ AS imGroupName,
+        sum( if(ifnull(c.train_time_,0) &gt;= b.sign_standard_ * 60,1,0)) AS playDay,
+        sum(ifnull(c.train_time_,0)) AS playTime
+        FROM
+        `temp_little_artist_training_camp_user_relation` `a`
+        left join temp_little_artist_training_camp b on b.id_ = a.activity_id_
+        left join user_music_compare_camp_day_data c on c.camp_id_ = a.activity_id_ and a.user_id_ = c.user_id_
+
+        LEFT JOIN `sys_user` `d` ON `d`.`id_` = `a`.`user_id_`
+        LEFT JOIN `im_group` `e` ON `a`.`im_group_id_` = `e`.`id_`
+        <where>
+            a.activity_id_ = #{param.campId} and a.state_ = #{param.state}
+            <if test="param.imGroupId != null">
+                AND e.id_ = #{param.imGroupId}
+            </if>
+            <if test="param.search != null">
+                AND (
+                d.`id_` LIKE CONCAT('%', #{param.search},'%')
+                OR d.`username_` LIKE CONCAT('%', #{param.search},'%')
+                OR d.`phone_` LIKE CONCAT('%', #{param.search},'%')
+                )
+            </if>
+        </where>
+        group by a.user_id_
+        )  t
+        <where>
+            <if test="param.standardFlag != null and param.standardFlag == true">
+                AND ifnull( t.playDay, 0 ) >= #{param.standardDays}
+            </if>
+            <if test="param.standardFlag != null and param.standardFlag == false">
+                AND ifnull( t.playDay, 0 ) &lt; #{param.standardDays}
+            </if>
+        </where>
+    </select>
+
     <select id="queryCampImGroup" resultType="com.ym.mec.biz.dal.entity.ImGroup">
         select id_ as id,
                name_ as name

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ym.mec.biz.dal.dao.UserMusicCompareCampDayDataDao">
+
+<update id="updateCampDayData">
+    UPDATE user_music_compare_camp_day_data a
+        set a.train_num_ = a.train_num_ + 1,
+        a.train_time_ = a.train_time_ + #{playTime}
+        where a.user_id_ = #{userId}
+        and a.camp_id_ = #{campId}
+        and a.day_ = date_format(now(), '%Y-%m-%d')
+    </update>
+</mapper>

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

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

mec-web/pom.xml

@@ -71,6 +71,10 @@
 			<artifactId>dynamic-datasource</artifactId>
 		</dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
 	</dependencies>
 	<build>
 		<plugins>

mec-web/src/main/resources/bootstrap-local.properties

@@ -1,9 +1,9 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.114.176.40:8848
+spring.cloud.nacos.config.server-addr=43.137.4.92:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=6488ff54-d97a-43ea-8c7b-d1d25bb54622
+spring.cloud.nacos.config.namespace=fcc00e52-a464-4ab8-96aa-3469b3f66062
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}