From b4f8febec95bb030ae214b6a33eca2e46a99fbe2 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Fri, 20 Nov 2020 19:15:25 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mt/src/main/java/com/ccsens/mt/service/CompeteService.java | 3 +++ mt/src/main/java/com/ccsens/mt/service/ExcelService.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 41f609c3..f8bfb42b 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -1472,6 +1472,9 @@ public class CompeteService implements ICompeteService { //场次表里面的东西 CompeteStartOrder competeStartOrder1 = competeStartOrderMapper.selectByPrimaryKey(param.getSiteOrderId()); + if(competeStartOrder1==null){ + throw new BaseException(CodeEnum.PARAM_ERROR); + } selScropeVo.setWaiver(competeStartOrder1.getWaiver()); //项目表里面的东西 CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(competeStartOrder1.getProjectId()); diff --git a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java index 84855e86..006938c2 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -223,7 +223,7 @@ public class ExcelService implements IExcelService { //查出教练和领队的list List jLandLD=competeCompanyDao.selectByCompanyId(com.getId()); CompetePlayerExample competePlayerExample=new CompetePlayerExample(); - competePlayerExample.createCriteria().andCompanyIdEqualTo(com.getId()); + competePlayerExample.createCriteria().andCompanyIdEqualTo(com.getId()).andRecStatusEqualTo((byte) 0); //运动员list List competePlayerList = competePlayerMapper.selectByExample(competePlayerExample); From e47f77d05c34036dea015604fc2cc0e37284b633 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Sat, 21 Nov 2020 09:59:51 +0800 Subject: [PATCH 02/10] v --- .../com/ccsens/mt/api/KCPlayerController.java | 48 ++++++++ .../java/com/ccsens/mt/bean/vo/TableVo.java | 6 +- .../ccsens/mt/service/CompeteTaskService.java | 55 +++++---- .../ccsens/mt/service/IKCPlayerService.java | 5 + .../ccsens/mt/service/KCPlayerService.java | 53 +++++++++ .../java/com/ccsens/mt/util/Constant.java | 2 + .../com/ccsens/util/KCPlayerSignature.java | 104 ++++++++++++++++++ 7 files changed, 248 insertions(+), 25 deletions(-) create mode 100644 mt/src/main/java/com/ccsens/mt/api/KCPlayerController.java create mode 100644 mt/src/main/java/com/ccsens/mt/service/IKCPlayerService.java create mode 100644 mt/src/main/java/com/ccsens/mt/service/KCPlayerService.java create mode 100644 util/src/main/java/com/ccsens/util/KCPlayerSignature.java diff --git a/mt/src/main/java/com/ccsens/mt/api/KCPlayerController.java b/mt/src/main/java/com/ccsens/mt/api/KCPlayerController.java new file mode 100644 index 00000000..255185a3 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/api/KCPlayerController.java @@ -0,0 +1,48 @@ +package com.ccsens.mt.api; + +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.mt.bean.dto.CompeteDto; +import com.ccsens.mt.bean.vo.CompeteVo; +import com.ccsens.mt.service.IKCPlayerService; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +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 java.util.List; +import java.util.Map; + +@Slf4j +@Api(tags = "云点播", description = "") +@RestController +@RequestMapping("/kcPlayer") +public class KCPlayerController { + @Resource + private IKCPlayerService kcPlayerService; + + @ApiOperation(value = "查看云点播签名", notes = "从redis获取云点播签名，有则返回，没有则调用工具类查询，存入redis并返回") + @RequestMapping(value = "/get", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse getSignature() { + log.info("查看云点播签名"); + String signature = kcPlayerService.getSignature(); + log.info("查看云点播签名：{}",signature); + return JsonResponse.newInstance().ok(signature); + } + + @ApiOperation(value = "查看云点播签名", notes = "从redis获取云点播签名，有则返回，没有则调用工具类查询，存入redis并返回") + @RequestMapping(value = "/receive", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse receive(@RequestBody Map map) { + log.info("接受文件上传通知：{}",map); + + return JsonResponse.newInstance().ok(); + } + +} diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java index 0643eef7..28cabbca 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java @@ -141,7 +141,7 @@ public class TableVo { public static class CompeteProjectConfig{ @ApiModelProperty("参赛id") private Long projectId; - @ApiModelProperty("参赛项目") + @ApiModelProperty("参赛项目名字") private String projectName; @ApiModelProperty("参赛人/队伍") private int joinNum; @@ -153,9 +153,9 @@ public class TableVo { private int games; @ApiModelProperty("总时间") private int timeSum; - @ApiModelProperty("项目开始时间") + @ApiModelProperty("比赛项目开始时间") private Long startTime; - @ApiModelProperty("项目结束时间") + @ApiModelProperty("比赛项目结束时间") private Long endTime; public int getGames(){ diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index 668272fe..f250a203 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -75,7 +75,9 @@ public class CompeteTaskService implements ICompeteTaskService{ public List updateCompeteProjectConfig(ProvinceCompeteDto.UpdateCompeteProjectConfig param,String token) { //获取比赛类型 AtomicInteger type = new AtomicInteger(); - if(CollectionUtil.isNotEmpty(param.getUpdateCompeteTaskList())){ + if(CollectionUtil.isEmpty(param.getUpdateCompeteTaskList())) { + return new ArrayList<>(); + } param.getUpdateCompeteTaskList().forEach(projectConfig -> { //获取项目 CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId()); @@ -109,14 +111,13 @@ public class CompeteTaskService implements ICompeteTaskService{ // 生成出场顺序表，存入数据库。在tall内添加对应的任务 setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token); }); - } + return projectConfigDao.queryProjectConfig(type.get()); } /** * 修改配置时生成出场顺序 */ public void setStartOrder(CompeteProjectConfig projectConfig, Long tallProjectId,Long tallRoleId,String token) { - if (ObjectUtil.isNotNull(projectConfig)) { //查找项目 CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId()); @@ -156,12 +157,16 @@ public class CompeteTaskService implements ICompeteTaskService{ // 修改tall的任务 TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo(); updateTaskInfo.setId(competeStartOrder.getId()); - updateTaskInfo.setBeginTime(competeStartOrder.getId()); - updateTaskInfo.setBeginTime(competeStartOrder.getEndTime()); + updateTaskInfo.setBeginTime(competeStartOrder.getStartTime()); + updateTaskInfo.setEndTime(competeStartOrder.getEndTime()); updateTaskInfo.setToken(token); log.info("修改tall的任务信息：{}",updateTaskInfo); - tallFeignClient.updataTask(updateTaskInfo); - log.info("修改tall的任务信息后返回：{}",updateTaskInfo); + JsonResponse normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo); + log.info("修改tall的任务信息后返回：{}",normalTaskJsonResponse); + //失败return + if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200){ + return; + } } startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); @@ -177,12 +182,14 @@ public class CompeteTaskService implements ICompeteTaskService{ addTask.setToken(token); log.info("在tall内添加任务：{}",addTask); JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); + //异常return log.info("添加任务后返回：{}",normalTaskJsonResponse); - if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { - TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); - if (ObjectUtil.isNotNull(normalTask)) { - taskId = normalTask.getDetailId(); - } + if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) { + return; + } + TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); + if (ObjectUtil.isNotNull(normalTask)) { + taskId = normalTask.getDetailId(); } //添加出场顺序信息 CompeteStartOrder competeStartOrder = new CompeteStartOrder(); @@ -218,10 +225,7 @@ public class CompeteTaskService implements ICompeteTaskService{ long orderTime = 0; if(order != 0) { orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); - }else { - log.info("场次为0的比赛：{}------{}",project,projectConfig); } -// long orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); //场次 int competeOrder = 1; //场地 @@ -244,8 +248,12 @@ public class CompeteTaskService implements ICompeteTaskService{ updateTaskInfo.setBeginTime(competeStartOrder.getEndTime()); updateTaskInfo.setToken(token); log.info("修改tall的任务信息：{}",updateTaskInfo); - tallFeignClient.updataTask(updateTaskInfo); - log.info("修改tall的任务信息后返回：{}",updateTaskInfo); + JsonResponse normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo); + log.info("修改tall的任务信息后返回：{}",normalTaskJsonResponse); + //失败return + if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200){ + return; + } } startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); @@ -262,11 +270,14 @@ public class CompeteTaskService implements ICompeteTaskService{ log.info("在tall内添加任务：{}",addTask); JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); log.info("添加任务后返回：{}",normalTaskJsonResponse); - if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { - TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); - if (ObjectUtil.isNotNull(normalTask)) { - taskId = normalTask.getDetailId(); - } + //异常return + log.info("添加任务后返回：{}",normalTaskJsonResponse); + if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) { + return; + } + TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); + if (ObjectUtil.isNotNull(normalTask)) { + taskId = normalTask.getDetailId(); } //添加出场顺序信息 CompeteStartOrder competeStartOrder = new CompeteStartOrder(); diff --git a/mt/src/main/java/com/ccsens/mt/service/IKCPlayerService.java b/mt/src/main/java/com/ccsens/mt/service/IKCPlayerService.java new file mode 100644 index 00000000..68799425 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/service/IKCPlayerService.java @@ -0,0 +1,5 @@ +package com.ccsens.mt.service; + +public interface IKCPlayerService { + String getSignature(); +} diff --git a/mt/src/main/java/com/ccsens/mt/service/KCPlayerService.java b/mt/src/main/java/com/ccsens/mt/service/KCPlayerService.java new file mode 100644 index 00000000..9e474bfe --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/service/KCPlayerService.java @@ -0,0 +1,53 @@ +package com.ccsens.mt.service; + +import cn.hutool.core.util.ObjectUtil; +import com.ccsens.mt.util.Constant; +import com.ccsens.util.CodeEnum; +import com.ccsens.util.KCPlayerSignature; +import com.ccsens.util.RedisUtil; +import com.ccsens.util.exception.BaseException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Random; +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) +public class KCPlayerService implements IKCPlayerService{ + @Resource + private RedisUtil redisUtil; + + /** + * 获取云点播签名 + * @return 返回签名 + */ + @Override + public String getSignature() { + String signature; + //查询redis + Object o = redisUtil.get(Constant.Redis.KC_PLAYER_SIGNATURE); + if(ObjectUtil.isNotNull(o)){ + return (String) o; + } + + KCPlayerSignature sign = new KCPlayerSignature(); + sign.setCurrentTime(System.currentTimeMillis() / 1000); + sign.setRandom(new Random().nextInt(java.lang.Integer.MAX_VALUE)); + // 签名有效期：2天 + sign.setSignValidDuration(3600 * 24 * 2); + try { + signature = sign.getUploadSignature(); + log.info("获取云点播签名成功：{}",signature); + //存入redis + redisUtil.set(Constant.Redis.KC_PLAYER_SIGNATURE,signature,3600 * 24); + } catch (Exception e) { + log.error("获取云点播签名失败",e); + throw new BaseException(CodeEnum.SYS_ERROR); + + } + return signature; + } +} diff --git a/mt/src/main/java/com/ccsens/mt/util/Constant.java b/mt/src/main/java/com/ccsens/mt/util/Constant.java index 8e415048..e8d80d4d 100644 --- a/mt/src/main/java/com/ccsens/mt/util/Constant.java +++ b/mt/src/main/java/com/ccsens/mt/util/Constant.java @@ -31,6 +31,8 @@ public class Constant { public final static long COMPETE_COMPANY_TIME = 10 * 24 * 60 * 60; // 远程比赛参赛单位 public final static String COMPETE_LEVEL = "compete_"; + //云点播签名 + public final static String KC_PLAYER_SIGNATURE = "kc_player_signature"; } public static final int VOTE_TOTAL = 2; diff --git a/util/src/main/java/com/ccsens/util/KCPlayerSignature.java b/util/src/main/java/com/ccsens/util/KCPlayerSignature.java new file mode 100644 index 00000000..54e4c3e1 --- /dev/null +++ b/util/src/main/java/com/ccsens/util/KCPlayerSignature.java @@ -0,0 +1,104 @@ +package com.ccsens.util; + + +import java.util.Base64; +import java.util.Random; +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; + + +/** + * 签名工具类 + * @author 逗 + */ +public class KCPlayerSignature{ + private String secretId = "AKIDTr6B7uA2qCRWRDRXyeUAZpkfR2tupVFu"; + private String secretKey = "wVtKAuXEjXFpxQmz9PM6hWallNEyZ0Na"; + private long currentTime; + private int random; + private int signValidDuration; + //签名算法 + private static final String HMAC_ALGORITHM = "HmacSHA1"; + private static final String CONTENT_CHARSET = "UTF-8"; + + public static byte[] byteMerger(byte[] byte1, byte[] byte2) { + byte[] byte3 = new byte[byte1.length + byte2.length]; + System.arraycopy(byte1, 0, byte3, 0, byte1.length); + System.arraycopy(byte2, 0, byte3, byte1.length, byte2.length); + return byte3; + } + + // 获取签名 + public String getUploadSignature() throws Exception { + String strSign = ""; + String contextStr = ""; + + // 生成原始参数字符串 + long endTime = (currentTime + signValidDuration); + contextStr += "secretId=" + java.net.URLEncoder.encode(secretId, "utf8"); + contextStr += "¤tTimeStamp=" + currentTime; + contextStr += "&expireTime=" + endTime; + contextStr += "&random=" + random; + contextStr += "&sourceContext=id"; + + + try { + Mac mac = Mac.getInstance(HMAC_ALGORITHM); + SecretKeySpec secretKey = new SecretKeySpec(this.secretKey.getBytes(CONTENT_CHARSET), mac.getAlgorithm()); + mac.init(secretKey); + + byte[] hash = mac.doFinal(contextStr.getBytes(CONTENT_CHARSET)); + byte[] sigBuf = byteMerger(hash, contextStr.getBytes("utf8")); + strSign = base64Encode(sigBuf); + strSign = strSign.replace(" ", "").replace("\n", "").replace("\r", ""); + } catch (Exception e) { + throw e; + } + return strSign; + } + + private String base64Encode(byte[] buffer) { + Base64.Encoder encoder = Base64.getEncoder(); + return encoder.encodeToString(buffer); + } + + + public void setSecretId(String secretId) { + this.secretId = secretId; + } + + public void setSecretKey(String secretKey) { + this.secretKey = secretKey; + } + + public void setCurrentTime(long currentTime) { + this.currentTime = currentTime; + } + + public void setRandom(int random) { + this.random = random; + } + + public void setSignValidDuration(int signValidDuration) { + this.signValidDuration = signValidDuration; + } + + static void main(String[] args) { + KCPlayerSignature sign = new KCPlayerSignature(); + // 设置 App 的云 API 密钥 + sign.setSecretId("个人 API 密钥中的 Secret Id"); + sign.setSecretKey("个人 API 密钥中的 Secret Key"); + sign.setCurrentTime(System.currentTimeMillis() / 1000); + sign.setRandom(new Random().nextInt(java.lang.Integer.MAX_VALUE)); + // 签名有效期：2天 + sign.setSignValidDuration(3600 * 24 * 2); + + try { + String signature = sign.getUploadSignature(); + System.out.println("signature : " + signature); + } catch (Exception e) { + System.out.print("获取签名失败"); + e.printStackTrace(); + } + } +} \ No newline at end of file From f992f40ac37058f14b3d2d00bb8df7833e924520 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Sat, 21 Nov 2020 10:02:40 +0800 Subject: [PATCH 03/10] 20201121v1.1 --- .../main/java/com/ccsens/mt/api/KCPlayerController.java | 4 ++-- .../java/com/ccsens/mt/service/IKCPlayerService.java | 2 +- .../main/java/com/ccsens/mt/service/KCPlayerService.java | 9 +++++---- mt/src/main/java/com/ccsens/mt/util/Constant.java | 2 +- .../src/main/java/com/ccsens/util/KCPlayerSignature.java | 6 +++--- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/KCPlayerController.java b/mt/src/main/java/com/ccsens/mt/api/KCPlayerController.java index 255185a3..3d07b837 100644 --- a/mt/src/main/java/com/ccsens/mt/api/KCPlayerController.java +++ b/mt/src/main/java/com/ccsens/mt/api/KCPlayerController.java @@ -30,9 +30,9 @@ public class KCPlayerController { @ApiOperation(value = "查看云点播签名", notes = "从redis获取云点播签名，有则返回，没有则调用工具类查询，存入redis并返回") @RequestMapping(value = "/get", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse getSignature() { + public JsonResponse getSignature(Long id) { log.info("查看云点播签名"); - String signature = kcPlayerService.getSignature(); + String signature = kcPlayerService.getSignature(id); log.info("查看云点播签名：{}",signature); return JsonResponse.newInstance().ok(signature); } diff --git a/mt/src/main/java/com/ccsens/mt/service/IKCPlayerService.java b/mt/src/main/java/com/ccsens/mt/service/IKCPlayerService.java index 68799425..b6531324 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IKCPlayerService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IKCPlayerService.java @@ -1,5 +1,5 @@ package com.ccsens.mt.service; public interface IKCPlayerService { - String getSignature(); + String getSignature(Long id); } diff --git a/mt/src/main/java/com/ccsens/mt/service/KCPlayerService.java b/mt/src/main/java/com/ccsens/mt/service/KCPlayerService.java index 9e474bfe..d626a569 100644 --- a/mt/src/main/java/com/ccsens/mt/service/KCPlayerService.java +++ b/mt/src/main/java/com/ccsens/mt/service/KCPlayerService.java @@ -23,12 +23,13 @@ public class KCPlayerService implements IKCPlayerService{ /** * 获取云点播签名 * @return 返回签名 + * @param id */ @Override - public String getSignature() { + public String getSignature(Long id) { String signature; //查询redis - Object o = redisUtil.get(Constant.Redis.KC_PLAYER_SIGNATURE); + Object o = redisUtil.get(Constant.Redis.KC_PLAYER_SIGNATURE + id); if(ObjectUtil.isNotNull(o)){ return (String) o; } @@ -39,10 +40,10 @@ public class KCPlayerService implements IKCPlayerService{ // 签名有效期：2天 sign.setSignValidDuration(3600 * 24 * 2); try { - signature = sign.getUploadSignature(); + signature = sign.getUploadSignature(id); log.info("获取云点播签名成功：{}",signature); //存入redis - redisUtil.set(Constant.Redis.KC_PLAYER_SIGNATURE,signature,3600 * 24); + redisUtil.set(Constant.Redis.KC_PLAYER_SIGNATURE + id,signature,3600 * 24); } catch (Exception e) { log.error("获取云点播签名失败",e); throw new BaseException(CodeEnum.SYS_ERROR); diff --git a/mt/src/main/java/com/ccsens/mt/util/Constant.java b/mt/src/main/java/com/ccsens/mt/util/Constant.java index e8d80d4d..ef0667ca 100644 --- a/mt/src/main/java/com/ccsens/mt/util/Constant.java +++ b/mt/src/main/java/com/ccsens/mt/util/Constant.java @@ -32,7 +32,7 @@ public class Constant { // 远程比赛参赛单位 public final static String COMPETE_LEVEL = "compete_"; //云点播签名 - public final static String KC_PLAYER_SIGNATURE = "kc_player_signature"; + public final static String KC_PLAYER_SIGNATURE = "kc_player_signature_"; } public static final int VOTE_TOTAL = 2; diff --git a/util/src/main/java/com/ccsens/util/KCPlayerSignature.java b/util/src/main/java/com/ccsens/util/KCPlayerSignature.java index 54e4c3e1..9ca43426 100644 --- a/util/src/main/java/com/ccsens/util/KCPlayerSignature.java +++ b/util/src/main/java/com/ccsens/util/KCPlayerSignature.java @@ -29,7 +29,7 @@ public class KCPlayerSignature{ } // 获取签名 - public String getUploadSignature() throws Exception { + public String getUploadSignature(Long id) throws Exception { String strSign = ""; String contextStr = ""; @@ -39,7 +39,7 @@ public class KCPlayerSignature{ contextStr += "¤tTimeStamp=" + currentTime; contextStr += "&expireTime=" + endTime; contextStr += "&random=" + random; - contextStr += "&sourceContext=id"; + contextStr += "&sourceContext=" + id; try { @@ -94,7 +94,7 @@ public class KCPlayerSignature{ sign.setSignValidDuration(3600 * 24 * 2); try { - String signature = sign.getUploadSignature(); + String signature = sign.getUploadSignature(id); System.out.println("signature : " + signature); } catch (Exception e) { System.out.print("获取签名失败"); From 4ea2819e50119a943adf827c70ae369340abe5d4 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Sat, 21 Nov 2020 10:36:34 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/mt/api/CompeteScoreController.java | 1 + .../com/ccsens/mt/api/ExcelController.java | 10 ++++++ .../java/com/ccsens/mt/bean/vo/CompeteVo.java | 2 +- .../com/ccsens/mt/service/ExcelService.java | 35 +++++++++++++++++++ .../com/ccsens/mt/service/IExcelService.java | 2 ++ .../resources/mapper_dao/CompeteVideoDao.xml | 12 +++---- 6 files changed, 55 insertions(+), 7 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index 81bb0ffa..dbd6081c 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.spring.web.json.Json; import javax.annotation.Resource; import java.util.List; diff --git a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java index 80ea10e5..c497e672 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java @@ -4,6 +4,7 @@ package com.ccsens.mt.api; import com.ccsens.cloudutil.annotation.MustLogin; import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +import com.ccsens.mt.bean.dto.ScoreDto; import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.service.IExcelService; import com.ccsens.util.JsonResponse; @@ -122,4 +123,13 @@ public class ExcelController { List schedulePlanDetailList = excelService.schedulePlanning(params.getParam()); return JsonResponse.newInstance().ok(schedulePlanDetailList); } + @MustLogin + @ApiOperation(value = "花样赛成绩导出（导出）", notes = "") + @RequestMapping(value = "/patternExpTable", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse patternExpTable(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("参赛人数统计表：{}",params); + String path = excelService.patternExpTable(params.getParam()); + return JsonResponse.newInstance().ok(path); + } + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java index 73f4b577..36d990fd 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java @@ -468,7 +468,7 @@ public class CompeteVo { @ApiModel("花样赛总成绩") public static class TotalScoreDisplay{ - @ApiModelProperty("项目名") + @ApiModelProperty("单位名") public String companyName; @ApiModelProperty("参赛队员名") public String peopleName; diff --git a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java index 006938c2..fe673a9a 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -5,8 +5,10 @@ import cn.hutool.core.util.IdcardUtil; import cn.hutool.core.util.ObjectUtil; import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +import com.ccsens.mt.bean.dto.ScoreDto; import com.ccsens.mt.bean.po.*; import com.ccsens.mt.bean.vo.CompeteExcelVo; +import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.persist.dao.*; import com.ccsens.mt.persist.mapper.*; @@ -81,6 +83,9 @@ public class ExcelService implements IExcelService { @Resource private CompeteProjectDao competeProjectDao; + @Resource + private ICompeteService competeService; + @Override public String dasaiduiwuxinxiWPS(QueryDto params) { //这个里面包含联系人得信息 @@ -1368,5 +1373,35 @@ public class ExcelService implements IExcelService { // } return schedulePlanDetailList; } + + @Override + public String patternExpTable(ScoreDto.ShowResult param) { + List totalScoreDisplays = competeService.showResult(param); + List> list = new ArrayList<>(); + List one=new ArrayList<>(); + PoiUtil.PoiUtilCell oneOne=new PoiUtil.PoiUtilCell("参赛单位", 1, 2); + PoiUtil.PoiUtilCell oneTwo=new PoiUtil.PoiUtilCell("参赛队员", 1, 2); + PoiUtil.PoiUtilCell oneThree=new PoiUtil.PoiUtilCell("创意编排分", 3, 1); + PoiUtil.PoiUtilCell oneFour=new PoiUtil.PoiUtilCell("创意最后得分", 1, 1); + PoiUtil.PoiUtilCell oneFive=new PoiUtil.PoiUtilCell("完成质量分", 3, 1); + PoiUtil.PoiUtilCell oneSix=new PoiUtil.PoiUtilCell("完成最后得分", 1, 1); + PoiUtil.PoiUtilCell oneSeven=new PoiUtil.PoiUtilCell("主裁判扣分", 1, 1); + PoiUtil.PoiUtilCell oneEight=new PoiUtil.PoiUtilCell("最后得分", 1, 1); + PoiUtil.PoiUtilCell oneNine=new PoiUtil.PoiUtilCell("名次", 1, 1); + PoiUtil.PoiUtilCell oneTen=new PoiUtil.PoiUtilCell("备注", 1, 1); + one.add(oneOne); + one.add(oneTwo); + one.add(oneThree); + one.add(oneFour); + one.add(oneFive); + one.add(oneSix); + one.add(oneSeven); + one.add(oneEight); + one.add(oneNine); + one.add(oneTen); + List two=new ArrayList<>(); + PoiUtil.PoiUtilCell twoOne=new PoiUtil.PoiUtilCell("参赛单位", 1, 2); + return null; + } } diff --git a/mt/src/main/java/com/ccsens/mt/service/IExcelService.java b/mt/src/main/java/com/ccsens/mt/service/IExcelService.java index 29fb90a6..9eb5a563 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IExcelService.java @@ -2,6 +2,7 @@ package com.ccsens.mt.service; import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +import com.ccsens.mt.bean.dto.ScoreDto; import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.mt.bean.dto.CompeteDto; @@ -84,4 +85,5 @@ public interface IExcelService { */ List schedulePlanning(CompeteDto.CompeteTime params); + String patternExpTable(ScoreDto.ShowResult param); } diff --git a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml index 88fcaf07..fb61539f 100644 --- a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml @@ -14,16 +14,16 @@ select company_id,max(look_time) as `look_time` FROM t_compete_player_look where `rec_status`=0 - + and t_compete_player_look.`look_time` <= #{param.signEndTime} ) tcpl on tcpl.company_id=tcc.id where tct.id= #{param.id} - + and tcc.`name`=#{param.name} - + and tcc.`contacts_name`=#{param.phone} and tcc.`rec_status`=0 @@ -43,17 +43,17 @@ user_id From tall.t_sys_log where `url`='/users/signin' and `rec_status`=0 - + and tall.t_sys_log.created_at <= #{param.signEndTime} ) tt on tt.`user_id`=tcj.`user_id` LEFT JOIN t_compete_time tct on tct.id =tcj.`compete_time_id` WHERE tct.id=#{param.id} - + and tcj.`name`=#{param.name} - + and tcj.`phone`=#{param.phone} and tcj.`rec_status`=0 From cd58761a0f5db554176ca5ac2b9e5589c7ee3366 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Sat, 21 Nov 2020 10:36:46 +0800 Subject: [PATCH 05/10] 20201121v1.2 --- .../ccsens/mt/api/CompeteTaskController.java | 2 +- .../com/ccsens/util/KCPlayerSignature.java | 32 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java index ac30c925..b7d74a75 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java @@ -47,7 +47,7 @@ public class CompeteTaskController { @MustLogin @ApiOperation(value = "日程安排更新", notes = "zy:1、循环查找项目对应的配置信息。2、有则修改，没有则添加配置信息。" + "3、根据配置的时间和场地生成出场顺序表。4存入出场顺序表。5、调用tall接口添加任务") - @RequestMapping(value = "/update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + @RequestMapping(value = "/", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse updateCompeteConfig( @ApiParam @Validated @RequestBody QueryDto params, HttpServletRequest request) { log.info("日程安排更新：{}",params); diff --git a/util/src/main/java/com/ccsens/util/KCPlayerSignature.java b/util/src/main/java/com/ccsens/util/KCPlayerSignature.java index 9ca43426..0aeef470 100644 --- a/util/src/main/java/com/ccsens/util/KCPlayerSignature.java +++ b/util/src/main/java/com/ccsens/util/KCPlayerSignature.java @@ -84,21 +84,21 @@ public class KCPlayerSignature{ } static void main(String[] args) { - KCPlayerSignature sign = new KCPlayerSignature(); - // 设置 App 的云 API 密钥 - sign.setSecretId("个人 API 密钥中的 Secret Id"); - sign.setSecretKey("个人 API 密钥中的 Secret Key"); - sign.setCurrentTime(System.currentTimeMillis() / 1000); - sign.setRandom(new Random().nextInt(java.lang.Integer.MAX_VALUE)); - // 签名有效期：2天 - sign.setSignValidDuration(3600 * 24 * 2); - - try { - String signature = sign.getUploadSignature(id); - System.out.println("signature : " + signature); - } catch (Exception e) { - System.out.print("获取签名失败"); - e.printStackTrace(); - } +// KCPlayerSignature sign = new KCPlayerSignature(); +// // 设置 App 的云 API 密钥 +// sign.setSecretId("个人 API 密钥中的 Secret Id"); +// sign.setSecretKey("个人 API 密钥中的 Secret Key"); +// sign.setCurrentTime(System.currentTimeMillis() / 1000); +// sign.setRandom(new Random().nextInt(java.lang.Integer.MAX_VALUE)); +// // 签名有效期：2天 +// sign.setSignValidDuration(3600 * 24 * 2); +// +// try { +// String signature = sign.getUploadSignature(id); +// System.out.println("signature : " + signature); +// } catch (Exception e) { +// System.out.print("获取签名失败"); +// e.printStackTrace(); +// } } } \ No newline at end of file From 1b7510218daf1e8eb1c7d9f463c9c98eab50d434 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Sat, 21 Nov 2020 10:49:30 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/mt/bean/vo/VideoProjectVo.java | 4 +++- .../com/ccsens/mt/service/ExcelService.java | 19 ++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java index 644838c1..e185a41c 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java @@ -6,6 +6,8 @@ import lombok.Data; import lombok.Getter; import lombok.Setter; +import java.util.Date; + @Data public class VideoProjectVo { @@ -48,7 +50,7 @@ public class VideoProjectVo { @ApiModelProperty("裁判类型") private byte chiefJudgment; @ApiModelProperty("最近签到时间") - private Long time; + private Date time; } diff --git a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java index fe673a9a..8ef0e06e 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -1379,8 +1379,8 @@ public class ExcelService implements IExcelService { List totalScoreDisplays = competeService.showResult(param); List> list = new ArrayList<>(); List one=new ArrayList<>(); - PoiUtil.PoiUtilCell oneOne=new PoiUtil.PoiUtilCell("参赛单位", 1, 2); - PoiUtil.PoiUtilCell oneTwo=new PoiUtil.PoiUtilCell("参赛队员", 1, 2); + PoiUtil.PoiUtilCell oneOne=new PoiUtil.PoiUtilCell("参赛单位", 1, 1); + PoiUtil.PoiUtilCell oneTwo=new PoiUtil.PoiUtilCell("参赛队员", 1, 1); PoiUtil.PoiUtilCell oneThree=new PoiUtil.PoiUtilCell("创意编排分", 3, 1); PoiUtil.PoiUtilCell oneFour=new PoiUtil.PoiUtilCell("创意最后得分", 1, 1); PoiUtil.PoiUtilCell oneFive=new PoiUtil.PoiUtilCell("完成质量分", 3, 1); @@ -1399,8 +1399,21 @@ public class ExcelService implements IExcelService { one.add(oneEight); one.add(oneNine); one.add(oneTen); + list.add(one); List two=new ArrayList<>(); - PoiUtil.PoiUtilCell twoOne=new PoiUtil.PoiUtilCell("参赛单位", 1, 2); + PoiUtil.PoiUtilCell twoOne=new PoiUtil.PoiUtilCell(); + PoiUtil.PoiUtilCell twoTwo=new PoiUtil.PoiUtilCell(); + PoiUtil.PoiUtilCell twoThree=new PoiUtil.PoiUtilCell("1", 1, 1); + PoiUtil.PoiUtilCell twoFour=new PoiUtil.PoiUtilCell("2", 1, 1); + PoiUtil.PoiUtilCell twoFive=new PoiUtil.PoiUtilCell("3", 1, 1); + PoiUtil.PoiUtilCell twoSix=new PoiUtil.PoiUtilCell(); + PoiUtil.PoiUtilCell twoSeven=new PoiUtil.PoiUtilCell("1", 1, 1); + PoiUtil.PoiUtilCell twoEight=new PoiUtil.PoiUtilCell("2", 1, 1); + PoiUtil.PoiUtilCell twoNight=new PoiUtil.PoiUtilCell("3", 1, 1); + two.add(twoOne); + two.add(twoTwo); + two.add(twoThree); + two.add(twoFour); return null; } } From 8d110cc92c8a7ab883d32f7d78f37dbeeb1aab83 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Sat, 21 Nov 2020 11:12:17 +0800 Subject: [PATCH 07/10] 20201110v1.3 --- mt/src/main/resources/mapper_dao/CompeteTimeDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml b/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml index b9d3884b..8c902a7f 100644 --- a/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml @@ -49,6 +49,7 @@ rec_status = 0 and type = #{type} + and sex < 2 ORDER BY sequence From a791156bb40458cfab1bd209c0a9ba37b13e68a2 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Sat, 21 Nov 2020 12:16:06 +0800 Subject: [PATCH 08/10] 20201121v1.5 --- .../health/service/AbnormalService.java | 1 + .../ht/service/PatientReportService.java | 1 + .../ccsens/mt/service/CompeteTaskService.java | 188 +++++++++--------- .../mapper_dao/CompeteProjectConfigDao.xml | 5 +- 4 files changed, 100 insertions(+), 95 deletions(-) diff --git a/health/src/main/java/com/ccsens/health/service/AbnormalService.java b/health/src/main/java/com/ccsens/health/service/AbnormalService.java index ac57273e..38435f47 100644 --- a/health/src/main/java/com/ccsens/health/service/AbnormalService.java +++ b/health/src/main/java/com/ccsens/health/service/AbnormalService.java @@ -171,6 +171,7 @@ public class AbnormalService implements IAbnormalService { AbnormalDto.AbnormalStatisticsDto abnormalDto = params.getParam(); PageHelper.startPage(abnormalDto.getPage(), abnormalDto.getPageSize()); + List abnormalList = healthAbnormalDao.getAbnormalList(abnormalDto.getPost(), abnormalDto.getDepartment(), abnormalDto.getHealthType()); return new PageInfo<>(abnormalList); diff --git a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java index d4d6005c..d8dc38b0 100644 --- a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java +++ b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java @@ -163,6 +163,7 @@ public class PatientReportService implements IPatientReportService { List reportVos = new ArrayList<>(); //分页查询报告单列表 PageHelper.startPage(query.getPageNum(), query.getPageSize()); + HtPatientReportExample reportExample = new HtPatientReportExample(); //查询医生信息 HtDoctorExample doctorExample = new HtDoctorExample(); diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index f250a203..be6beb10 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -109,7 +109,7 @@ public class CompeteTaskService implements ICompeteTaskService{ projectConfigDao.insertSelective(competeProjectConfig); } // 生成出场顺序表，存入数据库。在tall内添加对应的任务 - setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token); +// setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token); }); return projectConfigDao.queryProjectConfig(type.get()); @@ -418,99 +418,99 @@ public class CompeteTaskService implements ICompeteTaskService{ competeJudgment.setSite(siteJudgment.getSite()); competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); competeJudgmentDao.insertSelective(competeJudgment); - //添加角色 - MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); - saveRole.setProjectId(tallProjectId); - String jdgmentNum = ""; - if (judgmentInfo.getJudgmentNum() == 0) { - jdgmentNum = "主裁判"; - } else { - jdgmentNum = "裁判" + judgmentInfo.getJudgmentNum(); - } - saveRole.setRoleName(project.getName() + "-场地" + siteJudgment.getSite() + "-" + jdgmentNum); - Long roleId = null; - saveRole.setToken(token); - log.info("在tall内添加角色：{}", saveRole); - JsonResponse roleJsonResponse = tallFeignClient.saveRole(saveRole); - log.info("添加角色后返回：{}", roleJsonResponse); - if (ObjectUtil.isNotNull(roleJsonResponse)) { - MemberVo.RoleInfo roleInfo = roleJsonResponse.getData(); - if (ObjectUtil.isNotNull(roleInfo)) { - roleId = roleInfo.getRoleId(); - } - } - //添加成员 - MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember(); - saveMember.setMemberName(judgmentInfo.getJudgmentName()); - saveMember.setProjectId(tallProjectId); - saveMember.setPhone(judgmentInfo.getJudgmentPhone()); - saveMember.setRoleId(Arrays.asList(roleId)); - saveMember.setToken(token); - log.info("在tall内添加成员：{}", saveMember); - JsonResponse memberJsonResponse = tallFeignClient.saveMember(saveMember); - log.info("添加成员后返回：{}", memberJsonResponse); - //如果成员已存在，查询成员信息然后添加至角色内 - Long memberId = null; - if (ObjectUtil.isNotNull(memberJsonResponse)) { - //code等于21代表成员已存在 - if(memberJsonResponse.getCode() == 21){ - //查询该手机号在项目内的成员的id - MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone(); - getMemberByPhone.setProjectId(tallProjectId); - getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone()); - getMemberByPhone.setToken(token); - JsonResponse memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone); - if (ObjectUtil.isNotNull(memberListJsonResponse)) { - MemberVo.MemberList memberList = memberListJsonResponse.getData(); - if (ObjectUtil.isNotNull(memberList)) { - memberId = memberList.getMemberId(); - } - } - //将该成员添加至角色下 - if(ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)){ - MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); - saveMemberInRole.setRoleId(roleId); - saveMemberInRole.setMemberId(memberId); - saveMemberInRole.setToken(token); - tallFeignClient.saveMemberInRole(saveMemberInRole); - } - } - } - //添加任务 - //查找场次信息表 - CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); - startOrderExample.createCriteria().andProjectIdEqualTo(project.getId()) - .andSiteEqualTo((byte) siteJudgment.getSite()); - List startOrderList = startOrderMapper.selectByExample(startOrderExample); - if (CollectionUtil.isNotEmpty(startOrderList)) { - for (CompeteStartOrder startOrder : startOrderList) { - TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); - addTask.setProjectId(tallProjectId); - addTask.setTaskName(project.getName() + startOrder.getCompeteOrder() + "-" - + startOrder.getSite() + "-" + jdgmentNum); - addTask.setBeginTime(startOrder.getStartTime()); - addTask.setEndTime(startOrder.getEndTime()); - addTask.setExecutorId(roleId); - addTask.setParentTaskId(startOrder.getTaskId()); - addTask.setToken(token); - log.info("在tall内添加任务：{}", addTask); - JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); - log.info("添加任务后返回：{}", normalTaskJsonResponse); - if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { - TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); - if (ObjectUtil.isNotNull(normalTask)) { - //修改任务插件配置信息 - TallTaskDto.UpdatePluginConfig updatePluginConfig = new TallTaskDto.UpdatePluginConfig(); - updatePluginConfig.setWebPath("/home/osct/video-score"); - updatePluginConfig.setTaskId(normalTask.getDetailId()); - updatePluginConfig.setToken(token); - log.info("修改tall内任务插件配置：{}", updatePluginConfig); - JsonResponse pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); - log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse); - } - } - } - } +// //添加角色 +// MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); +// saveRole.setProjectId(tallProjectId); +// String jdgmentNum = ""; +// if (judgmentInfo.getJudgmentNum() == 0) { +// jdgmentNum = "主裁判"; +// } else { +// jdgmentNum = "裁判" + judgmentInfo.getJudgmentNum(); +// } +// saveRole.setRoleName(project.getName() + "-场地" + siteJudgment.getSite() + "-" + jdgmentNum); +// Long roleId = null; +// saveRole.setToken(token); +// log.info("在tall内添加角色：{}", saveRole); +// JsonResponse roleJsonResponse = tallFeignClient.saveRole(saveRole); +// log.info("添加角色后返回：{}", roleJsonResponse); +// if (ObjectUtil.isNotNull(roleJsonResponse)) { +// MemberVo.RoleInfo roleInfo = roleJsonResponse.getData(); +// if (ObjectUtil.isNotNull(roleInfo)) { +// roleId = roleInfo.getRoleId(); +// } +// } +// //添加成员 +// MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember(); +// saveMember.setMemberName(judgmentInfo.getJudgmentName()); +// saveMember.setProjectId(tallProjectId); +// saveMember.setPhone(judgmentInfo.getJudgmentPhone()); +// saveMember.setRoleId(Arrays.asList(roleId)); +// saveMember.setToken(token); +// log.info("在tall内添加成员：{}", saveMember); +// JsonResponse memberJsonResponse = tallFeignClient.saveMember(saveMember); +// log.info("添加成员后返回：{}", memberJsonResponse); +// //如果成员已存在，查询成员信息然后添加至角色内 +// Long memberId = null; +// if (ObjectUtil.isNotNull(memberJsonResponse)) { +// //code等于21代表成员已存在 +// if(memberJsonResponse.getCode() == 21){ +// //查询该手机号在项目内的成员的id +// MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone(); +// getMemberByPhone.setProjectId(tallProjectId); +// getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone()); +// getMemberByPhone.setToken(token); +// JsonResponse memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone); +// if (ObjectUtil.isNotNull(memberListJsonResponse)) { +// MemberVo.MemberList memberList = memberListJsonResponse.getData(); +// if (ObjectUtil.isNotNull(memberList)) { +// memberId = memberList.getMemberId(); +// } +// } +// //将该成员添加至角色下 +// if(ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)){ +// MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); +// saveMemberInRole.setRoleId(roleId); +// saveMemberInRole.setMemberId(memberId); +// saveMemberInRole.setToken(token); +// tallFeignClient.saveMemberInRole(saveMemberInRole); +// } +// } +// } +// //添加任务 +// //查找场次信息表 +// CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); +// startOrderExample.createCriteria().andProjectIdEqualTo(project.getId()) +// .andSiteEqualTo((byte) siteJudgment.getSite()); +// List startOrderList = startOrderMapper.selectByExample(startOrderExample); +// if (CollectionUtil.isNotEmpty(startOrderList)) { +// for (CompeteStartOrder startOrder : startOrderList) { +// TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); +// addTask.setProjectId(tallProjectId); +// addTask.setTaskName(project.getName() + startOrder.getCompeteOrder() + "-" +// + startOrder.getSite() + "-" + jdgmentNum); +// addTask.setBeginTime(startOrder.getStartTime()); +// addTask.setEndTime(startOrder.getEndTime()); +// addTask.setExecutorId(roleId); +// addTask.setParentTaskId(startOrder.getTaskId()); +// addTask.setToken(token); +// log.info("在tall内添加任务：{}", addTask); +// JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); +// log.info("添加任务后返回：{}", normalTaskJsonResponse); +// if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { +// TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); +// if (ObjectUtil.isNotNull(normalTask)) { +// //修改任务插件配置信息 +// TallTaskDto.UpdatePluginConfig updatePluginConfig = new TallTaskDto.UpdatePluginConfig(); +// updatePluginConfig.setWebPath("/home/osct/video-score"); +// updatePluginConfig.setTaskId(normalTask.getDetailId()); +// updatePluginConfig.setToken(token); +// log.info("修改tall内任务插件配置：{}", updatePluginConfig); +// JsonResponse pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); +// log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse); +// } +// } +// } +// } } } diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index f91a50a9..8f4b9247 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -192,10 +192,11 @@ pp.project_id as projectId FROM t_compete_project_player pp LEFT JOIN t_compete_player pl on pp.player_id = pl.id + LEFT JOIN t_compete_company c on pl.company_id = c.id WHERE pp.rec_status = 0 and pl .rec_status = 0 - + and c.rec_status = 0 )a on a.projectId = p.id LEFT JOIN ( @@ -204,10 +205,12 @@ FROM t_compete_team t LEFT JOIN t_compete_team_member m on t.id = m.compete_team_id LEFT JOIN t_compete_player pl on m.player_id = pl.id + LEFT JOIN t_compete_company c on t.company_id = c.id WHERE t.rec_status = 0 and m .rec_status = 0 and pl .rec_status = 0 + and c.rec_status = 0 GROUP BY t.id )b on b.projectId = p.id WHERE From 1058f98ce0b46f399f4abcc29f48db2ca77ea208 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Sat, 21 Nov 2020 12:37:04 +0800 Subject: [PATCH 09/10] 20201121v1.6 --- .../ccsens/mt/service/CompeteTaskService.java | 190 +++++++++--------- .../mapper_dao/CompeteProjectConfigDao.xml | 3 +- 2 files changed, 97 insertions(+), 96 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index be6beb10..cb741a6a 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -108,8 +108,8 @@ public class CompeteTaskService implements ICompeteTaskService{ competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime()); projectConfigDao.insertSelective(competeProjectConfig); } - // 生成出场顺序表，存入数据库。在tall内添加对应的任务 -// setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token); + //生成出场顺序表，存入数据库。在tall内添加对应的任务 + setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token); }); return projectConfigDao.queryProjectConfig(type.get()); @@ -418,99 +418,99 @@ public class CompeteTaskService implements ICompeteTaskService{ competeJudgment.setSite(siteJudgment.getSite()); competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); competeJudgmentDao.insertSelective(competeJudgment); -// //添加角色 -// MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); -// saveRole.setProjectId(tallProjectId); -// String jdgmentNum = ""; -// if (judgmentInfo.getJudgmentNum() == 0) { -// jdgmentNum = "主裁判"; -// } else { -// jdgmentNum = "裁判" + judgmentInfo.getJudgmentNum(); -// } -// saveRole.setRoleName(project.getName() + "-场地" + siteJudgment.getSite() + "-" + jdgmentNum); -// Long roleId = null; -// saveRole.setToken(token); -// log.info("在tall内添加角色：{}", saveRole); -// JsonResponse roleJsonResponse = tallFeignClient.saveRole(saveRole); -// log.info("添加角色后返回：{}", roleJsonResponse); -// if (ObjectUtil.isNotNull(roleJsonResponse)) { -// MemberVo.RoleInfo roleInfo = roleJsonResponse.getData(); -// if (ObjectUtil.isNotNull(roleInfo)) { -// roleId = roleInfo.getRoleId(); -// } -// } -// //添加成员 -// MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember(); -// saveMember.setMemberName(judgmentInfo.getJudgmentName()); -// saveMember.setProjectId(tallProjectId); -// saveMember.setPhone(judgmentInfo.getJudgmentPhone()); -// saveMember.setRoleId(Arrays.asList(roleId)); -// saveMember.setToken(token); -// log.info("在tall内添加成员：{}", saveMember); -// JsonResponse memberJsonResponse = tallFeignClient.saveMember(saveMember); -// log.info("添加成员后返回：{}", memberJsonResponse); -// //如果成员已存在，查询成员信息然后添加至角色内 -// Long memberId = null; -// if (ObjectUtil.isNotNull(memberJsonResponse)) { -// //code等于21代表成员已存在 -// if(memberJsonResponse.getCode() == 21){ -// //查询该手机号在项目内的成员的id -// MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone(); -// getMemberByPhone.setProjectId(tallProjectId); -// getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone()); -// getMemberByPhone.setToken(token); -// JsonResponse memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone); -// if (ObjectUtil.isNotNull(memberListJsonResponse)) { -// MemberVo.MemberList memberList = memberListJsonResponse.getData(); -// if (ObjectUtil.isNotNull(memberList)) { -// memberId = memberList.getMemberId(); -// } -// } -// //将该成员添加至角色下 -// if(ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)){ -// MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); -// saveMemberInRole.setRoleId(roleId); -// saveMemberInRole.setMemberId(memberId); -// saveMemberInRole.setToken(token); -// tallFeignClient.saveMemberInRole(saveMemberInRole); -// } -// } -// } -// //添加任务 -// //查找场次信息表 -// CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); -// startOrderExample.createCriteria().andProjectIdEqualTo(project.getId()) -// .andSiteEqualTo((byte) siteJudgment.getSite()); -// List startOrderList = startOrderMapper.selectByExample(startOrderExample); -// if (CollectionUtil.isNotEmpty(startOrderList)) { -// for (CompeteStartOrder startOrder : startOrderList) { -// TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); -// addTask.setProjectId(tallProjectId); -// addTask.setTaskName(project.getName() + startOrder.getCompeteOrder() + "-" -// + startOrder.getSite() + "-" + jdgmentNum); -// addTask.setBeginTime(startOrder.getStartTime()); -// addTask.setEndTime(startOrder.getEndTime()); -// addTask.setExecutorId(roleId); -// addTask.setParentTaskId(startOrder.getTaskId()); -// addTask.setToken(token); -// log.info("在tall内添加任务：{}", addTask); -// JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); -// log.info("添加任务后返回：{}", normalTaskJsonResponse); -// if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { -// TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); -// if (ObjectUtil.isNotNull(normalTask)) { -// //修改任务插件配置信息 -// TallTaskDto.UpdatePluginConfig updatePluginConfig = new TallTaskDto.UpdatePluginConfig(); -// updatePluginConfig.setWebPath("/home/osct/video-score"); -// updatePluginConfig.setTaskId(normalTask.getDetailId()); -// updatePluginConfig.setToken(token); -// log.info("修改tall内任务插件配置：{}", updatePluginConfig); -// JsonResponse pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); -// log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse); -// } -// } -// } -// } + //添加角色 + MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); + saveRole.setProjectId(tallProjectId); + String jdgmentNum = ""; + if (judgmentInfo.getJudgmentNum() == 0) { + jdgmentNum = "主裁判"; + } else { + jdgmentNum = "裁判" + judgmentInfo.getJudgmentNum(); + } + saveRole.setRoleName(project.getName() + "-场地" + siteJudgment.getSite() + "-" + jdgmentNum); + Long roleId = null; + saveRole.setToken(token); + log.info("在tall内添加角色：{}", saveRole); + JsonResponse roleJsonResponse = tallFeignClient.saveRole(saveRole); + log.info("添加角色后返回：{}", roleJsonResponse); + if (ObjectUtil.isNotNull(roleJsonResponse)) { + MemberVo.RoleInfo roleInfo = roleJsonResponse.getData(); + if (ObjectUtil.isNotNull(roleInfo)) { + roleId = roleInfo.getRoleId(); + } + } + //添加成员 + MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember(); + saveMember.setMemberName(judgmentInfo.getJudgmentName()); + saveMember.setProjectId(tallProjectId); + saveMember.setPhone(judgmentInfo.getJudgmentPhone()); + saveMember.setRoleId(Arrays.asList(roleId)); + saveMember.setToken(token); + log.info("在tall内添加成员：{}", saveMember); + JsonResponse memberJsonResponse = tallFeignClient.saveMember(saveMember); + log.info("添加成员后返回：{}", memberJsonResponse); + //如果成员已存在，查询成员信息然后添加至角色内 + Long memberId = null; + if (ObjectUtil.isNotNull(memberJsonResponse)) { + //code等于21代表成员已存在 + if(memberJsonResponse.getCode() == 21){ + //查询该手机号在项目内的成员的id + MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone(); + getMemberByPhone.setProjectId(tallProjectId); + getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone()); + getMemberByPhone.setToken(token); + JsonResponse memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone); + if (ObjectUtil.isNotNull(memberListJsonResponse)) { + MemberVo.MemberList memberList = memberListJsonResponse.getData(); + if (ObjectUtil.isNotNull(memberList)) { + memberId = memberList.getMemberId(); + } + } + //将该成员添加至角色下 + if(ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)){ + MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); + saveMemberInRole.setRoleId(roleId); + saveMemberInRole.setMemberId(memberId); + saveMemberInRole.setToken(token); + tallFeignClient.saveMemberInRole(saveMemberInRole); + } + } + } + //添加任务 + //查找场次信息表 + CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); + startOrderExample.createCriteria().andProjectIdEqualTo(project.getId()) + .andSiteEqualTo((byte) siteJudgment.getSite()); + List startOrderList = startOrderMapper.selectByExample(startOrderExample); + if (CollectionUtil.isNotEmpty(startOrderList)) { + for (CompeteStartOrder startOrder : startOrderList) { + TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); + addTask.setProjectId(tallProjectId); + addTask.setTaskName(project.getName() + startOrder.getCompeteOrder() + "-" + + startOrder.getSite() + "-" + jdgmentNum); + addTask.setBeginTime(startOrder.getStartTime()); + addTask.setEndTime(startOrder.getEndTime()); + addTask.setExecutorId(roleId); + addTask.setParentTaskId(startOrder.getTaskId()); + addTask.setToken(token); + log.info("在tall内添加任务：{}", addTask); + JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); + log.info("添加任务后返回：{}", normalTaskJsonResponse); + if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { + TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); + if (ObjectUtil.isNotNull(normalTask)) { + //修改任务插件配置信息 + TallTaskDto.UpdatePluginConfig updatePluginConfig = new TallTaskDto.UpdatePluginConfig(); + updatePluginConfig.setWebPath("/home/osct/video-score"); + updatePluginConfig.setTaskId(normalTask.getDetailId()); + updatePluginConfig.setToken(token); + log.info("修改tall内任务插件配置：{}", updatePluginConfig); + JsonResponse pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); + log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse); + } + } + } + } } } diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index 8f4b9247..aafce982 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -185,7 +185,8 @@ pc.start_time as startTime, pc.end_time as endTime FROM - t_compete_project p LEFT JOIN t_compete_project_config pc on pc.project_id = p.id + t_compete_project p + LEFT JOIN (SELECT * FROM t_compete_project_config WHERE rec_status = 0 and rec_status is null) pc on pc.project_id = p.id LEFT JOIN ( SELECT From 6ab637c8f1e1963faff8d5d97a1f6c8a4b08ea8d Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Sat, 21 Nov 2020 14:00:34 +0800 Subject: [PATCH 10/10] 20201121v1.7 --- .../com/ccsens/mt/api/CompeteTaskController.java | 2 +- .../com/ccsens/mt/service/CompeteTaskService.java | 12 +++++++++--- .../resources/mapper_dao/CompeteProjectConfigDao.xml | 1 + .../ccsens/tall/service/ProTaskDetailService.java | 4 ++++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java index b7d74a75..ac30c925 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java @@ -47,7 +47,7 @@ public class CompeteTaskController { @MustLogin @ApiOperation(value = "日程安排更新", notes = "zy:1、循环查找项目对应的配置信息。2、有则修改，没有则添加配置信息。" + "3、根据配置的时间和场地生成出场顺序表。4存入出场顺序表。5、调用tall接口添加任务") - @RequestMapping(value = "/", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + @RequestMapping(value = "/update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse updateCompeteConfig( @ApiParam @Validated @RequestBody QueryDto params, HttpServletRequest request) { log.info("日程安排更新：{}",params); diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index cb741a6a..9c8bee58 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -79,6 +79,10 @@ public class CompeteTaskService implements ICompeteTaskService{ return new ArrayList<>(); } param.getUpdateCompeteTaskList().forEach(projectConfig -> { + //判断时间和时长是否正确 + if(projectConfig.getStartTime() == 0 || projectConfig.getEndTime() == 0 || projectConfig.getDuration() == 0){ + return; + } //获取项目 CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId()); if(ObjectUtil.isNotNull(project)){ @@ -132,7 +136,7 @@ public class CompeteTaskService implements ICompeteTaskService{ //计算场次 int order = (int) Math.ceil(projectPlayerList.size() / projectConfig.getSiteNum()); //计算每个场次时间 - long projectStartTime = projectConfig.getStartTime() + Constant.UPLOAD_VIDEO_TIME; + long projectStartTime = projectConfig.getStartTime(); long orderTime = 0; if(order != 0) { orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); @@ -199,7 +203,7 @@ public class CompeteTaskService implements ICompeteTaskService{ competeStartOrder.setSite((byte) site); competeStartOrder.setTeam((byte) 0); competeStartOrder.setCompeteOrder((byte) competeOrder); - competeStartOrder.setTaskId(taskId); +// competeStartOrder.setTaskId(taskId); competeStartOrder.setStartTime(projectStartTime); competeStartOrder.setEndTime(projectStartTime + orderTime); startOrderMapper.insertSelective(competeStartOrder); @@ -287,7 +291,7 @@ public class CompeteTaskService implements ICompeteTaskService{ competeStartOrder.setSite((byte) site); competeStartOrder.setTeam((byte) 0); competeStartOrder.setCompeteOrder((byte) competeOrder); - competeStartOrder.setTaskId(taskId); +// competeStartOrder.setTaskId(taskId); competeStartOrder.setStartTime(projectStartTime); competeStartOrder.setEndTime(projectStartTime + orderTime); startOrderMapper.insertSelective(competeStartOrder); @@ -418,6 +422,8 @@ public class CompeteTaskService implements ICompeteTaskService{ competeJudgment.setSite(siteJudgment.getSite()); competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); competeJudgmentDao.insertSelective(competeJudgment); + + //添加角色 MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); saveRole.setProjectId(tallProjectId); diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index aafce982..5350a63a 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -217,6 +217,7 @@ WHERE p.type = #{type} and p.`level` = 2 + and p.certificate = 0 and p.rec_status = 0 GROUP BY p.id diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java index 75eeab2a..077a72ae 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java @@ -26,6 +26,7 @@ import com.ccsens.util.WebConstant; import com.ccsens.util.cron.CronConstant; import com.ccsens.util.cron.NatureToDate; import com.ccsens.util.exception.BaseException; +import com.fasterxml.jackson.annotation.JsonFormat; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -282,6 +283,9 @@ public class ProTaskDetailService implements IProTaskDetailService { proTaskDetailExample.setOrderByClause("begin_time"); List firstTaskDetailList = taskDetailDao.selectByExample(proTaskDetailExample); PageInfo pageInfo = new PageInfo<>(firstTaskDetailList); + + + if (CollectionUtil.isNotEmpty(firstTaskDetailList)) { int sequence = 1; for (ProTaskDetail firstTaskDetail : firstTaskDetailList) {