大赛管理功能
This commit is contained in:
parent
9cda9872cd
commit
8b23269aba
|
@ -1 +1 @@
|
|||
Subproject commit e86eac94a2db155b79d09bbe4fb145a8ebc69014
|
||||
Subproject commit 6e89e00929268799a12329aafb770e1a74ec491d
|
|
@ -7,6 +7,7 @@ import club.joylink.rtss.vo.AccountVO;
|
|||
import club.joylink.rtss.vo.client.PageVO;
|
||||
import club.joylink.rtss.vo.race.RacePaper.RacePaperCreateVO;
|
||||
import club.joylink.rtss.vo.race.RacePaper.RacePaperDetailVO;
|
||||
import club.joylink.rtss.vo.race.RacePaper.RacePaperMenuVO;
|
||||
import club.joylink.rtss.vo.race.RacePaper.RacePaperModuleVO;
|
||||
import club.joylink.rtss.vo.race.RacePaper.RacePaperVO;
|
||||
import club.joylink.rtss.vo.race.RacePaperQueryVO;
|
||||
|
@ -61,6 +62,17 @@ public class RacePaperController {
|
|||
return racePaperService.pageQuery(queryVO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取赛季试卷菜单
|
||||
*
|
||||
* @param queryVO
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/menu")
|
||||
public RacePaperMenuVO pageMenu(RacePaperQueryVO queryVO) {
|
||||
return this.racePaperService.pageMenuQuery(queryVO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 试卷配置
|
||||
*
|
||||
|
|
|
@ -7,6 +7,7 @@ import club.joylink.rtss.vo.client.PageVO;
|
|||
import club.joylink.rtss.vo.race.RaceSeasonOuterClass.RaceSeasonCreateVO;
|
||||
import club.joylink.rtss.vo.race.RaceSeasonOuterClass.RaceSeasonVO;
|
||||
import club.joylink.rtss.vo.race.RaceSeasonQueryVO;
|
||||
import java.util.Map;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
|
@ -50,6 +51,28 @@ public class RaceSeasonController {
|
|||
this.raceSeasonService.update(id, dto, user);
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑html内容
|
||||
*
|
||||
* @param id
|
||||
* @param user
|
||||
*/
|
||||
@PostMapping("/{id}/html")
|
||||
public void updateHtmlContent(@PathVariable("id") Long id, @RequestBody Map<String, String> contentMap, @RequestAttribute AccountVO user) {
|
||||
String content = contentMap.get("htmlContent");
|
||||
this.raceSeasonService.updateHtmlContent(id, content, user);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查找对应的html content
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/{id}/html")
|
||||
public String queryHtmlContent(@PathVariable("id") Long id) {
|
||||
return this.raceSeasonService.queryHtmlContent(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查找
|
||||
|
|
|
@ -19,7 +19,7 @@ import org.springframework.stereotype.Repository;
|
|||
public interface RacetrPaperDAO extends MyBatisBaseDao<RacetrPaper, Long, RacetrPaperExample> {
|
||||
|
||||
@Select("<script>"
|
||||
+ " select A.id,A.name,A.`desc`,A.season_id as seasonId ,B.code as seasonName,B.group"
|
||||
+ " select A.id,A.name,A.`desc`,A.season_id as seasonId ,B.code as seasonName,B.group,B.term as seasonTerm"
|
||||
+ " ,A.creator_id,A.create_time,A.updater_id,A.update_time,C.nickname as creatorName,D.nickname as updaterName "
|
||||
+ " from racetr_paper A left join racetr_season B on A.season_id = B.id "
|
||||
+ " left join sys_account C on A.creator_id = C.id "
|
||||
|
|
|
@ -3,6 +3,8 @@ package club.joylink.rtss.dao.racetr;
|
|||
import club.joylink.rtss.dao.MyBatisBaseDao;
|
||||
import club.joylink.rtss.entity.racetr.RacetrSeason;
|
||||
import club.joylink.rtss.entity.racetr.RacetrSeasonExample;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
|
@ -12,4 +14,5 @@ import org.springframework.stereotype.Repository;
|
|||
@Repository
|
||||
public interface RacetrSeasonDAO extends MyBatisBaseDao<RacetrSeason, Long, RacetrSeasonExample> {
|
||||
|
||||
List<RacetrSeason> selectByExampleWithBLOBs(RacetrSeasonExample example);
|
||||
}
|
|
@ -48,5 +48,10 @@ public class RacetrSeason implements Serializable {
|
|||
*/
|
||||
private LocalDateTime udpateTime;
|
||||
|
||||
/**
|
||||
* html文本信息
|
||||
*/
|
||||
private String detailHtmlContent;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
}
|
|
@ -0,0 +1,19 @@
|
|||
package club.joylink.rtss.exception;
|
||||
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
public enum RacetrExceptionAssert implements BusinessExceptionAssert {
|
||||
publishSceneNotForce(12000, "发布重复的场景,是否强制替换"),
|
||||
|
||||
;
|
||||
|
||||
int code;
|
||||
|
||||
String message;
|
||||
|
||||
private RacetrExceptionAssert(int code, String message) {
|
||||
this.code = code;
|
||||
this.message = message;
|
||||
}
|
||||
}
|
|
@ -1,13 +1,21 @@
|
|||
package club.joylink.rtss.services.race;
|
||||
|
||||
import club.joylink.rtss.dao.racetr.RacetrPaperDAO;
|
||||
import club.joylink.rtss.dao.racetr.RacetrSeasonDAO;
|
||||
import club.joylink.rtss.entity.racetr.RacetrPaper;
|
||||
import club.joylink.rtss.entity.racetr.RacetrPaperExample;
|
||||
import club.joylink.rtss.entity.racetr.RacetrSeason;
|
||||
import club.joylink.rtss.entity.racetr.RacetrSeasonExample;
|
||||
import club.joylink.rtss.entity.racetr.RacetrSeasonExample.Criteria;
|
||||
import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
|
||||
import club.joylink.rtss.vo.AccountVO;
|
||||
import club.joylink.rtss.vo.client.PageVO;
|
||||
import club.joylink.rtss.vo.common.ModifyInfo.ModifyInfoVO;
|
||||
import club.joylink.rtss.vo.race.RacePaper.RacePaperCreateVO;
|
||||
import club.joylink.rtss.vo.race.RacePaper.RacePaperDetailVO;
|
||||
import club.joylink.rtss.vo.race.RacePaper.RacePaperMenuVO;
|
||||
import club.joylink.rtss.vo.race.RacePaper.RacePaperMenuVO.PaperMenu;
|
||||
import club.joylink.rtss.vo.race.RacePaper.RacePaperMenuVO.SeasonMenu;
|
||||
import club.joylink.rtss.vo.race.RacePaper.RacePaperModuleVO;
|
||||
import club.joylink.rtss.vo.race.RacePaper.RacePaperModuleVO.PaperModule;
|
||||
import club.joylink.rtss.vo.race.RacePaper.RacePaperVO;
|
||||
|
@ -43,6 +51,8 @@ public class RacePaperService {
|
|||
private RacetrPaperDAO paperDAO;
|
||||
@Autowired
|
||||
private RaceTaskService taskService;
|
||||
@Autowired
|
||||
private RacetrSeasonDAO seasonDAO;
|
||||
|
||||
private RacetrPaper findId(Long id) {
|
||||
RacetrPaper rp = this.paperDAO.selectByPrimaryKey(id);
|
||||
|
@ -74,6 +84,57 @@ public class RacePaperService {
|
|||
|
||||
}
|
||||
|
||||
private List<RacetrSeason> findSeasonMenu(Group group) {
|
||||
RacetrSeasonExample example = new RacetrSeasonExample();
|
||||
Criteria c = example.createCriteria();
|
||||
if (Objects.nonNull(group) && group != Group.Unknown) {
|
||||
c.andGroupEqualTo(group.name());
|
||||
}
|
||||
List<RacetrSeason> seasons = this.seasonDAO.selectByExampleWithBLOBs(example);
|
||||
return seasons;
|
||||
}
|
||||
|
||||
public RacePaperMenuVO pageMenuQuery(RacePaperQueryVO query) {
|
||||
Group group = Group.Unknown;
|
||||
if (StringUtils.isNotEmpty(query.getGroup())) {
|
||||
group = Group.valueOf(query.getGroup());
|
||||
}
|
||||
List<RacetrSeason> seasons = this.findSeasonMenu(group);
|
||||
RacePaperMenuVO.Builder menuBuilder = RacePaperMenuVO.newBuilder();
|
||||
if (CollectionUtils.isEmpty(seasons)) {
|
||||
return menuBuilder.build();
|
||||
}
|
||||
List<Long> seasonIdList = seasons.stream().map(RacetrSeason::getId).collect(Collectors.toList());
|
||||
RacetrPaperExample paperExample = new RacetrPaperExample();
|
||||
paperExample.createCriteria().andSeasonIdIn(seasonIdList);
|
||||
List<RacetrPaper> papers = this.paperDAO.selectByExample(paperExample);
|
||||
Map<Long, List<RacetrPaper>> paperMapList = papers.stream().collect(Collectors.groupingBy(RacetrPaper::getSeasonId));
|
||||
|
||||
for (RacetrSeason season : seasons) {
|
||||
SeasonMenu.Builder sm = SeasonMenu.newBuilder();
|
||||
sm.setSeasonId(season.getId());
|
||||
sm.setSeasonName(season.getTerm());
|
||||
if (StringUtils.isNotEmpty(season.getDetailHtmlContent())) {
|
||||
sm.setDetailHtmlContent(season.getDetailHtmlContent());
|
||||
}
|
||||
|
||||
this.convertPaperMenu(sm, paperMapList);
|
||||
menuBuilder.addMenu(sm);
|
||||
}
|
||||
return menuBuilder.build();
|
||||
}
|
||||
|
||||
private void convertPaperMenu(SeasonMenu.Builder seasonBuild, Map<Long, List<RacetrPaper>> paperMapList) {
|
||||
List<RacetrPaper> paperList = paperMapList.get(seasonBuild.getSeasonId());
|
||||
if (!CollectionUtils.isEmpty(paperList)) {
|
||||
for (RacetrPaper paper : paperList) {
|
||||
PaperMenu.Builder pm = PaperMenu.newBuilder();
|
||||
pm.setId(paper.getId());
|
||||
pm.setName(paper.getName());
|
||||
seasonBuild.addPapers(pm);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public PageVO<RacePaperVO> pageQuery(RacePaperQueryVO query) {
|
||||
if (!StringUtils.equalsAny(query.getGroup(), Group.GZ.name(), Group.ZZ.name())) {
|
||||
|
|
|
@ -7,7 +7,9 @@ import club.joylink.rtss.entity.racetr.RacetrScene;
|
|||
import club.joylink.rtss.entity.racetr.RacetrSceneExample;
|
||||
import club.joylink.rtss.entity.racetr.RacetrTaskExample;
|
||||
import club.joylink.rtss.entity.training2.DraftTraining2WithBLOBs;
|
||||
import club.joylink.rtss.exception.BusinessExceptionAssert;
|
||||
import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
|
||||
import club.joylink.rtss.exception.RacetrExceptionAssert;
|
||||
import club.joylink.rtss.simulation.cbtc.training2.Training2;
|
||||
import club.joylink.rtss.util.JsonUtils;
|
||||
import club.joylink.rtss.vo.AccountVO;
|
||||
|
@ -34,6 +36,7 @@ import lombok.extern.slf4j.Slf4j;
|
|||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
@Service
|
||||
@Slf4j
|
||||
|
@ -72,6 +75,7 @@ public class RaceSceneService {
|
|||
return vo.build();
|
||||
}
|
||||
|
||||
|
||||
public List<RaceSceneListVO> convertDto(List<RaceScenePageVO> list) {
|
||||
if (CollectionUtils.isEmpty(list)) {
|
||||
return Collections.emptyList();
|
||||
|
@ -93,10 +97,16 @@ public class RaceSceneService {
|
|||
}
|
||||
|
||||
public void publishHere(RaceScenePublishVO vo, AccountVO user) {
|
||||
BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertTrue(StringUtils.hasText(vo.getName()), "请输入发布场景的名称");
|
||||
String publishName = vo.getName().trim();
|
||||
PublishHereVO phvo = this.createSceneProto(vo.getDafitid());
|
||||
RacetrSceneExample sceneExample = new RacetrSceneExample();
|
||||
sceneExample.createCriteria().andDraftTrainingIdEqualTo(vo.getDafitid());
|
||||
sceneExample.createCriteria().andNameEqualTo(publishName);
|
||||
// sceneExample.createCriteria().andDraftTrainingIdEqualTo(vo.getDafitid());
|
||||
List<RacetrScene> rsList = this.sceneDAO.selectByExample(sceneExample);
|
||||
if (!CollectionUtils.isEmpty(rsList) && Objects.equals(vo.getForcePublish(), false)) {
|
||||
RacetrExceptionAssert.publishSceneNotForce.fail();
|
||||
}
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
RacetrScene rs;
|
||||
boolean sceneExist = false;
|
||||
|
@ -113,7 +123,7 @@ public class RaceSceneService {
|
|||
rs.setUpdaterId(user.getId());
|
||||
rs.setUpdateTime(now);
|
||||
rs.setMapId(phvo.mapId);
|
||||
rs.setName(vo.getName());
|
||||
rs.setName(publishName);
|
||||
Scene.Builder sceneBu = Scene.newBuilder();
|
||||
sceneBu.setStorageSimulation(phvo.getStorageSimulation());
|
||||
rs.setProto(sceneBu.build().toByteArray());
|
||||
|
|
|
@ -49,6 +49,21 @@ public class RaceSeasonService {
|
|||
return rs;
|
||||
}
|
||||
|
||||
public void updateHtmlContent(Long id, String htmlContent, AccountVO user) {
|
||||
BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertTrue(StringUtils.isNotEmpty(htmlContent), "请填写需要展示的内容");
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
RacetrSeason rr = this.find(id);
|
||||
rr.setUpdaterId(user.getId());
|
||||
rr.setUdpateTime(now);
|
||||
rr.setDetailHtmlContent(htmlContent);
|
||||
this.seasonDAO.updateByPrimaryKeySelective(rr);
|
||||
}
|
||||
|
||||
public String queryHtmlContent(Long id) {
|
||||
RacetrSeason rr = this.find(id);
|
||||
return rr.getDetailHtmlContent();
|
||||
}
|
||||
|
||||
public void save(RaceSeasonCreateVO dto, AccountVO user) {
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
RacetrSeason rs = new RacetrSeason();
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
// Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
// source: common/modify_info.proto
|
||||
// source: modify_info.proto
|
||||
|
||||
package club.joylink.rtss.vo.common;
|
||||
|
||||
|
@ -1146,12 +1146,12 @@ public final class ModifyInfo {
|
|||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\030common/modify_info.proto\022\006common\"\214\001\n\014M" +
|
||||
"odifyInfoVO\022\022\n\ncreator_id\030\001 \001(\003\022\023\n\013creat" +
|
||||
"e_time\030\002 \001(\t\022\022\n\nupdater_id\030\003 \001(\003\022\023\n\013upda" +
|
||||
"te_time\030\004 \001(\t\022\024\n\014creator_name\030\005 \001(\t\022\024\n\014u" +
|
||||
"pdater_name\030\006 \001(\tB\035\n\033club.joylink.rtss.v" +
|
||||
"o.commonb\006proto3"
|
||||
"\n\021modify_info.proto\022\006common\"\214\001\n\014ModifyIn" +
|
||||
"foVO\022\022\n\ncreator_id\030\001 \001(\003\022\023\n\013create_time\030" +
|
||||
"\002 \001(\t\022\022\n\nupdater_id\030\003 \001(\003\022\023\n\013update_time" +
|
||||
"\030\004 \001(\t\022\024\n\014creator_name\030\005 \001(\t\022\024\n\014updater_" +
|
||||
"name\030\006 \001(\tB\035\n\033club.joylink.rtss.vo.commo" +
|
||||
"nb\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
// Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
// source: common/page_query.proto
|
||||
// source: page_query.proto
|
||||
|
||||
package club.joylink.rtss.vo.common;
|
||||
|
||||
|
@ -552,9 +552,9 @@ public final class PageQuery {
|
|||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\027common/page_query.proto\022\006common\")\n\013Pag" +
|
||||
"eQueryVO\022\014\n\004page\030\001 \001(\005\022\014\n\004size\030\002 \001(\005B\035\n\033" +
|
||||
"club.joylink.rtss.vo.commonb\006proto3"
|
||||
"\n\020page_query.proto\022\006common\")\n\013PageQueryV" +
|
||||
"O\022\014\n\004page\030\001 \001(\005\022\014\n\004size\030\002 \001(\005B\035\n\033club.jo" +
|
||||
"ylink.rtss.vo.commonb\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
// Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
// source: race/race_application.proto
|
||||
// source: race_application.proto
|
||||
|
||||
package club.joylink.rtss.vo.race;
|
||||
|
||||
|
@ -2107,15 +2107,15 @@ public final class RaceApplication {
|
|||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\033race/race_application.proto\022\004race\032\024rac" +
|
||||
"e/race_task.proto\"N\n\022RacePracticeResult\022" +
|
||||
"\030\n\020custom_module_id\030\001 \001(\005\022\036\n\004node\030\002 \003(\0132" +
|
||||
"\020.race.ResultNode\"\241\001\n\nResultNode\022\014\n\004name" +
|
||||
"\030\001 \001(\t\022\021\n\tfullScore\030\002 \001(\002\022\r\n\005score\030\003 \001(\002" +
|
||||
"\0221\n\004type\030\004 \001(\0162#.race.RaceTaskChildVO.Ch" +
|
||||
"ildNodeType\022\037\n\005child\030\005 \003(\0132\020.race.Result" +
|
||||
"Node\022\017\n\007sceneId\030\006 \001(\003B\033\n\031club.joylink.rt" +
|
||||
"ss.vo.raceb\006proto3"
|
||||
"\n\026race_application.proto\022\004race\032\024race/rac" +
|
||||
"e_task.proto\"N\n\022RacePracticeResult\022\030\n\020cu" +
|
||||
"stom_module_id\030\001 \001(\005\022\036\n\004node\030\002 \003(\0132\020.rac" +
|
||||
"e.ResultNode\"\241\001\n\nResultNode\022\014\n\004name\030\001 \001(" +
|
||||
"\t\022\021\n\tfullScore\030\002 \001(\002\022\r\n\005score\030\003 \001(\002\0221\n\004t" +
|
||||
"ype\030\004 \001(\0162#.race.RaceTaskChildVO.ChildNo" +
|
||||
"deType\022\037\n\005child\030\005 \003(\0132\020.race.ResultNode\022" +
|
||||
"\017\n\007sceneId\030\006 \001(\003B\033\n\031club.joylink.rtss.vo" +
|
||||
".raceb\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
// Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
// source: race/race_module.proto
|
||||
// source: race_module.proto
|
||||
|
||||
package club.joylink.rtss.vo.race;
|
||||
|
||||
|
@ -5593,23 +5593,23 @@ public final class RaceModule {
|
|||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\026race/race_module.proto\022\004race\032\030common/m" +
|
||||
"odify_info.proto\"\256\001\n\014RaceModuleVO\022\n\n\002id\030" +
|
||||
"\001 \001(\003\022\014\n\004code\030\003 \001(\t\022\014\n\004desc\030\004 \001(\t\022\020\n\010pap" +
|
||||
"er_id\030\005 \001(\003\022\'\n\014task_setting\030\006 \001(\0132\021.race" +
|
||||
".TaskSetting\022\020\n\010duration\030\007 \001(\005\022)\n\013modify" +
|
||||
"_info\030\010 \001(\0132\024.common.ModifyInfoVO\"\235\001\n\020Ra" +
|
||||
"ceModuleListVO\022\n\n\002id\030\001 \001(\003\022\014\n\004code\030\003 \001(\t" +
|
||||
"\022\014\n\004desc\030\004 \001(\t\022\020\n\010paper_id\030\005 \001(\003\022\022\n\npape" +
|
||||
"r_name\030\006 \001(\t\022\020\n\010duration\030\007 \001(\005\022)\n\013modify" +
|
||||
"_info\030\010 \001(\0132\024.common.ModifyInfoVO\"T\n\022Rac" +
|
||||
"eModuleCreateVO\022\014\n\004code\030\001 \001(\t\022\014\n\004desc\030\002 " +
|
||||
"\001(\t\022\020\n\010paper_id\030\003 \001(\003\022\020\n\010duration\030\004 \001(\005\"" +
|
||||
"\206\001\n\013TaskSetting\022&\n\005group\030\002 \003(\0132\027.race.Ta" +
|
||||
"skSetting.Group\032O\n\005Group\022\020\n\010task_ids\030\001 \003" +
|
||||
"(\003\022&\n\005group\030\002 \003(\0132\027.race.TaskSetting.Gro" +
|
||||
"up\022\014\n\004name\030\003 \001(\tB\033\n\031club.joylink.rtss.vo" +
|
||||
".raceb\006proto3"
|
||||
"\n\021race_module.proto\022\004race\032\030common/modify" +
|
||||
"_info.proto\"\256\001\n\014RaceModuleVO\022\n\n\002id\030\001 \001(\003" +
|
||||
"\022\014\n\004code\030\003 \001(\t\022\014\n\004desc\030\004 \001(\t\022\020\n\010paper_id" +
|
||||
"\030\005 \001(\003\022\'\n\014task_setting\030\006 \001(\0132\021.race.Task" +
|
||||
"Setting\022\020\n\010duration\030\007 \001(\005\022)\n\013modify_info" +
|
||||
"\030\010 \001(\0132\024.common.ModifyInfoVO\"\235\001\n\020RaceMod" +
|
||||
"uleListVO\022\n\n\002id\030\001 \001(\003\022\014\n\004code\030\003 \001(\t\022\014\n\004d" +
|
||||
"esc\030\004 \001(\t\022\020\n\010paper_id\030\005 \001(\003\022\022\n\npaper_nam" +
|
||||
"e\030\006 \001(\t\022\020\n\010duration\030\007 \001(\005\022)\n\013modify_info" +
|
||||
"\030\010 \001(\0132\024.common.ModifyInfoVO\"T\n\022RaceModu" +
|
||||
"leCreateVO\022\014\n\004code\030\001 \001(\t\022\014\n\004desc\030\002 \001(\t\022\020" +
|
||||
"\n\010paper_id\030\003 \001(\003\022\020\n\010duration\030\004 \001(\005\"\206\001\n\013T" +
|
||||
"askSetting\022&\n\005group\030\002 \003(\0132\027.race.TaskSet" +
|
||||
"ting.Group\032O\n\005Group\022\020\n\010task_ids\030\001 \003(\003\022&\n" +
|
||||
"\005group\030\002 \003(\0132\027.race.TaskSetting.Group\022\014\n" +
|
||||
"\004name\030\003 \001(\tB\033\n\031club.joylink.rtss.vo.race" +
|
||||
"b\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -12,6 +12,7 @@ public class RacePaperPageVO {
|
|||
private Boolean supportCopy;
|
||||
private Long seasonId;
|
||||
private String seasonName;
|
||||
private String seasonTerm;
|
||||
private Long creatorId;
|
||||
private LocalDateTime createTime;
|
||||
private Long updaterId;
|
||||
|
|
|
@ -16,4 +16,5 @@ public class RacePaperQueryVO extends PageQueryVO {
|
|||
|
||||
private Long seasonId;
|
||||
private String seasonName;
|
||||
private boolean querySeasonHtml;
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
// Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
// source: race/race_scene.proto
|
||||
// source: race_scene.proto
|
||||
|
||||
package club.joylink.rtss.vo.race;
|
||||
|
||||
|
@ -2554,6 +2554,16 @@ public final class RaceSceneOuterClass {
|
|||
*/
|
||||
com.google.protobuf.ByteString
|
||||
getNameBytes();
|
||||
|
||||
/**
|
||||
* <pre>
|
||||
*是否强制更新
|
||||
* </pre>
|
||||
*
|
||||
* <code>bool force_publish = 4;</code>
|
||||
* @return The forcePublish.
|
||||
*/
|
||||
boolean getForcePublish();
|
||||
}
|
||||
/**
|
||||
* Protobuf type {@code race.RaceScenePublishVO}
|
||||
|
@ -2653,6 +2663,21 @@ public final class RaceSceneOuterClass {
|
|||
}
|
||||
}
|
||||
|
||||
public static final int FORCE_PUBLISH_FIELD_NUMBER = 4;
|
||||
private boolean forcePublish_ = false;
|
||||
/**
|
||||
* <pre>
|
||||
*是否强制更新
|
||||
* </pre>
|
||||
*
|
||||
* <code>bool force_publish = 4;</code>
|
||||
* @return The forcePublish.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean getForcePublish() {
|
||||
return forcePublish_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
|
@ -2673,6 +2698,9 @@ public final class RaceSceneOuterClass {
|
|||
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
|
||||
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, name_);
|
||||
}
|
||||
if (forcePublish_ != false) {
|
||||
output.writeBool(4, forcePublish_);
|
||||
}
|
||||
getUnknownFields().writeTo(output);
|
||||
}
|
||||
|
||||
|
@ -2689,6 +2717,10 @@ public final class RaceSceneOuterClass {
|
|||
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
|
||||
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, name_);
|
||||
}
|
||||
if (forcePublish_ != false) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeBoolSize(4, forcePublish_);
|
||||
}
|
||||
size += getUnknownFields().getSerializedSize();
|
||||
memoizedSize = size;
|
||||
return size;
|
||||
|
@ -2708,6 +2740,8 @@ public final class RaceSceneOuterClass {
|
|||
!= other.getDafitid()) return false;
|
||||
if (!getName()
|
||||
.equals(other.getName())) return false;
|
||||
if (getForcePublish()
|
||||
!= other.getForcePublish()) return false;
|
||||
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
|
||||
return true;
|
||||
}
|
||||
|
@ -2724,6 +2758,9 @@ public final class RaceSceneOuterClass {
|
|||
getDafitid());
|
||||
hash = (37 * hash) + NAME_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getName().hashCode();
|
||||
hash = (37 * hash) + FORCE_PUBLISH_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
|
||||
getForcePublish());
|
||||
hash = (29 * hash) + getUnknownFields().hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
|
@ -2857,6 +2894,7 @@ public final class RaceSceneOuterClass {
|
|||
bitField0_ = 0;
|
||||
dafitid_ = 0L;
|
||||
name_ = "";
|
||||
forcePublish_ = false;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -2896,6 +2934,9 @@ public final class RaceSceneOuterClass {
|
|||
if (((from_bitField0_ & 0x00000002) != 0)) {
|
||||
result.name_ = name_;
|
||||
}
|
||||
if (((from_bitField0_ & 0x00000004) != 0)) {
|
||||
result.forcePublish_ = forcePublish_;
|
||||
}
|
||||
}
|
||||
|
||||
@java.lang.Override
|
||||
|
@ -2918,6 +2959,9 @@ public final class RaceSceneOuterClass {
|
|||
bitField0_ |= 0x00000002;
|
||||
onChanged();
|
||||
}
|
||||
if (other.getForcePublish() != false) {
|
||||
setForcePublish(other.getForcePublish());
|
||||
}
|
||||
this.mergeUnknownFields(other.getUnknownFields());
|
||||
onChanged();
|
||||
return this;
|
||||
|
@ -2954,6 +2998,11 @@ public final class RaceSceneOuterClass {
|
|||
bitField0_ |= 0x00000002;
|
||||
break;
|
||||
} // case 26
|
||||
case 32: {
|
||||
forcePublish_ = input.readBool();
|
||||
bitField0_ |= 0x00000004;
|
||||
break;
|
||||
} // case 32
|
||||
default: {
|
||||
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
|
||||
done = true; // was an endgroup tag
|
||||
|
@ -3106,6 +3155,50 @@ public final class RaceSceneOuterClass {
|
|||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private boolean forcePublish_ ;
|
||||
/**
|
||||
* <pre>
|
||||
*是否强制更新
|
||||
* </pre>
|
||||
*
|
||||
* <code>bool force_publish = 4;</code>
|
||||
* @return The forcePublish.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean getForcePublish() {
|
||||
return forcePublish_;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
*是否强制更新
|
||||
* </pre>
|
||||
*
|
||||
* <code>bool force_publish = 4;</code>
|
||||
* @param value The forcePublish to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setForcePublish(boolean value) {
|
||||
|
||||
forcePublish_ = value;
|
||||
bitField0_ |= 0x00000004;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
*是否强制更新
|
||||
* </pre>
|
||||
*
|
||||
* <code>bool force_publish = 4;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearForcePublish() {
|
||||
bitField0_ = (bitField0_ & ~0x00000004);
|
||||
forcePublish_ = false;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
|
@ -5593,26 +5686,26 @@ public final class RaceSceneOuterClass {
|
|||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\025race/race_scene.proto\022\004race\032\030common/mo" +
|
||||
"dify_info.proto\"\305\001\n\013RaceSceneVO\022\n\n\002id\030\001 " +
|
||||
"\001(\003\022\014\n\004name\030\002 \001(\t\022\"\n\004type\030\003 \001(\0162\024.race.R" +
|
||||
"aceScene.Type\022\022\n\nfunctionId\030\004 \001(\003\022\032\n\005sce" +
|
||||
"ne\030\005 \001(\0132\013.race.Scene\022(\n\nmodifyInfo\030\006 \001(" +
|
||||
"\0132\024.common.ModifyInfoVO\022\r\n\005mapId\030\007 \001(\003\022\017" +
|
||||
"\n\007mapName\030\010 \001(\t\"\234\001\n\017RaceSceneListVO\022\n\n\002i" +
|
||||
"d\030\001 \001(\003\022\014\n\004name\030\002 \001(\t\022\"\n\004type\030\003 \001(\0162\024.ra" +
|
||||
"ce.RaceScene.Type\022\016\n\006map_id\030\004 \001(\003\022\020\n\010map" +
|
||||
"_name\030\005 \001(\t\022)\n\013modify_info\030\006 \001(\0132\024.commo" +
|
||||
"n.ModifyInfoVO\"3\n\022RaceScenePublishVO\022\017\n\007" +
|
||||
"dafitid\030\001 \001(\003\022\014\n\004name\030\003 \001(\t\"I\n\005Scene\022\013\n\003" +
|
||||
"url\030\001 \001(\t\0223\n\022storage_simulation\030\002 \001(\0132\027." +
|
||||
"race.StorageSimulation\"\201\001\n\021StorageSimula" +
|
||||
"tion\022\025\n\rbg_scene_json\030\001 \001(\t\022\021\n\tstep_json" +
|
||||
"\030\002 \001(\t\022\023\n\013member_json\030\003 \001(\t\022\022\n\nplayer_id" +
|
||||
"s\030\004 \003(\t\022\031\n\021scoring_rule_json\030\005 \001(\t\"5\n\tRa" +
|
||||
"ceScene\"(\n\004Type\022\013\n\007Unknown\020\000\022\t\n\005Local\020\001\022" +
|
||||
"\010\n\004Link\020\002B\033\n\031club.joylink.rtss.vo.raceb\006" +
|
||||
"proto3"
|
||||
"\n\020race_scene.proto\022\004race\032\030common/modify_" +
|
||||
"info.proto\"\305\001\n\013RaceSceneVO\022\n\n\002id\030\001 \001(\003\022\014" +
|
||||
"\n\004name\030\002 \001(\t\022\"\n\004type\030\003 \001(\0162\024.race.RaceSc" +
|
||||
"ene.Type\022\022\n\nfunctionId\030\004 \001(\003\022\032\n\005scene\030\005 " +
|
||||
"\001(\0132\013.race.Scene\022(\n\nmodifyInfo\030\006 \001(\0132\024.c" +
|
||||
"ommon.ModifyInfoVO\022\r\n\005mapId\030\007 \001(\003\022\017\n\007map" +
|
||||
"Name\030\010 \001(\t\"\234\001\n\017RaceSceneListVO\022\n\n\002id\030\001 \001" +
|
||||
"(\003\022\014\n\004name\030\002 \001(\t\022\"\n\004type\030\003 \001(\0162\024.race.Ra" +
|
||||
"ceScene.Type\022\016\n\006map_id\030\004 \001(\003\022\020\n\010map_name" +
|
||||
"\030\005 \001(\t\022)\n\013modify_info\030\006 \001(\0132\024.common.Mod" +
|
||||
"ifyInfoVO\"J\n\022RaceScenePublishVO\022\017\n\007dafit" +
|
||||
"id\030\001 \001(\003\022\014\n\004name\030\003 \001(\t\022\025\n\rforce_publish\030" +
|
||||
"\004 \001(\010\"I\n\005Scene\022\013\n\003url\030\001 \001(\t\0223\n\022storage_s" +
|
||||
"imulation\030\002 \001(\0132\027.race.StorageSimulation" +
|
||||
"\"\201\001\n\021StorageSimulation\022\025\n\rbg_scene_json\030" +
|
||||
"\001 \001(\t\022\021\n\tstep_json\030\002 \001(\t\022\023\n\013member_json\030" +
|
||||
"\003 \001(\t\022\022\n\nplayer_ids\030\004 \003(\t\022\031\n\021scoring_rul" +
|
||||
"e_json\030\005 \001(\t\"5\n\tRaceScene\"(\n\004Type\022\013\n\007Unk" +
|
||||
"nown\020\000\022\t\n\005Local\020\001\022\010\n\004Link\020\002B\033\n\031club.joyl" +
|
||||
"ink.rtss.vo.raceb\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
@ -5636,7 +5729,7 @@ public final class RaceSceneOuterClass {
|
|||
internal_static_race_RaceScenePublishVO_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_race_RaceScenePublishVO_descriptor,
|
||||
new java.lang.String[] { "Dafitid", "Name", });
|
||||
new java.lang.String[] { "Dafitid", "Name", "ForcePublish", });
|
||||
internal_static_race_Scene_descriptor =
|
||||
getDescriptor().getMessageTypes().get(3);
|
||||
internal_static_race_Scene_fieldAccessorTable = new
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
// Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
// source: race/race_scoring_rule.proto
|
||||
// source: race_scoring_rule.proto
|
||||
|
||||
package club.joylink.rtss.vo.race;
|
||||
|
||||
|
@ -4081,18 +4081,18 @@ public final class RaceScoringRule {
|
|||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\034race/race_scoring_rule.proto\022\004race\032\030co" +
|
||||
"mmon/modify_info.proto\"r\n\021RaceScoringRul" +
|
||||
"eVO\022\n\n\002id\030\001 \001(\003\022\014\n\004name\030\002 \001(\t\022\030\n\004rule\030\003 " +
|
||||
"\001(\0132\n.race.Rule\022)\n\013modify_info\030\004 \001(\0132\024.c" +
|
||||
"ommon.ModifyInfoVO\"\\\n\025RaceScoringRuleLis" +
|
||||
"tVO\022\n\n\002id\030\001 \001(\003\022\014\n\004name\030\002 \001(\t\022)\n\013modify_" +
|
||||
"info\030\003 \001(\0132\024.common.ModifyInfoVO\"\214\001\n\004Rul" +
|
||||
"e\022\036\n\005units\030\001 \003(\0132\017.race.Rule.Unit\032d\n\004Uni" +
|
||||
"t\022\014\n\004name\030\001 \001(\t\022\r\n\005score\030\002 \001(\r\022\020\n\010criter" +
|
||||
"ia\030\004 \001(\t\022!\n\010children\030\005 \003(\0132\017.race.Rule.U" +
|
||||
"nit\022\n\n\002id\030\006 \001(\tB\033\n\031club.joylink.rtss.vo." +
|
||||
"raceb\006proto3"
|
||||
"\n\027race_scoring_rule.proto\022\004race\032\030common/" +
|
||||
"modify_info.proto\"r\n\021RaceScoringRuleVO\022\n" +
|
||||
"\n\002id\030\001 \001(\003\022\014\n\004name\030\002 \001(\t\022\030\n\004rule\030\003 \001(\0132\n" +
|
||||
".race.Rule\022)\n\013modify_info\030\004 \001(\0132\024.common" +
|
||||
".ModifyInfoVO\"\\\n\025RaceScoringRuleListVO\022\n" +
|
||||
"\n\002id\030\001 \001(\003\022\014\n\004name\030\002 \001(\t\022)\n\013modify_info\030" +
|
||||
"\003 \001(\0132\024.common.ModifyInfoVO\"\214\001\n\004Rule\022\036\n\005" +
|
||||
"units\030\001 \003(\0132\017.race.Rule.Unit\032d\n\004Unit\022\014\n\004" +
|
||||
"name\030\001 \001(\t\022\r\n\005score\030\002 \001(\r\022\020\n\010criteria\030\004 " +
|
||||
"\001(\t\022!\n\010children\030\005 \003(\0132\017.race.Rule.Unit\022\n" +
|
||||
"\n\002id\030\006 \001(\tB\033\n\031club.joylink.rtss.vo.raceb" +
|
||||
"\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
// Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
// source: race/race_season.proto
|
||||
// source: race_season.proto
|
||||
|
||||
package club.joylink.rtss.vo.race;
|
||||
|
||||
|
@ -2495,16 +2495,16 @@ public final class RaceSeasonOuterClass {
|
|||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\026race/race_season.proto\022\004race\032\030common/m" +
|
||||
"odify_info.proto\"\210\001\n\014RaceSeasonVO\022\n\n\002id\030" +
|
||||
"\001 \001(\003\022\014\n\004code\030\002 \001(\t\022%\n\005group\030\003 \001(\0162\026.rac" +
|
||||
"e.RaceSeason.Group\022\014\n\004term\030\004 \001(\t\022)\n\013modi" +
|
||||
"fy_info\030\005 \001(\0132\024.common.ModifyInfoVO\"W\n\022R" +
|
||||
"aceSeasonCreateVO\022\014\n\004code\030\001 \001(\t\022%\n\005group" +
|
||||
"\030\002 \001(\0162\026.race.RaceSeason.Group\022\014\n\004term\030\003" +
|
||||
" \001(\t\"2\n\nRaceSeason\"$\n\005Group\022\013\n\007Unknown\020\000" +
|
||||
"\022\006\n\002ZZ\020\001\022\006\n\002GZ\020\002B\033\n\031club.joylink.rtss.vo" +
|
||||
".raceb\006proto3"
|
||||
"\n\021race_season.proto\022\004race\032\030common/modify" +
|
||||
"_info.proto\"\210\001\n\014RaceSeasonVO\022\n\n\002id\030\001 \001(\003" +
|
||||
"\022\014\n\004code\030\002 \001(\t\022%\n\005group\030\003 \001(\0162\026.race.Rac" +
|
||||
"eSeason.Group\022\014\n\004term\030\004 \001(\t\022)\n\013modify_in" +
|
||||
"fo\030\005 \001(\0132\024.common.ModifyInfoVO\"W\n\022RaceSe" +
|
||||
"asonCreateVO\022\014\n\004code\030\001 \001(\t\022%\n\005group\030\002 \001(" +
|
||||
"\0162\026.race.RaceSeason.Group\022\014\n\004term\030\003 \001(\t\"" +
|
||||
"2\n\nRaceSeason\"$\n\005Group\022\013\n\007Unknown\020\000\022\006\n\002Z" +
|
||||
"Z\020\001\022\006\n\002GZ\020\002B\033\n\031club.joylink.rtss.vo.race" +
|
||||
"b\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
// Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
// source: race/race_task.proto
|
||||
// source: race_task.proto
|
||||
|
||||
package club.joylink.rtss.vo.race;
|
||||
|
||||
|
@ -10729,44 +10729,43 @@ public final class RaceTask {
|
|||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\024race/race_task.proto\022\004race\032\030common/mod" +
|
||||
"ify_info.proto\032\025race/race_scene.proto\"\266\001" +
|
||||
"\n\nRaceTaskVO\022\n\n\002id\030\001 \001(\003\022\014\n\004name\030\002 \001(\t\022\014" +
|
||||
"\n\004desc\030\003 \001(\t\022\017\n\007content\030\004 \001(\t\022\021\n\tstandar" +
|
||||
"ds\030\005 \001(\t\022 \n\005scene\030\006 \001(\0132\021.race.RaceScene" +
|
||||
"VO\022\020\n\010parentId\030\007 \001(\003\022(\n\nmodifyInfo\030\010 \001(\013" +
|
||||
"2\024.common.ModifyInfoVO\"\344\001\n\020RaceTaskDetai" +
|
||||
"lVO\022\n\n\002id\030\001 \001(\003\022\014\n\004name\030\002 \001(\t\022\014\n\004desc\030\003 " +
|
||||
"\001(\t\022\017\n\007content\030\004 \001(\t\022\021\n\tstandards\030\005 \001(\t\022" +
|
||||
"\020\n\010scene_id\030\006 \001(\003\022\021\n\tsceneName\030\007 \001(\t\022\017\n\007" +
|
||||
"rule_id\030\010 \001(\003\022\020\n\010ruleName\030\t \001(\t\022\021\n\tparen" +
|
||||
"t_id\030\n \001(\003\022)\n\013modify_info\030\013 \001(\0132\024.common" +
|
||||
".ModifyInfoVO\"w\n\020RaceTaskCreateVO\022\014\n\004nam" +
|
||||
"e\030\001 \001(\t\022\014\n\004desc\030\002 \001(\t\022\017\n\007content\030\003 \001(\t\022\021" +
|
||||
"\n\tstandards\030\004 \001(\t\022\020\n\010scene_id\030\005 \001(\003\022\021\n\tp" +
|
||||
"arent_id\030\006 \001(\003\"\210\001\n\014RaceTaskBind\022\017\n\007bind_" +
|
||||
"id\030\002 \001(\003\0222\n\tbind_type\030\003 \001(\0162\037.race.RaceT" +
|
||||
"askBind.TaskBindType\022\016\n\006status\030\004 \001(\005\"#\n\014" +
|
||||
"TaskBindType\022\010\n\004rule\020\000\022\t\n\005scene\020\001\"\205\002\n\023Ra" +
|
||||
"cePaperModuleTask\022\030\n\020custom_module_id\030\001 " +
|
||||
"\001(\005\022@\n\014module_group\030\002 \003(\0132*.race.RacePap" +
|
||||
"erModuleTask.PaperModuleGroup\032\221\001\n\020PaperM" +
|
||||
"oduleGroup\022\022\n\ngroup_name\030\001 \001(\t\022\'\n\010treeDa" +
|
||||
"ta\030\002 \003(\0132\025.race.RaceTaskChildVO\022@\n\014modul" +
|
||||
"e_group\030\003 \003(\0132*.race.RacePaperModuleTask" +
|
||||
".PaperModuleGroup\"\312\002\n\017RaceTaskChildVO\022\n\n" +
|
||||
"\002id\030\001 \001(\003\022\014\n\004name\030\002 \001(\t\022\014\n\004desc\030\003 \001(\t\022\017\n" +
|
||||
"\007content\030\004 \001(\t\022\021\n\tstandards\030\005 \001(\t\022\020\n\010sce" +
|
||||
"ne_id\030\006 \001(\003\022\017\n\007rule_id\030\007 \001(\003\022\021\n\tparent_i" +
|
||||
"d\030\010 \001(\003\022\'\n\010children\030\t \003(\0132\025.race.RaceTas" +
|
||||
"kChildVO\0226\n\tnode_type\030\n \001(\0162#.race.RaceT" +
|
||||
"askChildVO.ChildNodeType\022\'\n\tsceneType\030\013 " +
|
||||
"\001(\0162\024.race.RaceScene.Type\"+\n\rChildNodeTy" +
|
||||
"pe\022\020\n\014MODULE_GROUP\020\000\022\010\n\004TASK\020\001\"`\n\036RacePa" +
|
||||
"perSingleModuleGroupTask\022\030\n\020custom_modul" +
|
||||
"e_id\030\001 \001(\005\022$\n\005child\030\002 \003(\0132\025.race.RaceTas" +
|
||||
"kChildVOB\033\n\031club.joylink.rtss.vo.raceb\006p" +
|
||||
"roto3"
|
||||
"\n\017race_task.proto\022\004race\032\030common/modify_i" +
|
||||
"nfo.proto\032\025race/race_scene.proto\"\266\001\n\nRac" +
|
||||
"eTaskVO\022\n\n\002id\030\001 \001(\003\022\014\n\004name\030\002 \001(\t\022\014\n\004des" +
|
||||
"c\030\003 \001(\t\022\017\n\007content\030\004 \001(\t\022\021\n\tstandards\030\005 " +
|
||||
"\001(\t\022 \n\005scene\030\006 \001(\0132\021.race.RaceSceneVO\022\020\n" +
|
||||
"\010parentId\030\007 \001(\003\022(\n\nmodifyInfo\030\010 \001(\0132\024.co" +
|
||||
"mmon.ModifyInfoVO\"\344\001\n\020RaceTaskDetailVO\022\n" +
|
||||
"\n\002id\030\001 \001(\003\022\014\n\004name\030\002 \001(\t\022\014\n\004desc\030\003 \001(\t\022\017" +
|
||||
"\n\007content\030\004 \001(\t\022\021\n\tstandards\030\005 \001(\t\022\020\n\010sc" +
|
||||
"ene_id\030\006 \001(\003\022\021\n\tsceneName\030\007 \001(\t\022\017\n\007rule_" +
|
||||
"id\030\010 \001(\003\022\020\n\010ruleName\030\t \001(\t\022\021\n\tparent_id\030" +
|
||||
"\n \001(\003\022)\n\013modify_info\030\013 \001(\0132\024.common.Modi" +
|
||||
"fyInfoVO\"w\n\020RaceTaskCreateVO\022\014\n\004name\030\001 \001" +
|
||||
"(\t\022\014\n\004desc\030\002 \001(\t\022\017\n\007content\030\003 \001(\t\022\021\n\tsta" +
|
||||
"ndards\030\004 \001(\t\022\020\n\010scene_id\030\005 \001(\003\022\021\n\tparent" +
|
||||
"_id\030\006 \001(\003\"\210\001\n\014RaceTaskBind\022\017\n\007bind_id\030\002 " +
|
||||
"\001(\003\0222\n\tbind_type\030\003 \001(\0162\037.race.RaceTaskBi" +
|
||||
"nd.TaskBindType\022\016\n\006status\030\004 \001(\005\"#\n\014TaskB" +
|
||||
"indType\022\010\n\004rule\020\000\022\t\n\005scene\020\001\"\205\002\n\023RacePap" +
|
||||
"erModuleTask\022\030\n\020custom_module_id\030\001 \001(\005\022@" +
|
||||
"\n\014module_group\030\002 \003(\0132*.race.RacePaperMod" +
|
||||
"uleTask.PaperModuleGroup\032\221\001\n\020PaperModule" +
|
||||
"Group\022\022\n\ngroup_name\030\001 \001(\t\022\'\n\010treeData\030\002 " +
|
||||
"\003(\0132\025.race.RaceTaskChildVO\022@\n\014module_gro" +
|
||||
"up\030\003 \003(\0132*.race.RacePaperModuleTask.Pape" +
|
||||
"rModuleGroup\"\312\002\n\017RaceTaskChildVO\022\n\n\002id\030\001" +
|
||||
" \001(\003\022\014\n\004name\030\002 \001(\t\022\014\n\004desc\030\003 \001(\t\022\017\n\007cont" +
|
||||
"ent\030\004 \001(\t\022\021\n\tstandards\030\005 \001(\t\022\020\n\010scene_id" +
|
||||
"\030\006 \001(\003\022\017\n\007rule_id\030\007 \001(\003\022\021\n\tparent_id\030\010 \001" +
|
||||
"(\003\022\'\n\010children\030\t \003(\0132\025.race.RaceTaskChil" +
|
||||
"dVO\0226\n\tnode_type\030\n \001(\0162#.race.RaceTaskCh" +
|
||||
"ildVO.ChildNodeType\022\'\n\tsceneType\030\013 \001(\0162\024" +
|
||||
".race.RaceScene.Type\"+\n\rChildNodeType\022\020\n" +
|
||||
"\014MODULE_GROUP\020\000\022\010\n\004TASK\020\001\"`\n\036RacePaperSi" +
|
||||
"ngleModuleGroupTask\022\030\n\020custom_module_id\030" +
|
||||
"\001 \001(\005\022$\n\005child\030\002 \003(\0132\025.race.RaceTaskChil" +
|
||||
"dVOB\033\n\031club.joylink.rtss.vo.raceb\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
|
|
@ -11,6 +11,9 @@
|
|||
<result column="updater_id" jdbcType="BIGINT" property="updaterId" />
|
||||
<result column="udpate_time" jdbcType="TIMESTAMP" property="udpateTime" />
|
||||
</resultMap>
|
||||
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="club.joylink.rtss.entity.racetr.RacetrSeason">
|
||||
<result column="detail_html_content" jdbcType="LONGVARCHAR" property="detailHtmlContent" />
|
||||
</resultMap>
|
||||
<sql id="Example_Where_Clause">
|
||||
<where>
|
||||
<foreach collection="oredCriteria" item="criteria" separator="or">
|
||||
|
@ -72,6 +75,33 @@
|
|||
<sql id="Base_Column_List">
|
||||
id, code, `group`, term, creator_id, create_time, updater_id, udpate_time
|
||||
</sql>
|
||||
<sql id="Blob_Column_List">
|
||||
detail_html_content
|
||||
</sql>
|
||||
<select id="selectByExampleWithBLOBs" parameterType="club.joylink.rtss.entity.racetr.RacetrSeasonExample" resultMap="ResultMapWithBLOBs">
|
||||
select
|
||||
<if test="distinct">
|
||||
distinct
|
||||
</if>
|
||||
<include refid="Base_Column_List" />
|
||||
,
|
||||
<include refid="Blob_Column_List" />
|
||||
from racetr_season
|
||||
<if test="_parameter != null">
|
||||
<include refid="Example_Where_Clause" />
|
||||
</if>
|
||||
<if test="orderByClause != null">
|
||||
order by ${orderByClause}
|
||||
</if>
|
||||
<if test="limit != null">
|
||||
<if test="offset != null">
|
||||
limit ${offset}, ${limit}
|
||||
</if>
|
||||
<if test="offset == null">
|
||||
limit ${limit}
|
||||
</if>
|
||||
</if>
|
||||
</select>
|
||||
<select id="selectByExample" parameterType="club.joylink.rtss.entity.racetr.RacetrSeasonExample" resultMap="BaseResultMap">
|
||||
select
|
||||
<if test="distinct">
|
||||
|
@ -94,9 +124,11 @@
|
|||
</if>
|
||||
</if>
|
||||
</select>
|
||||
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
|
||||
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
|
||||
select
|
||||
<include refid="Base_Column_List" />
|
||||
,
|
||||
<include refid="Blob_Column_List" />
|
||||
from racetr_season
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
</select>
|
||||
|
@ -113,10 +145,10 @@
|
|||
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="club.joylink.rtss.entity.racetr.RacetrSeason" useGeneratedKeys="true">
|
||||
insert into racetr_season (code, `group`, term,
|
||||
creator_id, create_time, updater_id,
|
||||
udpate_time)
|
||||
udpate_time, detail_html_content)
|
||||
values (#{code,jdbcType=VARCHAR}, #{group,jdbcType=VARCHAR}, #{term,jdbcType=VARCHAR},
|
||||
#{creatorId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{updaterId,jdbcType=BIGINT},
|
||||
#{udpateTime,jdbcType=TIMESTAMP})
|
||||
#{udpateTime,jdbcType=TIMESTAMP}, #{detailHtmlContent,jdbcType=LONGVARCHAR})
|
||||
</insert>
|
||||
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="club.joylink.rtss.entity.racetr.RacetrSeason" useGeneratedKeys="true">
|
||||
insert into racetr_season
|
||||
|
@ -142,6 +174,9 @@
|
|||
<if test="udpateTime != null">
|
||||
udpate_time,
|
||||
</if>
|
||||
<if test="detailHtmlContent != null">
|
||||
detail_html_content,
|
||||
</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="code != null">
|
||||
|
@ -165,6 +200,9 @@
|
|||
<if test="udpateTime != null">
|
||||
#{udpateTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="detailHtmlContent != null">
|
||||
#{detailHtmlContent,jdbcType=LONGVARCHAR},
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
<select id="countByExample" parameterType="club.joylink.rtss.entity.racetr.RacetrSeasonExample" resultType="java.lang.Long">
|
||||
|
@ -200,11 +238,29 @@
|
|||
<if test="record.udpateTime != null">
|
||||
udpate_time = #{record.udpateTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="record.detailHtmlContent != null">
|
||||
detail_html_content = #{record.detailHtmlContent,jdbcType=LONGVARCHAR},
|
||||
</if>
|
||||
</set>
|
||||
<if test="_parameter != null">
|
||||
<include refid="Update_By_Example_Where_Clause" />
|
||||
</if>
|
||||
</update>
|
||||
<update id="updateByExampleWithBLOBs" parameterType="map">
|
||||
update racetr_season
|
||||
set id = #{record.id,jdbcType=BIGINT},
|
||||
code = #{record.code,jdbcType=VARCHAR},
|
||||
`group` = #{record.group,jdbcType=VARCHAR},
|
||||
term = #{record.term,jdbcType=VARCHAR},
|
||||
creator_id = #{record.creatorId,jdbcType=BIGINT},
|
||||
create_time = #{record.createTime,jdbcType=TIMESTAMP},
|
||||
updater_id = #{record.updaterId,jdbcType=BIGINT},
|
||||
udpate_time = #{record.udpateTime,jdbcType=TIMESTAMP},
|
||||
detail_html_content = #{record.detailHtmlContent,jdbcType=LONGVARCHAR}
|
||||
<if test="_parameter != null">
|
||||
<include refid="Update_By_Example_Where_Clause" />
|
||||
</if>
|
||||
</update>
|
||||
<update id="updateByExample" parameterType="map">
|
||||
update racetr_season
|
||||
set id = #{record.id,jdbcType=BIGINT},
|
||||
|
@ -243,9 +299,24 @@
|
|||
<if test="udpateTime != null">
|
||||
udpate_time = #{udpateTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="detailHtmlContent != null">
|
||||
detail_html_content = #{detailHtmlContent,jdbcType=LONGVARCHAR},
|
||||
</if>
|
||||
</set>
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
</update>
|
||||
<update id="updateByPrimaryKeyWithBLOBs" parameterType="club.joylink.rtss.entity.racetr.RacetrSeason">
|
||||
update racetr_season
|
||||
set code = #{code,jdbcType=VARCHAR},
|
||||
`group` = #{group,jdbcType=VARCHAR},
|
||||
term = #{term,jdbcType=VARCHAR},
|
||||
creator_id = #{creatorId,jdbcType=BIGINT},
|
||||
create_time = #{createTime,jdbcType=TIMESTAMP},
|
||||
updater_id = #{updaterId,jdbcType=BIGINT},
|
||||
udpate_time = #{udpateTime,jdbcType=TIMESTAMP},
|
||||
detail_html_content = #{detailHtmlContent,jdbcType=LONGVARCHAR}
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
</update>
|
||||
<update id="updateByPrimaryKey" parameterType="club.joylink.rtss.entity.racetr.RacetrSeason">
|
||||
update racetr_season
|
||||
set code = #{code,jdbcType=VARCHAR},
|
||||
|
|
|
@ -3,6 +3,7 @@ package club.joylink.rtss.services.race;
|
|||
import club.joylink.rtss.util.JsonUtils;
|
||||
import club.joylink.rtss.vo.client.PageVO;
|
||||
import club.joylink.rtss.vo.race.RacePaper.RacePaperCreateVO;
|
||||
import club.joylink.rtss.vo.race.RacePaper.RacePaperMenuVO;
|
||||
import club.joylink.rtss.vo.race.RacePaper.RacePaperVO;
|
||||
import club.joylink.rtss.vo.race.RacePaperQueryVO;
|
||||
import club.joylink.rtss.vo.race.RaceSeasonOuterClass.RaceSeason.Group;
|
||||
|
@ -48,4 +49,12 @@ public class PaperServiceTest {
|
|||
RacePaperSingleModuleGroupTask moduleTask = this.paperService.singlePaperModuleTask(13L, 2);
|
||||
System.out.println(JsonUtils.writeValueAsString(moduleTask));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void pageMenuQueryTest() {
|
||||
RacePaperQueryVO queryVO = new RacePaperQueryVO();
|
||||
|
||||
RacePaperMenuVO menuVO = this.paperService.pageMenuQuery(queryVO);
|
||||
System.out.println(JsonUtils.writeValueAsString(menuVO));
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue