ccsens_wiki
/
ccsenscloud
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'pt' of https://dd.tall.wiki/gitea/ccsens_wiki/ccsenscloud into pt

tiaosheng
Lihong@123456 5 years ago
parent
c06d911211 d9f07452c7
commit
6b66a8aaa3
7 changed files with 54 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      mt/src/main/java/com/ccsens/mt/api/KCPlayerController.java
  2. 6
      mt/src/main/java/com/ccsens/mt/service/CompeteService.java
  3. 8
      mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java
  4. 51
      mt/src/main/java/com/ccsens/mt/service/ExcelService.java
  5. 2
      mt/src/main/java/com/ccsens/mt/service/ICompeteService.java
  6. 8
      mt/src/main/java/com/ccsens/mt/service/KCPlayerService.java
  7. 9
      mt/src/main/resources/mapper_dao/CompeteVideoDao.xml

2
mt/src/main/java/com/ccsens/mt/api/KCPlayerController.java
View File

@ -41,7 +41,7 @@ public class KCPlayerController {
@ApiOperation(value = "云点播回调接口", notes = "上传时候后，云点播回调接口，保存视频的路径")
@RequestMapping(value = "/receive", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse receive(@RequestBody JSONObject jsonObject) {
log.info("接受文件上传通知：{}",jsonObject);
log.info("云点播回调接口：{}",jsonObject);
kcPlayerService.saveVideoUrl(jsonObject);
return JsonResponse.newInstance().ok();
}

6
mt/src/main/java/com/ccsens/mt/service/CompeteService.java
View File

@ -107,8 +107,8 @@ public class CompeteService implements ICompeteService {
@Override
public PageInfo<CompeteVo.TotalScoreDisplay> showResultPage(ScoreDto.ShowResultW param) {
PageHelper.startPage(param.getPageNum(),param.getPageSize());
public List<CompeteVo.TotalScoreDisplay> showResultPage(ScoreDto.ShowResultW param) {
//PageHelper.startPage(param.getPageNum(),param.getPageSize());
List<CompeteVo.TotalScoreDisplay> totalScoreDisplaysList=new ArrayList<>();
CompeteStartOrderExample competeStartOrderExample =new CompeteStartOrderExample();
@ -207,7 +207,7 @@ public class CompeteService implements ICompeteService {
totalScoreDisplay.setRownum(i+1);
}
return new PageInfo<>(totalScoreDisplaysList);
return totalScoreDisplaysList;
}
/**
* 花样赛总成绩展示

8
mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java
View File

@ -68,6 +68,12 @@ public class CompeteVedioService implements ICompeteVedioService{
@Override
public String uploadVideoPath(VideoDto.UploadVdeo param) {
CompeteVideoExample competeVideoExample=new CompeteVideoExample();
competeVideoExample.createCriteria().andProjectIdEqualTo(param.getCompeteProjectId()).andPlayerIdEqualTo(param.getPlayerOrTeamId()).andRecStatusEqualTo((byte)0);
List<CompeteVideo> competeVideos = competeVideoMapper.selectByExample(competeVideoExample);
if(competeVideos.size()>0){
return competeVideos.get(0).getVideoUrl();
}
CompeteVideo competeVideo=new CompeteVideo();
competeVideo.setId(snowflake.nextId());
competeVideo.setCompeteTimeId(param.getCompeteTimeId());
@ -77,7 +83,7 @@ public class CompeteVedioService implements ICompeteVedioService{
competeVideo.setRecStatus((byte) 0);
long startTime = System.currentTimeMillis();
competeVideo.setUploadTime(startTime);
competeVideoMapper.insert(competeVideo);
competeVideoMapper.insertSelective(competeVideo);
return param.getVideoPath();
}

51
mt/src/main/java/com/ccsens/mt/service/ExcelService.java
View File

@ -14,11 +14,13 @@ import com.ccsens.mt.bean.vo.TableVo;
import com.ccsens.mt.persist.dao.*;
import com.ccsens.mt.persist.mapper.*;
import com.ccsens.mt.util.Constant;
import com.ccsens.util.CodeEnum;
import com.ccsens.util.PoiUtil;
import com.ccsens.util.PropUtil;
import com.ccsens.util.WebConstant;
import com.ccsens.util.bean.dto.QueryDto;
import com.ccsens.util.exception.BaseException;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
@ -1332,17 +1334,18 @@ public class ExcelService implements IExcelService {
@Override
public String patternExpTable(ScoreDto.ShowResultW param) {
List<CompeteVo.TotalScoreDisplay> totalScoreDisplays = competeService.showResult(param).getList();
//List<CompeteVo.TotalScoreDisplay> totalScoreDisplays = competeService.showResultPage(param);
List<CompeteVo.TotalScoreDisplay> totalScoreDisplays = competeScoreDao.queryVarietyScore(param.getProjectId());
List<List<PoiUtil.PoiUtilCell>> list = new ArrayList<>();
List<PoiUtil.PoiUtilCell> zero=new ArrayList<>();
PoiUtil.PoiUtilCell zeroOne=new PoiUtil.PoiUtilCell("比赛成绩公示(花样赛)", 14, 1);
zero.add(zeroOne);
list.add(zero);
List<PoiUtil.PoiUtilCell> one=new ArrayList<>();
PoiUtil.PoiUtilCell oneOne=new PoiUtil.PoiUtilCell("参赛单位", 1, 1);
PoiUtil.PoiUtilCell oneTwo=new PoiUtil.PoiUtilCell("参赛队员", 1, 1);
PoiUtil.PoiUtilCell oneOne=new PoiUtil.PoiUtilCell("参赛单位", 1, 2);
PoiUtil.PoiUtilCell oneTwo=new PoiUtil.PoiUtilCell("参赛队员", 1, 2);
PoiUtil.PoiUtilCell oneThree=new PoiUtil.PoiUtilCell("创意编排分", 3, 1);
PoiUtil.PoiUtilCell oneFour=new PoiUtil.PoiUtilCell("创意最后得分", 1, 1);
PoiUtil.PoiUtilCell oneFour=new PoiUtil.PoiUtilCell("创意最后得分", 1, 2);
PoiUtil.PoiUtilCell oneFive=new PoiUtil.PoiUtilCell("完成质量分", 3, 1);
PoiUtil.PoiUtilCell oneSix=new PoiUtil.PoiUtilCell("完成最后得分", 1, 2);
PoiUtil.PoiUtilCell oneSeven=new PoiUtil.PoiUtilCell("主裁判扣分", 1, 2);
@ -1352,8 +1355,13 @@ public class ExcelService implements IExcelService {
one.add(oneOne);
one.add(oneTwo);
one.add(oneThree);
one.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL) );
one.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL) );
one.add(oneFour);
one.add(oneFive);
one.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL) );
one.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL) );
one.add(oneSix);
one.add(oneSeven);
one.add(oneEight);
@ -1361,8 +1369,8 @@ public class ExcelService implements IExcelService {
one.add(oneTen);
list.add(one);
List<PoiUtil.PoiUtilCell> two = new ArrayList<>();
PoiUtil.PoiUtilCell twoOne = new PoiUtil.PoiUtilCell();
PoiUtil.PoiUtilCell twoTwo = new PoiUtil.PoiUtilCell();
PoiUtil.PoiUtilCell twoOne = new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL);
PoiUtil.PoiUtilCell twoTwo = new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL);
PoiUtil.PoiUtilCell twoThree = new PoiUtil.PoiUtilCell("1", 1, 1);
PoiUtil.PoiUtilCell twoFour = new PoiUtil.PoiUtilCell("2", 1, 1);
PoiUtil.PoiUtilCell twoFive = new PoiUtil.PoiUtilCell("3", 1, 1);
@ -1386,7 +1394,7 @@ public class ExcelService implements IExcelService {
PoiUtil.PoiUtilCell threeTwo = new PoiUtil.PoiUtilCell(mes.getPeopleName(), 1, 1);
three.add(threeOne);
three.add(threeTwo);
if(mes.getRemark()==(byte)0){
if(true){
PoiUtil.PoiUtilCell threeThree=new PoiUtil.PoiUtilCell(StringUtil.valueOf(mes.getReferee1()),1,1);
PoiUtil.PoiUtilCell threeFive=new PoiUtil.PoiUtilCell(StringUtil.valueOf(mes.getReferee2()),1,1);
PoiUtil.PoiUtilCell threeSix=new PoiUtil.PoiUtilCell(StringUtil.valueOf(mes.getReferee3()),1,1);
@ -1491,16 +1499,23 @@ public class ExcelService implements IExcelService {
public String countExpTable(ScoreDto.ShowResult param) {
List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSiteList = new ArrayList<>();
CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId());
if(ObjectUtil.isNotNull(competeProject)) {
if(competeProject.getTeam() == 0) {
countScoreCurrentSiteList = competeScoreDao.queryCountScoreAll(param.getProjectId());
}else {
countScoreCurrentSiteList = competeScoreDao.queryCountScoreAllByTeam(param.getProjectId());
}
log.info("计数赛成绩公示：{}", param);
CompeteProject project = competeProjectMapper.selectByPrimaryKey(param.getProjectId());
log.info("查询{}项目的成绩：", project);
if (project == null) {
throw new BaseException(CodeEnum.PARAM_ERROR);
}
List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSites = countScoreCurrentSiteList;
// PageHelper.startPage(param.getPage(), param.getSize());
List<ScoreVo.CountScorePublicity> countScoreCurrentSiteList;
if (project.getTeam() == Constant.Compete.TEAM_YES) {
// 团体赛
countScoreCurrentSiteList = competeScoreDao.queryCountScoreTeam(param.getProjectId());
} else {
// 个人赛
countScoreCurrentSiteList = competeScoreDao.queryCountScorePerson(param.getProjectId());
}
List<ScoreVo.CountScorePublicity> countScoreCurrentSites = countScoreCurrentSiteList;
List<List<PoiUtil.PoiUtilCell>> list = new ArrayList<>();
@ -1519,9 +1534,13 @@ public class ExcelService implements IExcelService {
PoiUtil.PoiUtilCell oneEight=new PoiUtil.PoiUtilCell("名词", 1, 2);
PoiUtil.PoiUtilCell oneNine=new PoiUtil.PoiUtilCell("备注", 1, 2);
one.add(oneOne);
one.add(oneTwo);
one.add(oneThree);
one.add(oneFour);
one.add(new PoiUtil.PoiUtilCell());
one.add(oneFive);
one.add(oneSix);
one.add(oneSeven);

2
mt/src/main/java/com/ccsens/mt/service/ICompeteService.java
View File

@ -155,7 +155,7 @@ public interface ICompeteService {
void submitOrderList(ScoreDto.InformationSubmitted param);
PageInfo<CompeteVo.TotalScoreDisplay> showResultPage(ScoreDto.ShowResultW param);
List<CompeteVo.TotalScoreDisplay> showResultPage(ScoreDto.ShowResultW param);
PageInfo<CompeteVo.TotalScoreDisplay> showResult(ScoreDto.ShowResultW param);

8
mt/src/main/java/com/ccsens/mt/service/KCPlayerService.java
View File

@ -73,9 +73,11 @@ public class KCPlayerService implements IKCPlayerService{
JSONObject sourceInfo = mediaBasicInfo.getJSONObject("SourceInfo");
JSONObject sourceContext = sourceInfo.getJSONObject("SourceContext");
Long orderId = Long.parseLong(sourceContext.toString());
log.info("获取场次id：{}",orderId);
// TODO 获取视频路径
JSONObject mediaUrl = mediaBasicInfo.getJSONObject("MediaUrl");
String videoUrl = mediaUrl.toString();
log.info("获取视频路径：{}",videoUrl);
//通过场次id获取场次信息
CompeteStartOrder startOrder = startOrderMapper.selectByPrimaryKey(orderId);
if(ObjectUtil.isNull(startOrder)){
@ -85,9 +87,12 @@ public class KCPlayerService implements IKCPlayerService{
CompeteVideoExample competeVideoExample = new CompeteVideoExample();
competeVideoExample.createCriteria().andProjectIdEqualTo(startOrder.getProjectId())
.andPlayerIdEqualTo(startOrder.getPlayerId());
if(competeVideoMapper.countByExample(competeVideoExample) > 0){
long count = competeVideoMapper.countByExample(competeVideoExample);
log.info("查询以前上传的视频的记录：{}",count);
if(count > 0){
throw new BaseException(CodeEnum.ALREADY_UPLOAD_VIDEO);
}
//将视频信息存入视频表
CompeteVideo competeVideo = new CompeteVideo();
competeVideo.setId(snowflake.nextId());
@ -95,6 +100,7 @@ public class KCPlayerService implements IKCPlayerService{
competeVideo.setPlayerId(startOrder.getPlayerId());
competeVideo.setVideoUrl(videoUrl);
competeVideo.setUploadTime(System.currentTimeMillis());
log.info("添加上传视频记录：{}",count);
competeVideoMapper.insertSelective(competeVideo);
}
}

9
mt/src/main/resources/mapper_dao/CompeteVideoDao.xml
View File

@ -62,15 +62,6 @@
and tall.t_sys_log.created_at &lt;= #{param.signEndTime,jdbcType=TIMESTAMP}
</if>
GROUP BY tall.t_sys_log.user_id
<!-- select created_at as cr,user_id FROM(-->
<!-- select * from tall.t_sys_log-->
<!-- where `url`='/users/signin' and `rec_status`=0-->
<!-- <if test="param.signEndTime!=null">-->
<!-- and tall.t_sys_log.created_at &lt;= #{param.signEndTime,jdbcType=TIMESTAMP}-->
<!-- </if>-->
<!-- ORDER BY created_at DESC ) tt-->
<!-- GROUP BY tt.user_id-->
) tt on tt.`user_id`=tcj.`user_id`
LEFT JOIN t_compete_time tct on tct.id =tcj.`compete_time_id`
WHERE

Write Preview
Loading…
Cancel
Save