Skip to content

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

自选号牌

parent fb3a955a
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 27 deletions
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptMapper.xml
View file @ 30a8f9d5
......@@ -291,7 +291,6 @@
<select id="getEnrollUsersByPhone" resultType="com.dlbridge.jadp.plugins.cmpt.bean.RoadUser">
select b.userMapId userMapId
from common.neucmpt a inner join raceenroll.competitionusermap b on a.gcmptid=b.cmptid
where a.gtcmptid = #{cmptId} and b.callPhone = #{callPhone} and isdelete=0 and enrollstatus=1
where a.gtcmptid = #{cmptId} and b.callPhone = #{callPhone} and isdelete=0 and enrollstatus=1 limit 1
</select>
</mapper>
\ No newline at end of file
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptScoreRuleScoreInfoMapper.java
View file @ 30a8f9d5
......@@ -123,4 +123,6 @@ public interface CmptScoreRuleScoreInfoMapper {
* @return
*/
List<CmptScoreRuleScoreInfo> getScoreRuleScoreInfosBycmptIdAndMarkNo(@Param("cmptId") int cmptId, @Param("markNo") String markNo);
List<CmptScoreRuleScoreInfo> getScoreInfosBycmptIdAndMarkNoEnd(int cmptId, String markNo);
}
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptScoreRuleScoreInfoMapper.xml
View file @ 30a8f9d5
......@@ -76,7 +76,12 @@
</select>
<select id="getScoreRuleScoreInfosBycmptIdAndMarkNo" resultType="com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo">
select id,cmptId,rule_id as ruleId,mark_no as markNo,subsectionTime,subsectionscore,subsectionMileage,cmptPace,checkStatus from gk_cmpt_score_rule_scoreinfo where cmptId=#{cmptId} and mark_no=#{markNo} and isDelete=0
select id,cmptId,rule_id as ruleId,mark_no as markNo,subsectionTime,subsectionscore,subsectionMileage,cmptPace,checkStatus
from gk_cmpt_score_rule_scoreinfo where cmptId=#{cmptId} and mark_no=#{markNo} and isDelete=0
</select>
<select id="getScoreInfosBycmptIdAndMarkNoEnd" resultType="com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo">
select id,cmptId,rule_id as ruleId,mark_no as markNo,subsectionTime,subsectionscore,subsectionMileage,cmptPace,checkStatus
from gk_cmpt_score_rule_scoreinfo where cmptId=#{cmptId} and mark_no=#{markNo} and isDelete=0 and is_end=1
</select>
</mapper>
\ No newline at end of file
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/FuncSettingMapper.xml
View file @ 30a8f9d5
......@@ -31,7 +31,7 @@
<if test="setting.mileage != null">
switch_mileage=#{setting.mileage},
</if>
<if test="setting.mileage != null">
<if test="setting.customer != null">
switch_customer=#{setting.customer},
</if>
<if test="setting.switchScoreReview != null">
......
src/main/java/com/dlbridge/jadp/plugins/cmpt/service/CmptScoreRuleScoreInfoService.java
View file @ 30a8f9d5
......@@ -206,5 +206,7 @@ public class CmptScoreRuleScoreInfoService {
}
public List<CmptScoreRuleScoreInfo> getScoreInfosBycmptIdAndMarkNoEnd(int cmptId, String markNo) {
return cmptScoreRuleScoreInfoMapper.getScoreInfosBycmptIdAndMarkNoEnd(cmptId,markNo);
}
}
src/main/java/com/dlbridge/jadp/plugins/cmpt/service/CmptService.java
View file @ 30a8f9d5
......@@ -7,7 +7,6 @@ import com.dlbridge.jadp.plugins.cmpt.dao.model.UserCmpt;
import com.dlbridge.jadp.plugins.cmpt.utils.Page;
import com.dlbridge.jadp.plugins.cmpt.utils.PageFactory;
import lombok.extern.log4j.Log4j2;
import org.apache.log4j.Logger;
import org.springframework.data.domain.Pageable;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.stereotype.Service;
......@@ -27,8 +26,6 @@ import java.util.Map;
@Log4j2
public class CmptService {
Logger logger = Logger.getLogger(CmptService.class);
@Resource
private CmptMapper cmptMapper;
......@@ -43,11 +40,11 @@ public class CmptService {
Cmpt cmpt = remoteService.getCmptByCmptId(cmptId);
if(cmpt == null) {
logger.error("not find related cmpt id : " + cmptId);
log.error("not find related cmpt id : " + cmptId);
return new Cmpt().setCmptId(cmptId);
}
cmpt.setCmptId(cmptId);
logger.info(cmpt);
log.info(cmpt);
Cmpt localCmpt = cmptMapper.queryCmptBycmptId(cmptId);
......@@ -63,7 +60,7 @@ public class CmptService {
return localCmpt;
}
}catch (Exception ex){
logger.error(ex.getMessage(),ex);
log.error(ex.getMessage(),ex);
return new Cmpt().setCmptId(cmptId);
}
}
......@@ -93,7 +90,7 @@ public class CmptService {
if (info != null) { // 找到报名信息
UserCmpt cmpt = queryUserCmpt(cmptId, userId, info.getMarkNo());
if (cmpt != null && cmpt.getStatus() == 1) { // 已经绑定
logger.info("已绑定数据，需更新:" + cmpt);
log.info("已绑定数据，需更新:" + cmpt);
cmpt.setEnrollId(info.getMarkNo());
cmptMapper.updateUserCmptById(cmpt);
info.setManualMarkNo(cmpt.getManualMarkNo());
......@@ -102,7 +99,7 @@ public class CmptService {
UserCmpt userCmpt = new UserCmpt().setCmptId(cmptId)
.setEnrollId(info.getMarkNo()).setUserId(userId)
.setStatus(1);
logger.info("插入绑定内容："+userCmpt);
log.info("插入绑定内容："+userCmpt);
saveUserCmpt(userCmpt);
return info;
}
......@@ -217,21 +214,23 @@ public class CmptService {
public EnrollInfo bindByManual(Integer userId, String markNo, int cmptId) {
EnrollInfo info = remoteService.getUserInfoByMarkNo(markNo, cmptId);
log.info("手动设置计时返回的用户信息："+info);
if (info != null) { // 找到报名信息
UserCmpt cmpt = queryUserCmpt(cmptId, userId, info.getMarkNo());
if (cmpt != null && cmpt.getStatus() == 1) { // 已经绑定
logger.info("已绑定数据，需更新:" + cmpt);
cmpt.setManualMarkNo(info.getMarkNo());
cmptMapper.updateUserCmptById(cmpt);
info.setManualMarkNo(markNo);
log.info("手动设置 update 已绑定数据，需更新:" + cmpt);
cmptMapper.updateUserCmptById(cmpt);
return info;
} else {
UserCmpt userCmpt = new UserCmpt().setCmptId(cmptId)
.setEnrollId(info.getMarkNo()).setUserId(userId)
.setStatus(1).setManualMarkNo(info.getMarkNo());
logger.info("插入绑定内容："+userCmpt);
saveUserCmpt(userCmpt);
info.setManualMarkNo(info.getMarkNo());
saveUserCmpt(userCmpt);
log.info("手动设置 insert 插入绑定内容："+userCmpt);
return info;
}
} else {
......
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/CustomerController.java
View file @ 30a8f9d5
......@@ -6,6 +6,7 @@ import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
import com.dlbridge.jadp.plugins.cmpt.service.CmptService;
import com.dlbridge.jadp.plugins.cmpt.service.CustomerService;
import com.neusoft.www.utils.web.Result;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -16,6 +17,7 @@ import javax.annotation.Resource;
@Controller
@RequestMapping("gk/customer/")
@Log4j2
public class CustomerController {
@Resource
private CmptService cmptService;
......@@ -42,6 +44,7 @@ public class CustomerController {
@ResponseBody
public Result saveOrUpdate(Customer customer){
customerService.saveOrUpdate(customer);
log.info("变更客服电话："+customer);
return Result.success().setContent(customer);
}
}
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java
View file @ 30a8f9d5
......@@ -1211,10 +1211,12 @@ public class MicroApiController {
@GetMapping(value = "/manualMarkNO")
@ResponseBody
public Result manualMarkNO(@RequestParam("cmptId") int cmptId,@RequestParam("userMapId") int userMapId,
@RequestParam("markNo") String markNo,@RequestParam("manualMarkNo") String manualMarkNo) {
@RequestParam("markNo") String markNo,@RequestParam("manualMarkNo") String manualMarkNo,
@RequestParam("userId") int userId) {
log.info("c:"+cmptId+",u:"+userMapId+"m:"+markNo+",om:"+manualMarkNo+",userId："+userId);
List<CmptScoreRuleScoreInfo> scores = cmptScoreRuleScoreInfoService.getScoreInfosBycmptIdAndMarkNoEnd(cmptId, markNo);
List<CmptScoreRuleScoreInfo> scores = cmptScoreRuleScoreInfoService.getScoreRuleScoreInfosBycmptIdAndMarkNo(cmptId, markNo);
if(scores.size() > 0){
return Result.fail().setMsg("已经有成绩数据，无法自选号码牌！");
......@@ -1223,12 +1225,24 @@ public class MicroApiController {
if(o != null){
return Result.fail().setMsg("该号码牌已经被分配！");
}
EnrollInfo userInfoByMarkNo = remoteService.getUserInfoByMarkNo(manualMarkNo, cmptId);// 获取原计时信息
String stock = manualMarkNo.split("-")[0];
String markno = manualMarkNo.split("-")[1];
// -AAAA 除掉 -
manualMarkNo = StringUtils.isBlank(stock) ? markno : manualMarkNo;
EnrollInfo userInfoByMarkNo = remoteService.getUserInfoByMarkNo(manualMarkNo, cmptId);// 获取原计时信息
if(userInfoByMarkNo != null){
return Result.fail().setMsg("该号码牌已经被分配！");
}
Boolean best_mark_no = hashOperations.hasKey("best_mark_no", markno);
if(best_mark_no){
return Result.fail().setMsg("该号码牌为预留号码牌，不能分配！");
}
EnrollInfo userInfo = null;
if(StringUtils.isNotBlank(markNo)){
userInfo = remoteService.getUserInfoByMarkNo(markNo, cmptId); // 获取原计时信息
......@@ -1249,12 +1263,12 @@ public class MicroApiController {
String json = new Gson().toJson(param);
log.info("请求参数："+json);
ResponseEntity<String> responseEntity = restTemplate.getForEntity(timerURL+"/mergePersonEnroll.do?org-id=1-3&personEnroll={json}", String.class,json);
log.info("返回结果："+responseEntity.getBody());
log.info("计时1返回结果："+responseEntity.getBody());
JSONObject jsonObject = JSONObject.parseObject(responseEntity.getBody());
int status = jsonObject.getIntValue("status");
if(status == 0){
Object registerId = param.get("registerId");
EnrollInfo info = cmptService.bindByManual(Integer.valueOf(registerId.toString()), manualMarkNo, cmptId);
EnrollInfo info = cmptService.bindByManual(userId, manualMarkNo, cmptId);
hashOperations.put("manual:markno:" + cmptId, manualMarkNo,"1");
return Result.success().setContent(info);
}else{
......@@ -1263,6 +1277,7 @@ public class MicroApiController {
}else{
Map<String,String> param = remoteService.getEnrollUsersByUserMapId(userMapId);
param.put("cmptId",cmptId+"");
param.put("markNo",StringUtils.isBlank(stock) ? manualMarkNo.replace("-","") : manualMarkNo);
......@@ -1277,12 +1292,13 @@ public class MicroApiController {
String json = new Gson().toJson(param);
log.info("请求参数："+json);
ResponseEntity<String> responseEntity = restTemplate.getForEntity(timerURL+"/mergePersonEnroll.do?org-id=1-3&personEnroll={json}", String.class,json);
log.info("返回结果："+responseEntity.getBody());
log.info("计时1返回结果："+responseEntity.getBody());
JSONObject jsonObject = JSONObject.parseObject(responseEntity.getBody());
int status = jsonObject.getIntValue("status");
if(status == 0){
Object registerId = param.get("registerId");
EnrollInfo info = cmptService.bindByManual(Integer.valueOf(registerId.toString()), manualMarkNo, cmptId);
log.info("registerId:"+registerId);
EnrollInfo info = cmptService.bindByManual(userId, manualMarkNo, cmptId);
hashOperations.put("manual:markno:" + cmptId, manualMarkNo,"1");
return Result.success().setContent(info);
}else{
......@@ -1291,6 +1307,15 @@ public class MicroApiController {
}
}
@RequestMapping("initMark")
@ResponseBody
public Result init(@RequestParam("marknos")String marksno){
Arrays.stream(marksno.split(",")).forEach(markno ->{
hashOperations.put("best_mark_no",markno,1);
});
return Result.success().setContent(hashOperations.keys("best_mark_no"));
}
public static void main(String[] args) {
System.out.println("-aaa".split("-")[0]+","+"-aaa".split("-")[1]);
}
......
src/main/webapp/WEB-INF/views/cmpt/scan.jsp
View file @ 30a8f9d5
......@@ -56,7 +56,6 @@
justify-content: space-between;
}
.road-text{
width:93px;
height:28px;
font-size:20px;
font-family:PingFangSC-Medium,PingFang SC;
......@@ -149,7 +148,7 @@
<script src="${ctxStatic}/newdermon/vendor/popper.js/umd/popper.min.js"></script>
<script src="${ctxStatic}/js/qikoo.js"></script>
<script src="${ctxStatic}/js/scan.js"></script>
<script src="${ctxStatic}/js/scan.js?<%=System.currentTimeMillis()%>"></script>
</body>
......
src/main/webapp/static/js/scan.js
View file @ 30a8f9d5
......@@ -63,7 +63,7 @@ $(document).ready(function () {
$('.QRCodeDown').click(function () {
var hasCp = $(this).attr('data-hasCp');
if(hasCp == 'false') return;
var roadId = $('.road-name.active').attr('road-id');
var roadId = $(this).parent().attr('road-id');
console.log(roadId);
const link = document.createElement('a')
const body = document.querySelector('body')
......
src/main/webapp/static/js/score_review.js
View file @ 30a8f9d5
......@@ -88,6 +88,8 @@ var score = new Vue({
changeStatus:function (event) {
score.$data.reviewStatus = event;
score.$data.param.checkstatus = event;
score.$data.jumpToPage = 1;
score.$data.param.page = 0;
reviewPage.reloadPage();
},
checkAll:function () {
......@@ -104,6 +106,8 @@ var score = new Vue({
reviewPage.reloadPage();
},
changeOrigin:function () {
score.$data.jumpToPage = 1;
score.$data.param.page = 0;
reviewPage.reloadPage();
},
next:function () {
......
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