tenantId

cms/src/main/java/com/ym/mec/cms/interceptor/TenantInterceptor.java

@@ -30,7 +30,7 @@ public class TenantInterceptor extends HandlerInterceptorAdapter {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		
 		if(sysUser != null){
-			TenantContextHolder.setTenantId(sysUser.getTenantId() + "");
+			TenantContextHolder.setTenantId(sysUser.getTenantId());
 			
 			TenantInfo tenantInfo = tenantInfoService.get(sysUser.getTenantId());
 			if(tenantInfo != null){

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

@@ -19,6 +19,7 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.filters.TenantIdThreadLocal;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
@@ -487,7 +488,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         if(signOutCourseTimeBetween <= 0){
             return SalarySettlementSignEnum.NORMAL_OUT;
         }
-        Integer tenantId = TenantIdThreadLocal.get();
+        Integer tenantId = TenantContextHolder.getTenantId();
         //异常签退规则
         String configValue = null;
         if(teachModeEnum == TeachModeEnum.ONLINE){

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

@@ -18,6 +18,7 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.filters.TenantIdThreadLocal;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -607,7 +608,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 	@Override
 	public Map<String, Object> getIndexErrData(String organIdsStr, IndexErrorType errorType) {
-		Integer tenantId = TenantIdThreadLocal.get();
+		Integer tenantId = TenantContextHolder.getTenantId();
 		//只筛选指定时间之后的数据
 		String startTime = DateUtil.format(DateUtil.getFirstDayOfMonth(DateUtil.addMonths(new Date(), -2)),DateUtil.ISO_EXPANDED_DATE_FORMAT);
 
@@ -1107,7 +1108,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 	@Override
 	public Map<String,Boolean> hasIndexErrData(String organIdsStr) {
-		Integer tenantId = TenantIdThreadLocal.get();
+		Integer tenantId = TenantContextHolder.getTenantId();
 		String startTime = DateUtil.format(DateUtil.getFirstDayOfMonth(DateUtil.addMonths(new Date(), -2)),DateUtil.ISO_EXPANDED_DATE_FORMAT);
 
 		Map<String,Boolean> resultMap = new HashMap<>();

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

@@ -16,6 +16,7 @@ import com.ym.mec.common.filters.TenantIdThreadLocal;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.redis.service.RedisCache;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
 import com.ym.mec.util.collection.MapUtil;
@@ -421,7 +422,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void addTeacherAttendanceSignIn(Long firstCourseId, Integer userId, Long courseScheduleId,String deviceNum) {
-		Integer tenantId = TenantIdThreadLocal.get();
+		Integer tenantId = TenantContextHolder.getTenantId();
 		ClassGroup classGroup = classGroupDao.findByCourseSchedule(courseScheduleId.intValue(),0);
 		TeacherAttendance teacherAttendance=teacherAttendanceDao.findByTeacherAttendanceInfo(userId.longValue(),courseScheduleId);
 		if(Objects.isNull(teacherAttendance)){

mec-common/common-core/src/main/java/com/ym/mec/common/tenant/TenantContextHolder.java

@@ -1,14 +1,12 @@
 package com.ym.mec.common.tenant;
 
 
-import org.apache.commons.lang3.StringUtils;
-
 public class TenantContextHolder {
 	
 
-	private static final ThreadLocal<String> tenantContextHolder = new ThreadLocal<String>();
+	private static final ThreadLocal<Integer> tenantContextHolder = new ThreadLocal<Integer>();
 
-	public static void setTenantId(String tenantId) {
+	public static void setTenantId(Integer tenantId) {
 		tenantContextHolder.set(tenantId);
 	}
 
@@ -16,9 +14,10 @@ public class TenantContextHolder {
 	 * 获取数据源
 	 * @return
 	 */
-	public static String getTenantId() {
-		if (StringUtils.isEmpty(tenantContextHolder.get())){
-			return "0";
+	public static Integer getTenantId() {
+		Integer tenantId = tenantContextHolder.get();
+		if (tenantId == null){
+			return 0;
 		}
 		return tenantContextHolder.get();
 	}

mec-im/src/main/java/com/ym/interceptor/TenantInterceptor.java

@@ -36,7 +36,7 @@ public class TenantInterceptor extends HandlerInterceptorAdapter {
 			}
 		}
 		if(StringUtils.isNotEmpty(tenantId)){
-			TenantContextHolder.setTenantId(tenantId);
+			TenantContextHolder.setTenantId(Integer.parseInt(tenantId));
 			TenantInfo tenantInfo = tenantInfoService.get(Integer.parseInt(tenantId));
 			if(tenantInfo != null){
 				request.setAttribute(DATA_SOURCE_ID, tenantInfo.getDataSource());

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

@@ -1,5 +1,6 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.common.tenant.TenantContextHolder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -316,10 +317,8 @@ public class StudentManageController extends BaseController {
 
     @ApiOperation(value = "获取子集科目列表")
     @GetMapping("subject/findSubSubjects")
-    public Object findSubSubjects(Integer tenantId){
-        if(tenantId == null){
-            tenantId = TenantIdThreadLocal.get();
-        }
+    public Object findSubSubjects(){
+        Integer tenantId = TenantContextHolder.getTenantId();
         return succeed(subjectService.findSubSubjects(tenantId));
     }
 

mec-student/src/main/java/com/ym/mec/student/interceptor/TenantInterceptor.java

@@ -37,7 +37,7 @@ public class TenantInterceptor extends HandlerInterceptorAdapter {
 			}
 		}
 		if(StringUtils.isNotEmpty(tenantId)){
-			TenantContextHolder.setTenantId(tenantId);
+			TenantContextHolder.setTenantId(Integer.parseInt(tenantId));
 			TenantInfo tenantInfo = tenantInfoService.get(Integer.parseInt(tenantId));
 			if(tenantInfo != null){
 				request.setAttribute(DATA_SOURCE_ID, tenantInfo.getDataSource());

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherSubjectController.java

@@ -5,6 +5,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.service.SubjectService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.filters.TenantIdThreadLocal;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +44,7 @@ public class TeacherSubjectController extends BaseController {
     @GetMapping("/findSubSubjects")
     public Object findSubSubjects(Integer tenantId){
         if(tenantId == null){
-            tenantId = TenantIdThreadLocal.get();
+            tenantId = TenantContextHolder.getTenantId();
         }
         return succeed(subjectService.findSubSubjects(tenantId));
     }

mec-teacher/src/main/java/com/ym/mec/teacher/interceptor/TenantInterceptor.java

@@ -36,7 +36,7 @@ public class TenantInterceptor extends HandlerInterceptorAdapter {
 			}
 		}
 		if(StringUtils.isNotEmpty(tenantId)){
-			TenantContextHolder.setTenantId(tenantId);
+			TenantContextHolder.setTenantId(Integer.parseInt(tenantId));
 			TenantInfo tenantInfo = tenantInfoService.get(Integer.parseInt(tenantId));
 			if(tenantInfo != null){
 				request.setAttribute(DATA_SOURCE_ID, tenantInfo.getDataSource());

mec-web/src/main/java/com/ym/mec/web/controller/IndexController.java

@@ -144,17 +144,17 @@ public class IndexController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-			Employee employee = employeeService.get(sysUser.getId());
-			if (StringUtils.isBlank(organId)) {
-				organId = employee.getOrganIdList();
-			}else if(StringUtils.isEmpty(employee.getOrganIdList())){
-				return failed("用户所在分部异常");
-			}else {
-				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.containsAll(Arrays.asList(organId.split(",")))){
-					return failed("非法请求");
-				}
+		Employee employee = employeeService.get(sysUser.getId());
+		if (StringUtils.isBlank(organId)) {
+			organId = employee.getOrganIdList();
+		}else if(StringUtils.isEmpty(employee.getOrganIdList())){
+			return failed("用户所在分部异常");
+		}else {
+			List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+			if(!list.containsAll(Arrays.asList(organId.split(",")))){
+				return failed("非法请求");
 			}
+		}
 		return succeed(indexService.hasIndexErrData(organId));
 	}
 

mec-web/src/main/java/com/ym/mec/web/interceptor/TenantInterceptor.java

@@ -4,6 +4,7 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.TenantInfo;
 import com.ym.mec.biz.service.TenantInfoService;
+import com.ym.mec.common.filters.TenantIdThreadLocal;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +37,7 @@ public class TenantInterceptor extends HandlerInterceptorAdapter {
 			}
 		}
 		if(StringUtils.isNotEmpty(tenantId)){
-			TenantContextHolder.setTenantId(tenantId);
+			TenantContextHolder.setTenantId(Integer.parseInt(tenantId));
 			TenantInfo tenantInfo = tenantInfoService.get(Integer.parseInt(tenantId));
 			if(tenantInfo != null){
 				request.setAttribute(DATA_SOURCE_ID, tenantInfo.getDataSource());