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

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

@@ -108,8 +108,7 @@ public class ImLiveRoomReservationServiceImpl extends ServiceImpl<ImLiveRoomRese
             return;
         }
         SysUser user = getUser(room.getSpeakerId());
-        String baseUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
-        String memo = "10?" + baseUrl + "/#/live?roomUid=" + room.getRoomUid();
+        String memo = "10?roomUid=" + room.getRoomUid();
         Map<Integer, String> pushStudentList = new HashMap<>();
         for (ImLiveRoomReservation obj : list) {
             pushStudentList.put(obj.getUserId(), obj.getUserId().toString());

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

@@ -10,6 +10,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.TempLittleArtistTrainingCampDao;
 import com.ym.mec.biz.dal.dto.TempLittleArtistTrainingCampDto;
 import com.ym.mec.biz.dal.entity.ImGroup;
+import com.ym.mec.biz.dal.entity.SysConfig;
 import com.ym.mec.biz.dal.entity.TempLittleArtistTrainingCamp;
 import com.ym.mec.biz.dal.entity.TempLittleArtistTrainingCampUserRelation;
 import com.ym.mec.biz.dal.vo.TempCampUserTrainingDetailVo;
@@ -17,15 +18,18 @@ import com.ym.mec.biz.dal.vo.TempCampUserTrainingPlayTimeVo;
 import com.ym.mec.biz.dal.vo.TempCampUserVo;
 import com.ym.mec.biz.dal.vo.TempUserTrainingTimeDetailVo;
 import com.ym.mec.biz.service.ImGroupService;
+import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.TempLittleArtistTrainingCampService;
 import com.ym.mec.biz.service.TempLittleArtistTrainingCampUserRelationService;
 import com.ym.mec.common.exception.BizException;
 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.tenant.TenantContextHolder;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.excel.POIUtil;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -61,6 +65,8 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
     private TempLittleArtistTrainingCampUserRelationService tempLittleArtistTrainingCampUserRelationService;
     @Autowired
     private ImGroupService imGroupService;
+    @Autowired
+    private SysConfigService sysConfigService;
 
     @Override
     public TempLittleArtistTrainingCampDao getDao() {
@@ -409,9 +415,15 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
         if (CollectionUtils.isEmpty(groupCampList)) {
             return;
         }
+        TenantContextHolder.setTenantId(1);
         String groupType = "TRAINING";
         //每个房间最大人数
-        BigDecimal maxUserNum = new BigDecimal("1");
+        BigDecimal maxUserNum = Optional.of("temp_little_artist_training_camp_grouping_num")
+                .map(sysConfigService::findByParamName)
+                .filter(a -> StringUtils.isNotBlank(a.getParanValue()))
+                .map(SysConfig::getParanValue)
+                .map(BigDecimal::new)
+                .orElse(new BigDecimal("60"));
         //key-训练营id  value-训练营集合
         groupCampList.forEach(camp -> {
             List<String> imGroupIds = new ArrayList<>();
@@ -453,6 +465,7 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
             camp.setImGroupIds(String.join(",", imGroupIds));
             this.updateById(camp);
         });
+        TenantContextHolder.clearTenantId();
     }
 
     /**