Skip to content

G
gk
Commit fbbe5d80 authored by yangshuxing's avatar yangshuxing
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 7693fee7 8013bb01
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 96 deletions
src/main/java/com/dlbridge/jadp/fallback/ScoreFallbackFactory.java
View file @ fbbe5d80
package com.dlbridge.jadp.fallback; package com.dlbridge.jadp.fallback;
import com.dlbridge.feign.NewsService;
import com.dlbridge.feign.ScoreService; import com.dlbridge.feign.ScoreService;
import com.dlbridge.feign.bean.ScoreItem; import com.dlbridge.feign.bean.ScoreItem;
import com.neusoft.www.utils.web.Result; import com.neusoft.www.utils.web.Result;
...@@ -8,8 +7,6 @@ import feign.hystrix.FallbackFactory; ...@@ -8,8 +7,6 @@ import feign.hystrix.FallbackFactory;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
@Component @Component
@Log4j2 @Log4j2
public class ScoreFallbackFactory implements FallbackFactory<ScoreService> { public class ScoreFallbackFactory implements FallbackFactory<ScoreService> {
......
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptScoreRuleMapper.xml
View file @ fbbe5d80
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</select> </select>
--> -->
<select id="getCmptScoreRulesMapBymarkNoAndRuleId" resultType="java.lang.Integer"> <select id="getCmptScoreRulesMapBymarkNoAndRuleId" resultType="java.lang.Integer">
select rule_id as scoreItemId from gk_cmpt_score_rule_scoreinfo where mark_no=#{markNo} and rule_id=#{ruleId} and cmptId=#{cmptId} select rule_id as scoreItemId from gk_cmpt_score_rule_scoreinfo where mark_no=#{markNo} and rule_id=#{ruleId}
</select> </select>
......
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptScoreRuleScoreInfoMapper.java
View file @ fbbe5d80
package com.dlbridge.jadp.plugins.cmpt.dao.mapper; package com.dlbridge.jadp.plugins.cmpt.dao.mapper;
import com.dlbridge.feign.bean.ScoreItem;
import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo; import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo;
import com.dlbridge.jadp.plugins.cmpt.bean.UserScoreExcelBean; import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import java.util.HashMap; import java.util.HashMap;
...@@ -15,7 +14,7 @@ public interface CmptScoreRuleScoreInfoMapper { ...@@ -15,7 +14,7 @@ public interface CmptScoreRuleScoreInfoMapper {
* 保存用户提交的成绩 * 保存用户提交的成绩
* @param cmptScoreRuleScoreInfo * @param cmptScoreRuleScoreInfo
*/ */
void saveScoreRuleScoreInfo(CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo); void saveScoreRuleScoreInfo(@Param("cmptScoreRuleScoreInfo") CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo);
/** /**
* 根据号码牌获取用户的成绩 * 根据号码牌获取用户的成绩
...@@ -23,7 +22,7 @@ public interface CmptScoreRuleScoreInfoMapper { ...@@ -23,7 +22,7 @@ public interface CmptScoreRuleScoreInfoMapper {
* @param markNo * @param markNo
* @return * @return
*/ */
List<CmptScoreRuleScoreInfo> getScoreRuleScoreInfoByMarkNo(Integer cmptId, String markNo); List<CmptScoreRuleScoreInfo> getScoreRuleScoreInfoByMarkNo(@Param("cmptId") Integer cmptId, @Param("markNo") String markNo);
/** /**
* *
...@@ -33,7 +32,7 @@ public interface CmptScoreRuleScoreInfoMapper { ...@@ -33,7 +32,7 @@ public interface CmptScoreRuleScoreInfoMapper {
* @param ruleId * @param ruleId
* @return * @return
*/ */
Integer getCmptScoreRuleScoreInfoIdByruleIdAndMarkNo(Integer cmptId,String markNo,int ruleId); Integer getCmptScoreRuleScoreInfoIdByruleIdAndMarkNo(@Param("cmptId")Integer cmptId, @Param("markNo")String markNo, @Param("ruleId") int ruleId);
/** /**
...@@ -43,7 +42,7 @@ public interface CmptScoreRuleScoreInfoMapper { ...@@ -43,7 +42,7 @@ public interface CmptScoreRuleScoreInfoMapper {
* @param checkStatus * @param checkStatus
* @return * @return
*/ */
Integer getCmptScoreRuleScoreInfoToalNumer(int cmptId,int roadId,int ruleId,int checkStatus); Integer getCmptScoreRuleScoreInfoToalNumer(@Param("cmptId") int cmptId, @Param("roadId") int roadId, @Param("ruleId") int ruleId,@Param("checkStatus") int checkStatus);
/** /**
* 分页获取用户提交的成绩 * 分页获取用户提交的成绩
...@@ -92,4 +91,7 @@ public interface CmptScoreRuleScoreInfoMapper { ...@@ -92,4 +91,7 @@ public interface CmptScoreRuleScoreInfoMapper {
* @return * @return
*/ */
HashMap<String,Object> getCmptScoreRuleScoreInfoStatistics(int cmptId, int roadId, int ruleId); HashMap<String,Object> getCmptScoreRuleScoreInfoStatistics(int cmptId, int roadId, int ruleId);
CmptScoreRuleScoreInfo getCmptScoreRuleScoreInfoByruleIdAndMarkNo(int cmptId,String markNo,int ruleId);
} }
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptScoreRuleScoreInfoMapper.xml
View file @ fbbe5d80
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
<mapper namespace="com.dlbridge.jadp.plugins.cmpt.dao.mapper.CmptScoreRuleScoreInfoMapper"> <mapper namespace="com.dlbridge.jadp.plugins.cmpt.dao.mapper.CmptScoreRuleScoreInfoMapper">
<insert id="saveScoreRuleScoreInfo" useGeneratedKeys="true" keyProperty="id" keyColumn="id"> <insert id="saveScoreRuleScoreInfo" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
INSERT INTO gk_cmpt_score_rule_scoreinfo(cmptId,rule_id,mark_no,subsectionTime,subsectionscore,subsectionMileage,insertTime,updateTime) INSERT INTO gk_cmpt_score_rule_scoreinfo(cmptId,rule_id,mark_no,subsectionTime,subsectionscore,subsectionMileage,cmptPace,isDelete,insertTime,updateTime)
VALUES(#{scoreItem.cmptId},#{scoreItem.ruleId},#{scoreItem.markNo},#{scoreItem.subsectionTime},#{scoreItem.subsectionscore},#{scoreItem.subsectionMileage},now(),now()) VALUES(#{cmptScoreRuleScoreInfo.cmptId},#{cmptScoreRuleScoreInfo.ruleId},#{cmptScoreRuleScoreInfo.markNo},#{cmptScoreRuleScoreInfo.subsectionTime},#{cmptScoreRuleScoreInfo.subsectionscore},#{cmptScoreRuleScoreInfo.subsectionMileage},#{cmptScoreRuleScoreInfo.cmptPace},0,now(),now())
</insert> </insert>
<select id="getUserScoreinfoByMarkNo" resultType="com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo"> <select id="getScoreRuleScoreInfoByMarkNo" resultType="com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo">
select id,cmptId,rule_id as ruleId,mark_no as markNo,subsectionTime,subsectionscore,subsectionMileage from gk_cmpt_score_rule_scoreinfo where cmptId=#{cmptId} and mark_no=#{markNo} select id,cmptId,rule_id as ruleId,mark_no as markNo,subsectionTime,subsectionscore,subsectionMileage,cmptPace from gk_cmpt_score_rule_scoreinfo where cmptId=#{cmptId} and mark_no=#{markNo}
</select> </select>
<select id="getCmptScoreRuleScoreInfoIdByruleIdAndMarkNo" resultType="int"> <select id="getCmptScoreRuleScoreInfoIdByruleIdAndMarkNo" resultType="int">
select id from gk_cmpt_score_rule_scoreinfo where cmptId=#{cmptId} and rule_id=#{ruleId} and mark_no=#{markNo} select id from gk_cmpt_score_rule_scoreinfo where cmptId=#{cmptId} and rule_id=#{ruleId} and mark_no=#{markNo}
...@@ -48,4 +48,8 @@ ...@@ -48,4 +48,8 @@
count(case when checkStatus=2 then 1 end) as 'nopass' from geerunner.cmpt_enroll as a left join count(case when checkStatus=2 then 1 end) as 'nopass' from geerunner.cmpt_enroll as a left join
gk_cmpt_score_rule_scoreinfo as b on a.cmpt_id=b.cmptId and a.nick_id=b.mark_no where a.cmpt_id=#{cmptId} and a.cmpt_item=#{roadId} and rule_id=#{ruleId} and a.del_flg=0 and b.isDelete=0 gk_cmpt_score_rule_scoreinfo as b on a.cmpt_id=b.cmptId and a.nick_id=b.mark_no where a.cmpt_id=#{cmptId} and a.cmpt_item=#{roadId} and rule_id=#{ruleId} and a.del_flg=0 and b.isDelete=0
</select> </select>
<select id="getCmptScoreRuleScoreInfoByruleIdAndMarkNo" resultType="com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo">
select id as cmptScoreRuleScoreId,cmptId,rule_id as ruleId,mark_no as markNo,subsectionTime,subsectionscore,subsectionMileage from gk_cmpt_score_rule_scoreinfo where cmptId=#{cmptId} and rule_id=#{ruleId} and mark_no=#{markNo}
</select>
</mapper> </mapper>
\ No newline at end of file
src/main/java/com/dlbridge/jadp/plugins/cmpt/service/CmptScoreRuleScoreInfoService.java
View file @ fbbe5d80
package com.dlbridge.jadp.plugins.cmpt.service; package com.dlbridge.jadp.plugins.cmpt.service;
import com.dlbridge.feign.bean.ScoreItem;
import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreFieldValue; import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreFieldValue;
import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo; import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo;
import com.dlbridge.jadp.plugins.cmpt.bean.UserScoreExcelBean;
import com.dlbridge.jadp.plugins.cmpt.dao.mapper.CmptScoreRuleScoreInfoMapper; import com.dlbridge.jadp.plugins.cmpt.dao.mapper.CmptScoreRuleScoreInfoMapper;
import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
import com.dlbridge.jadp.plugins.cmpt.utils.Page; import com.dlbridge.jadp.plugins.cmpt.utils.Page;
import com.dlbridge.jadp.plugins.cmpt.utils.PageFactory; import com.dlbridge.jadp.plugins.cmpt.utils.PageFactory;
import com.dlbridge.jadp.plugins.cmpt.utils.date.DateUtil; import com.dlbridge.jadp.plugins.cmpt.utils.date.DateUtil;
...@@ -14,9 +11,7 @@ import org.springframework.stereotype.Service; ...@@ -14,9 +11,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
...@@ -45,6 +40,7 @@ public class CmptScoreRuleScoreInfoService { ...@@ -45,6 +40,7 @@ public class CmptScoreRuleScoreInfoService {
* @param cmptScoreRuleScoreInfo * @param cmptScoreRuleScoreInfo
*/ */
public void saveScoreRuleScoreInfo(CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo){ public void saveScoreRuleScoreInfo(CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo){
System.out.print("===="+cmptScoreRuleScoreInfo.getCmptPace());
cmptScoreRuleScoreInfoMapper.saveScoreRuleScoreInfo(cmptScoreRuleScoreInfo); cmptScoreRuleScoreInfoMapper.saveScoreRuleScoreInfo(cmptScoreRuleScoreInfo);
} }
...@@ -58,17 +54,18 @@ public class CmptScoreRuleScoreInfoService { ...@@ -58,17 +54,18 @@ public class CmptScoreRuleScoreInfoService {
//根据号码牌获取所有成绩记录 //根据号码牌获取所有成绩记录
List<CmptScoreRuleScoreInfo> cmptScoreRuleScoreInfoList=cmptScoreRuleScoreInfoMapper.getScoreRuleScoreInfoByMarkNo(cmptId,markNo); List<CmptScoreRuleScoreInfo> cmptScoreRuleScoreInfoList=cmptScoreRuleScoreInfoMapper.getScoreRuleScoreInfoByMarkNo(cmptId,markNo);
//计算成绩之和 //计算成绩之和
long userTotalScore=cmptScoreRuleScoreInfoList.stream().mapToInt(CmptScoreRuleScoreInfo::getSubsectionscore).sum(); long userTotalScore=cmptScoreRuleScoreInfoList.stream().filter(entry -> entry.getSubsectionscore() != null).mapToInt(CmptScoreRuleScoreInfo::getSubsectionscore).sum();
//计算里程之和 //计算里程之和
int userTotalMileage=cmptScoreRuleScoreInfoList.stream().mapToInt(CmptScoreRuleScoreInfo::getSubsectionMileage).sum(); //int userTotalMileage=cmptScoreRuleScoreInfoList.stream().mapToInt(CmptScoreRuleScoreInfo::getSubsectionMileage).sum();
int userTotalMileage=Optional.of(cmptScoreRuleScoreInfoList).orElse(cmptScoreRuleScoreInfoList).stream().filter(entry -> entry.getSubsectionMileage() != null).mapToInt(CmptScoreRuleScoreInfo::getSubsectionMileage).sum();
HashMap<String,Object> userScore=new HashMap<>(); HashMap<String,Object> userScore=new HashMap<>();
userScore.put("userTotalScore",userTotalScore); userScore.put("userTotalScore",userTotalScore);
userScore.put("userTotalMileage",userTotalMileage); userScore.put("userTotalMileage",Integer.valueOf(userTotalMileage));
return userScore; return userScore;
} }
/** /**
* 根据赛事ID，号码牌，成绩提交的规则，查看是否已经提交过成绩 * 根据赛事ID，号码牌，成绩提交的规则，查看是否已经提交过成绩
* @param cmptId * @param cmptId
...@@ -88,6 +85,7 @@ public class CmptScoreRuleScoreInfoService { ...@@ -88,6 +85,7 @@ public class CmptScoreRuleScoreInfoService {
*/ */
public boolean scoreReviewByMarkNo(int cmptId, String markNo, int SwitchScoreReview){ public boolean scoreReviewByMarkNo(int cmptId, String markNo, int SwitchScoreReview){
//成绩自动审核开启SwitchScoreReview==1 //成绩自动审核开启SwitchScoreReview==1
boolean enrollFlag=false;
if(SwitchScoreReview==1){ if(SwitchScoreReview==1){
//根据赛事id和号码牌查出总成绩 //根据赛事id和号码牌查出总成绩
HashMap<String,Object> scoreResult=cmptScoreRuleScoreInfoService.getUserScoreByMarkNo(cmptId,markNo); HashMap<String,Object> scoreResult=cmptScoreRuleScoreInfoService.getUserScoreByMarkNo(cmptId,markNo);
...@@ -98,13 +96,17 @@ public class CmptScoreRuleScoreInfoService { ...@@ -98,13 +96,17 @@ public class CmptScoreRuleScoreInfoService {
cmptEnrollInfo.put("deviceId",markNo); cmptEnrollInfo.put("deviceId",markNo);
cmptEnrollInfo.put("remark", DateUtil.formatDate((Long)scoreResult.get("userTotalScore"))); cmptEnrollInfo.put("remark", DateUtil.formatDate((Long)scoreResult.get("userTotalScore")));
cmptEnrollInfo.put("remark2",String.valueOf(((int)scoreResult.get("userTotalMileage")/100d)/10d)); cmptEnrollInfo.put("remark2",String.valueOf(((int)scoreResult.get("userTotalMileage")/100d)/10d));
boolean enrollFlag=remoteService.mergePersonEnrollByMarkNo(cmptEnrollInfo); try{
enrollFlag=remoteService.mergePersonEnrollByMarkNo(cmptEnrollInfo);
}catch (Exception e){
e.printStackTrace();
}
// //将成绩插入到计时系统，以便出完赛证书 // //将成绩插入到计时系统，以便出完赛证书
// String records=markNo+","+DateUtil.formatDate((Long)scoreResult.get("userTotalScore"))+",3"; // String records=markNo+","+DateUtil.formatDate((Long)scoreResult.get("userTotalScore"))+",3";
// boolean timeFlag=remoteService.uploadTimeScore(cmptId,records); // boolean timeFlag=remoteService.uploadTimeScore(cmptId,records);
return enrollFlag; return enrollFlag;
} }
return false; return enrollFlag;
} }
/** /**
...@@ -165,5 +167,16 @@ public class CmptScoreRuleScoreInfoService { ...@@ -165,5 +167,16 @@ public class CmptScoreRuleScoreInfoService {
return cmptScoreRuleScoreInfoStatistics; return cmptScoreRuleScoreInfoStatistics;
} }
/**
* 根据cmptId，markNo，ruleId 查看提交成绩详情
* @param cmptId
* @param markNo
* @param ruleId
* @return
*/
public CmptScoreRuleScoreInfo getCmptScoreRuleScoreInfoByruleIdAndMarkNo(Integer cmptId,String markNo,int ruleId){
return cmptScoreRuleScoreInfoMapper.getCmptScoreRuleScoreInfoByruleIdAndMarkNo(cmptId,markNo,ruleId);
}
} }
src/main/java/com/dlbridge/jadp/plugins/cmpt/service/RemoteService.java
View file @ fbbe5d80
...@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject; ...@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
import com.dlbridge.jadp.plugins.cmpt.bean.*; import com.dlbridge.jadp.plugins.cmpt.bean.*;
import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt; import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.apache.commons.codec.net.URLCodec;
import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.lang3.math.NumberUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
...@@ -14,6 +15,9 @@ import org.springframework.stereotype.Service; ...@@ -14,6 +15,9 @@ import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -532,9 +536,9 @@ public class RemoteService { ...@@ -532,9 +536,9 @@ public class RemoteService {
* @param cmptEnrollInfo * @param cmptEnrollInfo
* @return * @return
*/ */
public boolean mergePersonEnrollByMarkNo(HashMap<String,Object> cmptEnrollInfo){ public boolean mergePersonEnrollByMarkNo(HashMap<String,Object> cmptEnrollInfo) throws UnsupportedEncodingException {
String cmptEnrolljson= JSON.toJSONString(cmptEnrollInfo); String cmptEnrolljson= JSON.toJSONString(cmptEnrollInfo);
ResponseEntity<String> forEntity = restTemplate.getForEntity(timerURL + "updateUserEnroll.do?personEnroll="+cmptEnrolljson, String.class); ResponseEntity<String> forEntity = restTemplate.getForEntity(timerURL + "updateUserEnroll.do?personEnroll="+URLEncoder.encode(cmptEnrolljson, StandardCharsets.UTF_8.toString()), String.class);
if (forEntity.getStatusCode() == HttpStatus.OK) { if (forEntity.getStatusCode() == HttpStatus.OK) {
String resultString = forEntity.getBody(); String resultString = forEntity.getBody();
JSONObject object = JSONObject.parseObject(resultString); JSONObject object = JSONObject.parseObject(resultString);
......
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/AutoScoreController.java
View file @ fbbe5d80
package com.dlbridge.jadp.plugins.cmpt.web; package com.dlbridge.jadp.plugins.cmpt.web;
import com.dlbridge.feign.ScoreService;
import com.dlbridge.feign.bean.ScoreItem;
import com.dlbridge.jadp.common.interceptor.PageView; import com.dlbridge.jadp.common.interceptor.PageView;
import com.dlbridge.jadp.plugins.cmpt.bean.*; import com.dlbridge.jadp.plugins.cmpt.bean.*;
import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt; import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
import com.dlbridge.jadp.plugins.cmpt.service.*; import com.dlbridge.jadp.plugins.cmpt.service.*;
import com.dlbridge.jadp.plugins.cmpt.utils.date.DateUtil;
import com.neusoft.www.utils.web.Result;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.apache.commons.lang3.time.DateUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.CellRangeAddress;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.text.ParseException;
import java.util.*; import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
@Controller @Controller
@Log4j2 @Log4j2
...@@ -49,8 +31,6 @@ public class AutoScoreController { ...@@ -49,8 +31,6 @@ public class AutoScoreController {
@Resource @Resource
private CmptScoreRuleService ruleService; private CmptScoreRuleService ruleService;
@Resource
private ScoreService scoreService;
@Resource @Resource
RemoteService remoteService; RemoteService remoteService;
......
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/CmptScoreRuleController.java
View file @ fbbe5d80
package com.dlbridge.jadp.plugins.cmpt.web; package com.dlbridge.jadp.plugins.cmpt.web;
import com.dlbridge.feign.ScoreService;
import com.dlbridge.feign.bean.ScoreItem;
import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRule; import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRule;
import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleBean; import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleBean;
import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo;
import com.dlbridge.jadp.plugins.cmpt.service.CmptScoreRuleScoreInfoService;
import com.dlbridge.jadp.plugins.cmpt.service.CmptScoreRuleService; import com.dlbridge.jadp.plugins.cmpt.service.CmptScoreRuleService;
import com.neusoft.www.utils.web.Result; import com.neusoft.www.utils.web.Result;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
...@@ -27,9 +27,8 @@ public class CmptScoreRuleController { ...@@ -27,9 +27,8 @@ public class CmptScoreRuleController {
@Resource @Resource
CmptScoreRuleService cmptScoreRuleService; CmptScoreRuleService cmptScoreRuleService;
@Resource @Resource
ScoreService scoreService; CmptScoreRuleScoreInfoService cmptScoreRuleScoreInfoService;
/** /**
* 更新赛事规则信息 * 更新赛事规则信息
* @param cmptScoreRules * @param cmptScoreRules
...@@ -64,8 +63,8 @@ public class CmptScoreRuleController { ...@@ -64,8 +63,8 @@ public class CmptScoreRuleController {
Integer scoreItemId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndRuleId(markNo, rule.getId()); Integer scoreItemId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndRuleId(markNo, rule.getId());
if(scoreItemId != null){ if(scoreItemId != null){
Result<ScoreItem> scoreItem = scoreService.getScoreItem(scoreItemId); CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo=cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfoByruleIdAndMarkNo(cmptId,markNo,rule.getId());
if(scoreItem.isStatus() && scoreItem.getContent() != null){ if(cmptScoreRuleScoreInfo.getMarkNo() != null){
bean.setUploaded(true); bean.setUploaded(true);
}else{ }else{
bean.setUploaded(false); bean.setUploaded(false);
......
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java
View file @ fbbe5d80
...@@ -2,8 +2,6 @@ package com.dlbridge.jadp.plugins.cmpt.web; ...@@ -2,8 +2,6 @@ package com.dlbridge.jadp.plugins.cmpt.web;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.dlbridge.feign.NewsService; import com.dlbridge.feign.NewsService;
import com.dlbridge.feign.ScoreService;
import com.dlbridge.feign.bean.ScoreItem;
import com.dlbridge.jadp.common.service.JService; import com.dlbridge.jadp.common.service.JService;
import com.dlbridge.jadp.job.CountJob; import com.dlbridge.jadp.job.CountJob;
import com.dlbridge.jadp.plugins.cmpt.bean.*; import com.dlbridge.jadp.plugins.cmpt.bean.*;
...@@ -81,8 +79,6 @@ public class MicroApiController { ...@@ -81,8 +79,6 @@ public class MicroApiController {
@Resource @Resource
RemoteService remoteService; RemoteService remoteService;
@Resource
private ScoreService scoreService;
@Resource @Resource
private CmptScoreFieldValueService cmptScoreFieldValueService; private CmptScoreFieldValueService cmptScoreFieldValueService;
...@@ -817,7 +813,7 @@ public class MicroApiController { ...@@ -817,7 +813,7 @@ public class MicroApiController {
/** /**
* 微信手机信息绑定赛事 * 上传成绩
* *
* @return * @return
*/ */
...@@ -890,19 +886,25 @@ public class MicroApiController { ...@@ -890,19 +886,25 @@ public class MicroApiController {
int isHasMileage=settingByCmptId.getMileage(); int isHasMileage=settingByCmptId.getMileage();
if(isHasMileage==1){ if(isHasMileage==1){
mileage=score.getScore().getMileage(); mileage=score.getScore().getMileage();
if(mileage ==0){
return Result.fail().setMsg("请输入里程");
}
cmptPace=duration/mileage; cmptPace=duration/mileage;
}else{ }else{
int distance=(int)remoteService.getTimeSegInfoByRoadId(score.getCmptId(),score.getRoadId()).get("distance"); int distance=(int)remoteService.getTimeSegInfoByRoadId(score.getCmptId(),score.getRoadId()).get("distance");
if(distance ==0){
return Result.fail().setMsg("赛事项目需要设置里程");
}
mileage=distance; mileage=distance;
cmptPace=duration/mileage; cmptPace=duration/mileage;
} }
//前端上传json中取出里程，耗时，提交时间，赛事地,规则id，markNo //前端上传json中取出里程，耗时，提交时间，赛事地,规则id，markNo
CmptScoreRuleScoreInfo CmptScoreRuleScoreInfo = new CmptScoreRuleScoreInfo() CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo = new CmptScoreRuleScoreInfo().setCmptId(score.getCmptId())
.setSubsectionscore(score.getScore().getDuration()).setSubsectionMileage(mileage).setCmptPace(cmptPace) .setSubsectionscore(score.getScore().getDuration()).setSubsectionMileage(mileage).setCmptPace(cmptPace)
.setSubsectionTime(score.getScore().getDate()) .setSubsectionTime(score.getScore().getDate())
.setCmptId(score.getCmptId()).setRuleId(rule.getId()).setMarkNo(score.getMarkNo()); .setCmptId(score.getCmptId()).setRuleId(rule.getId()).setMarkNo(score.getMarkNo());
// 保存校验通过的成绩 // 保存校验通过的成绩
cmptScoreRuleScoreInfoService.saveScoreRuleScoreInfo(CmptScoreRuleScoreInfo); cmptScoreRuleScoreInfoService.saveScoreRuleScoreInfo(cmptScoreRuleScoreInfo);
//设置附加项的参数，并保存附加项 //设置附加项的参数，并保存附加项
for(CmptScoreFieldValue value : score.getFields()){ for(CmptScoreFieldValue value : score.getFields()){
value.setCmptId(score.getCmptId()); value.setCmptId(score.getCmptId());
...@@ -942,14 +944,15 @@ public class MicroApiController { ...@@ -942,14 +944,15 @@ public class MicroApiController {
Integer subsectionMileage=0; Integer subsectionMileage=0;
if(scoreItemId != null){ if(scoreItemId != null){
Result<ScoreItem> scoreItem = scoreService.getScoreItem(scoreItemId); CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo=cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfoByruleIdAndMarkNo(score.getCmptId(),score.getMarkNo(),rule.getId());
ScoreItem content = scoreItem.getContent(); //Result<ScoreItem> scoreItem = scoreService1.getScoreItem(scoreItemId);
if(content.getSubsectionMileage()==null){ //ScoreItem content = scoreItem.getContent();
if(cmptScoreRuleScoreInfo.getSubsectionMileage()==null){
subsectionMileage=0; subsectionMileage=0;
}else{ }else{
subsectionMileage=content.getSubsectionMileage(); subsectionMileage=cmptScoreRuleScoreInfo.getSubsectionMileage();
} }
result.put("score",new Score().setDate(content.getSubsectionTime().substring(0,10)).setDuration(content.getSubsectionscore()).setMileage(subsectionMileage).setSwitchMileage(switchMileage)); result.put("score",new Score().setDate(cmptScoreRuleScoreInfo.getSubsectionTime().substring(0,10)).setDuration(cmptScoreRuleScoreInfo.getSubsectionscore()).setMileage(subsectionMileage).setSwitchMileage(switchMileage));
}else{ //初始阶段没有上传成绩，json也显示score，方便前端判断 }else{ //初始阶段没有上传成绩，json也显示score，方便前端判断
result.put("score",new Score().setDate("0000-00-00").setDuration(0).setMileage(subsectionMileage).setSwitchMileage(switchMileage)); result.put("score",new Score().setDate("0000-00-00").setDuration(0).setMileage(subsectionMileage).setSwitchMileage(switchMileage));
} }
......
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/ScanController.java
View file @ fbbe5d80
package com.dlbridge.jadp.plugins.cmpt.web; package com.dlbridge.jadp.plugins.cmpt.web;
import com.dlbridge.feign.ScoreService;
import com.dlbridge.jadp.common.interceptor.PageView; import com.dlbridge.jadp.common.interceptor.PageView;
import com.dlbridge.jadp.plugins.cmpt.bean.Road; import com.dlbridge.jadp.plugins.cmpt.bean.Road;
import com.dlbridge.jadp.plugins.cmpt.bean.RoadsGpsCheckpointMap; import com.dlbridge.jadp.plugins.cmpt.bean.RoadsGpsCheckpointMap;
...@@ -12,17 +11,14 @@ import org.springframework.stereotype.Controller; ...@@ -12,17 +11,14 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
...@@ -32,7 +28,7 @@ import java.util.HashMap; ...@@ -32,7 +28,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream; import java.util.zip.ZipOutputStream;
import java.net.URL;
@Controller @Controller
@Log4j2 @Log4j2
@RequestMapping("gk/scan") @RequestMapping("gk/scan")
...@@ -50,8 +46,6 @@ public class ScanController { ...@@ -50,8 +46,6 @@ public class ScanController {
@Resource @Resource
private CmptScoreRuleService ruleService; private CmptScoreRuleService ruleService;
@Resource
private ScoreService scoreService;
@Resource @Resource
RemoteService remoteService; RemoteService remoteService;
......
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/ScoreController.java
View file @ fbbe5d80
package com.dlbridge.jadp.plugins.cmpt.web; package com.dlbridge.jadp.plugins.cmpt.web;
import com.dlbridge.feign.ScoreService;
import com.dlbridge.feign.bean.ScoreItem;
import com.dlbridge.jadp.common.interceptor.PageView; import com.dlbridge.jadp.common.interceptor.PageView;
import com.dlbridge.jadp.common.utils.Encodes;
import com.dlbridge.jadp.common.utils.excel.ExportExcel;
import com.dlbridge.jadp.plugins.cmpt.bean.*; import com.dlbridge.jadp.plugins.cmpt.bean.*;
import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt; import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
import com.dlbridge.jadp.plugins.cmpt.service.*; import com.dlbridge.jadp.plugins.cmpt.service.*;
...@@ -26,8 +22,6 @@ import springfox.documentation.annotations.ApiIgnore; ...@@ -26,8 +22,6 @@ import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.text.ParseException; import java.text.ParseException;
...@@ -53,9 +47,6 @@ public class ScoreController { ...@@ -53,9 +47,6 @@ public class ScoreController {
@Resource @Resource
private CmptScoreRuleService ruleService; private CmptScoreRuleService ruleService;
@Resource
private ScoreService scoreService;
@Resource @Resource
CmptScoreRuleService cmptScoreRuleService; CmptScoreRuleService cmptScoreRuleService;
...@@ -65,6 +56,9 @@ public class ScoreController { ...@@ -65,6 +56,9 @@ public class ScoreController {
@Resource @Resource
private FuncSettingService funcSettingService; private FuncSettingService funcSettingService;
@Resource
CmptScoreRuleScoreInfoService cmptScoreRuleScoreInfoService;
@RequestMapping("index/{cmptId}") @RequestMapping("index/{cmptId}")
@PageView @PageView
public ModelAndView index(@PathVariable("cmptId") Integer cmptId, ModelAndView mv) { public ModelAndView index(@PathVariable("cmptId") Integer cmptId, ModelAndView mv) {
...@@ -108,17 +102,16 @@ public class ScoreController { ...@@ -108,17 +102,16 @@ public class ScoreController {
Integer scoreItemId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndRuleId(markNo,rule.getId()); Integer scoreItemId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndRuleId(markNo,rule.getId());
if(scoreItemId == null) continue; if(scoreItemId == null) continue;
Result<ScoreItem> scoreItem = scoreService.getScoreItem(scoreItemId); CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo=cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfoByruleIdAndMarkNo(cmptId,markNo,rule.getId());
ScoreItem content = scoreItem.getContent(); //ScoreItem content = scoreItem.getContent();
if(content == null) continue; if(cmptScoreRuleScoreInfo == null) continue;
score.setDate(content.getSubsectionTime().substring(0,10))
.setDuration(content.getSubsectionscore())
.setDurationStr(DateUtil.formatDate(content.getSubsectionscore()))
.setMileage(content.getSubsectionMileage())
.setId(content.getId());
duration += content.getSubsectionscore(); score.setDate(cmptScoreRuleScoreInfo.getSubsectionTime().substring(0,10))
.setDuration(cmptScoreRuleScoreInfo.getSubsectionscore())
.setDurationStr(DateUtil.formatDate(cmptScoreRuleScoreInfo.getSubsectionscore()))
.setMileage(cmptScoreRuleScoreInfo.getSubsectionMileage())
.setId(cmptScoreRuleScoreInfo.getCmptScoreRuleScoreId());
duration += cmptScoreRuleScoreInfo.getSubsectionscore();
date = score.getDate(); date = score.getDate();
} }
EnrollInfo userInfo = remoteService.getUserInfoByMarkNo(markNo, cmptId); EnrollInfo userInfo = remoteService.getUserInfoByMarkNo(markNo, cmptId);
...@@ -242,7 +235,7 @@ public class ScoreController { ...@@ -242,7 +235,7 @@ public class ScoreController {
@PathVariable("scoreItemId") Integer scoreItemId, @PathVariable("scoreItemId") Integer scoreItemId,
HttpServletResponse response) { HttpServletResponse response) {
Integer ruleId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndScoreId(markNo,scoreItemId); Integer ruleId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndScoreId(markNo,scoreItemId);
scoreService.deleteScoreItem(scoreItemId); //scoreService.deleteScoreItem(scoreItemId);//20200520记得修改
cmptScoreRuleService.deleteScoreMap(markNo,scoreItemId); cmptScoreRuleService.deleteScoreMap(markNo,scoreItemId);
if(ruleId != null){ if(ruleId != null){
cmptScoreFieldValueService.deleteFieldValueByRuleIdAndMarkNo(ruleId,markNo); cmptScoreFieldValueService.deleteFieldValueByRuleIdAndMarkNo(ruleId,markNo);
......
src/test/java/com/dlbridge/jadp/ContextTest.java
View file @ fbbe5d80
...@@ -7,12 +7,10 @@ import com.dlbridge.jadp.plugins.cmpt.bean.SettingTemplate; ...@@ -7,12 +7,10 @@ import com.dlbridge.jadp.plugins.cmpt.bean.SettingTemplate;
import com.dlbridge.jadp.plugins.cmpt.bean.UserScoreExcelBean; import com.dlbridge.jadp.plugins.cmpt.bean.UserScoreExcelBean;
import com.dlbridge.jadp.plugins.cmpt.dao.model.CmptSetting; import com.dlbridge.jadp.plugins.cmpt.dao.model.CmptSetting;
import com.dlbridge.jadp.plugins.cmpt.service.*; import com.dlbridge.jadp.plugins.cmpt.service.*;
import com.dlbridge.jadp.plugins.cmpt.web.MicroApiController;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.DigestUtils; import org.springframework.util.DigestUtils;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
...@@ -21,7 +19,6 @@ import javax.annotation.Resource; ...@@ -21,7 +19,6 @@ import javax.annotation.Resource;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment