Merge remote-tracking branch 'origin/saas' into saas

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

@@ -9,20 +9,20 @@ public enum HardLevelEnum implements BaseEnum<String, HardLevelEnum> {
 	 * 完成度范围, 未演奏的范围
 	 */
 	//BEGINNER("入门级", 3, 5, 5, 5, 10, 10, 13, 15, 60, 10), 
-	BEGINNER("入门级", 3, 5, 10, 10, 15, 15, 22, 22, 75, 25), 
+	BEGINNER("入门级", 3, 5, 10, 10, 15, 18, 22, 25, 70, 25), 
 	/**
 	 * 进阶级, 振幅阈值, 频率阈值 <br>
 	 * 节奏有效范围（1分音符）, 节奏有效范围（2分音符）, 节奏有效范围（4分音符）, 节奏有效范围（8分音符）, 节奏有效范围（16分音符）, 节奏有效范围（32分音符）<br>
 	 * 完成度范围, 未演奏的范围
 	 */
-	ADVANCED("进阶级", 3, 5, 8, 8, 12, 12, 20, 20, 85, 15),
+	ADVANCED("进阶级", 3, 5, 8, 8, 12, 15, 20, 22, 80, 15),
 	//ADVANCED("进阶级", 3, 5, 50, 50, 50, 50, 50, 5, 80, 10),
 	/**
 	 * 大师级, 振幅阈值, 频率阈值 <br>
 	 * 节奏有效范围（1分音符）, 节奏有效范围（2分音符）, 节奏有效范围（4分音符）, 节奏有效范围（8分音符）, 节奏有效范围（16分音符）, 节奏有效范围（32分音符）<br>
 	 * 完成度范围, 未演奏的范围
 	 */
-	PERFORMER("大师级", 3, 3, 5, 5, 10, 10, 13, 15, 95, 10);
+	PERFORMER("大师级", 3, 3, 5, 5, 10, 12, 15, 18, 90, 10);
 
 	private String msg;
 

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

@@ -36,7 +36,7 @@ public class UserChannelContext {
 	private final static Logger LOGGER = LoggerFactory.getLogger(UserChannelContext.class);
 	
 	//打击乐
-	private final static List<Integer> percussionList = Arrays.asList(23, 113);
+	private final static List<Integer> percussionList = Arrays.asList(23, 113, 121);
 	
 	private final static int MIN_FREQUECY = 43;
 	

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

@@ -21,6 +21,7 @@
         <result column="longitude_latitude_" property="longitudeLatitude"/>
         <result column="subsidy_" property="subsidy"/>
         <result column="cooperation_organ_id_" property="cooperationOrganId"/>
+        <result column="cooperation_organ_name_" property="cooperationOrganName"/>
         <result column="remark_" property="remark"/>
         <result column="tenant_id_" property="tenantId"/>
     </resultMap>
@@ -162,7 +163,7 @@
     </select>
     
     <select id="querySchoolExportList" resultMap="School" parameterType="map">
-        SELECT s.id_,o.`name_` organName,ifnull(co.`name_`,'租赁') cooperationOrganName ,s.`name_` name_,ifnull(s.`subsidy_`,0) subsidy_,s.`address_` ,ifnull(su.real_name_,'公共')  real_name_ FROM school s
+        SELECT s.id_,o.`name_` organName,ifnull(co.`name_`,'租赁') cooperation_organ_name_ ,s.`name_` name_,ifnull(s.`subsidy_`,0) subsidy_,s.`address_` ,ifnull(su.real_name_,'公共')  real_name_ FROM school s
 		LEFT JOIN `organization` o on o.`id_` = s.`organ_id_` 
 		LEFT JOIN `cooperation_organ` co on co.`id_` = s.`cooperation_organ_id_` 
         LEFT JOIN sys_user su ON su.id_ = s.user_id_