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

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TenantInfoDao.java
#	mec-biz/src/main/java/com/ym/mec/biz/service/TenantInfoService.java
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java
#	mec-biz/src/main/resources/config/mybatis/TenantInfoMapper.xml

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/TenantInfoDao.java

@@ -5,5 +5,5 @@ import com.ym.mec.common.dal.BaseDAO;
 
 public interface TenantInfoDao extends BaseDAO<Integer, TenantInfo> {
 
-	
+    TenantInfo getOpenTenant(Integer tenantId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/interceptor/TenantInterceptor.java

@@ -3,6 +3,7 @@ package com.ym.mec.auth.interceptor;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ym.mec.common.exception.BizException;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -44,9 +45,11 @@ public class TenantInterceptor extends HandlerInterceptorAdapter {
 		}
 		if(StringUtils.isNotEmpty(tenantId)){
 			TenantContextHolder.setTenantId(Integer.parseInt(tenantId));
-			TenantInfo tenantInfo = tenantInfoService.get(Integer.parseInt(tenantId));
+			TenantInfo tenantInfo = tenantInfoService.getOpenTenant(Integer.parseInt(tenantId));
 			if(tenantInfo != null){
 				request.setAttribute(DATA_SOURCE_ID, tenantInfo.getDataSource());
+			}else {
+				throw new BizException("机构信息异常，请联系管理员");
 			}
 		}
 		return true;

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/TenantInfoService.java

@@ -5,4 +5,5 @@ import com.ym.mec.common.service.BaseService;
 
 public interface TenantInfoService extends BaseService<Integer, TenantInfo> {
 
+    TenantInfo getOpenTenant(Integer tenantId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/TenantInfoServiceImpl.java

@@ -1,13 +1,12 @@
 package com.ym.mec.auth.service.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.ym.mec.auth.api.entity.TenantInfo;
 import com.ym.mec.auth.dal.dao.TenantInfoDao;
 import com.ym.mec.auth.service.TenantInfoService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 @Service
 public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>  implements TenantInfoService {
@@ -19,5 +18,9 @@ public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>
 	public BaseDAO<Integer, TenantInfo> getDAO() {
 		return tenantInfoDao;
 	}
-	
+
+	@Override
+	public TenantInfo getOpenTenant(Integer tenantId) {
+		return tenantInfoDao.getOpenTenant(tenantId);
+	}
 }

mec-auth/mec-auth-server/src/main/resources/config/mybatis/TenantInfoMapper.xml

@@ -31,8 +31,6 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.auth.api.entity.TenantInfo"
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
-			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO tenant_info
 		(id_,name_,address_,domain_name_,logo_url_,contact_name_,contact_phone_,data_source_,create_time_,update_time_)
 		VALUES(#{id},#{name},#{address},#{domainName},#{logoUrl},#{contactName},#{contactPhone},#{dataSource},#{createTime},#{updateTime})
@@ -91,4 +89,7 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM tenant_info
 	</select>
+	<select id="getOpenTenant" resultMap="TenantInfo">
+		SELECT * FROM tenant_info WHERE id_ = #{id} AND state_ = 1
+	</select>
 </mapper>

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

@@ -15,5 +15,5 @@ public interface TenantInfoDao extends BaseMapper<TenantInfo> {
 
     TenantProductSumm queryTenantInfoProductSumm(Integer tenantId);
 
-    TenantInfo queryTenantInfoByOrgan(Integer organId);
+    TenantInfo getOpenTenant(Integer tenantId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/EducationBaseQueryInfo.java

@@ -9,12 +9,24 @@ public class EducationBaseQueryInfo extends QueryInfo {
     //分部
     private String organIds;
 
+    //分部(兼容前端参数)
+    private String organId;
+
     //教务老师
     private Integer educationUserId;
 
     //班级列表
     private List<Long> classGroupIds;
 
+    public String getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(String organId) {
+        this.organIds = organId;
+        this.organId = organId;
+    }
+
     public List<Long> getClassGroupIds() {
         return classGroupIds;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/MusicGroupPerformanceQueryInfo.java

@@ -4,18 +4,6 @@ public class MusicGroupPerformanceQueryInfo extends EducationBaseQueryInfo {
 
     private String musicGroupId;
 
-    //用父类的organIds，因为涉及到移动端，所以保留了该字段
-    private String organId;
-
-    public String getOrganId() {
-        return organId;
-    }
-
-    public void setOrganId(String organId) {
-        super.setOrganIds(organId);
-        this.organId = organId;
-    }
-
     public String getMusicGroupId() {
         return musicGroupId;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentErrorLeaveQueryInfo.java

@@ -5,8 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 public class StudentErrorLeaveQueryInfo extends EducationBaseQueryInfo {
     private Integer userId;
 
-    private String organId;
-
     @ApiModelProperty(value = "是否回访")
     private Integer leaveVisitFlag;
 
@@ -21,14 +19,6 @@ public class StudentErrorLeaveQueryInfo extends EducationBaseQueryInfo {
         this.userId = userId;
     }
 
-    public String getOrganId() {
-        return organId;
-    }
-
-    public void setOrganId(String organId) {
-        this.organId = organId;
-    }
-
     public Integer getLeaveVisitFlag() {
         return leaveVisitFlag;
     }

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

@@ -8,6 +8,7 @@ import com.ym.mec.biz.dal.vo.TenantInfoInfoPageVo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.thirdparty.yqpay.Msg;
 
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.Map;
 
@@ -39,5 +40,12 @@ public interface TenantInfoService extends IService<TenantInfo> {
 
     Boolean testEmail();
 
-    TenantInfo queryTenantInfoByOrgan(Integer organId);
+    /**
+    * @description: 保存tenantId
+     * @param request
+    * @return void
+    * @author zx
+    * @date 2022/1/7 14:42
+    */
+    void saveTenantContextHolder(HttpServletRequest request);
 }

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

@@ -106,15 +106,15 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds(), employee.getTenantId());
 		//添加用户现金账户
 		sysUserCashAccountDao.insert(new SysUserCashAccount(employee.getId(),"CNY"));
-//		ImResult imResult = imFeignService.register(new ImUserModel(employee.getId().toString(), employee.getUsername(),null));
-//		employee.setImToken(imResult.getToken());
+		ImResult imResult = imFeignService.register(new ImUserModel(employee.getId().toString(), employee.getUsername(),null));
+		employee.setImToken(imResult.getToken());
 		teacherDao.updateUser(employee);
 		if(user != null){
 			employee.setAvatar(user.getAvatar());
 		}
 
 		//添加到OA
-//		oaUserService.addOaUser(employee);
+		oaUserService.addOaUser(employee);
 	}
 
 	@Override

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

@@ -749,19 +749,22 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			//课程异常
 			fourChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_NOT_A_CLASS, IndexErrorType.TEACHER_NOT_A_CLASS.getMsg(), noAttendance, null));
 
-			//服务指标异常
-			Map<String, Object> params = new HashMap<>();
-			LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
-			LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()).plusDays(-7);
-			LocalDate sunDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue()).plusDays(-7);
-			params.put("organIds", organIds);
-			params.put("monday",monDayDate.toString());
-			params.put("sunday",sunDayDate.toString());
-			params.put("jobNature", JobNatureEnum.FULL_TIME);
-			params.put("unDone",1);
-			params.put("reminded",0);
-			int serveErrTeacherNum = studentExtracurricularExercisesSituationDao.countTeacherServeInfo(params);
-			fourChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_SERVE_ERROR, IndexErrorType.TEACHER_SERVE_ERROR.getMsg(), serveErrTeacherNum, null));
+			//只适用大雅
+			if(tenantId == 1){
+				//服务指标异常
+				Map<String, Object> params = new HashMap<>();
+				LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
+				LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()).plusDays(-7);
+				LocalDate sunDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue()).plusDays(-7);
+				params.put("organIds", organIds);
+				params.put("monday",monDayDate.toString());
+				params.put("sunday",sunDayDate.toString());
+				params.put("jobNature", JobNatureEnum.FULL_TIME);
+				params.put("unDone",1);
+				params.put("reminded",0);
+				int serveErrTeacherNum = studentExtracurricularExercisesSituationDao.countTeacherServeInfo(params);
+				fourChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_SERVE_ERROR, IndexErrorType.TEACHER_SERVE_ERROR.getMsg(), serveErrTeacherNum, null));
+			}
 
 			four.setNum(fourChild.stream().mapToInt(IndexErrInfoDto::getNum).sum());
 			four.setResult(fourChild);
@@ -1216,7 +1219,8 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 				flag4 = true;
 			}
 		}
-		if(!flag4){
+		//服务指标只用于大雅
+		if(tenantId == 1 && !flag4){
 			Map<String, Object> params = new HashMap<>();
 			LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
 			LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()).plusDays(-7);

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

@@ -1361,12 +1361,20 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         MusicGroup musicGroup = saveLog(musicGroupId, MusicGroupStatusEnum.PREPARE);
 
         //乐器采购清单是否确认
-        Map<String, Object> param = new HashMap<>();
-        param.put("musicGroupId", musicGroupId);
-        int i = musicGroupPurchaseListDao.queryCount(param);
-        if (i <= 0) {
-            throw new BizException("采购清单未确认");
+        List<StudentPaymentOrderDetail> applyOrder = studentPaymentOrderDetailService.findApplyOrderSuccess(musicGroupId, DealStatusEnum.SUCCESS);
+        if(applyOrder != null && applyOrder.size() > 0){
+            //是否购买了乐器，支持无乐器乐团
+            long count = applyOrder.stream().filter(e -> StringUtils.isNotEmpty(e.getGoodsIdList())).count();
+            if(count > 0l){
+                Map<String, Object> param = new HashMap<>();
+                param.put("musicGroupId", musicGroupId);
+                int i = musicGroupPurchaseListDao.queryCount(param);
+                if (i <= 0) {
+                    throw new BizException("采购清单未确认");
+                }
+            }
         }
+
         //课酬是否确认
         Integer courseScheduleNum = courseScheduleDao.countCourseScheduleByMusicGroupId(musicGroupId);
         if (courseScheduleNum != null && courseScheduleNum > 0) {

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

@@ -24,11 +24,13 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.PageUtil;
 import com.ym.mec.common.page.WrapperUtil;
 import com.ym.mec.common.service.IdGeneratorService;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.thirdparty.yqpay.DateUtils;
 import com.ym.mec.thirdparty.yqpay.Msg;
 import com.ym.mec.util.date.DateUtil;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.joda.time.LocalDate;
 import org.joda.time.LocalDateTime;
 import org.redisson.api.RBucket;
@@ -41,6 +43,7 @@ import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -667,15 +670,29 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         return tps;
     }
 
-    @Override
-    public TenantInfo queryTenantInfoByOrgan(Integer organId) {
-        return baseMapper.queryTenantInfoByOrgan(organId);
-    }
 
     @Override
     public Boolean testEmail() {
         // sysMessageService.batchSendMessage(MessageSener.);
         return false;
     }
-
+    @Override
+    public void saveTenantContextHolder(HttpServletRequest request) {
+        String tenantId = request.getHeader("tenantId");
+        if(StringUtils.isEmpty(tenantId)){
+            SysUser sysUser = sysUserFeignService.queryUserInfo();
+            if(sysUser != null && sysUser.getTenantId() != null){
+                tenantId = sysUser.getTenantId().toString();
+            }
+        }
+        if(StringUtils.isNotEmpty(tenantId)){
+            TenantInfo tenantInfo = this.baseMapper.getOpenTenant(Integer.parseInt(tenantId));
+            if(tenantInfo != null){
+                TenantContextHolder.setTenantId(Integer.parseInt(tenantId));
+                request.setAttribute("datasourceId", tenantInfo.getDataSource());
+            }else {
+                throw new BizException("机构信息异常，请联系管理员");
+            }
+        }
+    }
 }

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

@@ -33,11 +33,6 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPurchaseList" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
         INSERT INTO music_group_purchase_list (id_,music_group_id_,goods_id_,purchase_num_,create_time_,update_time_,tenant_id_)
         VALUES(#{id},#{musicGroupId},#{goodsId},#{purchaseNum},now(),now(),#{tenantId})
     </insert>
@@ -49,15 +44,13 @@
             <if test="purchaseNum != null">
                 purchase_num_ = #{purchaseNum},
             </if>
-            <if test="updateTime != null">
-                update_time_ = NOW(),
-            </if>
             <if test="musicGroupId != null">
                 music_group_id_ = #{musicGroupId},
             </if>
             <if test="goodsId != null">
                 goods_id_ = #{goodsId},
             </if>
+            update_time_ = NOW()
         </set>
         WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>

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

@@ -105,9 +105,8 @@
                      left join platform_serve_detail psd on tp.serve_detail_id_ = psd.id_
             where t.id_ = #{tenantId}
     </select>
-    <select id="queryTenantInfoByOrgan"  resultMap="BaseResultMap">
-        select * from tenant_info
-        where id_ = (select tenant_id_ from organization where id_ = #{tenantId})
+    <select id="getOpenTenant" resultType="com.ym.mec.biz.dal.entity.TenantInfo">
+        SELECT * FROM tenant_info WHERE id_ = #{tenantId} AND state_ = 1
     </select>
 
 </mapper>

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

@@ -1,13 +1,8 @@
 package com.ym.interceptor;
 
-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.tenant.TenantContextHolder;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -17,31 +12,12 @@ import javax.servlet.http.HttpServletResponse;
 @Component
 public class TenantInterceptor extends HandlerInterceptorAdapter {
 
-	private static final String DATA_SOURCE_ID = "datasourceId";
-
-	@Autowired
-	@Lazy
-	private SysUserFeignService sysUserFeignService;
-	
 	@Autowired
 	private TenantInfoService tenantInfoService;
 
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler){
-		String tenantId = request.getHeader("tenantId");
-		if(StringUtils.isEmpty(tenantId)){
-			SysUser sysUser = sysUserFeignService.queryUserInfo();
-			if(sysUser != null && sysUser.getTenantId() != null){
-				tenantId = sysUser.getTenantId().toString();
-			}
-		}
-		if(StringUtils.isNotEmpty(tenantId)){
-			TenantContextHolder.setTenantId(Integer.parseInt(tenantId));
-			TenantInfo tenantInfo = tenantInfoService.get(Integer.parseInt(tenantId));
-			if(tenantInfo != null){
-				request.setAttribute(DATA_SOURCE_ID, tenantInfo.getDataSource());
-			}
-		}
+		tenantInfoService.saveTenantContextHolder(request);
 		return true;
 	}
 

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

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 
 @RequestMapping("sysCouponCode")
@@ -30,17 +31,16 @@ public class SysCouponCodeController extends BaseController {
     @Autowired
     private SysCouponIssueRecordService couponIssueRecordService;
 
-
     @ApiOperation("分页查询")
     @RequestMapping(value = "queryPage")
     public HttpResponseResult queryPage(SysCouponCodeQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser != null && sysUser.getId() != null) {
+        if (Objects.isNull(queryInfo.getUserId())) {
+            SysUser sysUser = sysUserFeignService.queryUserInfo();
+            if (Objects.isNull(sysUser.getId())) {
+                return failed("请登录");
+            }
             queryInfo.setUserId(sysUser.getId());
         }
-        if (queryInfo.getUserId() == null) {
-            return failed("请登录");
-        }
         return succeed(sysCouponCodeService.querySysCouponUseList(queryInfo));
     }
 

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

@@ -1,16 +1,10 @@
 package com.ym.mec.student.interceptor;
 
-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.tenant.TenantContextHolder;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-import springfox.documentation.annotations.Cacheable;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -18,31 +12,12 @@ import javax.servlet.http.HttpServletResponse;
 @Component
 public class TenantInterceptor extends HandlerInterceptorAdapter {
 
-	private static final String DATA_SOURCE_ID = "datasourceId";
-
-	@Autowired
-	@Lazy
-	private SysUserFeignService sysUserFeignService;
-	
 	@Autowired
 	private TenantInfoService tenantInfoService;
 
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler){
-		String tenantId = request.getHeader("tenantId");
-		if(StringUtils.isEmpty(tenantId)){
-			SysUser sysUser = sysUserFeignService.queryUserInfo();
-			if(sysUser != null && sysUser.getTenantId() != null){
-				tenantId = sysUser.getTenantId().toString();
-			}
-		}
-		if(StringUtils.isNotEmpty(tenantId)){
-			TenantContextHolder.setTenantId(Integer.parseInt(tenantId));
-			TenantInfo tenantInfo = tenantInfoService.get(Integer.parseInt(tenantId));
-			if(tenantInfo != null){
-				request.setAttribute(DATA_SOURCE_ID, tenantInfo.getDataSource());
-			}
-		}
+		tenantInfoService.saveTenantContextHolder(request);
 		return true;
 	}
 

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

@@ -1,13 +1,8 @@
 package com.ym.mec.teacher.interceptor;
 
-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.tenant.TenantContextHolder;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -17,31 +12,12 @@ import javax.servlet.http.HttpServletResponse;
 @Component
 public class TenantInterceptor extends HandlerInterceptorAdapter {
 
-	private static final String DATA_SOURCE_ID = "datasourceId";
-
-	@Autowired
-	@Lazy
-	private SysUserFeignService sysUserFeignService;
-	
 	@Autowired
 	private TenantInfoService tenantInfoService;
 
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler){
-		String tenantId = request.getHeader("tenantId");
-		if(StringUtils.isEmpty(tenantId)){
-			SysUser sysUser = sysUserFeignService.queryUserInfo();
-			if(sysUser != null && sysUser.getTenantId() != null){
-				tenantId = sysUser.getTenantId().toString();
-			}
-		}
-		if(StringUtils.isNotEmpty(tenantId)){
-			TenantContextHolder.setTenantId(Integer.parseInt(tenantId));
-			TenantInfo tenantInfo = tenantInfoService.get(Integer.parseInt(tenantId));
-			if(tenantInfo != null){
-				request.setAttribute(DATA_SOURCE_ID, tenantInfo.getDataSource());
-			}
-		}
+		tenantInfoService.saveTenantContextHolder(request);
 		return true;
 	}
 

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

@@ -1,14 +1,8 @@
 package com.ym.mec.web.interceptor;
 
-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;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -18,31 +12,12 @@ import javax.servlet.http.HttpServletResponse;
 @Component
 public class TenantInterceptor extends HandlerInterceptorAdapter {
 
-	private static final String DATA_SOURCE_ID = "datasourceId";
-
-	@Autowired
-	@Lazy
-	private SysUserFeignService sysUserFeignService;
-	
 	@Autowired
 	private TenantInfoService tenantInfoService;
 
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler){
-		String tenantId = request.getHeader("tenantId");
-		if(StringUtils.isEmpty(tenantId)){
-			SysUser sysUser = sysUserFeignService.queryUserInfo();
-			if(sysUser != null && sysUser.getTenantId() != null){
-				tenantId = sysUser.getTenantId().toString();
-			}
-		}
-		if(StringUtils.isNotEmpty(tenantId)){
-			TenantContextHolder.setTenantId(Integer.parseInt(tenantId));
-			TenantInfo tenantInfo = tenantInfoService.get(Integer.parseInt(tenantId));
-			if(tenantInfo != null){
-				request.setAttribute(DATA_SOURCE_ID, tenantInfo.getDataSource());
-			}
-		}
+		tenantInfoService.saveTenantContextHolder(request);
 		return true;
 	}