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

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

@@ -690,9 +690,12 @@ public class UserChannelContext {
 		
 		chunkAnalysisList = totalChunkAnalysisList.stream().filter(t -> Double.doubleToLongBits(t.getStartTime()) >= Double.doubleToLongBits(correctedStartTime) && Double.doubleToLongBits(t.getEndTime()) <= Double.doubleToLongBits(correctedEndTime)).collect(Collectors.toList());
 		
-		//根据完整度取部分有效信号
+		//根据完整度取部分有效信号，取中间的
 		int elementSize = chunkAnalysisList.size() * hardLevel.getIntegrityRange() / 100;
-		List<ChunkAnalysis> chunkList = chunkAnalysisList.subList(0, elementSize);
+		
+		int startIndex = (chunkAnalysisList.size() - elementSize) / 2 - 1;
+		startIndex = startIndex < 1 ? 0 : startIndex;
+		List<ChunkAnalysis> chunkList = chunkAnalysisList.subList(startIndex, elementSize + startIndex);
 		
 		if(chunkList == null || chunkList.size() == 0){
 			return false;

audio-analysis/src/main/resources/logback-spring.xml

@@ -27,7 +27,7 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.yonge.audio" level="INFO" />
+	<logger name="com.yonge.audio" level="dev" />
 
 	<!--开发环境:打印控制台 -->
 	<springProfile name="dev">
@@ -38,7 +38,7 @@
 	</springProfile>
 	
 	<springProfile name="test">
-		<root level="dev">
+		<root level="info">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />
 		</root>

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

@@ -11,7 +11,7 @@ import java.util.Set;
 
 public interface SysMusicScoreCategoriesDao extends BaseDAO<Integer, SysMusicScoreCategories> {
 
-    List<SysMusicScoreCategories> findByParentId(@Param("parentId") Integer parentId,@Param("organId") String organId, @Param("enable") Boolean enable);
+    List<SysMusicScoreCategories> findByParentId(@Param("parentId") Integer parentId,@Param("search") String search, @Param("enable") Boolean enable);
 
     void batchInsert(@Param("categoriesList") List<SysMusicScoreCategories> sysMusicScoreCategoriesList, @Param("organId") String organId, @Param("enable") Boolean enable);
 

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

@@ -35,8 +35,8 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 
 	@Override
 	public List<SysMusicScoreCategories> queryTree(MusicScoreQueryInfo menuQueryInfo) {
-		List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesDao.findByParentId(menuQueryInfo.getParentId(),menuQueryInfo.getOrganId(),menuQueryInfo.getEnable());
-		List<SysMusicScoreCategories> scoreCategoriesAllList = sysMusicScoreCategoriesDao.findByParentId(null,menuQueryInfo.getOrganId(),menuQueryInfo.getEnable());
+		List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesDao.findByParentId(menuQueryInfo.getParentId(),menuQueryInfo.getSearch(),menuQueryInfo.getEnable());
+		List<SysMusicScoreCategories> scoreCategoriesAllList = sysMusicScoreCategoriesDao.findByParentId(null,menuQueryInfo.getSearch(),menuQueryInfo.getEnable());
 		for (SysMusicScoreCategories categories : scoreCategories) {
 			int sum = getTree(categories, scoreCategoriesAllList);
 			categories.setMusicScoreNum(sum + categories.getMusicScoreNumSum());
@@ -57,7 +57,7 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 		SysMusicScoreCategories subCategory = null;
 		for(SysMusicScoreCategories smsc : categoryList){
 			
-			if(smsc == null){
+			if(smsc == null || smsc.getEnable() != true){
 				continue;
 			}
 			parentCategory = getParentTree(smsc);

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

@@ -191,9 +191,9 @@
 			<if test="parentId != null">
 				AND sm.parent_id_ = #{parentId}
 			</if>
-			<!-- <if test="organId != null">
-				AND INTE_ARRAY(#{organId},sm.organ_id_)
-			</if> -->
+			<if test="search != null and search != ''">
+				AND (sm.id_ like concat('%',#{search},'%') or sm.name_ like concat('%',#{search},'%'))
+			</if>
 		</where>
 	</sql>