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

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

@@ -890,7 +890,7 @@ public class UserChannelContext {
 			return chunkList.stream().filter(t -> t.getAmplitude() > hardLevel.getAmplitudeThreshold()).count() <= 0;
 		}
 		
-		Optional<ChunkAnalysis> chunkAnalysisOptional = totalChunkAnalysisList.stream().filter(t -> Double.doubleToLongBits(t.getEndTime()) < Double.doubleToLongBits(firstChunkAnalysis.getStartTime())).reduce((first, second) -> second);
+		Optional<ChunkAnalysis> chunkAnalysisOptional = totalChunkAnalysisList.stream().filter(t -> Double.doubleToLongBits(t.getEndTime()) < Double.doubleToLongBits(firstChunkAnalysis.getStartTime())).findFirst();
 
 		ChunkAnalysis lastChunkAnalysis = null;
 		if (chunkAnalysisOptional.isPresent()) {
@@ -914,12 +914,12 @@ public class UserChannelContext {
 		int peakSize = 0;
 
 		for (int i = 1; i < chunkAmplitudeList.size(); i++) {
-			if (chunkAmplitudeList.get(i - 1) + 3 >= chunkAmplitudeList.get(i)) {
+			if (chunkAmplitudeList.get(i - 1) + hardLevel.getAmplitudeThreshold() >= chunkAmplitudeList.get(i)) {
 				isContinue = false;
 				continue;
 			}
 
-			if(isContinue == false && chunkAmplitudeList.get(i - 1) + 3 < chunkAmplitudeList.get(i)){
+			if(isContinue == false && chunkAmplitudeList.get(i - 1) + hardLevel.getAmplitudeThreshold() < chunkAmplitudeList.get(i)){
 				isContinue = true;
 				peakSize++;
 				

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

@@ -86,4 +86,6 @@ public interface OrganizationService extends BaseService<Integer, Organization>
     boolean updateBasicInfo(Organization organization);
 
     Long add(Organization organization);
+
+    List<Organization> queryAll();
 }

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

@@ -215,6 +215,11 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		return insert;
     }
 
+	@Override
+	public List<Organization> queryAll() {
+		return organizationDao.getOrgans(null,1);
+	}
+
 	@Transactional(rollbackFor = Exception.class)
     public void updateOrganId(Integer userId,Integer organId){
 		Employee employee = employeeDao.get(userId);

mec-web/src/main/java/com/ym/mec/web/config/ResourceServerConfig.java

@@ -42,7 +42,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                         "/questionnaireTopic/getDetail", "/questionnaireUserResult/add",
                         "/tenantInfo/info/*", "/tenantInfo/checkInfo/*", "/tenantInfo/pay/*","/tenantInfo/testCheck", "/tenantInfo/getContract/*",
                         "/tenantPreJoin/add","/imLiveBroadcastRoom/queryRoomInfo","/imLiveBroadcastRoom/test",
-                        "/eduOrganization/queryAllOrgan","/eduOrganization/getOrganCooperation","/import/oaUploadFile",
+                        "/eduOrganization/queryAllOrgan","/eduOrganization/queryAll","/eduOrganization/getOrganCooperation","/import/oaUploadFile",
                         "/tenantInfo/callback","/adapay/callback","/temp/*"
                 )
                 .permitAll().anyRequest().authenticated().and().httpBasic();

mec-web/src/main/java/com/ym/mec/web/controller/education/EduOrganizationController.java

@@ -45,6 +45,12 @@ public class EduOrganizationController extends BaseController {
     	
     }
 
+    @ApiOperation(value = "获取管乐迷分部列表")
+    @GetMapping("/queryAll")
+    public HttpResponseResult<List<Organization>> queryAll() {
+        return succeed(organizationService.queryAll());
+    }
+
     @ApiOperation(value = "获取员工所在分部列表")
     @GetMapping("/queryEmployeeOrgan")
     public HttpResponseResult<List<Organization>> queryEmployeeOrgan() throws Exception {