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

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

@@ -708,10 +708,22 @@ public class UserChannelContext {
 		if (musicXmlNote.getFrequency() == -1) {// 休止符
 			return chunkList.stream().filter(t -> t.getFrequency() > MIN_FREQUECY).count() <= 1;
 		}
-		
+
 		ChunkAnalysis firstChunkAnalysis = chunkAnalysisList.get(0);
+		//取出前面忽略的块
+		List<ChunkAnalysis> ignoreHeaderList = chunkAnalysisList.subList(0, startIndex);
+		if(ignoreHeaderList != null && ignoreHeaderList.size() > 0){
+			for(ChunkAnalysis ca : ignoreHeaderList){
+				if(ca.getFrequency() < MIN_FREQUECY){
+					firstChunkAnalysis.setFrequency(-1);
+					break;
+				}
+			}
+		}
 		
-		Optional<ChunkAnalysis> chunkAnalysisOptional = totalChunkAnalysisList.stream().filter(t -> Double.doubleToLongBits(t.getEndTime()) < Double.doubleToLongBits(firstChunkAnalysis.getStartTime())).findFirst();
+		double firstChunkStartTime = firstChunkAnalysis.getStartTime();
+		
+		Optional<ChunkAnalysis> chunkAnalysisOptional = totalChunkAnalysisList.stream().filter(t -> Double.doubleToLongBits(t.getEndTime()) < Double.doubleToLongBits(firstChunkStartTime)).findFirst();
 
 		ChunkAnalysis lastChunkAnalysis = null;
 		if (chunkAnalysisOptional.isPresent()) {
@@ -730,7 +742,7 @@ public class UserChannelContext {
 		
 		NoteFrequencyRange noteFrequencyRange = null;
 		ChunkAnalysis chunkAnalysis = null;
-		boolean tempo = false;
+		boolean tempo = true;
 		//boolean isContinue = true;
 		//int unplayedSize = 0;
 		int firstPeakIndex = -1;
@@ -771,9 +783,9 @@ public class UserChannelContext {
 			totalTimes = chunkList.size();
 		}
 		
-		if (maxTimes / totalTimes < hardLevel.getIntegrityRange()) {
+		if (maxTimes * 100 / totalTimes < hardLevel.getIntegrityRange()) {
 			tempo = false;
-			LOGGER.debug("节奏错误原因：不是同一个音");
+			LOGGER.debug("节奏错误原因：信号分堆后的最大数量不足指定的完成比例");
 		}
 		
 		/**
@@ -817,7 +829,7 @@ public class UserChannelContext {
 		
 		if (tempo) {
 			// 判断进入时间点
-			if(firstPeakIndex * 100 /chunkAnalysisList.size() > hardLevel.getTempoEffectiveRange(musicXmlNote.getDenominator())){
+			if(firstPeakIndex * 100 /chunkList.size() > hardLevel.getTempoEffectiveRange(musicXmlNote.getDenominator())){
 				tempo = false;
 				LOGGER.debug("节奏错误原因：进入时间点太晚");
 			}else{

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

@@ -19,6 +19,8 @@ public interface OrganizationService extends BaseService<Integer, Organization>
      * @return
      */
     List<Organization> queryEmployeeOrgan() throws Exception;
+    
+    List<Organization> queryAllOrganWithNoAuth(Integer tenantId);
 
     /**
      * 获取员工坐在分部列表
@@ -69,6 +71,8 @@ public interface OrganizationService extends BaseService<Integer, Organization>
     List<Organization> findAllOrgans(Integer tenantId);
 
     List<Organization> findOrgans(List<Integer> organIds,Integer tenantId);
+    
+    List<Organization> queryEmployeeOrgan(String organId);
 
     /**
     * @description: 校验当前用户是否只有教务老师角色,并给教务老师角色赋值

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

@@ -80,6 +80,11 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	}
 
 	@Override
+	public List<Organization> queryAllOrganWithNoAuth(Integer tenantId) {
+		return organizationDao.findAllOrgans(tenantId);
+	}
+
+	@Override
 	public List<Organization> queryEmployeeOrganByUser(){
 		return this.queryEmployeeOrgan();
 	}
@@ -171,6 +176,11 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	}
 
     @Override
+	public List<Organization> queryEmployeeOrgan(String organId) {
+		return organizationDao.queryEmployeeOrgan(organId);
+	}
+
+	@Override
     public <T extends EducationBaseQueryInfo> T onlyEducation(T queryInfo) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {

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

@@ -1,18 +1,23 @@
 package com.ym.mec.web.controller.education;
 
-import com.ym.mec.biz.dal.entity.CooperationOrgan;
-import com.ym.mec.biz.service.CooperationOrganService;
-import com.ym.mec.biz.service.OrganizationService;
-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 java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
+import com.ym.mec.biz.dal.entity.Organization;
+import com.ym.mec.biz.service.CooperationOrganService;
+import com.ym.mec.biz.service.OrganizationService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 
 @RequestMapping("eduOrganization")
 @Api(tags = "分部服务")
@@ -23,16 +28,28 @@ public class EduOrganizationController extends BaseController {
     private OrganizationService organizationService;
     @Autowired
     private CooperationOrganService cooperationOrganService;
+    
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
     @ApiOperation(value = "获取员工所在分部列表")
     @GetMapping("/queryAllOrgan")
-    public Object queryAllOrgan() throws Exception {
-        return succeed(organizationService.queryEmployeeOrgan());
+    public HttpResponseResult<List<Organization>> queryAllOrgan() throws Exception {
+
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if(sysUser == null || sysUser.getId() == null){
+	    	Integer tenantId = 1;
+	        return succeed(organizationService.queryAllOrganWithNoAuth(tenantId));
+		}else{
+			String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), "", sysUser.getIsSuperAdmin());
+	        return succeed(organizationService.queryEmployeeOrgan(organIds));
+		}
+    	
     }
 
     @ApiOperation(value = "获取员工所在分部列表")
     @GetMapping("/queryEmployeeOrgan")
-    public Object queryEmployeeOrgan() throws Exception {
+    public HttpResponseResult<List<Organization>> queryEmployeeOrgan() throws Exception {
         return succeed(organizationService.queryEmployeeOrgan());
     }