删除scoreservice使用的地方代码

src/main/java/com/dlbridge/jadp/fallback/ScoreFallbackFactory.java

 package com.dlbridge.jadp.fallback;
 
-import com.dlbridge.feign.NewsService;
 import com.dlbridge.feign.ScoreService;
 import com.dlbridge.feign.bean.ScoreItem;
 import com.neusoft.www.utils.web.Result;
@@ -8,8 +7,6 @@ import feign.hystrix.FallbackFactory;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 @Component
 @Log4j2
 public class ScoreFallbackFactory implements FallbackFactory<ScoreService> {

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptScoreRuleScoreInfoMapper.java

@@ -91,4 +91,7 @@ public interface CmptScoreRuleScoreInfoMapper {
      * @return
      */
     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

@@ -48,4 +48,8 @@
 	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
    </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>
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/CmptScoreRuleScoreInfoService.java

@@ -167,5 +167,16 @@ public class CmptScoreRuleScoreInfoService {
         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/web/AutoScoreController.java

 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.plugins.cmpt.bean.*;
 import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
 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 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.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 import springfox.documentation.annotations.ApiIgnore;
 
 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.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.stream.Collectors;
 
 @Controller
 @Log4j2
@@ -49,8 +31,6 @@ public class AutoScoreController {
     @Resource
     private CmptScoreRuleService ruleService;
 
-    @Resource
-    private ScoreService scoreService;
 
     @Resource
     RemoteService remoteService;

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/CmptScoreRuleController.java

 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.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.neusoft.www.utils.web.Result;
 import lombok.extern.log4j.Log4j2;
@@ -27,9 +27,8 @@ public class CmptScoreRuleController {
 
     @Resource
     CmptScoreRuleService cmptScoreRuleService;
-    
     @Resource
-    ScoreService scoreService;
+    CmptScoreRuleScoreInfoService cmptScoreRuleScoreInfoService;
     /**
      *  更新赛事规则信息
      * @param cmptScoreRules
@@ -64,8 +63,8 @@ public class CmptScoreRuleController {
 
             Integer scoreItemId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndRuleId(markNo, rule.getId());
             if(scoreItemId != null){
-                Result<ScoreItem> scoreItem = scoreService.getScoreItem(scoreItemId);
-                if(scoreItem.isStatus() && scoreItem.getContent() != null){
+                CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo=cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfoByruleIdAndMarkNo(cmptId,markNo,rule.getId());
+                if(cmptScoreRuleScoreInfo.getMarkNo() != null){
                     bean.setUploaded(true);
                 }else{
                     bean.setUploaded(false);

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java

@@ -2,8 +2,6 @@ package com.dlbridge.jadp.plugins.cmpt.web;
 
 import com.alibaba.fastjson.JSONObject;
 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.job.CountJob;
 import com.dlbridge.jadp.plugins.cmpt.bean.*;
@@ -81,8 +79,6 @@ public class MicroApiController {
     @Resource
     RemoteService remoteService;
 
-    @Resource
-    private ScoreService scoreService;
 
     @Resource
     private CmptScoreFieldValueService cmptScoreFieldValueService;
@@ -948,14 +944,15 @@ public class MicroApiController {
         Integer subsectionMileage=0;
 
         if(scoreItemId != null){
-            Result<ScoreItem> scoreItem = scoreService.getScoreItem(scoreItemId);
-            ScoreItem content = scoreItem.getContent();
-            if(content.getSubsectionMileage()==null){
+            CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo=cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfoByruleIdAndMarkNo(score.getCmptId(),score.getMarkNo(),rule.getId());
+            //Result<ScoreItem> scoreItem = scoreService1.getScoreItem(scoreItemId);
+            //ScoreItem content = scoreItem.getContent();
+            if(cmptScoreRuleScoreInfo.getSubsectionMileage()==null){
                 subsectionMileage=0;
             }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，方便前端判断
             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

 package com.dlbridge.jadp.plugins.cmpt.web;
 
-import com.dlbridge.feign.ScoreService;
 import com.dlbridge.jadp.common.interceptor.PageView;
 import com.dlbridge.jadp.plugins.cmpt.bean.Road;
 import com.dlbridge.jadp.plugins.cmpt.bean.RoadsGpsCheckpointMap;
@@ -12,17 +11,14 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import javax.imageio.ImageIO;
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -32,7 +28,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-import java.net.URL;
+
 @Controller
 @Log4j2
 @RequestMapping("gk/scan")
@@ -50,8 +46,6 @@ public class ScanController {
     @Resource
     private CmptScoreRuleService ruleService;
 
-    @Resource
-    private ScoreService scoreService;
 
     @Resource
     RemoteService remoteService;

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/ScoreController.java

 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.utils.Encodes;
-import com.dlbridge.jadp.common.utils.excel.ExportExcel;
 import com.dlbridge.jadp.plugins.cmpt.bean.*;
 import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
 import com.dlbridge.jadp.plugins.cmpt.service.*;
@@ -26,8 +22,6 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.text.ParseException;
@@ -53,9 +47,6 @@ public class ScoreController {
     @Resource
     private CmptScoreRuleService ruleService;
 
-    @Resource
-    private ScoreService scoreService;
-
     @Resource
     CmptScoreRuleService cmptScoreRuleService;
 
@@ -65,6 +56,9 @@ public class ScoreController {
     @Resource
     private FuncSettingService funcSettingService;
 
+    @Resource
+    CmptScoreRuleScoreInfoService cmptScoreRuleScoreInfoService;
+
     @RequestMapping("index/{cmptId}")
     @PageView
     public ModelAndView index(@PathVariable("cmptId") Integer cmptId, ModelAndView mv) {
@@ -108,17 +102,16 @@ public class ScoreController {
             Integer scoreItemId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndRuleId(markNo,rule.getId());
             if(scoreItemId == null) continue;
 
-            Result<ScoreItem> scoreItem = scoreService.getScoreItem(scoreItemId);
-            ScoreItem content = scoreItem.getContent();
-            if(content == null) continue;
-
-            score.setDate(content.getSubsectionTime().substring(0,10))
-                    .setDuration(content.getSubsectionscore())
-                    .setDurationStr(DateUtil.formatDate(content.getSubsectionscore()))
-                    .setMileage(content.getSubsectionMileage())
-                    .setId(content.getId());
+            CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo=cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfoByruleIdAndMarkNo(cmptId,markNo,rule.getId());
+            //ScoreItem content = scoreItem.getContent();
+            if(cmptScoreRuleScoreInfo == null) continue;
 
-            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();
         }
         EnrollInfo userInfo = remoteService.getUserInfoByMarkNo(markNo, cmptId);
@@ -242,7 +235,7 @@ public class ScoreController {
                          @PathVariable("scoreItemId") Integer scoreItemId,
                          HttpServletResponse response) {
         Integer ruleId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndScoreId(markNo,scoreItemId);
-        scoreService.deleteScoreItem(scoreItemId);
+        //scoreService.deleteScoreItem(scoreItemId);//20200520记得修改
         cmptScoreRuleService.deleteScoreMap(markNo,scoreItemId);
         if(ruleId != null){
             cmptScoreFieldValueService.deleteFieldValueByRuleIdAndMarkNo(ruleId,markNo);

src/test/java/com/dlbridge/jadp/ContextTest.java

@@ -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.dao.model.CmptSetting;
 import com.dlbridge.jadp.plugins.cmpt.service.*;
-import com.dlbridge.jadp.plugins.cmpt.web.MicroApiController;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.DigestUtils;
 import org.springframework.web.client.RestTemplate;
@@ -21,7 +19,6 @@ import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest