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

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

@@ -33,7 +33,7 @@ public class MusicXmlBasicInfo {
 	
 	private String partIndex;
 
-	private int speed;
+	private String speed;
 
 	private String heardLevel;
 
@@ -142,11 +142,11 @@ public class MusicXmlBasicInfo {
 		return partIndex;
 	}
 
-	public int getSpeed() {
+	public String getSpeed() {
 		return speed;
 	}
 
-	public void setSpeed(int speed) {
+	public void setSpeed(String speed) {
 		this.speed = speed;
 	}
 

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

@@ -1,14 +1,17 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.biz.dal.entity.Student;
 import com.ym.mec.biz.dal.enums.ClientEnum;
 import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.dal.wrapper.MusicSheetWrapper;
+import com.ym.mec.biz.service.StudentService;
 import com.ym.mec.biz.service.SysMusicScoreService;
 import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,6 +29,8 @@ public class SysMusicScoreController extends BaseController {
 
     @Resource
     private SysUserService sysUserService;
+    @Resource
+    private StudentService studentService;
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage2")
     public Object queryPage2(SysExamSongQueryInfo queryInfo) {
@@ -35,6 +40,41 @@ public class SysMusicScoreController extends BaseController {
         queryInfo.setType("COMMON");
         queryInfo.setClientFlag(true);
         queryInfo.setClientType(ClientTypeEnum.SMART_PRACTICE);
+        if(queryInfo.getSubjectId() == null && !StringUtils.equals(queryInfo.getCategoriesId(),"43")){
+            Student student = studentService.get(userId);
+            StringBuffer subjectIds = new StringBuffer();
+            if(StringUtils.isNotEmpty(student.getSubjectIdList())){
+                String[] split = student.getSubjectIdList().split(",");
+                for (String s : split) {
+                    if(subjectIds.length() > 0){
+                        subjectIds.append(",");
+                    }
+                    if (s.equals("5")){
+                        subjectIds.append("6");
+                    }else if(s.equals("122")){
+                        subjectIds.append("122,121,113,23");
+                    }else {
+                        subjectIds.append(s);
+                    }
+                }
+            }
+            if(StringUtils.isNotEmpty(student.getExtSubjectIds())){
+                String[] split = student.getExtSubjectIds().split(",");
+                for (String s : split) {
+                    if(subjectIds.length() > 0){
+                        subjectIds.append(",");
+                    }
+                    if (s.equals("5")){
+                        subjectIds.append("6");
+                    }else if(s.equals("122")){
+                        subjectIds.append("122,121,113,23");
+                    }else {
+                        subjectIds.append(s);
+                    }
+                }
+            }
+            queryInfo.setSubjectIds(subjectIds.toString());
+        }
         return succeed(sysMusicScoreService.queryMusicScorePageInfo(queryInfo));
     }
 

mec-application/src/main/resources/exportColumnMapper.ini

@@ -355,8 +355,8 @@ headColumns = ["分部","课程编号","课程收入"]
 fieldColumns = ["organName","courseId","amount"]
 
 [云教练激活明细]
-headColumns = ["分部","学员编号","学员姓名","激活时间","激活月份","金额"]
-fieldColumns = ["organName","studentId","studentName","createTime","time","amount"]
+headColumns = ["分部","学员编号","学员姓名","激活时间","激活月份","金额","激活版本"]
+fieldColumns = ["organName","studentId","studentName","createTime","time","amount","memberRankName"]
 
 [乐团梯队数据导出]
 headColumns = ["乐团","长笛","单簧管","萨克斯","小号","圆号","长号","上低音号","大号","小军鼓","合计"]

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CloudCoachActivationDetailsDto.java

@@ -17,4 +17,6 @@ public class CloudCoachActivationDetailsDto {
     private String time;
 
     private BigDecimal amount;
+
+    private String memberRankName;
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/SoundCompareHelper.java

@@ -54,7 +54,7 @@ public class SoundCompareHelper implements PitchDetectionHandler {
     private String recordFilePath;
 
     @ApiModelProperty(value = "播放速度")
-    private int speed = 90;
+    private String speed = "90";
 
     @ApiModelProperty(value = "小节xml信息字典")
     private Map<Integer, List<MusicPitchDetailDto>> measureXmlInfoMap = new HashMap<>();
@@ -118,11 +118,11 @@ public class SoundCompareHelper implements PitchDetectionHandler {
         this.recordId = recordId;
     }
 
-    public int getSpeed() {
+    public String getSpeed() {
         return speed;
     }
 
-    public void setSpeed(int speed) {
+    public void setSpeed(String speed) {
         this.speed = speed;
     }
 

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

@@ -76,7 +76,7 @@ public class SysMusicCompareRecord extends BaseEntity {
 
 	private float playTime = 0;
 
-	private int speed = 90;
+	private String speed = "90";
 
 	private String clientId;
 	

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/MusicPracticeRecordWrapper.java

@@ -508,7 +508,7 @@ public class MusicPracticeRecordWrapper {
                 .sourceTime(record.getSourceTime())
                 .playTime(record.getPlayTime())
                 .playRate(record.getPlayRate())
-                .speed(String.valueOf(OptionalInt.of(record.getSpeed()).orElse(0)))
+                .speed(record.getSpeed())
                 .monday(record.getMonday())
                 .feature(record.getFeature()!=null?record.getFeature().toCbs():null)
                 .heardLevel(record.getHeardLevel() !=null?record.getHeardLevel().getCode():null)
@@ -543,7 +543,7 @@ public class MusicPracticeRecordWrapper {
             sysMusicCompareRecord.setDeviceType(DeviceTypeEnum.valueOf(this.deviceType));
             sysMusicCompareRecord.setSourceTime(this.sourceTime);
             sysMusicCompareRecord.setPlayTime(this.playTime);
-            sysMusicCompareRecord.setSpeed(this.speed!=null?Integer.parseInt(this.speed):90);
+            sysMusicCompareRecord.setSpeed(this.speed);
             sysMusicCompareRecord.setMonday(this.monday);
             sysMusicCompareRecord.setFeature(this.feature!=null? FeatureType.format(this.feature):null);
             sysMusicCompareRecord.setHeardLevel(this.heardLevel!=null? HeardLevelEnum.valueOf(this.heardLevel):null);

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

@@ -118,7 +118,7 @@ public class SoundCompareHandler implements WebSocketEventHandler {
                     userSoundInfoMap.get(phone).setHeardLevel(HeardLevelEnum.valueOf(bodyObject.getString("heardLevel")));
                 }
                 if(bodyObject.containsKey("speed")){
-                    userSoundInfoMap.get(phone).setSpeed(bodyObject.getIntValue("speed"));
+                    userSoundInfoMap.get(phone).setSpeed(bodyObject.getString("speed"));
                 }
                 if(bodyObject.containsKey("subjectId")){
                     userSoundInfoMap.get(phone).setSubjectId(bodyObject.getIntValue("subjectId"));

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

@@ -300,9 +300,16 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
     @Override
     public PageInfo<SysMusicScore> queryMusicScorePage(SysExamSongQueryInfo queryInfo) {
         //封装查询参数
-//        queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         if(queryInfo.getSubjectId() != null){
-            queryInfo.setSubjectIds(queryInfo.getSubjectId().toString());
+            if(queryInfo.getSubjectId() == 5){
+                queryInfo.setSubjectId(null);
+                queryInfo.setSubjectIds("6");
+            }else if(queryInfo.getSubjectId() == 122){
+                queryInfo.setSubjectId(null);
+                queryInfo.setSubjectIds("122,121,113,23");
+            }else {
+                queryInfo.setSubjectIds(queryInfo.getSubjectId().toString());
+            }
         }
         this.initCategoryIds(queryInfo);
 

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

@@ -591,8 +591,9 @@
         WHEN cto.type_ = 'YEAR' THEN CONCAT(cto.time_ * 12,'月')
         WHEN cto.type_ = 'YEAR_HALF' THEN CONCAT(cto.time_ * 6,'月')
         WHEN cto.type_ = 'QUARTERLY' THEN CONCAT(cto.time_ * 3,'月')
-        ELSE CONCAT(cto.time_,'天') END AS time
+        ELSE CONCAT(cto.time_,'天') END AS time,mrs.name_ memberRankName
         from cloud_teacher_order cto
+        left join member_rank_setting mrs ON mrs.id_ = cto.level_
         left join organization o ON o.id_ = cto.organ_id_
         left join sys_user su ON su.id_ = cto.student_id_
         where cto.status_ = 2

pom.xml

@@ -26,7 +26,7 @@
 		<docker.registry.repository>127.0.0.1:5000</docker.registry.repository>
 		<docker.maven.plugin.version>1.2.2</docker.maven.plugin.version>
 		<com.microsvc.toolkit.version>1.0.8-RC1</com.microsvc.toolkit.version>
-		<cbs.version>1.0.22</cbs.version>
+		<cbs.version>1.0.23</cbs.version>
 	</properties>
 
 	<dependencyManagement>