|
@@ -4,10 +4,12 @@ import com.yonge.cooleshow.biz.dal.dao.CourseScheduleDao;
|
|
|
import com.yonge.cooleshow.biz.dal.dao.HomeDao;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.req.TotalReq;
|
|
|
import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
|
|
|
+import com.yonge.cooleshow.biz.dal.enums.TeacherTagEnum;
|
|
|
import com.yonge.cooleshow.biz.dal.service.CourseScheduleService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.HomeService;
|
|
|
import com.yonge.cooleshow.biz.dal.support.WrapperUtil;
|
|
|
import com.yonge.cooleshow.biz.dal.vo.CourseHomeVo;
|
|
|
+import com.yonge.cooleshow.biz.dal.vo.TagTotalTeacher;
|
|
|
import com.yonge.cooleshow.biz.dal.vo.res.HomeTotalStudent;
|
|
|
import com.yonge.cooleshow.biz.dal.vo.res.HomeTotalTeacher;
|
|
|
import com.yonge.cooleshow.biz.dal.vo.res.HomeUserToDoNum;
|
|
@@ -48,26 +50,84 @@ public class HomeServiceImpl implements HomeService {
|
|
|
public HttpResponseResult<HomeTotalTeacher> totalTeacher(TotalReq query) {
|
|
|
//统计查询
|
|
|
List<HomeTotalTeacher> totalList = baserMapper.totalTeacher(query.getTimeType().getCode(), query);
|
|
|
+
|
|
|
+ // 点亮图标
|
|
|
+ List<TagTotalTeacher> tagList = baserMapper.tagTeacher(query.getTimeType().getCode(), query);
|
|
|
+
|
|
|
+ Map<String, Map<String, List<TagTotalTeacher>>> tagTimeTypeGroup = tagList.stream()
|
|
|
+ .collect(Collectors.groupingBy(
|
|
|
+ TagTotalTeacher::getTimeStr,
|
|
|
+ Collectors.groupingBy(
|
|
|
+ TagTotalTeacher::getTagType)));
|
|
|
+ Map<String, Map<Long, List<TagTotalTeacher>>> tagTimeUserGroup = tagList.stream()
|
|
|
+ .collect(Collectors.groupingBy(
|
|
|
+ TagTotalTeacher::getTimeStr,
|
|
|
+ Collectors.groupingBy(
|
|
|
+ TagTotalTeacher::getUserId)));
|
|
|
+
|
|
|
Integer registerNum = 0;
|
|
|
Integer entryNum = 0;
|
|
|
Integer liveNum = 0;
|
|
|
Integer musicianNum = 0;
|
|
|
+ Integer tagNum = 0 ;
|
|
|
+ Integer styleTagNum = 0;
|
|
|
+ Integer videoTagNum = 0;
|
|
|
+ Integer liveTagNum = 0;
|
|
|
+ Integer musicTagNum = 0;
|
|
|
for (HomeTotalTeacher totalTeacher : totalList) {
|
|
|
totalTeacher.setRegisterNum(null == totalTeacher.getRegisterNum() ? 0 : totalTeacher.getRegisterNum());
|
|
|
totalTeacher.setEntryNum(null == totalTeacher.getEntryNum() ? 0 : totalTeacher.getEntryNum());
|
|
|
totalTeacher.setLiveNum(null == totalTeacher.getLiveNum() ? 0 : totalTeacher.getLiveNum());
|
|
|
totalTeacher.setMusicianNum(null == totalTeacher.getMusicianNum() ? 0 : totalTeacher.getMusicianNum());
|
|
|
|
|
|
+ Map<String, List<TagTotalTeacher>> typeGroup = tagTimeTypeGroup.get(totalTeacher.getTimeStr());
|
|
|
+ if (typeGroup != null) {
|
|
|
+ List<TagTotalTeacher> liveTagList = typeGroup.get(TeacherTagEnum.LIVE.getCode());
|
|
|
+ List<TagTotalTeacher> musicTagList = typeGroup.get(TeacherTagEnum.MUSIC.getCode());
|
|
|
+ List<TagTotalTeacher> styleTagList = typeGroup.get(TeacherTagEnum.STYLE.getCode());
|
|
|
+ List<TagTotalTeacher> videoTagList = typeGroup.get(TeacherTagEnum.VIDEO.getCode());
|
|
|
+ totalTeacher.setLiveTagNum(CollectionUtils.isEmpty(liveTagList) ? 0:liveTagList.size());
|
|
|
+ totalTeacher.setMusicTagNum(CollectionUtils.isEmpty(musicTagList) ? 0:musicTagList.size());
|
|
|
+ totalTeacher.setStyleTagNum(CollectionUtils.isEmpty(styleTagList) ? 0:styleTagList.size());
|
|
|
+ totalTeacher.setVideoTagNum(CollectionUtils.isEmpty(videoTagList) ? 0:videoTagList.size());
|
|
|
+ } else {
|
|
|
+ totalTeacher.setLiveTagNum(0);
|
|
|
+ totalTeacher.setMusicTagNum(0);
|
|
|
+ totalTeacher.setStyleTagNum(0);
|
|
|
+ totalTeacher.setVideoTagNum(0);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ Map<Long, List<TagTotalTeacher>> userGroup = tagTimeUserGroup.get(totalTeacher.getTimeStr());
|
|
|
+
|
|
|
+ if (userGroup != null) {
|
|
|
+
|
|
|
+ totalTeacher.setTagNum(userGroup.size());
|
|
|
+ } else {
|
|
|
+ totalTeacher.setTagNum(0);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
registerNum += totalTeacher.getRegisterNum();
|
|
|
entryNum += totalTeacher.getEntryNum();
|
|
|
liveNum += totalTeacher.getLiveNum();
|
|
|
musicianNum += totalTeacher.getMusicianNum();
|
|
|
+ tagNum += totalTeacher.getTagNum();
|
|
|
+ styleTagNum += totalTeacher.getStyleTagNum();
|
|
|
+ videoTagNum += totalTeacher.getVideoTagNum();
|
|
|
+ liveTagNum += totalTeacher.getLiveTagNum();
|
|
|
+ musicTagNum += totalTeacher.getMusicTagNum();
|
|
|
}
|
|
|
HomeTotalTeacher total = new HomeTotalTeacher();
|
|
|
total.setRegisterNum(registerNum);
|
|
|
total.setEntryNum(entryNum);
|
|
|
total.setLiveNum(liveNum);
|
|
|
total.setMusicianNum(musicianNum);
|
|
|
+ total.setTagNum(tagNum);
|
|
|
+ total.setStyleTagNum(styleTagNum);
|
|
|
+ total.setVideoTagNum(videoTagNum);
|
|
|
+ total.setLiveTagNum(liveTagNum);
|
|
|
+ total.setMusicTagNum(musicTagNum);
|
|
|
total.setInfoList(totalList);
|
|
|
return HttpResponseResult.succeed(total);
|
|
|
}
|
|
@@ -82,6 +142,7 @@ public class HomeServiceImpl implements HomeService {
|
|
|
Integer liveNum = 0;
|
|
|
Integer musicNum = 0;
|
|
|
Integer shoppingNum = 0;
|
|
|
+ Integer payStudentNum = 0;
|
|
|
|
|
|
for (HomeTotalStudent totalStudent : totalList) {
|
|
|
totalStudent.setRegisterNum(null == totalStudent.getRegisterNum() ? 0 : totalStudent.getRegisterNum());
|
|
@@ -91,6 +152,7 @@ public class HomeServiceImpl implements HomeService {
|
|
|
totalStudent.setLiveNum(null == totalStudent.getLiveNum() ? 0 : totalStudent.getLiveNum());
|
|
|
totalStudent.setMusicNum(null == totalStudent.getMusicNum() ? 0 : totalStudent.getMusicNum());
|
|
|
totalStudent.setShoppingNum(null == totalStudent.getShoppingNum() ? 0 : totalStudent.getShoppingNum());
|
|
|
+ totalStudent.setPayStudentNum(null == totalStudent.getPayStudentNum() ? 0 : totalStudent.getPayStudentNum());
|
|
|
|
|
|
registerNum += totalStudent.getRegisterNum();
|
|
|
vipNum += totalStudent.getVipNum();
|
|
@@ -99,6 +161,7 @@ public class HomeServiceImpl implements HomeService {
|
|
|
liveNum += totalStudent.getLiveNum();
|
|
|
musicNum += totalStudent.getMusicNum();
|
|
|
shoppingNum += totalStudent.getShoppingNum();
|
|
|
+ payStudentNum += totalStudent.getPayStudentNum();
|
|
|
}
|
|
|
HomeTotalStudent total = new HomeTotalStudent();
|
|
|
total.setRegisterNum(registerNum);
|
|
@@ -108,6 +171,7 @@ public class HomeServiceImpl implements HomeService {
|
|
|
total.setLiveNum(liveNum);
|
|
|
total.setMusicNum(musicNum);
|
|
|
total.setShoppingNum(shoppingNum);
|
|
|
+ total.setPayStudentNum(payStudentNum);
|
|
|
|
|
|
total.setInfoList(totalList);
|
|
|
return HttpResponseResult.succeed(total);
|