diff --git a/mt/src/main/java/com/ccsens/mt/api/DebugController.java b/mt/src/main/java/com/ccsens/mt/api/DebugController.java index 2a5da862..54b5366b 100644 --- a/mt/src/main/java/com/ccsens/mt/api/DebugController.java +++ b/mt/src/main/java/com/ccsens/mt/api/DebugController.java @@ -1,28 +1,62 @@ package com.ccsens.mt.api; +import com.ccsens.mt.bean.dto.LevelDto; +import com.ccsens.mt.bean.po.LevelUser; +import com.ccsens.mt.service.ILevelUpService; import com.ccsens.util.JsonResponse; +import com.ccsens.util.RedisUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.springframework.data.redis.core.ZSetOperations; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.util.Objects; +import java.util.Set; @Api(tags = "DEBUG" , description = "DebugController | ") @RestController @RequestMapping("/debug") public class DebugController { + @Resource + private RedisUtil redisUtil; + @Resource + private ILevelUpService levelUpService; @ApiOperation(value = "/测试",notes = "") @ApiImplicitParams({ }) @RequestMapping(value="",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"}) - public JsonResponse getSmsCode(HttpServletRequest request) throws Exception { - + public JsonResponse debug(HttpServletRequest request) throws Exception { return JsonResponse.newInstance().ok("测试"); } + @ApiOperation(value = "/测试自动晋级",notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value="/levelUp",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"}) + public JsonResponse levelUpDebug(HttpServletRequest request) throws Exception { + //比赛结束 + //查询每个选手的分数存入redis（模拟分数存入） + String key = "compete_1_6"; + Set> typedTuples = redisUtil.zsRevGetWithScore(key, 0, -1); + typedTuples.forEach(type ->{ + LevelUser levelUser = (LevelUser) type.getValue(); + if(levelUser.getPlayerId() == 1305713484796923904L){ + redisUtil.zsSet(key, levelUser, 20); + } + if(levelUser.getPlayerId() == 1305772321621020672L){ + redisUtil.zsSet(key, levelUser, 22); + } + }); + //调用自动晋级接口 + LevelDto.AutoLevelUpDto autoLevelUpDto = new LevelDto.AutoLevelUpDto(1L,"6"); + levelUpService.autoLevelUp(autoLevelUpDto); + return JsonResponse.newInstance().ok("OK"); + } } diff --git a/mt/src/main/java/com/ccsens/mt/api/LevelController.java b/mt/src/main/java/com/ccsens/mt/api/LevelController.java index 81d5aec2..053cabce 100644 --- a/mt/src/main/java/com/ccsens/mt/api/LevelController.java +++ b/mt/src/main/java/com/ccsens/mt/api/LevelController.java @@ -45,7 +45,7 @@ public class LevelController { @RequestMapping(value = "/userInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> queryLevelUserInfo(@ApiParam @Validated @RequestBody QueryDto params) { log.info("手动晋级：{}",params); - PageInfo levelUserInfoList = levelUpService.queryLevelUserInfo(params); + PageInfo levelUserInfoList = levelUpService.queryLevelUserInfo(params.getParam()); return JsonResponse.newInstance().ok(levelUserInfoList); } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/LevelDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/LevelDto.java index 7f8263d9..b894eeed 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/LevelDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/LevelDto.java @@ -23,6 +23,16 @@ public class LevelDto { private String name; @ApiModelProperty("团队id") private Long teamId; + + public LevelUserDto() { + } + + public LevelUserDto(Long playerId, String avatarUrl, String name, Long teamId) { + this.playerId = playerId; + this.avatarUrl = avatarUrl; + this.name = name; + this.teamId = teamId; + } } @@ -41,6 +51,15 @@ public class LevelDto { private int additionScore; @ApiModelProperty("名次") private int ranking; + + public LevelUpDto() { + } + + public LevelUpDto(Long competeTimeId, String competeCode, Long playerId) { + this.competeTimeId = competeTimeId; + this.competeCode = competeCode; + this.playerId = playerId; + } } @Data @@ -50,6 +69,14 @@ public class LevelDto { private Long competeTimeId; @ApiModelProperty("比赛code") private String competeCode; + + public AutoLevelUpDto() { + } + + public AutoLevelUpDto(Long competeTimeId, String competeCode) { + this.competeTimeId = competeTimeId; + this.competeCode = competeCode; + } } diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index 3b472b03..2561ae62 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.ObjectUtil; import com.ccsens.mt.bean.dto.CompeteDto; +import com.ccsens.mt.bean.dto.LevelDto; import com.ccsens.mt.bean.po.*; import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.persist.dao.CompetePlayerDao; @@ -52,6 +53,8 @@ public class CompeteService implements ICompeteService{ private CompeteProjectPlayerMapper competeProjectPlayerMapper; @Resource private CompeteGroupMapper competeGroupMapper; + @Resource + private ILevelUpService levelUpService; /** @@ -115,13 +118,13 @@ public class CompeteService implements ICompeteService{ CompeteDto.CompetePlayerInfo competePlayerInfo = params.getParam(); Long userId = params.getUserId(); - //检查验证码是否正确 - if (!redisUtil.hasKey(RedisKeyManager.getSigninSmsKey(competePlayerInfo.getPhone()))) { - throw new BaseException(CodeEnum.SMS_CODE_CORRECT); - } - if (!competePlayerInfo.getSmsCode().equals(redisUtil.get(RedisKeyManager.getSigninSmsKey(competePlayerInfo.getPhone())).toString())) { - throw new BaseException(CodeEnum.SMS_CODE_CORRECT); - } +// //检查验证码是否正确 +// if (!redisUtil.hasKey(RedisKeyManager.getSigninSmsKey(competePlayerInfo.getPhone()))) { +// throw new BaseException(CodeEnum.SMS_CODE_CORRECT); +// } +// if (!competePlayerInfo.getSmsCode().equals(redisUtil.get(RedisKeyManager.getSigninSmsKey(competePlayerInfo.getPhone())).toString())) { +// throw new BaseException(CodeEnum.SMS_CODE_CORRECT); +// } //检查此用户是否已经报名 CompetePlayerExample playerExample = new CompetePlayerExample(); playerExample.createCriteria().andUserIdEqualTo(userId); @@ -162,6 +165,11 @@ public class CompeteService implements ICompeteService{ player.setCompanyId(company.getId()); competePlayerDao.insertSelective(player); + // TODO + LevelDto.LevelUserDto levelUserDto = new LevelDto.LevelUserDto(player.getId(),null,player.getName(),null); + log.info("将选手信息储存在晋级系统中:{}",levelUserDto); + levelUpService.saveLevelUser(levelUserDto); + return new CompeteVo.CompetePlayerInfo(player, group, company,getCompeteProjectAll(params.getUserId(), params.getParam().getCompeteTimeId())); } @@ -231,11 +239,13 @@ public class CompeteService implements ICompeteService{ } - CompeteGroup group = competeGroupMapper.selectByPrimaryKey(player.getCompeteGroupId()); CompeteCompany company = competeCompanyMapper.selectByPrimaryKey(player.getCompanyId()); CompeteVo.CompetePlayerInfo info = new CompeteVo.CompetePlayerInfo(player, group, company,getCompeteProjectAll(params.getUserId(), params.getParam().getCompeteTimeId())); + LevelDto.LevelUpDto levelUpDto = new LevelDto.LevelUpDto(params.getParam().getCompeteTimeId(),params.getParam().getCompeteProjectId().toString(),player.getId()); + log.info("添加晋级表信息，{}",levelUpDto); + levelUpService.joinCompete(levelUpDto); log.info("{}参加返回：{}", params.getUserId(), info); return info; diff --git a/mt/src/main/java/com/ccsens/mt/service/DepartmentService.java b/mt/src/main/java/com/ccsens/mt/service/DepartmentService.java index 63fd6903..426aaa85 100644 --- a/mt/src/main/java/com/ccsens/mt/service/DepartmentService.java +++ b/mt/src/main/java/com/ccsens/mt/service/DepartmentService.java @@ -87,14 +87,29 @@ public class DepartmentService implements IDepartmentService{ Long userId = params.getUserId(); //查看该院系的报名信息 Long companyId = competePlayerDao.getCompanyIdByUser(params.getUserId()); + log.info("查看该用户的院系：{}",companyId); if(ObjectUtil.isNotNull(companyId)){ throw new BaseException(CodeEnum.PLAYER_INFO_ALREADY); } CompeteCompanyRoleExample companyRoleExample = new CompeteCompanyRoleExample(); companyRoleExample.createCriteria().andCompeteCompanyIdEqualTo(departmentInfo.getId()).andTypeEqualTo((byte)2); if(competeCompanyRoleMapper.countByExample(companyRoleExample) == 0) { + //检查报名时间是否符合 + CompeteVo.CompeteTime competeTime = competeTimeDao.getCompeteTimeByType(departmentInfo.getType(),System.currentTimeMillis()); + log.info("检查报名时间是否符合：{}",competeTime); + if(ObjectUtil.isNotNull(competeTime)){ + if(competeTime.getSignUpStartTime() > System.currentTimeMillis()){ + throw new BaseException(CodeEnum.SIGN_UP_TIME_NOT_START); + } + if(competeTime.getSignUpEndTime() < System.currentTimeMillis()){ + throw new BaseException(CodeEnum.SIGN_UP_TIME_FINISHED); + } + } + + //添加裁判领队等信息 if (CollectionUtil.isNotEmpty(departmentInfo.getRoleList())) { + log.info("添加裁判领队等信息：{}",departmentInfo.getRoleList()); departmentInfo.getRoleList().forEach(departmentRole -> { //添加player信息 CompetePlayer competePlayer = new CompetePlayer(); @@ -117,13 +132,16 @@ public class DepartmentService implements IDepartmentService{ } //添加比赛报名信息 if (CollectionUtil.isNotEmpty(departmentInfo.getProjectList())) { + log.info("添加比赛报名信息：{}",departmentInfo.getProjectList()); departmentInfo.getProjectList().forEach(departmentProject -> { CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(departmentProject.getCompeteProjectId()); if (ObjectUtil.isNotNull(competeProject)) { if (competeProject.getTeam() == 0) { //不是团队比赛 + log.info("不是团队比赛：{}",competeProject); String names = StringUtil.replaceComma(departmentProject.getNames()); String[] playerNames = names.split(","); +// String[] playerNames = names.split("、"); if (ObjectUtil.isNotNull(playerNames)) { for (String playerName : playerNames) { //直接添加选手 @@ -143,6 +161,7 @@ public class DepartmentService implements IDepartmentService{ } } else if (competeProject.getTeam() == 1) { //创建一个团队 + log.info("创建一个团队：{}",competeProject); CompeteTeam competeTeam = new CompeteTeam(); competeTeam.setId(snowflake.nextId()); competeTeam.setProjectId(departmentProject.getCompeteProjectId()); diff --git a/mt/src/main/java/com/ccsens/mt/service/ILevelUpService.java b/mt/src/main/java/com/ccsens/mt/service/ILevelUpService.java index 21e48d8a..fd5e494e 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ILevelUpService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ILevelUpService.java @@ -39,5 +39,5 @@ public interface ILevelUpService { * @param params 比赛id和分页信息 * @return 返回查到的比赛下所有晋级的选手的信息 */ - PageInfo queryLevelUserInfo(QueryDto params); + PageInfo queryLevelUserInfo(LevelDto.QueryLevelUserInfo params); } diff --git a/mt/src/main/java/com/ccsens/mt/service/LevelUpService.java b/mt/src/main/java/com/ccsens/mt/service/LevelUpService.java index 172acefa..574bb4e0 100644 --- a/mt/src/main/java/com/ccsens/mt/service/LevelUpService.java +++ b/mt/src/main/java/com/ccsens/mt/service/LevelUpService.java @@ -161,6 +161,8 @@ public class LevelUpService implements ILevelUpService{ default: break; } + //将旧的数据从redis中删除 + redisUtil.del(key); } /** @@ -240,7 +242,7 @@ public class LevelUpService implements ILevelUpService{ * @return 返回查到的比赛下所有晋级的选手的信息 */ @Override - public PageInfo queryLevelUserInfo(QueryDto params) { + public PageInfo queryLevelUserInfo(LevelDto.QueryLevelUserInfo params) { LevelDto.QueryLevelUserInfo levelUserInfo = params.getParam(); if(levelUserInfo.getPage() != -1){ PageHelper.startPage(levelUserInfo.getPage(), levelUserInfo.getPageSize()); diff --git a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml index ce96149f..12a5441d 100644 --- a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml +++ b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml @@ -102,7 +102,7 @@ \ No newline at end of file diff --git a/mt/src/main/resources/mapper_dao/CompeteTeamDao.xml b/mt/src/main/resources/mapper_dao/CompeteTeamDao.xml index 4cfd3cf0..624accff 100644 --- a/mt/src/main/resources/mapper_dao/CompeteTeamDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteTeamDao.xml @@ -89,6 +89,10 @@ AND p.user_id = #{userId} AND pp.compete_time_id = #{competeTimeId} AND p2.team = 0 + and p.rec_status = 0 + and pp.rec_status = 0 + and p1.rec_status = 0 + and p2.rec_status = 0 select @@ -113,16 +116,16 @@ insert into t_pro_show (id, project_id, slide, filter, is_show_mvp, create_task, - created_at, updated_at, rec_status, time_show, duration, show_shortcuts, - select_task_type, detail_path, pims_nav_type - ) + select_task_type, detail_path, pims_nav_type, + share_change, share_change_code, created_at, + updated_at, rec_status) values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{slide,jdbcType=TINYINT}, #{filter,jdbcType=TINYINT}, #{isShowMvp,jdbcType=TINYINT}, #{createTask,jdbcType=TINYINT}, - #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{timeShow,jdbcType=VARCHAR}, #{duration,jdbcType=TINYINT}, #{showShortcuts,jdbcType=TINYINT}, - #{selectTaskType,jdbcType=TINYINT}, #{detailPath,jdbcType=VARCHAR}, #{pimsNavType,jdbcType=TINYINT} - ) + #{selectTaskType,jdbcType=TINYINT}, #{detailPath,jdbcType=VARCHAR}, #{pimsNavType,jdbcType=TINYINT}, + #{shareChange,jdbcType=TINYINT}, #{shareChangeCode,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) insert into t_pro_show @@ -145,15 +148,6 @@ create_task, - - created_at, - - - updated_at, - - - rec_status, - time_show, @@ -172,6 +166,21 @@ pims_nav_type, + + share_change, + + + share_change_code, + + + created_at, + + + updated_at, + + + rec_status, + @@ -192,15 +201,6 @@ #{createTask,jdbcType=TINYINT}, - - #{createdAt,jdbcType=TIMESTAMP}, - - - #{updatedAt,jdbcType=TIMESTAMP}, - - - #{recStatus,jdbcType=TINYINT}, - #{timeShow,jdbcType=VARCHAR}, @@ -219,6 +219,21 @@ #{pimsNavType,jdbcType=TINYINT}, + + #{shareChange,jdbcType=TINYINT}, + + + #{shareChangeCode,jdbcType=VARCHAR}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + - select - - distinct - - - from t_pro_task_deliver_post_log_checker - - - - - order by ${orderByClause} - - - - - delete from t_pro_task_deliver_post_log_checker - where id = #{id,jdbcType=BIGINT} - - - delete from t_pro_task_deliver_post_log_checker - - - - - - insert into t_pro_task_deliver_post_log_checker (id, deliver_post_log_id, checker_id, - remark, check_status, created_at, - updated_at, rec_status) - values (#{id,jdbcType=BIGINT}, #{deliverPostLogId,jdbcType=BIGINT}, #{checkerId,jdbcType=BIGINT}, - #{remark,jdbcType=VARCHAR}, #{checkStatus,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, - #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) - - - insert into t_pro_task_deliver_post_log_checker - - - id, - - - deliver_post_log_id, - - - checker_id, - - - remark, - - - check_status, - - - created_at, - - - updated_at, - - - rec_status, - - - - - #{id,jdbcType=BIGINT}, - - - #{deliverPostLogId,jdbcType=BIGINT}, - - - #{checkerId,jdbcType=BIGINT}, - - - #{remark,jdbcType=VARCHAR}, - - - #{checkStatus,jdbcType=INTEGER}, - - - #{createdAt,jdbcType=TIMESTAMP}, - - - #{updatedAt,jdbcType=TIMESTAMP}, - - - #{recStatus,jdbcType=TINYINT}, - - - - - - update t_pro_task_deliver_post_log_checker - - - id = #{record.id,jdbcType=BIGINT}, - - - deliver_post_log_id = #{record.deliverPostLogId,jdbcType=BIGINT}, - - - checker_id = #{record.checkerId,jdbcType=BIGINT}, - - - remark = #{record.remark,jdbcType=VARCHAR}, - - - check_status = #{record.checkStatus,jdbcType=INTEGER}, - - - created_at = #{record.createdAt,jdbcType=TIMESTAMP}, - - - updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - - - rec_status = #{record.recStatus,jdbcType=TINYINT}, - - - - - - - - update t_pro_task_deliver_post_log_checker - set id = #{record.id,jdbcType=BIGINT}, - deliver_post_log_id = #{record.deliverPostLogId,jdbcType=BIGINT}, - checker_id = #{record.checkerId,jdbcType=BIGINT}, - remark = #{record.remark,jdbcType=VARCHAR}, - check_status = #{record.checkStatus,jdbcType=INTEGER}, - created_at = #{record.createdAt,jdbcType=TIMESTAMP}, - updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{record.recStatus,jdbcType=TINYINT} - - - - - - update t_pro_task_deliver_post_log_checker - - - deliver_post_log_id = #{deliverPostLogId,jdbcType=BIGINT}, - - - checker_id = #{checkerId,jdbcType=BIGINT}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - check_status = #{checkStatus,jdbcType=INTEGER}, - - - created_at = #{createdAt,jdbcType=TIMESTAMP}, - - - updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - - - rec_status = #{recStatus,jdbcType=TINYINT}, - - - where id = #{id,jdbcType=BIGINT} - - - update t_pro_task_deliver_post_log_checker - set deliver_post_log_id = #{deliverPostLogId,jdbcType=BIGINT}, - checker_id = #{checkerId,jdbcType=BIGINT}, - remark = #{remark,jdbcType=VARCHAR}, - check_status = #{checkStatus,jdbcType=INTEGER}, - created_at = #{createdAt,jdbcType=TIMESTAMP}, - updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{recStatus,jdbcType=TINYINT} - where id = #{id,jdbcType=BIGINT} - + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, deliver_post_log_id, checker_id, remark, check_status, score, created_at, updated_at, + rec_status + + + + + delete from t_pro_task_deliver_post_log_checker + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_task_deliver_post_log_checker + + + + + + insert into t_pro_task_deliver_post_log_checker (id, deliver_post_log_id, checker_id, + remark, check_status, score, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{deliverPostLogId,jdbcType=BIGINT}, #{checkerId,jdbcType=BIGINT}, + #{remark,jdbcType=VARCHAR}, #{checkStatus,jdbcType=INTEGER}, #{score,jdbcType=INTEGER}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_pro_task_deliver_post_log_checker + + + id, + + + deliver_post_log_id, + + + checker_id, + + + remark, + + + check_status, + + + score, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{deliverPostLogId,jdbcType=BIGINT}, + + + #{checkerId,jdbcType=BIGINT}, + + + #{remark,jdbcType=VARCHAR}, + + + #{checkStatus,jdbcType=INTEGER}, + + + #{score,jdbcType=INTEGER}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_task_deliver_post_log_checker + + + id = #{record.id,jdbcType=BIGINT}, + + + deliver_post_log_id = #{record.deliverPostLogId,jdbcType=BIGINT}, + + + checker_id = #{record.checkerId,jdbcType=BIGINT}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + + + check_status = #{record.checkStatus,jdbcType=INTEGER}, + + + score = #{record.score,jdbcType=INTEGER}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_task_deliver_post_log_checker + set id = #{record.id,jdbcType=BIGINT}, + deliver_post_log_id = #{record.deliverPostLogId,jdbcType=BIGINT}, + checker_id = #{record.checkerId,jdbcType=BIGINT}, + remark = #{record.remark,jdbcType=VARCHAR}, + check_status = #{record.checkStatus,jdbcType=INTEGER}, + score = #{record.score,jdbcType=INTEGER}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_task_deliver_post_log_checker + + + deliver_post_log_id = #{deliverPostLogId,jdbcType=BIGINT}, + + + checker_id = #{checkerId,jdbcType=BIGINT}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + check_status = #{checkStatus,jdbcType=INTEGER}, + + + score = #{score,jdbcType=INTEGER}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_task_deliver_post_log_checker + set deliver_post_log_id = #{deliverPostLogId,jdbcType=BIGINT}, + checker_id = #{checkerId,jdbcType=BIGINT}, + remark = #{remark,jdbcType=VARCHAR}, + check_status = #{checkStatus,jdbcType=INTEGER}, + score = #{score,jdbcType=INTEGER}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/SysImitationMapper.xml b/tall/src/main/resources/mapper_raw/SysImitationMapper.xml new file mode 100644 index 00000000..45299910 --- /dev/null +++ b/tall/src/main/resources/mapper_raw/SysImitationMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, user_id, project_id, role_id, created_at, updated_at, rec_status + + + + + delete from t_sys_imitation + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_imitation + + + + + + insert into t_sys_imitation (id, user_id, project_id, + role_id, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, + #{roleId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_sys_imitation + + + id, + + + user_id, + + + project_id, + + + role_id, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{roleId,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_sys_imitation + + + id = #{record.id,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + role_id = #{record.roleId,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_sys_imitation + set id = #{record.id,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + role_id = #{record.roleId,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_sys_imitation + + + user_id = #{userId,jdbcType=BIGINT}, + + + project_id = #{projectId,jdbcType=BIGINT}, + + + role_id = #{roleId,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_sys_imitation + set user_id = #{userId,jdbcType=BIGINT}, + project_id = #{projectId,jdbcType=BIGINT}, + role_id = #{roleId,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java index 210fd984..ae4af294 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -151,6 +151,11 @@ public enum CodeEnum { GAME_TIME_DUE(128,"您的游戏已到期，请重新购买", true), TEAM_MEMBER_ERROR(129,"参赛人数不符合，请重新填写", true), + SIGN_UP_TIME_NOT_START(130,"报名未开始", true), + SIGN_UP_TIME_FINISHED(131,"报名已结束", true), + + PROJECT_IMITATION_NO(132,"该项目未开启变身系统", true), + PROJECT_IMITATION_CODE_ERROR(131,"秘钥错误", true), ; diff --git a/util/src/main/java/com/ccsens/util/StringUtil.java b/util/src/main/java/com/ccsens/util/StringUtil.java index 84d83767..c2d39a9e 100644 --- a/util/src/main/java/com/ccsens/util/StringUtil.java +++ b/util/src/main/java/com/ccsens/util/StringUtil.java @@ -166,7 +166,7 @@ public class StringUtil { */ public static String replaceComma(String str) { //可以在中括号内加上任何想要替换的字符 - String regEx = "[，,]"; + String regEx = "[，,、]"; String lBracket = "[（]"; String rBracket = "[）]"; diff --git a/util/src/test/java/com/ccsens/util/TestQrCord.java b/util/src/test/java/com/ccsens/util/TestQrCord.java index fbe73ecf..266f7234 100644 --- a/util/src/test/java/com/ccsens/util/TestQrCord.java +++ b/util/src/test/java/com/ccsens/util/TestQrCord.java @@ -28,9 +28,9 @@ public class TestQrCord { // String fileName = "zzz/" + DateUtil.today() + "/" + i+"组" + ".png"; // String text = "https://www.tall.wiki/pt-dev/respond?groupId="+i+"&groupName="+i+"组"; -// String text = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx7af1bf1e14facf82&redirect_uri=http://www.tall.wiki/pt-dev/vote&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect"; - String text = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx7af1bf1e14facf82&redirect_uri=http://test.tall.wiki/compete&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect"; - String fileName = "zzz/" + "远程比赛.png"; + String text = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx7af1bf1e14facf82&redirect_uri=http://www.tall.wiki/pt-dev/vote&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect"; +// String text = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx7af1bf1e14facf82&redirect_uri=http://test.tall.wiki/compete&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect"; + String fileName = "zzz/" + "远程比赛（生产）.png"; QRCodeWriter qrCodeWriter = new QRCodeWriter();