Browse Source

20201204

tiaosheng
zy_Java 5 years ago
parent
commit
9aed635177
  1. 4
      cloudutil/src/main/java/com/ccsens/cloudutil/aspect/MustLoginAspect.java
  2. 2
      game/src/main/resources/application-dev.yml
  3. 11
      game/src/main/resources/application-test.yml
  4. 4
      game/src/main/resources/application.yml
  5. 5
      game/src/main/resources/druid-test.yml
  6. 10
      mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java
  7. 21
      mt/src/main/java/com/ccsens/mt/api/DebugController.java
  8. 14
      mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java
  9. 128
      mt/src/main/java/com/ccsens/mt/bean/po/CompeteSpeedVideo.java
  10. 841
      mt/src/main/java/com/ccsens/mt/bean/po/CompeteSpeedVideoExample.java
  11. 4
      mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java
  12. 30
      mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteSpeedVideoMapper.java
  13. 45
      mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java
  14. 2
      mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java
  15. 2
      mt/src/main/resources/druid-prod.yml
  16. 726
      mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
  17. 4
      mt/src/main/resources/mapper_dao/CompeteVideoDao.xml
  18. 291
      mt/src/main/resources/mapper_raw/CompeteSpeedVideoMapper.xml
  19. 4
      tall/src/main/resources/mapper_dao/SysUserDao.xml
  20. 4
      util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java
  21. 8
      util/src/test/java/com/ccsens/util/VideoTest.java

4
cloudutil/src/main/java/com/ccsens/cloudutil/aspect/MustLoginAspect.java

@ -48,7 +48,9 @@ public class MustLoginAspect {
RequestContextHolder.getRequestAttributes()).getRequest();
final String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN);
if(StrUtil.isEmpty(authHeader)){
return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN);
}
Object[] args = pjp.getArgs();
QueryDto dto = args == null || args.length < 1 ? null : (QueryDto) args[0];

2
game/src/main/resources/application-dev.yml

@ -8,7 +8,7 @@ spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
rabbitmq:
host: 81.70.54.64
host: 192.168.0.99
password: 111111
port: 5672
username: admin

11
game/src/main/resources/application-test.yml

@ -8,17 +8,13 @@ spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
rabbitmq:
<<<<<<< HEAD
host: 81.70.54.64
=======
host: 127.0.0.1
>>>>>>> pt
password: 111111
port: 5672
username: admin
redis:
database: 0
host: 192.168.0.99
host: 127.0.0.1
jedis:
pool:
max-active: 200
@ -32,9 +28,6 @@ swagger:
enable: true
eureka:
instance:
<<<<<<< HEAD
ip-address: 192.168.0.99
=======
ip-address: 192.168.0.99
gatewayUrl: https://test.tall.wiki/gateway/
@ -42,4 +35,4 @@ notGatewayUrl: https://test.tall.wiki/
file:
qrCode: https://test.tall.wiki/gateway/tall/v1.0/uploads/
openWX: 0
>>>>>>> pt

4
game/src/main/resources/application.yml

@ -1,4 +1,4 @@
spring:
profiles:
active: prod
include: common, util-prod
active: test
include: common, util-test

5
game/src/main/resources/druid-test.yml

@ -27,10 +27,9 @@ spring:
testOnReturn: false
testWhileIdle: true
timeBetweenEvictionRunsMillis: 60000
<<<<<<< HEAD
# url: jdbc:mysql://test.tall.wiki/game?useUnicode=true&characterEncoding=UTF-8
=======
>>>>>>> pt
url: jdbc:mysql://49.233.89.188:3306/game?useUnicode=true&characterEncoding=UTF-8
username: root
validationQuery: SELECT 1 FROM DUAL

10
mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java

@ -71,6 +71,7 @@ public class CompeteVideoController {
public JsonResponse<PageInfo<VideoProjectVo.CoachSignStatu>> selectCoachSignStatus(@ApiParam @Validated @RequestBody QueryDto<VideoDto.GetSignStatus> params) {
log.info("查看裁判签到状态(签到用):{}",params);
PageInfo<VideoProjectVo.CoachSignStatu> coachSignStatus = iCompeteVedioService.selectCoachSignStatus(params);
log.info("查看裁判签到状态:{}",coachSignStatus);
return JsonResponse.newInstance().ok(coachSignStatus);
}
@ -92,6 +93,13 @@ public class CompeteVideoController {
return JsonResponse.newInstance().ok(list);
}
@MustLogin
@ApiOperation(value = "上传速度通级赛视频", notes = "zy--保存速度通级赛的视频,只存单位信息,选手名和视频地址")
@RequestMapping(value = "/save/speedVideo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<Boolean> saveSpeedVideo(@ApiParam @Validated @RequestBody QueryDto<VideoDto.SpeedVideoInfo> params) {
log.info("上传速度通级赛视频:{}",params);
iCompeteVedioService.saveSpeedVideo(params.getParam(),params.getUserId());
return JsonResponse.newInstance().ok(true);
}
}

21
mt/src/main/java/com/ccsens/mt/api/DebugController.java

@ -1,11 +1,15 @@
package com.ccsens.mt.api;
import com.ccsens.mt.bean.dto.LevelDto;
import com.ccsens.mt.bean.dto.VideoDto;
import com.ccsens.mt.bean.po.CompetePlayer;
import com.ccsens.mt.bean.po.CompeteVideo;
import com.ccsens.mt.bean.po.LevelUser;
import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
import com.ccsens.mt.bean.vo.TableVo;
import com.ccsens.mt.bean.vo.VideoProjectVo;
import com.ccsens.mt.persist.dao.CompetePlayerDao;
import com.ccsens.mt.persist.dao.CompeteVideoDao;
import com.ccsens.mt.service.IExcelService;
import com.ccsens.mt.service.ILevelUpService;
import com.ccsens.util.JsonResponse;
@ -13,6 +17,7 @@ import com.ccsens.util.RedisUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.ZSetOperations;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@ -29,6 +34,7 @@ import java.util.Set;
@Api(tags = "DEBUG" , description = "DebugController | ")
@RestController
@RequestMapping("/debug")
@Slf4j
public class DebugController {
@Resource
private RedisUtil redisUtil;
@ -37,6 +43,8 @@ public class DebugController {
@Resource
private CompetePlayerDao competePlayerDao;
@Resource
private CompeteVideoDao competeVideoDao;
@Resource
private IExcelService excelService;
@ApiOperation(value = "/测试",notes = "")
@ -82,4 +90,17 @@ public class DebugController {
return JsonResponse.newInstance().ok(competeAllCount);
}
@ApiOperation(value = "/测试",notes = "")
@ApiImplicitParams({
})
@RequestMapping(value="/time",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
public JsonResponse debugTime() throws Exception {
VideoDto.GetSignStatus getSignStatus = new VideoDto.GetSignStatus();
getSignStatus.setId((long) 1);
List<VideoProjectVo.CoachSignStatu> coachSignStatus = competeVideoDao.selectCoachSignStatus(getSignStatus);
log.info("查看裁判签到状态:{}",coachSignStatus);
return JsonResponse.newInstance().ok(coachSignStatus);
}
}

14
mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java

@ -8,7 +8,9 @@ import lombok.NonNull;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
/**
@ -115,4 +117,16 @@ public class VideoDto {
private int pageSize = 10;
}
@Data
@ApiModel("上传通级赛视频")
public static class SpeedVideoInfo{
@NotNull(message = "单位信息不正确")
@ApiModelProperty("单位id")
private Long companyId;
@ApiModelProperty("选手名称")
private String playerName;
@ApiModelProperty("签到时间")
private List<String> videoUrlList;
}
}

128
mt/src/main/java/com/ccsens/mt/bean/po/CompeteSpeedVideo.java

@ -0,0 +1,128 @@
package com.ccsens.mt.bean.po;
import java.io.Serializable;
import java.util.Date;
public class CompeteSpeedVideo implements Serializable {
private Long id;
private Long companyId;
private String companyName;
private String playerName;
private Long userId;
private String videoUrlOne;
private String videoUrlTwo;
private Date createdAt;
private Date updatedAt;
private Byte recStatus;
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getCompanyId() {
return companyId;
}
public void setCompanyId(Long companyId) {
this.companyId = companyId;
}
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName == null ? null : companyName.trim();
}
public String getPlayerName() {
return playerName;
}
public void setPlayerName(String playerName) {
this.playerName = playerName == null ? null : playerName.trim();
}
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public String getVideoUrlOne() {
return videoUrlOne;
}
public void setVideoUrlOne(String videoUrlOne) {
this.videoUrlOne = videoUrlOne == null ? null : videoUrlOne.trim();
}
public String getVideoUrlTwo() {
return videoUrlTwo;
}
public void setVideoUrlTwo(String videoUrlTwo) {
this.videoUrlTwo = videoUrlTwo == null ? null : videoUrlTwo.trim();
}
public Date getCreatedAt() {
return createdAt;
}
public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
}
public Date getUpdatedAt() {
return updatedAt;
}
public void setUpdatedAt(Date updatedAt) {
this.updatedAt = updatedAt;
}
public Byte getRecStatus() {
return recStatus;
}
public void setRecStatus(Byte recStatus) {
this.recStatus = recStatus;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", companyId=").append(companyId);
sb.append(", companyName=").append(companyName);
sb.append(", playerName=").append(playerName);
sb.append(", userId=").append(userId);
sb.append(", videoUrlOne=").append(videoUrlOne);
sb.append(", videoUrlTwo=").append(videoUrlTwo);
sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append("]");
return sb.toString();
}
}

841
mt/src/main/java/com/ccsens/mt/bean/po/CompeteSpeedVideoExample.java

@ -0,0 +1,841 @@
package com.ccsens.mt.bean.po;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class CompeteSpeedVideoExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
public CompeteSpeedVideoExample() {
oredCriteria = new ArrayList<Criteria>();
}
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
public String getOrderByClause() {
return orderByClause;
}
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
public boolean isDistinct() {
return distinct;
}
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Long value) {
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Long value) {
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Long value) {
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Long value) {
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Long> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Long> values) {
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andCompanyIdIsNull() {
addCriterion("company_id is null");
return (Criteria) this;
}
public Criteria andCompanyIdIsNotNull() {
addCriterion("company_id is not null");
return (Criteria) this;
}
public Criteria andCompanyIdEqualTo(Long value) {
addCriterion("company_id =", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotEqualTo(Long value) {
addCriterion("company_id <>", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdGreaterThan(Long value) {
addCriterion("company_id >", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdGreaterThanOrEqualTo(Long value) {
addCriterion("company_id >=", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdLessThan(Long value) {
addCriterion("company_id <", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdLessThanOrEqualTo(Long value) {
addCriterion("company_id <=", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdIn(List<Long> values) {
addCriterion("company_id in", values, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotIn(List<Long> values) {
addCriterion("company_id not in", values, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdBetween(Long value1, Long value2) {
addCriterion("company_id between", value1, value2, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotBetween(Long value1, Long value2) {
addCriterion("company_id not between", value1, value2, "companyId");
return (Criteria) this;
}
public Criteria andCompanyNameIsNull() {
addCriterion("company_name is null");
return (Criteria) this;
}
public Criteria andCompanyNameIsNotNull() {
addCriterion("company_name is not null");
return (Criteria) this;
}
public Criteria andCompanyNameEqualTo(String value) {
addCriterion("company_name =", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameNotEqualTo(String value) {
addCriterion("company_name <>", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameGreaterThan(String value) {
addCriterion("company_name >", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameGreaterThanOrEqualTo(String value) {
addCriterion("company_name >=", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameLessThan(String value) {
addCriterion("company_name <", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameLessThanOrEqualTo(String value) {
addCriterion("company_name <=", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameLike(String value) {
addCriterion("company_name like", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameNotLike(String value) {
addCriterion("company_name not like", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameIn(List<String> values) {
addCriterion("company_name in", values, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameNotIn(List<String> values) {
addCriterion("company_name not in", values, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameBetween(String value1, String value2) {
addCriterion("company_name between", value1, value2, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameNotBetween(String value1, String value2) {
addCriterion("company_name not between", value1, value2, "companyName");
return (Criteria) this;
}
public Criteria andPlayerNameIsNull() {
addCriterion("player_name is null");
return (Criteria) this;
}
public Criteria andPlayerNameIsNotNull() {
addCriterion("player_name is not null");
return (Criteria) this;
}
public Criteria andPlayerNameEqualTo(String value) {
addCriterion("player_name =", value, "playerName");
return (Criteria) this;
}
public Criteria andPlayerNameNotEqualTo(String value) {
addCriterion("player_name <>", value, "playerName");
return (Criteria) this;
}
public Criteria andPlayerNameGreaterThan(String value) {
addCriterion("player_name >", value, "playerName");
return (Criteria) this;
}
public Criteria andPlayerNameGreaterThanOrEqualTo(String value) {
addCriterion("player_name >=", value, "playerName");
return (Criteria) this;
}
public Criteria andPlayerNameLessThan(String value) {
addCriterion("player_name <", value, "playerName");
return (Criteria) this;
}
public Criteria andPlayerNameLessThanOrEqualTo(String value) {
addCriterion("player_name <=", value, "playerName");
return (Criteria) this;
}
public Criteria andPlayerNameLike(String value) {
addCriterion("player_name like", value, "playerName");
return (Criteria) this;
}
public Criteria andPlayerNameNotLike(String value) {
addCriterion("player_name not like", value, "playerName");
return (Criteria) this;
}
public Criteria andPlayerNameIn(List<String> values) {
addCriterion("player_name in", values, "playerName");
return (Criteria) this;
}
public Criteria andPlayerNameNotIn(List<String> values) {
addCriterion("player_name not in", values, "playerName");
return (Criteria) this;
}
public Criteria andPlayerNameBetween(String value1, String value2) {
addCriterion("player_name between", value1, value2, "playerName");
return (Criteria) this;
}
public Criteria andPlayerNameNotBetween(String value1, String value2) {
addCriterion("player_name not between", value1, value2, "playerName");
return (Criteria) this;
}
public Criteria andUserIdIsNull() {
addCriterion("user_id is null");
return (Criteria) this;
}
public Criteria andUserIdIsNotNull() {
addCriterion("user_id is not null");
return (Criteria) this;
}
public Criteria andUserIdEqualTo(Long value) {
addCriterion("user_id =", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdNotEqualTo(Long value) {
addCriterion("user_id <>", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdGreaterThan(Long value) {
addCriterion("user_id >", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdGreaterThanOrEqualTo(Long value) {
addCriterion("user_id >=", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdLessThan(Long value) {
addCriterion("user_id <", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdLessThanOrEqualTo(Long value) {
addCriterion("user_id <=", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdIn(List<Long> values) {
addCriterion("user_id in", values, "userId");
return (Criteria) this;
}
public Criteria andUserIdNotIn(List<Long> values) {
addCriterion("user_id not in", values, "userId");
return (Criteria) this;
}
public Criteria andUserIdBetween(Long value1, Long value2) {
addCriterion("user_id between", value1, value2, "userId");
return (Criteria) this;
}
public Criteria andUserIdNotBetween(Long value1, Long value2) {
addCriterion("user_id not between", value1, value2, "userId");
return (Criteria) this;
}
public Criteria andVideoUrlOneIsNull() {
addCriterion("video_url_one is null");
return (Criteria) this;
}
public Criteria andVideoUrlOneIsNotNull() {
addCriterion("video_url_one is not null");
return (Criteria) this;
}
public Criteria andVideoUrlOneEqualTo(String value) {
addCriterion("video_url_one =", value, "videoUrlOne");
return (Criteria) this;
}
public Criteria andVideoUrlOneNotEqualTo(String value) {
addCriterion("video_url_one <>", value, "videoUrlOne");
return (Criteria) this;
}
public Criteria andVideoUrlOneGreaterThan(String value) {
addCriterion("video_url_one >", value, "videoUrlOne");
return (Criteria) this;
}
public Criteria andVideoUrlOneGreaterThanOrEqualTo(String value) {
addCriterion("video_url_one >=", value, "videoUrlOne");
return (Criteria) this;
}
public Criteria andVideoUrlOneLessThan(String value) {
addCriterion("video_url_one <", value, "videoUrlOne");
return (Criteria) this;
}
public Criteria andVideoUrlOneLessThanOrEqualTo(String value) {
addCriterion("video_url_one <=", value, "videoUrlOne");
return (Criteria) this;
}
public Criteria andVideoUrlOneLike(String value) {
addCriterion("video_url_one like", value, "videoUrlOne");
return (Criteria) this;
}
public Criteria andVideoUrlOneNotLike(String value) {
addCriterion("video_url_one not like", value, "videoUrlOne");
return (Criteria) this;
}
public Criteria andVideoUrlOneIn(List<String> values) {
addCriterion("video_url_one in", values, "videoUrlOne");
return (Criteria) this;
}
public Criteria andVideoUrlOneNotIn(List<String> values) {
addCriterion("video_url_one not in", values, "videoUrlOne");
return (Criteria) this;
}
public Criteria andVideoUrlOneBetween(String value1, String value2) {
addCriterion("video_url_one between", value1, value2, "videoUrlOne");
return (Criteria) this;
}
public Criteria andVideoUrlOneNotBetween(String value1, String value2) {
addCriterion("video_url_one not between", value1, value2, "videoUrlOne");
return (Criteria) this;
}
public Criteria andVideoUrlTwoIsNull() {
addCriterion("video_url_two is null");
return (Criteria) this;
}
public Criteria andVideoUrlTwoIsNotNull() {
addCriterion("video_url_two is not null");
return (Criteria) this;
}
public Criteria andVideoUrlTwoEqualTo(String value) {
addCriterion("video_url_two =", value, "videoUrlTwo");
return (Criteria) this;
}
public Criteria andVideoUrlTwoNotEqualTo(String value) {
addCriterion("video_url_two <>", value, "videoUrlTwo");
return (Criteria) this;
}
public Criteria andVideoUrlTwoGreaterThan(String value) {
addCriterion("video_url_two >", value, "videoUrlTwo");
return (Criteria) this;
}
public Criteria andVideoUrlTwoGreaterThanOrEqualTo(String value) {
addCriterion("video_url_two >=", value, "videoUrlTwo");
return (Criteria) this;
}
public Criteria andVideoUrlTwoLessThan(String value) {
addCriterion("video_url_two <", value, "videoUrlTwo");
return (Criteria) this;
}
public Criteria andVideoUrlTwoLessThanOrEqualTo(String value) {
addCriterion("video_url_two <=", value, "videoUrlTwo");
return (Criteria) this;
}
public Criteria andVideoUrlTwoLike(String value) {
addCriterion("video_url_two like", value, "videoUrlTwo");
return (Criteria) this;
}
public Criteria andVideoUrlTwoNotLike(String value) {
addCriterion("video_url_two not like", value, "videoUrlTwo");
return (Criteria) this;
}
public Criteria andVideoUrlTwoIn(List<String> values) {
addCriterion("video_url_two in", values, "videoUrlTwo");
return (Criteria) this;
}
public Criteria andVideoUrlTwoNotIn(List<String> values) {
addCriterion("video_url_two not in", values, "videoUrlTwo");
return (Criteria) this;
}
public Criteria andVideoUrlTwoBetween(String value1, String value2) {
addCriterion("video_url_two between", value1, value2, "videoUrlTwo");
return (Criteria) this;
}
public Criteria andVideoUrlTwoNotBetween(String value1, String value2) {
addCriterion("video_url_two not between", value1, value2, "videoUrlTwo");
return (Criteria) this;
}
public Criteria andCreatedAtIsNull() {
addCriterion("created_at is null");
return (Criteria) this;
}
public Criteria andCreatedAtIsNotNull() {
addCriterion("created_at is not null");
return (Criteria) this;
}
public Criteria andCreatedAtEqualTo(Date value) {
addCriterion("created_at =", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtNotEqualTo(Date value) {
addCriterion("created_at <>", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtGreaterThan(Date value) {
addCriterion("created_at >", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
addCriterion("created_at >=", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtLessThan(Date value) {
addCriterion("created_at <", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
addCriterion("created_at <=", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtIn(List<Date> values) {
addCriterion("created_at in", values, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtNotIn(List<Date> values) {
addCriterion("created_at not in", values, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtBetween(Date value1, Date value2) {
addCriterion("created_at between", value1, value2, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
addCriterion("created_at not between", value1, value2, "createdAt");
return (Criteria) this;
}
public Criteria andUpdatedAtIsNull() {
addCriterion("updated_at is null");
return (Criteria) this;
}
public Criteria andUpdatedAtIsNotNull() {
addCriterion("updated_at is not null");
return (Criteria) this;
}
public Criteria andUpdatedAtEqualTo(Date value) {
addCriterion("updated_at =", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtNotEqualTo(Date value) {
addCriterion("updated_at <>", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtGreaterThan(Date value) {
addCriterion("updated_at >", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
addCriterion("updated_at >=", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtLessThan(Date value) {
addCriterion("updated_at <", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
addCriterion("updated_at <=", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtIn(List<Date> values) {
addCriterion("updated_at in", values, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtNotIn(List<Date> values) {
addCriterion("updated_at not in", values, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtBetween(Date value1, Date value2) {
addCriterion("updated_at between", value1, value2, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
addCriterion("updated_at not between", value1, value2, "updatedAt");
return (Criteria) this;
}
public Criteria andRecStatusIsNull() {
addCriterion("rec_status is null");
return (Criteria) this;
}
public Criteria andRecStatusIsNotNull() {
addCriterion("rec_status is not null");
return (Criteria) this;
}
public Criteria andRecStatusEqualTo(Byte value) {
addCriterion("rec_status =", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusNotEqualTo(Byte value) {
addCriterion("rec_status <>", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusGreaterThan(Byte value) {
addCriterion("rec_status >", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
addCriterion("rec_status >=", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusLessThan(Byte value) {
addCriterion("rec_status <", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
addCriterion("rec_status <=", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusIn(List<Byte> values) {
addCriterion("rec_status in", values, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusNotIn(List<Byte> values) {
addCriterion("rec_status not in", values, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusBetween(Byte value1, Byte value2) {
addCriterion("rec_status between", value1, value2, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
addCriterion("rec_status not between", value1, value2, "recStatus");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}

4
mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java

@ -49,8 +49,8 @@ public class VideoProjectVo {
private String phone;
@ApiModelProperty("裁判类型")
private byte chiefJudgment;
// @ApiModelProperty("最近签到时间")
// private Date time;
@ApiModelProperty("最近签到时间")
private Date dateTime;
@ApiModelProperty("最近签到时间戳")
private Long time;
}

30
mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteSpeedVideoMapper.java

@ -0,0 +1,30 @@
package com.ccsens.mt.persist.mapper;
import com.ccsens.mt.bean.po.CompeteSpeedVideo;
import com.ccsens.mt.bean.po.CompeteSpeedVideoExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface CompeteSpeedVideoMapper {
long countByExample(CompeteSpeedVideoExample example);
int deleteByExample(CompeteSpeedVideoExample example);
int deleteByPrimaryKey(Long id);
int insert(CompeteSpeedVideo record);
int insertSelective(CompeteSpeedVideo record);
List<CompeteSpeedVideo> selectByExample(CompeteSpeedVideoExample example);
CompeteSpeedVideo selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") CompeteSpeedVideo record, @Param("example") CompeteSpeedVideoExample example);
int updateByExample(@Param("record") CompeteSpeedVideo record, @Param("example") CompeteSpeedVideoExample example);
int updateByPrimaryKeySelective(CompeteSpeedVideo record);
int updateByPrimaryKey(CompeteSpeedVideo record);
}

45
mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java

@ -1,17 +1,18 @@
package com.ccsens.mt.service;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.ObjectUtil;
import com.ccsens.mt.bean.dto.VideoDto;
import com.ccsens.mt.bean.po.*;
import com.ccsens.mt.bean.vo.VideoProjectVo;
import com.ccsens.mt.persist.dao.CompeteTeamDao;
import com.ccsens.mt.persist.dao.CompeteTimeDao;
import com.ccsens.mt.persist.dao.CompeteVideoDao;
import com.ccsens.mt.persist.mapper.CompeteCompanyMapper;
import com.ccsens.mt.persist.mapper.CompetePlayerLookMapper;
import com.ccsens.mt.persist.mapper.CompeteProjectMapper;
import com.ccsens.mt.persist.mapper.CompeteVideoMapper;
import com.ccsens.mt.persist.mapper.*;
import com.ccsens.util.CodeEnum;
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;
@ -21,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
/**
@ -37,9 +39,8 @@ public class CompeteVedioService implements ICompeteVedioService{
private CompetePlayerLookMapper competePlayerLookMapper;
@Resource
private CompeteVideoMapper competeVideoMapper;
@Resource
private CompeteProjectMapper competeProjectMapper;
private CompeteSpeedVideoMapper speedVideoMapper;
@Resource
private CompeteCompanyMapper competeCompanyMapper;
@Resource
@ -142,6 +143,34 @@ public class CompeteVedioService implements ICompeteVedioService{
return new PageInfo<>(competeVideoDao.selectCoachSignStatus(params.getParam()));
}
/**
* 上传速度通级赛视频
* @param param 视频地址和选手名
* @param userId 上传者的userId
*/
@Override
public void saveSpeedVideo(VideoDto.SpeedVideoInfo param, Long userId) {
//查找单位信息
CompeteCompany company = competeCompanyMapper.selectByPrimaryKey(param.getCompanyId());
if(ObjectUtil.isNull(company)){
throw new BaseException(CodeEnum.PARAM_ERROR);
}
//保存视频信息
CompeteSpeedVideo speedVideo = new CompeteSpeedVideo();
speedVideo.setId(snowflake.nextId());
speedVideo.setCompanyId(param.getCompanyId());
speedVideo.setCompanyName(company.getName());
speedVideo.setPlayerName(param.getPlayerName());
if(CollectionUtil.isNotEmpty(param.getVideoUrlList())){
for (int i = 0; i < param.getVideoUrlList().size(); i++) {
String url = param.getVideoUrlList().get(i);
if(i == 0){
speedVideo.setVideoUrlOne(url);
}else {
speedVideo.setVideoUrlTwo(url);
}
}
}
speedVideoMapper.insertSelective(speedVideo);
}
}

2
mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java

@ -32,4 +32,6 @@ public interface ICompeteVedioService {
PageInfo<VideoProjectVo.PeoSignStatu> selectCompanySignStatus(QueryDto<VideoDto.GetSignStatus> params);
PageInfo<VideoProjectVo.CoachSignStatu> selectCoachSignStatus(QueryDto<VideoDto.GetSignStatus> params);
void saveSpeedVideo(VideoDto.SpeedVideoInfo param, Long userId);
}

2
mt/src/main/resources/druid-prod.yml

@ -27,7 +27,7 @@ spring:
testOnReturn: false
testWhileIdle: true
timeBetweenEvictionRunsMillis: 60000
url: jdbc:mysql://127.0.0.1/mt?useUnicode=true&characterEncoding=UTF-8
url: jdbc:mysql://127.0.0.1/mt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
username: root
validationQuery: SELECT 1 FROM DUAL
env: CCSENS_GAME

726
mt/src/main/resources/mapper_dao/CompeteScoreDao.xml

@ -778,19 +778,217 @@
group by startOrder.id
</select>
<select id="queryCountScorePerson" resultType="com.ccsens.mt.bean.vo.ScoreVo$CountScorePublicity">
--
-- select * from (
-- select t1.groupName,t1.name, t1.companyName, t1.mainOneScore,t1.mainTwoScore,t1.shouldScore ,t1.deductTime, t1.finalScore, "" as remark, count(t2.id) +1 as rangee from
-- (SELECT
-- competeGroup.group_name as groupName,
-- player.NAME as name,
-- score.final_score as finalScore,
-- p.NAME as companyName,
-- score.id,
-- score.judgment_a_score as mainOneScore,
-- score.judgment_b_score2 as mainTwoScore,
-- score.should_times as shouldScore,
-- score.deduct_times as deductTime
-- FROM
-- t_compete_count_score score,
-- t_compete_start_order startOrder,
-- t_compete_video v,
-- t_compete_project_player pp,
-- t_compete_player player,
-- t_compete_group competeGroup,
-- t_compete_company p
-- WHERE
-- score.project_id = #{projectId}
-- AND score.site_order_id = startOrder.id AND startOrder.waiver = 0
-- AND startOrder.player_id = pp.id
-- AND startOrder.project_id = v.project_id AND startOrder.player_id = v.player_id
-- AND pp.player_id = player.id
-- AND player.compete_group_id = competeGroup.id
-- and player.company_id = p.id
-- AND score.rec_status = 0
-- AND player.rec_status = 0
-- AND startOrder.rec_status = 0
-- AND v.rec_status = 0
-- AND competeGroup.rec_status = 0)t1
-- left join
-- (SELECT
-- competeGroup.group_name as groupName,
-- player.NAME as name,
-- score.final_score as finalScore,
-- p.NAME as companyName,
-- score.id,
-- score.judgment_a_score as mainOneScore,
-- score.judgment_b_score2 as mainTwoScore,
-- score.should_times as shouldScore,
-- score.deduct_times as deductTime
-- FROM
-- t_compete_count_score score,
-- t_compete_start_order startOrder,
-- t_compete_video v,
-- t_compete_project_player pp,
-- t_compete_player player,
-- t_compete_group competeGroup,
-- t_compete_company p
-- WHERE
-- score.project_id = #{projectId}
-- AND score.site_order_id = startOrder.id AND startOrder.waiver = 0
-- AND startOrder.project_id = v.project_id AND startOrder.player_id = v.player_id
-- AND startOrder.player_id = pp.id
-- AND pp.player_id = player.id
-- AND player.compete_group_id = competeGroup.id
-- and player.company_id = p.id
-- AND score.rec_status = 0
-- AND player.rec_status = 0
-- AND startOrder.rec_status = 0
-- AND v.rec_status = 0
-- AND competeGroup.rec_status = 0)t2
-- on t1.groupName = t2.groupName and t1.finalScore &lt; t2.finalScore
-- group by t1.id
-- order by t1.groupName, rangee) t
-- union
-- -- 上传视频未打分
-- SELECT
-- competeGroup.group_name as groupName,
-- player.NAME as name,
-- p.NAME as companyName,
--
-- 0 as mainOneScore,
-- 0 as mainTwoScore,
-- 0 as shouldScore,
-- 0 as deductTime,
-- 0 as finalScore,
-- "裁判未打分" as remark,
-- null as rangee
-- FROM
-- (select o.* from t_compete_start_order o left join (select * from t_compete_count_score s where s.rec_status = 0) s on o.id = s.site_order_id and o.rec_status = 0) startOrder,
-- t_compete_video v,
-- t_compete_project_player pp,
-- t_compete_player player,
-- t_compete_group competeGroup,
-- t_compete_company p
-- WHERE
-- startOrder.project_id = #{projectId}
-- AND startOrder.player_id = pp.id
-- AND pp.player_id = player.id
-- AND player.compete_group_id = competeGroup.id
-- and player.company_id = p.id
-- AND player.rec_status = 0
-- AND startOrder.rec_status = 0
-- AND competeGroup.rec_status = 0
-- union
-- -- 上传视频未打分
-- SELECT
-- competeGroup.group_name as groupName,
-- player.NAME as name,
-- p.NAME as companyName,
-- 0 as mainOneScore,
-- 0 as mainTwoScore,
-- 0 as shouldScore,
-- 0 as deductTime,
-- 0 as finalScore,
-- "裁判未打分" as remark,
-- null as rangee
-- FROM
-- (select o.* from t_compete_start_order o left join (select * from t_compete_count_score s where s.rec_status = 0) s on o.id = s.site_order_id and o.rec_status = 0 and o.waiver = 0) startOrder,
-- t_compete_video v,
-- t_compete_project_player pp,
-- t_compete_player player,
-- t_compete_group competeGroup,
-- t_compete_company p
-- WHERE
-- startOrder.project_id = #{projectId}
-- AND startOrder.player_id = pp.id
-- AND pp.player_id = player.id
-- AND player.compete_group_id = competeGroup.id
-- and player.company_id = p.id
-- AND player.rec_status = 0
-- AND startOrder.rec_status = 0
-- AND competeGroup.rec_status = 0
-- union
-- -- 取消资格
-- SELECT
-- competeGroup.group_name as groupName,
-- player.NAME as name,
-- p.NAME as companyName,
-- 0 as mainOneScore,
-- 0 as mainTwoScore,
-- 0 as shouldScore,
-- 0 as deductTime,
-- 0 as finalScore,
-- "取消资格" as remark,
-- null as rangee
-- FROM
-- t_compete_start_order startOrder,
-- t_compete_project_player pp,
-- t_compete_player player,
-- t_compete_group competeGroup,
-- t_compete_company p
-- WHERE
-- startOrder.project_id = #{projectId} and startOrder.waiver = 2
-- AND startOrder.player_id = pp.id
-- AND pp.player_id = player.id
-- AND player.compete_group_id = competeGroup.id
-- and player.company_id = p.id
-- AND player.rec_status = 0
-- AND startOrder.rec_status = 0
-- AND competeGroup.rec_status = 0
-- union
-- -- 报名没有视频
-- SELECT
-- competeGroup.group_name as groupName,
-- player.NAME as name,
-- p.NAME as companyName,
-- 0 as mainOneScore,
-- 0 as mainTwoScore,
-- 0 as shouldScore,
-- 0 as deductTime,
-- 0 as finalScore,
-- "弃权" as remark,
-- null as rangee
-- FROM
-- (select o.* from t_compete_start_order o left join (select * from t_compete_video where rec_status = 0) v on o.project_id = v.project_id and o.player_id = v.player_id where o.project_id = #{projectId} and v.id is null and o.rec_status = 0 and o.waiver = 0 )startOrder,
-- t_compete_project_player pp,
-- t_compete_player player,
-- t_compete_group competeGroup,
-- t_compete_company p
-- WHERE
-- startOrder.player_id = pp.id
-- AND pp.player_id = player.id
-- AND player.compete_group_id = competeGroup.id
-- and player.company_id = p.id
-- AND player.rec_status = 0
-- AND competeGroup.rec_status = 0
SELECT
*
FROM
(
SELECT
t1.groupName,
t1.companyName,
t1.NAME,
select * from (
select t1.groupName,t1.name, t1.companyName, t1.mainOneScore,t1.mainTwoScore,t1.shouldScore ,t1.deductTime, t1.finalScore, "" as remark, count(t2.id) +1 as rangee from
(SELECT
competeGroup.group_name as groupName,
player.NAME as name,
score.final_score as finalScore,
p.NAME as companyName,
t1.mainOneScore,
t1.mainTwoScore,
t1.shouldScore,
t1.deductTime,
t1.finalScore,
if(t1.deductCause != '' and t1.deductCause != '0' ,t1.deductCause,"") AS remark,
count( t2.id ) + 1 AS rangee
FROM
(
SELECT
competeGroup.group_name AS groupName,
player.NAME AS NAME,
score.final_score AS finalScore,
p.NAME AS companyName,
score.id,
score.judgment_a_score as mainOneScore,
score.judgment_b_score2 as mainTwoScore,
score.should_times as shouldScore,
score.deduct_times as deductTime
score.judgment_a_score AS mainOneScore,
score.judgment_b_score2 AS mainTwoScore,
score.should_times AS shouldScore,
score.deduct_cause AS deductCause,
score.deduct_times AS deductTime
FROM
t_compete_count_score score,
t_compete_start_order startOrder,
@ -801,28 +999,33 @@
t_compete_company p
WHERE
score.project_id = #{projectId}
AND score.site_order_id = startOrder.id AND startOrder.waiver = 0
AND score.site_order_id = startOrder.id
AND startOrder.waiver = 0
AND startOrder.player_id = pp.id
AND startOrder.project_id = v.project_id AND startOrder.player_id = v.player_id
AND startOrder.project_id = v.project_id
AND startOrder.player_id = v.player_id
AND pp.player_id = player.id
AND player.compete_group_id = competeGroup.id
and player.company_id = p.id
AND player.company_id = p.id
AND score.rec_status = 0
AND player.rec_status = 0
AND startOrder.rec_status = 0
AND v.rec_status = 0
AND competeGroup.rec_status = 0)t1
left join
(SELECT
competeGroup.group_name as groupName,
player.NAME as name,
score.final_score as finalScore,
p.NAME as companyName,
AND pp.rec_status = 0
AND p.rec_status = 0
AND competeGroup.rec_status = 0
) t1
LEFT JOIN (
SELECT
competeGroup.group_name AS groupName,
player.NAME AS NAME,
score.final_score AS finalScore,
p.NAME AS companyName,
score.id,
score.judgment_a_score as mainOneScore,
score.judgment_b_score2 as mainTwoScore,
score.should_times as shouldScore,
score.deduct_times as deductTime
score.judgment_a_score AS mainOneScore,
score.judgment_b_score2 AS mainTwoScore,
score.should_times AS shouldScore,
score.deduct_times AS deductTime
FROM
t_compete_count_score score,
t_compete_start_order startOrder,
@ -833,36 +1036,50 @@
t_compete_company p
WHERE
score.project_id = #{projectId}
AND score.site_order_id = startOrder.id AND startOrder.waiver = 0
AND startOrder.project_id = v.project_id AND startOrder.player_id = v.player_id
AND score.site_order_id = startOrder.id
AND startOrder.waiver = 0
AND startOrder.project_id = v.project_id
AND startOrder.player_id = v.player_id
AND startOrder.player_id = pp.id
AND pp.player_id = player.id
AND player.compete_group_id = competeGroup.id
and player.company_id = p.id
AND player.company_id = p.id
AND score.rec_status = 0
AND player.rec_status = 0
AND startOrder.rec_status = 0
AND v.rec_status = 0
AND competeGroup.rec_status = 0)t2
on t1.groupName = t2.groupName and t1.finalScore &lt; t2.finalScore
group by t1.id
order by t1.groupName, rangee) t
union
-- 上传视频未打分
AND p.rec_status = 0
AND pp.rec_status = 0
AND competeGroup.rec_status = 0
) t2 ON t1.groupName = t2.groupName
AND t1.finalScore &lt; t2.finalScore
GROUP BY
t1.id
ORDER BY
t1.groupName,
rangee
) t UNION-- 上传视频未打分
SELECT
competeGroup.group_name as groupName,
player.NAME as name,
p.NAME as companyName,
competeGroup.group_name AS groupName,
p.NAME AS companyName,
player.NAME AS NAME,
0 as mainOneScore,
0 as mainTwoScore,
0 as shouldScore,
0 as deductTime,
0 as finalScore,
"裁判未打分" as remark,
null as rangee
0 AS mainOneScore,
0 AS mainTwoScore,
0 AS shouldScore,
0 AS deductTime,
0 AS finalScore,
"裁判未打分" AS remark,
NULL AS rangee
FROM
(select o.* from t_compete_start_order o left join (select * from t_compete_count_score s where s.rec_status = 0) s on o.id = s.site_order_id and o.rec_status = 0) startOrder,
(
SELECT
o.*
FROM
t_compete_start_order o
LEFT JOIN ( SELECT * FROM t_compete_count_score s WHERE s.rec_status = 0 ) s ON o.id = s.site_order_id
AND o.rec_status = 0 WHERE s.id is null
) startOrder,
t_compete_video v,
t_compete_project_player pp,
t_compete_player player,
@ -873,52 +1090,68 @@
AND startOrder.player_id = pp.id
AND pp.player_id = player.id
AND player.compete_group_id = competeGroup.id
and player.company_id = p.id
AND player.company_id = p.id
AND player.rec_status = 0
AND startOrder.rec_status = 0
AND competeGroup.rec_status = 0
union
-- 上传视频未打分
AND pp.rec_status = 0
AND p.rec_status = 0
UNION-- 上传视频未打分
SELECT
competeGroup.group_name as groupName,
player.NAME as name,
p.NAME as companyName,
0 as mainOneScore,
0 as mainTwoScore,
0 as shouldScore,
0 as deductTime,
0 as finalScore,
"裁判未打分" as remark,
null as rangee
competeGroup.group_name AS groupName,
p.NAME AS companyName,
player.NAME AS NAME,
0 AS mainOneScore,
0 AS mainTwoScore,
0 AS shouldScore,
0 AS deductTime,
0 AS finalScore,
"裁判未打分" AS remark,
NULL AS rangee
FROM
(
SELECT
o.*
FROM
(select o.* from t_compete_start_order o left join (select * from t_compete_count_score s where s.rec_status = 0) s on o.id = s.site_order_id and o.rec_status = 0 and o.waiver = 0) startOrder,
t_compete_start_order o
LEFT JOIN ( SELECT * FROM t_compete_count_score s WHERE s.rec_status = 0 ) s ON o.id = s.site_order_id
AND o.rec_status = 0
WHERE
o.project_id = #{projectId} AND o.waiver = 0 and s.id is null
) startOrder,
t_compete_video v,
t_compete_project_player pp,
t_compete_player player,
t_compete_group competeGroup,
t_compete_company p
WHERE
startOrder.project_id = #{projectId}
AND startOrder.player_id = pp.id
startOrder.player_id = pp.id
AND pp.player_id = player.id
AND player.compete_group_id = competeGroup.id
and player.company_id = p.id
AND player.company_id = p.id
AND player.rec_status = 0
AND p.rec_status = 0
AND pp.rec_status = 0
AND startOrder.rec_status = 0
AND competeGroup.rec_status = 0
union
-- 取消资格
UNION-- 取消资格
SELECT
competeGroup.group_name as groupName,
player.NAME as name,
p.NAME as companyName,
0 as mainOneScore,
0 as mainTwoScore,
0 as shouldScore,
0 as deductTime,
0 as finalScore,
"取消资格" as remark,
null as rangee
competeGroup.group_name AS groupName,
p.NAME AS companyName,
player.NAME AS NAME,
0 AS mainOneScore,
0 AS mainTwoScore,
0 AS shouldScore,
0 AS deductTime,
0 AS finalScore,
"取消资格" AS remark,
NULL AS rangee
FROM
t_compete_start_order startOrder,
t_compete_project_player pp,
@ -926,29 +1159,44 @@
t_compete_group competeGroup,
t_compete_company p
WHERE
startOrder.project_id = #{projectId} and startOrder.waiver = 2
startOrder.project_id = #{projectId}
AND startOrder.waiver = 2
AND startOrder.player_id = pp.id
AND pp.player_id = player.id
AND player.compete_group_id = competeGroup.id
and player.company_id = p.id
AND player.company_id = p.id
AND player.rec_status = 0
AND pp.rec_status = 0
AND p.rec_status = 0
AND startOrder.rec_status = 0
AND competeGroup.rec_status = 0
union
-- 报名没有视频
UNION-- 报名没有视频
SELECT
competeGroup.group_name as groupName,
player.NAME as name,
p.NAME as companyName,
0 as mainOneScore,
0 as mainTwoScore,
0 as shouldScore,
0 as deductTime,
0 as finalScore,
"弃权" as remark,
null as rangee
competeGroup.group_name AS groupName,
p.NAME AS companyName,
player.NAME AS NAME,
0 AS mainOneScore,
0 AS mainTwoScore,
0 AS shouldScore,
0 AS deductTime,
0 AS finalScore,
"弃权" AS remark,
NULL AS rangee
FROM
(select o.* from t_compete_start_order o left join (select * from t_compete_video where rec_status = 0) v on o.project_id = v.project_id and o.player_id = v.player_id where o.project_id = #{projectId} and v.id is null and o.rec_status = 0 and o.waiver = 0 )startOrder,
(
SELECT
o.*
FROM
t_compete_start_order o
LEFT JOIN ( SELECT * FROM t_compete_video WHERE rec_status = 0 ) v ON o.project_id = v.project_id
AND o.player_id = v.player_id
WHERE
o.project_id = #{projectId}
AND v.id IS NULL
AND o.rec_status = 0
AND o.waiver = 0
) startOrder,
t_compete_project_player pp,
t_compete_player player,
t_compete_group competeGroup,
@ -957,91 +1205,265 @@
startOrder.player_id = pp.id
AND pp.player_id = player.id
AND player.compete_group_id = competeGroup.id
and player.company_id = p.id
AND player.company_id = p.id
AND player.rec_status = 0
AND p.rec_status = 0
AND pp.rec_status = 0
AND competeGroup.rec_status = 0
</select>
<select id="queryVarietyScore" resultType="com.ccsens.mt.bean.vo.CompeteVo$TotalScoreDisplay">
SELECT
t.*,
@rownum := @rownum + 1 AS rownum
FROM
(
select s.*, c.name as companyName, GROUP_CONCAT(p.name) as peopleName, (ifnull(s.referee1,0)+ifnull(s.referee2,0)+ifnull(s.referee3,0))/3 as avg1To3,
(ifnull(s.referee4,0)+ifnull(s.referee5,0)+ifnull(s.referee6,0))/3 as avg4To6,
(ifnull(s.referee1,0)+ifnull(s.referee2,0)+ifnull(s.referee3,0))/3 + (ifnull(s.referee4,0)+ifnull(s.referee5,0)+ifnull(s.referee6,0))/3 - s.referee0 as result,
case o.waiver when 1 then '弃权' when 2 then '取消比赛资格' end as remark
from
(select site_order_id, max(if(chief_judgment = 0, score, null)) as referee0, max(if(chief_judgment = 1, score, null)) as referee1,
max(if(chief_judgment = 2, score, null)) as referee2, max(if(chief_judgment = 3, score, null)) as referee3,
max(if(chief_judgment = 4, score, null)) as referee4, max(if(chief_judgment = 5, score, null)) as referee5,
max(if(chief_judgment = 6, score, null)) as referee6, max(if(chief_judgment = 7, score, null)) as referee7
from
(select s.site_order_id, j.chief_judgment, sum(s.score) as score from t_compete_variety_score s, t_compete_judgment j where s.judgment_id = j.id and s.project_id = #{projectId} and s.rec_status = 0 and j.rec_status = 0 group by s.site_order_id,j.chief_judgment) t
group by t.site_order_id) s,
t_compete_start_order o,
t_compete_video v,
t_compete_team t,
t_compete_team_member m,
t_compete_player p,
t_compete_company c
where s.site_order_id = o.id and o.player_id = t.id and t.id = m.compete_team_id and m.player_id = p.id and p.company_id = c.id
and o.project_id = v.project_id and o.player_id = v.player_id and o.waiver = 0
and o.rec_status = 0 and t.rec_status = 0 and m.rec_status = 0 and p.rec_status = 0 and c.rec_status = 0 and v.rec_status = 0
group by s.site_order_id
order by result desc
)t,
(SELECT @rownum := ${page})t1
t.*,
@rownum := @rownum + 1 AS rownum
FROM
(
SELECT
s.*,
c.NAME AS companyName,
GROUP_CONCAT( p.NAME ) AS peopleName,
convert(
(
ifnull( s.referee1, 0 )+ ifnull( s.referee2, 0 )+ ifnull( s.referee3, 0 ))/ 3
,decimal(15,2)
) AS avg1To3,
convert(
(
ifnull( s.referee4, 0 )+ ifnull( s.referee5, 0 )+ ifnull( s.referee6, 0 ))/ 3
,decimal(15,2)
) as avg4To6,
convert(
(ifnull( s.referee1, 0 )+ ifnull( s.referee2, 0 )+ ifnull( s.referee3, 0 ))/ 3 ,decimal(15,2))+
union
-- 有视频没有分数
select
o.id as site_order_id, 0 as referee0,0 as referee1,0 as referee2,0 as referee3,0 as referee4,0 as referee5,0 as referee6,0 as referee7, c.name as companyName, GROUP_CONCAT(p.name), 0 as avg1To3, 0 as avg4To6, 0 as result, '裁判未打分' as remark, null as rownum
from
(select o.* from t_compete_start_order o left join (select * from t_compete_variety_score where rec_status = 0) s on o.id = s.site_order_id where s.id is null and o.rec_status = 0 and o.project_id = #{projectId} ) o,
convert((
ifnull( s.referee4, 0 )+ ifnull( s.referee5, 0 )+ ifnull( s.referee6, 0 ))/ 3 ,decimal(15,2)) - ifnull(s.referee0,0) AS result,
CASE
o.waiver
WHEN 1 THEN
'弃权'
WHEN 2 THEN
'取消比赛资格'
END AS remark
FROM
(
SELECT
site_order_id,
max(
IF
( chief_judgment = 0, ifnull(score,0), NULL )) AS referee0,
max(
IF
( chief_judgment = 1, ifnull(score,0), NULL )) AS referee1,
max(
IF
( chief_judgment = 2, ifnull(score,0), NULL )) AS referee2,
max(
IF
( chief_judgment = 3, ifnull(score,0), NULL )) AS referee3,
max(
IF
( chief_judgment = 4, ifnull(score,0), NULL )) AS referee4,
max(
IF
( chief_judgment = 5, ifnull(score,0), NULL )) AS referee5,
max(
IF
( chief_judgment = 6, ifnull(score,0), NULL )) AS referee6,
max(
IF
( chief_judgment = 7, ifnull(score,0), NULL )) AS referee7
FROM
(
SELECT
s.site_order_id,
j.chief_judgment,
sum( s.score ) AS score
FROM
t_compete_variety_score s,
t_compete_judgment j
WHERE
s.judgment_id = j.id
AND s.project_id = #{projectId}
AND s.rec_status = 0
AND j.rec_status = 0
GROUP BY
s.site_order_id,
j.chief_judgment
) t
GROUP BY
t.site_order_id
) s,
t_compete_start_order o,
t_compete_video v,
t_compete_team t,
t_compete_team_member m,
t_compete_player p,
t_compete_company c
where o.project_id = v.project_id and o.player_id = v.player_id and o.player_id = t.id and t.id = m.compete_team_id and m.player_id = p.id and p.company_id = c.id
and o.waiver = 0
and o.rec_status = 0 and t.rec_status = 0 and m.rec_status = 0 and p.rec_status = 0 and c.rec_status = 0
group by o.id
WHERE
s.site_order_id = o.id
AND o.player_id = t.id
AND t.id = m.compete_team_id
AND m.player_id = p.id
AND p.company_id = c.id
AND o.project_id = v.project_id
AND o.player_id = v.player_id
AND o.waiver = 0
AND o.rec_status = 0
AND t.rec_status = 0
AND m.rec_status = 0
AND p.rec_status = 0
AND c.rec_status = 0
AND v.rec_status = 0
GROUP BY
s.site_order_id
ORDER BY
result DESC
) t,
( SELECT @rownum := 0 ) t1
union
-- 取消资格
UNION-- 有视频没有分数
SELECT
o.id AS site_order_id,
0 AS referee0,
0 AS referee1,
0 AS referee2,
0 AS referee3,
0 AS referee4,
0 AS referee5,
0 AS referee6,
0 AS referee7,
c.NAME AS companyName,
GROUP_CONCAT( p.NAME ),
0 AS avg1To3,
0 AS avg4To6,
0 AS result,
'裁判未打分' AS remark,
NULL AS rownum
FROM
(
SELECT
o.*
FROM
t_compete_start_order o
LEFT JOIN ( SELECT * FROM t_compete_variety_score WHERE rec_status = 0 ) s ON o.id = s.site_order_id
WHERE
s.id IS NULL
AND o.rec_status = 0
AND o.project_id = #{projectId}
) o,
t_compete_video v,
t_compete_team t,
t_compete_team_member m,
t_compete_player p,
t_compete_company c
WHERE
o.project_id = v.project_id
AND o.player_id = v.player_id
AND o.player_id = t.id
AND t.id = m.compete_team_id
AND m.player_id = p.id
AND p.company_id = c.id
AND o.waiver = 0
AND o.rec_status = 0
AND t.rec_status = 0
AND m.rec_status = 0
AND p.rec_status = 0
AND c.rec_status = 0
GROUP BY
o.id UNION-- 取消资格
(
select
o.id as site_order_id, 0 as referee0,0 as referee1,0 as referee2,0 as referee3,0 as referee4,0 as referee5,0 as referee6,0 as referee7, c.name as companyName, GROUP_CONCAT(p.name), 0 as avg1To3, 0 as avg4To6, 0 as result, '取消资格' as remark, null as rownum
from
SELECT
o.id AS site_order_id,
0 AS referee0,
0 AS referee1,
0 AS referee2,
0 AS referee3,
0 AS referee4,
0 AS referee5,
0 AS referee6,
0 AS referee7,
c.NAME AS companyName,
GROUP_CONCAT( p.NAME ),
0 AS avg1To3,
0 AS avg4To6,
0 AS result,
'取消资格' AS remark,
NULL AS rownum
FROM
t_compete_start_order o,
t_compete_team t,
t_compete_team_member m,
t_compete_player p,
t_compete_company c
where o.player_id = t.id and t.id = m.compete_team_id and m.player_id = p.id and p.company_id = c.id
and o.project_id = #{projectId} and o.waiver = 2
and o.rec_status = 0 and t.rec_status = 0 and m.rec_status = 0 and p.rec_status = 0 and c.rec_status = 0
group by o.id
WHERE
o.player_id = t.id
AND t.id = m.compete_team_id
AND m.player_id = p.id
AND p.company_id = c.id
AND o.project_id = #{projectId}
AND o.waiver = 2
AND o.rec_status = 0
AND t.rec_status = 0
AND m.rec_status = 0
AND p.rec_status = 0
AND c.rec_status = 0
GROUP BY
o.id
)
UNION
-- 报名没有视频
SELECT
o.id AS site_order_id,
0 AS referee0,
0 AS referee1,
0 AS referee2,
0 AS referee3,
0 AS referee4,
0 AS referee5,
0 AS referee6,
0 AS referee7,
c.NAME AS companyName,
GROUP_CONCAT( p.NAME ),
0 AS avg1To3,
0 AS avg4To6,
0 AS result,
'弃权' AS remark,
NULL AS rownum
FROM
(
SELECT
o.*
FROM
t_compete_start_order o
LEFT JOIN ( SELECT * FROM t_compete_video WHERE rec_status = 0 ) v ON o.project_id = v.project_id AND
o.player_id = v.player_id
WHERE
o.project_id = #{projectId}
AND o.rec_status = 0
and v.id is null
) o,
t_compete_team t,
t_compete_team_member m,
t_compete_player p,
t_compete_company c
WHERE
o.player_id = t.id
AND t.id = m.compete_team_id
AND m.player_id = p.id
AND p.company_id = c.id
AND t.rec_status = 0
AND m.rec_status = 0
AND p.rec_status = 0
AND c.rec_status = 0
GROUP BY
o.id
ORDER BY
rownum IS NULL,
rownum ASC
union
-- 报名没有视频
select
o.id as site_order_id, 0 as referee0,0 as referee1,0 as referee2,0 as referee3,0 as referee4,0 as referee5,0 as referee6,0 as referee7, c.name as companyName, GROUP_CONCAT(p.name), 0 as avg1To3, 0 as avg4To6, 0 as result, '弃权' as remark, null as rownum
from
(select o.* from t_compete_start_order o left join (select * from t_compete_video where rec_status = 0) v on o.project_id = v.project_id and o.player_id = v.player_id and o.project_id = #{projectId} and o.rec_status = 0) o,
t_compete_team t,
t_compete_team_member m,
t_compete_player p,
t_compete_company c
where o.player_id = t.id and t.id = m.compete_team_id and m.player_id = p.id and p.company_id = c.id
and t.rec_status = 0 and m.rec_status = 0 and p.rec_status = 0 and c.rec_status = 0
group by o.id
order by rownum is null, rownum asc
</select>
<select id="selAllDaiBiaoDui" resultType="com.ccsens.mt.bean.vo.CompeteVo$DaiBiaoDUi">
select q.*,identity,GROUP_CONCAT(tcch.name) as name From

4
mt/src/main/resources/mapper_dao/CompeteVideoDao.xml

@ -65,8 +65,8 @@
tcj.`name` as `name`,
tcj.`phone` as `phone`,
tcj.`chief_judgment` as `chiefJudgment`,
(UNIX_TIMESTAMP(tt.`cr`) * 1000) as `time`
(UNIX_TIMESTAMP(tt.`cr`) * 1000) as `time`,
tt.`cr` as dateTime
FROM
t_compete_judgment tcj
left join tall.t_pro_member ttpm on tcj.member_id=ttpm.id and ttpm.user_id != 0

291
mt/src/main/resources/mapper_raw/CompeteSpeedVideoMapper.xml

@ -0,0 +1,291 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ccsens.mt.persist.mapper.CompeteSpeedVideoMapper">
<resultMap id="BaseResultMap" type="com.ccsens.mt.bean.po.CompeteSpeedVideo">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="company_id" jdbcType="BIGINT" property="companyId" />
<result column="company_name" jdbcType="VARCHAR" property="companyName" />
<result column="player_name" jdbcType="VARCHAR" property="playerName" />
<result column="user_id" jdbcType="BIGINT" property="userId" />
<result column="video_url_one" jdbcType="VARCHAR" property="videoUrlOne" />
<result column="video_url_two" jdbcType="VARCHAR" property="videoUrlTwo" />
<result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
<result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
<result column="rec_status" jdbcType="TINYINT" property="recStatus" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, company_id, company_name, player_name, user_id, video_url_one, video_url_two,
created_at, updated_at, rec_status
</sql>
<select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteSpeedVideoExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from t_compete_speed_video
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from t_compete_speed_video
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from t_compete_speed_video
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.ccsens.mt.bean.po.CompeteSpeedVideoExample">
delete from t_compete_speed_video
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.ccsens.mt.bean.po.CompeteSpeedVideo">
insert into t_compete_speed_video (id, company_id, company_name,
player_name, user_id, video_url_one,
video_url_two, created_at, updated_at,
rec_status)
values (#{id,jdbcType=BIGINT}, #{companyId,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR},
#{playerName,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, #{videoUrlOne,jdbcType=VARCHAR},
#{videoUrlTwo,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP},
#{recStatus,jdbcType=TINYINT})
</insert>
<insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteSpeedVideo">
insert into t_compete_speed_video
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="companyId != null">
company_id,
</if>
<if test="companyName != null">
company_name,
</if>
<if test="playerName != null">
player_name,
</if>
<if test="userId != null">
user_id,
</if>
<if test="videoUrlOne != null">
video_url_one,
</if>
<if test="videoUrlTwo != null">
video_url_two,
</if>
<if test="createdAt != null">
created_at,
</if>
<if test="updatedAt != null">
updated_at,
</if>
<if test="recStatus != null">
rec_status,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="companyId != null">
#{companyId,jdbcType=BIGINT},
</if>
<if test="companyName != null">
#{companyName,jdbcType=VARCHAR},
</if>
<if test="playerName != null">
#{playerName,jdbcType=VARCHAR},
</if>
<if test="userId != null">
#{userId,jdbcType=BIGINT},
</if>
<if test="videoUrlOne != null">
#{videoUrlOne,jdbcType=VARCHAR},
</if>
<if test="videoUrlTwo != null">
#{videoUrlTwo,jdbcType=VARCHAR},
</if>
<if test="createdAt != null">
#{createdAt,jdbcType=TIMESTAMP},
</if>
<if test="updatedAt != null">
#{updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="recStatus != null">
#{recStatus,jdbcType=TINYINT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.ccsens.mt.bean.po.CompeteSpeedVideoExample" resultType="java.lang.Long">
select count(*) from t_compete_speed_video
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update t_compete_speed_video
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.companyId != null">
company_id = #{record.companyId,jdbcType=BIGINT},
</if>
<if test="record.companyName != null">
company_name = #{record.companyName,jdbcType=VARCHAR},
</if>
<if test="record.playerName != null">
player_name = #{record.playerName,jdbcType=VARCHAR},
</if>
<if test="record.userId != null">
user_id = #{record.userId,jdbcType=BIGINT},
</if>
<if test="record.videoUrlOne != null">
video_url_one = #{record.videoUrlOne,jdbcType=VARCHAR},
</if>
<if test="record.videoUrlTwo != null">
video_url_two = #{record.videoUrlTwo,jdbcType=VARCHAR},
</if>
<if test="record.createdAt != null">
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
</if>
<if test="record.updatedAt != null">
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="record.recStatus != null">
rec_status = #{record.recStatus,jdbcType=TINYINT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update t_compete_speed_video
set id = #{record.id,jdbcType=BIGINT},
company_id = #{record.companyId,jdbcType=BIGINT},
company_name = #{record.companyName,jdbcType=VARCHAR},
player_name = #{record.playerName,jdbcType=VARCHAR},
user_id = #{record.userId,jdbcType=BIGINT},
video_url_one = #{record.videoUrlOne,jdbcType=VARCHAR},
video_url_two = #{record.videoUrlTwo,jdbcType=VARCHAR},
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
rec_status = #{record.recStatus,jdbcType=TINYINT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.mt.bean.po.CompeteSpeedVideo">
update t_compete_speed_video
<set>
<if test="companyId != null">
company_id = #{companyId,jdbcType=BIGINT},
</if>
<if test="companyName != null">
company_name = #{companyName,jdbcType=VARCHAR},
</if>
<if test="playerName != null">
player_name = #{playerName,jdbcType=VARCHAR},
</if>
<if test="userId != null">
user_id = #{userId,jdbcType=BIGINT},
</if>
<if test="videoUrlOne != null">
video_url_one = #{videoUrlOne,jdbcType=VARCHAR},
</if>
<if test="videoUrlTwo != null">
video_url_two = #{videoUrlTwo,jdbcType=VARCHAR},
</if>
<if test="createdAt != null">
created_at = #{createdAt,jdbcType=TIMESTAMP},
</if>
<if test="updatedAt != null">
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="recStatus != null">
rec_status = #{recStatus,jdbcType=TINYINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.ccsens.mt.bean.po.CompeteSpeedVideo">
update t_compete_speed_video
set company_id = #{companyId,jdbcType=BIGINT},
company_name = #{companyName,jdbcType=VARCHAR},
player_name = #{playerName,jdbcType=VARCHAR},
user_id = #{userId,jdbcType=BIGINT},
video_url_one = #{videoUrlOne,jdbcType=VARCHAR},
video_url_two = #{videoUrlTwo,jdbcType=VARCHAR},
created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

4
tall/src/main/resources/mapper_dao/SysUserDao.xml

@ -145,8 +145,8 @@
<select id="selectUserInfo" parameterType="java.util.Map" resultType="com.ccsens.tall.bean.vo.UserVo$SelectUserInfo">
SELECT
u.id as id,
(SELECT identifier FROM t_sys_auth WHERE rec_status = 0 AND user_id = #{userId} and identify_type = 3) as account,
(SELECT identifier FROM t_sys_auth WHERE rec_status = 0 AND user_id = #{userId} and identify_type = 1) as phone,
(SELECT identifier FROM t_sys_auth WHERE rec_status = 0 AND user_id = #{userId} and identify_type = 3 order by updated_at limit 1) as account,
(SELECT identifier FROM t_sys_auth WHERE rec_status = 0 AND user_id = #{userId} and identify_type = 1 order by updated_at limit 1) as phone,
u.nickname as nickname,
u.avatar_url as avatarUrl,
i.signature as signature,

4
util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java

@ -269,12 +269,12 @@ public class WxXcxUtil {
file.getParentFile().mkdirs();
}
String url = String.format(URL_GET_WX_CODE_C, WxGzhUtil.getAccessToken(appId(code),secret(code)));
log.info("调用生成二维码路径和accessToken:{}",url);
WechatCodeA wechatCode = new WechatCodeA();
wechatCode.path = page;
String postStr = JacksonUtil.beanToJson(wechatCode);
System.out.println(postStr);
log.info("二维码的参数:{}",postStr);
HttpsUtil.httpsRequest(url,"POST",postStr,path);
}

8
util/src/test/java/com/ccsens/util/VideoTest.java

@ -98,14 +98,14 @@ public class VideoTest {
// 指定资源地址,下载文件测试
// downloadFile("http://1258473962.vod2.myqcloud.com/1e124671vodcq1258473962/76557f735285890810478037694/VCj25SXUgFsA.mp4", "D:/temp/");
List<Object[]> objects = PoiUtil.readExce(new File("D:\\temp\\test.xlsx"), 0, null, 0, false);
List<Object[]> objects = PoiUtil.readExce(new File("C:\\Users\\逗\\Desktop\\跳绳比赛选手证件照.xlsx"), 0, null, 0, false);
for (int i = 0; i < objects.size(); i++) {
Object[] obj = objects.get(i);
if (obj == null || obj.length < 3) {
if (obj == null || obj.length < 4) {
continue;
}
String path = (String)obj[2];
String dir = "D:\\temp\\" + obj[0] + "\\" + obj[1];
String path = (String)obj[3];
String dir = "D:\\选手证件照\\" + obj[0] + "\\" + obj[1] + "\\" + obj[2];
try{
downloadFile(path, dir);
} catch (Exception e) {

Loading…
Cancel
Save