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

audio-analysis/src/main/java/com/yonge/netty/dto/UserChannelContext.java

@@ -340,7 +340,8 @@ public class UserChannelContext {
 		if(StringUtils.equalsIgnoreCase(evaluationCriteria, EvaluationCriteriaEnum.AMPLITUDE.getCode())) {
 			amplitude = (int) Signals.norm(samples);
 		}else if(StringUtils.equalsIgnoreCase(evaluationCriteria, EvaluationCriteriaEnum.DECIBELS.getCode())){
-			amplitude = (int) Signals.decibels(samples) >= 38 ? 10 : 1;
+			amplitude = (int) Signals.decibels(samples);
+			amplitude = amplitude >= 50 ? amplitude : 0;
 		}
 		//float rms = Signals.rms(samples);
 		
@@ -885,7 +886,7 @@ public class UserChannelContext {
 
 		if (musicXmlNote.getFrequency() == -1) {// 休止符
 			
-			LOGGER.debug("--Amplitude:{}  Denominator:{}",chunkList.stream().map(t -> t).collect(Collectors.toList()), musicXmlNote.getDenominator());
+			LOGGER.debug("--Amplitude:{}  Denominator:{}",chunkList.stream().map(t -> t.getAmplitude()).collect(Collectors.toList()), musicXmlNote.getDenominator());
 			return chunkList.stream().filter(t -> t.getAmplitude() > hardLevel.getAmplitudeThreshold()).count() <= 0;
 		}
 		

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

@@ -134,6 +134,9 @@ public class Teacher extends SysUser {
 	@ApiModelProperty(value = "岗位管理部门",required = false)
 	private String postDeptIds;
 
+	@ApiModelProperty(value = "云教练限制")
+	private Boolean coursewareLimit;
+
 	public Boolean getIsSettlementSalary() {
 		return isSettlementSalary;
 	}
@@ -422,6 +425,14 @@ public class Teacher extends SysUser {
 		this.postDeptIds = postDeptIds;
 	}
 
+	public Boolean getCoursewareLimit() {
+		return coursewareLimit;
+	}
+
+	public void setCoursewareLimit(Boolean coursewareLimit) {
+		this.coursewareLimit = coursewareLimit;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -61,6 +61,7 @@
         <result column="is_settlement_salary_" property="isSettlementSalary"/>
         <result column="contract_url_" property="contractUrl"/>
         <result column="tenant_id_" property="tenantId"/>
+        <result column="courseware_limit_" property="coursewareLimit"/>
     </resultMap>
     
     <resultMap type="com.ym.mec.biz.dal.dto.TeacherDefaultSalaryDto" id="TeacherDefaultSalaryDto">
@@ -124,7 +125,7 @@
         su.real_name_,su.id_card_no_,su.password_,su.salt_,su.phone_,su.avatar_,
         su.lock_flag_,su.del_flag_,su.wx_openid_,su.qq_openid_,su.user_type_,
         su.gender_,su.nation_,su.birthdate_,su.email_,su.im_token_,su.username_,su.organ_id_,
-        t.is_settlement_salary_,su.tenant_id_
+        t.is_settlement_salary_,su.tenant_id_, t.courseware_limit_
         FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
         WHERE t.id_ = #{id} AND su.del_flag_ = 0
@@ -237,6 +238,9 @@
             <if test="postDeptIds != null">
                 post_dept_ids_ = #{postDeptIds},
             </if>
+            <if test="coursewareLimit != null">
+                courseware_limit_ = #{coursewareLimit},
+            </if>
         </set>
         WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
@@ -323,6 +327,9 @@
             <if test="postDeptIds != null">
                 post_dept_ids_ = #{postDeptIds},
             </if>
+            <if test="coursewareLimit != null">
+                courseware_limit_ = #{coursewareLimit},
+            </if>
         </set>
         WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>

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

@@ -7,6 +7,8 @@ import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,6 +27,8 @@ import java.util.Objects;
 @RestController
 public class SysMusicCompareRecordController extends BaseController {
 
+    private static final Logger log = LoggerFactory.getLogger(SysMusicCompareRecordController.class);
+
     @Autowired
     private SysUserService sysUserService;
     @Autowired
@@ -39,6 +43,8 @@ public class SysMusicCompareRecordController extends BaseController {
         Integer userId = sysUserService.getUserId();
         record.setUserId(userId);
         record.setClientId("student");
+
+        log.warn(" add record info; record:{},campId :{}",record,campId);
         
         sysMusicCompareRecordService.insert(record,campId);