Merge branch 'master' of ssh://103.249.252.28:10022/lcy/education

src/main/java/org/rcisoft/business/bchapter/dao/BChapterRepository.java

@@ -280,7 +280,7 @@ public interface BChapterRepository extends BaseMapper<BChapter> {
             "LEFT JOIN b_r_student_chapter bsc on bc.business_id = bsc.chapter_id\n" +
             "LEFT JOIN b_student bs on bsc.student_id = bs.business_id\n" +
             "LEFT JOIN s_user su on su.login_name = bs.`code` \n" +
-            "where bc.business_id = #{chapterId} and bsc.score = '-1'</script>")
+            "where bc.business_id = #{chapterId} and bsc.score = '-1' and bsc.is_complete = '1'</script>")
     @ResultMap(value = "BaseResultMap" )
     List<BChapter> queryBchapterStudentById(String chapterId);
 

src/main/java/org/rcisoft/business/bchapter/entity/BChapter.java

@@ -86,6 +86,9 @@ public class BChapter extends IdEntity<BChapter> {
 
     @Transient
     private String studentNum;
+    @Transient
+    private String stuScore;
+
 
     @Transient
     private String videoUrl;

src/main/java/org/rcisoft/business/bchapter/service/impl/BChapterServiceImpl.java

@@ -202,8 +202,9 @@ public class BChapterServiceImpl implements BChapterService {
             int score = IntellEvaluation.IntellEvaluation(filePath,scoreInfoDTO.getStudentCode(),bChapter.getExperimentType());
             scoreInfoDTO.setScore(score);
 
-        }
+        }else{
             scoreInfoDTO.setScore(-1);
+        }
         scoreInfoDTO.setStudentId(stuid);
         int result;
         //查询是否已有关联关系

src/main/java/org/rcisoft/business/bcode/controller/BCodeController.java

@@ -202,7 +202,7 @@ public class BCodeController extends PaginationController {
                 + UserUtil.getUserInfoProp(getToken(), UserUtil.USER_ID) + File.separator;
         File file = new File(serverPath+filePath);
         String finished = bChapterService.queryIsCompleteByUserIdAndChapId(UserUtil.getUserInfoProp(getToken(), UserUtil.USER_ID),chapId);
-        if(finished!=null&&finished.equals("1")){
+        if(finished!=null&&finished.equals("1")&&!fileType.equals("6")){
             throw new ServiceException(ResultServiceEnums.EXPERIMENT_FINISHED);
         }
         if(fileType.equals("1")&&!file.exists()){//新增文件夹

src/main/java/org/rcisoft/business/bcode/service/impl/BCodeLxcServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 
 import java.io.File;
 import java.util.*;
+import java.util.logging.Logger;
 
 /**
  * Created by lcy on 18/1/9.
@@ -54,6 +55,7 @@ public class BCodeLxcServiceImpl implements BCodeLxcService {
 
     @Override
     public CommandResult startBCodeLxc(BCodeLxc lxc) {
+        Logger logger = Logger.getAnonymousLogger();
         CommandResult result = null;
         List<String> ports  = null;
         /*初始化port 20000 - 30000 */
@@ -62,13 +64,19 @@ public class BCodeLxcServiceImpl implements BCodeLxcService {
         Integer portSSH = global.getLxcInitPort()+10000;
         Integer maxPortSSH = global.getLxcMaxPort()+10000;
         ports = rcRedisServiceImpl.getList("lxcPorts");
+        logger.info("------------------------------------------------------------------------------------------------");
+        logger.info(ports.size()+"redis 端口使用数量");
         if(null == ports || 0 == ports.size())
             ports = new ArrayList<>();
         else{
+
             port = this.getIdleWithPorts(ports,port,maxPort);
+            logger.info("<port>:"+port);
             portSSH = this.getIdleWithPorts(ports,portSSH,maxPortSSH);
+            logger.info("<portSSH>:"+portSSH);
         }
 
+
         /*端口满了*/
         if(0 == port||0 == portSSH) {
             result = new CommandResult(ResultCode.FAIL,"端口全部占用,请稍后!",lxc);
@@ -150,11 +158,15 @@ public class BCodeLxcServiceImpl implements BCodeLxcService {
      * @return
      */
     private synchronized Integer getIdleWithPorts(List<String> ports, Integer port, Integer maxPort) {
+         Logger logger = Logger.getAnonymousLogger();
+        logger.info("------------------------getIdleWithPorts-------------------------------------");
+         logger.info("[portsSize:]"+ports.size());
+        logger.info("[port jisuan:]"+(ports.size() -1  - (maxPort - port)) );
         int choosePort = 0;
         /*端口占用满了*/
         if(ports.size() -1  - (maxPort - port) == 0)
             return choosePort;
-        for(int i = port ; i < maxPort - port ; i++){
+        for(int i = port ; i < maxPort ; i++){
             boolean flag = false;
             for (int j = 0 ; j < ports.size() ; j++){
                 if(i - Integer.parseInt(ports.get(j)) == 0) {

src/main/java/org/rcisoft/business/bcode/service/impl/BCodeServiceImpl.java

@@ -365,7 +365,12 @@ public class BCodeServiceImpl implements BCodeService {
             studentId="";
         }
         //根据slId获得章节及学生
-        students = brSlStudentRepository.queryStudentBySlId(slId,studentId);
+        if(studentId.equals("")){//工程
+            students = brSlStudentRepository.queryStudentBySlId1(slId,studentId);
+        }else {
+            students = brSlStudentRepository.queryStudentBySlId2(slId,studentId);
+        }
+
         //查询该课程的所有章节
         //List<BChapter> chapterList = bChapterRepository.queryChapterBySlId(slId);
         if(students.size()>=1){
@@ -399,31 +404,52 @@ public class BCodeServiceImpl implements BCodeService {
                 //学生代码文件所在目录
                 String codePath = SlPath + student.getChapterId() +File.separator
                         + codeType + student.getStudentId() + File.separator;
-                File userFile = new File(codePath);
-                //得到目录下的所有文件
-                File javaFile[] = userFile.listFiles();
-                if(javaFile!=null) {
-                    for (File simpleFile : javaFile) {
-                        //将文件复制出去
+                File codeFile = new File(codePath);
+                if(!codeFile.exists()){
+                    codeFile.mkdirs();
+                }
                 try {
-                            int bytesum = 0;
-                            int byteread = 0;
-                            InputStream inStream = new FileInputStream(simpleFile.getPath()); //读入原文件
-                            FileOutputStream fs = new FileOutputStream(finalPath + simpleFile.getName());
-                            byte[] buffer = new byte[102400];
-                            int length;
-                            while ((byteread = inStream.read(buffer)) != -1) {
-                                bytesum += byteread; //字节数 文件大小
-                                fs.write(buffer, 0, byteread);
-                            }
-                            inStream.close();
-                            fs.close();
+//                    if(student.getExperimentType().equals("2")||student.getExperimentType().equals("4")){
+                        FileUtils.copyDirectory(codeFile,copyFile);
+//                    }else {
+//                        File javaFile[] = codeFile.listFiles();
+//                        for(File simpleFile : javaFile){
+//                            File finalFile = new File(finalPath + simpleFile.getName());
+//                            FileUtils.copyFile(javaFile[0],finalFile);
+//                        }
+//
+//                    }
                 } catch (Exception e) {
-                            System.out.println("复制时出错");
+                    System.out.println("复制逻辑出错，可能路径不对！");
                     e.printStackTrace();
                 }
-                    }
-                }
+
+
+//                File userFile = new File(codePath);
+//                //得到目录下的所有文件
+//                File javaFile[] = userFile.listFiles();
+//                if(javaFile!=null) {
+//                    for (File simpleFile : javaFile) {
+//                        //将文件复制出去
+//                        try {
+//                            int bytesum = 0;
+//                            int byteread = 0;
+//                            InputStream inStream = new FileInputStream(simpleFile.getPath()+File.separator+"42432"); //读入原文件
+//                            FileOutputStream fs = new FileOutputStream(finalPath + simpleFile.getName());
+//                            byte[] buffer = new byte[102400];
+//                            int length;
+//                            while ((byteread = inStream.read(buffer)) != -1) {
+//                                bytesum += byteread; //字节数 文件大小
+//                                fs.write(buffer, 0, byteread);
+//                            }
+//                            inStream.close();
+//                            fs.close();
+//                        } catch (Exception e) {
+//                            System.out.println("复制时出错");
+//                            e.printStackTrace();
+//                        }
+//                    }
+//                }
             }
         }else{
             throw new ServiceException(ResultServiceEnums.NO_STUDENT_HOMEWORK);

src/main/java/org/rcisoft/business/bfile/controller/BFileController.java

@@ -10,8 +10,10 @@ import org.rcisoft.common.component.Global;
 import org.rcisoft.common.controller.PaginationController;
 import org.rcisoft.common.model.GridModel;
 import org.rcisoft.core.constant.MessageConstant;
+import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.Result;
+import org.rcisoft.core.result.ResultServiceEnums;
 import org.rcisoft.core.util.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -122,6 +124,30 @@ public class BFileController extends PaginationController<BFile> {
                     videoUrl);
     }
 
+    @ApiOperation(value="上传license", notes="上传license证书文件")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "license文件", required = true, dataType = "MultipartFile")})
+    @PostMapping(value = "/uploadLicenseWithoutAuth")
+    public Result uploadLicense(HttpServletRequest request) {
+        List<MultipartFile> list = ((MultipartHttpServletRequest)request).getFiles("file");
+        try {
+            if(list.size()>0){
+                bFileService.uploadLicense(list.get(0));
+            }else{
+                throw new ServiceException(ResultServiceEnums.UPLOAD_ERROR);
+            }
+
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new ServiceException(ResultServiceEnums.UPLOAD_ERROR);
+        }
+        return Result.builder(new PersistModel(1),
+                "license上传成功",
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                "");
+    }
+
+
     /**
      * 下载文件
      * @param chapterId

src/main/java/org/rcisoft/business/bfile/service/BFileService.java

@@ -5,6 +5,7 @@ import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -50,4 +51,10 @@ public interface BFileService {
     public String uploadVideoToServer(List<MultipartFile> list, BFile bFile, String token);
 
     public BFile queryFileUrlByChapterId(String chapterId);
+
+    /**
+     * 将license证书文件输出到指定路径下
+     * @param file
+     */
+    public void uploadLicense(MultipartFile file) throws IOException;
 }

src/main/java/org/rcisoft/business/bfile/service/impl/BFileServiceImpl.java

@@ -8,6 +8,8 @@ import org.rcisoft.business.bfile.service.BFileService;
 import org.rcisoft.business.bsl.task.SlTask;
 import org.rcisoft.common.component.Global;
 import org.rcisoft.core.aop.PageUtil;
+import org.rcisoft.core.bean.RcLkConfigBean;
+import org.rcisoft.core.component.RcVerify;
 import org.rcisoft.core.constant.DelStatus;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
@@ -42,6 +44,11 @@ public class BFileServiceImpl implements BFileService {
     private SlTask slTask;
     @Autowired
     private Global global;
+    @Autowired
+    private RcVerify rcVerify;
+
+    @Autowired
+    private RcLkConfigBean rcLkConfigBean;
 
     @Override
     public BFile selectOne(String businessId){
@@ -169,7 +176,7 @@ public class BFileServiceImpl implements BFileService {
                 + path + bFile.getChapterId();
         File tempFilePath = new File(tempPath);
         if(tempFilePath.exists()){
-            tempFilePath.delete();
+            FileUtils.deleteDirectory(tempFilePath);
         }
 
         String realFilePath =  global.getBASE_UPLOAD_SERVER_LOCATION() + File.separator
@@ -177,7 +184,10 @@ public class BFileServiceImpl implements BFileService {
                 + path + bFile.getChapterId() + File.separator
                 + pathName;
         File directory = new File(realFilePath);
+        if(directory.exists()){
             FileUtils.moveDirectory(directory,tempFilePath);
+        }
+
 
     }
 
@@ -279,6 +289,32 @@ public class BFileServiceImpl implements BFileService {
         return bFileRepository.queryFileUrlByChapterId(chapterId);
     }
 
+    @Override
+    public void uploadLicense(MultipartFile file) {
+        try {
+        BufferedOutputStream stream = null;
+
+        String path = global.getBASE_UPLOAD_SERVER_LOCATION() + rcLkConfigBean.getLicPath();
+        File oldFile = new File(path);
+        if(oldFile.exists()){
+            FileUtils.forceDelete(oldFile);
+        }
+        File newFile = new File(path);
+
+        stream = new BufferedOutputStream(new FileOutputStream(newFile));
+        byte[] bytes = file.getBytes();
+        stream.write(bytes,0,bytes.length);
+        stream.flush();
+        stream.close();
+            rcVerify.verify();
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new ServiceException(ResultServiceEnums.UPLOAD_ERROR);
+        }
+
+        return;
+    }
+
 
     public String uploadFileToServer(MultipartFile file, BFile bFile) throws Exception{
         String fileUrl = "";
@@ -301,4 +337,7 @@ public class BFileServiceImpl implements BFileService {
         }
         return fileUrl;
     }
+
+
+
 }

src/main/java/org/rcisoft/business/blesson/dao/BLessonRepository.java

@@ -59,7 +59,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
     @Update("<script>update b_lesson_direction set direction_id = #{directionId} where sl_id = #{slId}</script>")
     int updateDirectionBySlId(BLessonDirection direction);
 
-    @Select("SELECT SUM(class_hour) classHour FROM b_chapter where lesson_id = #{businessId} and pid != '-1'")
+    @Select("SELECT COALESCE(SUM(class_hour),0) classHour FROM b_chapter where lesson_id = #{businessId} and pid != '-1'")
     int queryClassHourByLessonId(String businessId);
 }
 

src/main/java/org/rcisoft/business/brclassstudent/dao/BRClassStudentRepository.java

 package org.rcisoft.business.brclassstudent.dao;
 
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.ResultMap;
 import org.apache.ibatis.annotations.Select;
@@ -59,5 +60,13 @@ public interface BRClassStudentRepository extends BaseMapper<BRClassStudent> {
             "WHERE\n" +
             "\tb2.business_id = #{classId}</script>")
     int selectStuentNumByClassId(String classId);
+
+    /**
+     * 根据学生code 删除所有记录
+     * @param stuCode
+     * @return
+     */
+    @Delete("delete from b_r_class_student where student_code = #{stuCode}")
+    int deleteCSByStuId(String stuCode);
 }
 

src/main/java/org/rcisoft/business/brslstudent/dao/BRSlStudentRepository.java

@@ -92,9 +92,25 @@ public interface BRSlStudentRepository extends BaseMapper<BRSlStudent> {
             "and bc.sl_id = #{slId} " +
             "and bc.pid != '-1' AND bc.is_test like '%1%' " +
             "and brc.is_complete = 1 " +
-            "<if test=\"studentId !=null and studentId !=''\">" +
-            "and FIND_IN_SET(su.business_id,#{studentId}) " +
-            "</if></script>")
-    List<BStudentDto> queryStudentBySlId(@Param("slId") String slId, @Param("studentId")String studentId);
+            "</script>")
+    List<BStudentDto> queryStudentBySlId1(@Param("slId") String slId, @Param("studentId")String studentId);
+
+    @Select("<script>select bc.business_id AS chapterId," +
+            "bc.experiment_type AS experimentType," +
+            "bc.sort,su.business_id AS studentId," +
+            "bs.`code` AS studentCode," +
+            "su.`name` AS studentName,\n" +
+            "(select sort  from b_chapter where business_id = bc.pid )AS pSort " +
+            "from b_chapter bc \n" +
+            "LEFT JOIN b_r_student_chapter brc ON bc.business_id = brc.chapter_id\n" +
+            "LEFT JOIN b_student bs on bs.business_id = brc.student_id \n" +
+            "LEFT JOIN s_user su on su.login_name = bs.`code`\n" +
+            "where bc.del_flag = 0 and bc.flag = 1  " +
+            "and bc.sl_id = #{slId} " +
+            "and bc.pid != '-1' AND bc.is_test like '%1%' " +
+            "and brc.is_complete = 1 " +
+            "and FIND_IN_SET(brc.student_id,#{studentId}) " +
+            "</script>")
+    List<BStudentDto> queryStudentBySlId2(@Param("slId") String slId, @Param("studentId")String studentId);
 }
 

src/main/java/org/rcisoft/business/bsl/dao/BSlRepository.java

@@ -156,7 +156,7 @@ public interface BSlRepository extends BaseMapper<BSl> {
             "LEFT JOIN b_term t9 ON t1.term_code = t9.`code`\n" +
             "LEFT JOIN b_lesson t6 ON t1.lesson_code = t6.`code`\n" +
             "LEFT JOIN (SELECT count(t3.business_id) AS t_num,t4.`name`,t2.`code`,t4.head_pic FROM b_teacher t2\n" +
-            "LEFT JOIN b_sl t3 ON t2.`code` = t3.teacher_code\n" +
+            "LEFT JOIN b_sl t3 ON t2.`code` = t3.teacher_code AND (t3.audit_status='2'|| t3.audit_status='4')\n" +
             "LEFT JOIN s_user t4 ON t4.login_name = t2.`code`\n" +
             "GROUP BY t3.teacher_code) t5 ON t5.`code` = t1.teacher_code\n" +
             "WHERE\n" +

src/main/java/org/rcisoft/business/bsl/service/impl/BSlServiceImpl.java

@@ -279,7 +279,7 @@ public class BSlServiceImpl implements BSlService {
         if(bSl==null)
             throw new ServiceException(ResultServiceEnums.SL_INFO_NOT_EXISTS);
         //action.deleteProject(bSl.getGitLabProjectId());
-        //brSlStudentRepository.deleteBatch(bSl.getCode());
+        brSlStudentRepository.deleteBatch(bSl.getCode());
         BSl bsl = new BSl();
         bsl.setBusinessId(id);
         UserUtil.setCurrentMergeOperation(bsl);

src/main/java/org/rcisoft/business/bstudent/dao/BStudentRepository.java

@@ -124,9 +124,9 @@ public interface BStudentRepository extends BaseMapper<BStudent> {
     String queryStudentByUserId(String userId);
 
 
-    @Select("<script>SELECT t3.code,t4.`name`,t6.class_name as className,\n" +
+    @Select("<script>SELECT t3.business_id as businessId, t3.code,t4.`name`,t6.class_name as className,\n" +
             "(CONCAT((SELECT COUNT(*) from b_r_student_chapter " +
-            "where student_id = t4.business_id and sl_id = #{slId} and is_complete = '1')," +
+            "where student_id = t3.business_id and sl_id = #{slId} and is_complete = '1')," +
             "'/'," +
             "(SELECT COUNT(*) from b_chapter where is_test like CONCAT('%','1','%') and sl_id = #{slId})) \n" +
             ") AS finishNum " +

src/main/java/org/rcisoft/business/bstudent/entity/BStudent.java

@@ -38,7 +38,8 @@ public class BStudent extends IdEntity<BStudent> {
         return code != null ? code.equals(bStudent.code) : bStudent.code == null;
     }
 
-
+//    /*学生ID*/
+//    private String stuId;
 
     /*学号*/
     @Length(min = 8,max = 64,message = "长度最小为8,最大为50")

src/main/java/org/rcisoft/business/bstudent/service/impl/BStudentServiceImpl.java

@@ -3,6 +3,8 @@ package org.rcisoft.business.bstudent.service.impl;
 import com.alibaba.druid.util.StringUtils;
 import com.alibaba.fastjson.JSON;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.rcisoft.business.brclassstudent.dao.BRClassStudentRepository;
+import org.rcisoft.business.brclassstudent.entity.BRClassStudent;
 import org.rcisoft.business.brslstudent.dao.BRSlStudentRepository;
 import org.rcisoft.business.bstudent.dao.BStudentRepository;
 import org.rcisoft.business.bstudent.entity.BStudent;
@@ -47,6 +49,8 @@ public class BStudentServiceImpl implements BStudentService {
     @Autowired
     private BStudentRepository bStudentRepository;
     @Autowired
+    private BRClassStudentRepository brClassStudentRepository;
+    @Autowired
     private SysUserService userService;
     @Autowired
     private SysUserMapper sysUserMapper;
@@ -249,7 +253,10 @@ public class BStudentServiceImpl implements BStudentService {
         sysUserMapper.deleteByCode(student.getCode());
         bStudent.setDeleted();
         UserUtil.setCurrentMergeOperation(bStudent);
+
         int line = bStudentRepository.logicalDelete(bStudent);
+        brClassStudentRepository.deleteCSByStuId(student.getCode());
+
         return new PersistModel(line, MessageConstant.MESSAGE_ALERT_SUCCESS);
     }
 

src/main/java/org/rcisoft/business/tpaperchapter/dao/TPaperChapterRepository.java

@@ -36,6 +36,6 @@ public interface TPaperChapterRepository extends BaseMapper<TPaperChapter> {
     List<TPaperChapter> queryTPaperChapterInfo(@Param("slId") String slId, @Param("chapterId") String chapterId);
 
     @Select("SELECT pdesc from t_paper_chapter WHERE chap_id = #{chapterId}")
-    String queryDescByChapId(String chapterId);
+    List<String> queryDescByChapId(String chapterId);
 }
 

src/main/java/org/rcisoft/business/tquestion/dao/TQuestionRepository.java

@@ -64,7 +64,7 @@ public interface TQuestionRepository extends BaseMapper<TQuestion> {
     @Select("<script>select q_num from t_paper_chapter_section pcs " +
             "LEFT JOIN t_paper_chapter tpc ON tpc.business_id = pcs.pc_id " +
             "where q_type = #{qtype} and tpc.chap_id = #{chapId}</script>")
-    String queryNumByType(@Param("qtype") String qtype,@Param("chapId") String chapId);
+    List<String> queryNumByType(@Param("qtype") String qtype,@Param("chapId") String chapId);
 
 
     @Select("<script>SELECT tq.* from t_question tq \n" +

src/main/java/org/rcisoft/business/tquestion/service/impl/TQuestionServiceImpl.java

@@ -234,7 +234,8 @@ public class TQuestionServiceImpl implements TQuestionService {
         }
         String pId = "";
         TExamInfo tExamInfo = tExamInfoRepository.queryIdByUserId(userId,chapterId);
-        String explain = tPaperChapterRepository.queryDescByChapId(chapterId);
+        List<String> explainResult = tPaperChapterRepository.queryDescByChapId(chapterId);
+        String explain = explainResult.size()>0?explainResult.get(0):"";
         if(tExamInfo==null){
             //占卷子
             tExamInfo = new TExamInfo();
@@ -292,9 +293,10 @@ public class TQuestionServiceImpl implements TQuestionService {
         questionListAndNum.setExamInfoId(tExamInfo.getBusinessId());
         questionListAndNum.setExplain(explain);
         questionListAndNum.setIsFinish(isFinish);
-        questionListAndNum.setNumOfChoice(tQuestionRepository.queryNumByType("1",chapterId));
-        questionListAndNum.setNumOfMultiSelect(tQuestionRepository.queryNumByType("2",chapterId));
-        questionListAndNum.setNumOfJudgment(tQuestionRepository.queryNumByType("3",chapterId));
+
+        questionListAndNum.setNumOfChoice(tQuestionRepository.queryNumByType("1",chapterId).get(0));
+        questionListAndNum.setNumOfMultiSelect(tQuestionRepository.queryNumByType("2",chapterId).get(0));
+        questionListAndNum.setNumOfJudgment(tQuestionRepository.queryNumByType("3",chapterId).get(0));
         //将数据放入缓存中
         rcRedisServiceImpl.setBytes(userId + "_" + chapterId,
                                     SerializationUtils.serializer(questionListAndNum),

src/main/java/org/rcisoft/core/security/JwtAuthenTokenFilter.java

@@ -46,15 +46,20 @@ public class JwtAuthenTokenFilter extends OncePerRequestFilter {
         response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE,PUT");
         response.setHeader("Access-Control-Allow-Headers","Authorization,Origin,X-Requested-With,X-File-Name,Content-Type, Accept");
         log.info("*********************************过滤器被使用**************************");
+        String reqUrl = request.getRequestURL().toString();
+        int permitRes = reqUrl.indexOf("/BVideo/uploadLicense");
 
         /**/
         String lk = rcRedisServiceImpl.get("lk");
+
         if(StringUtils.isBlank(lk) || !"1".equals(lk)){
+            if(permitRes==-1) {
                 Result result = new Result();
                 result.setCode(202);
                 ResponseUtil.responseResult(response, result);
                 return;
             }
+        }
         // 取得header
         String authHeader = request.getHeader(this.tokenHeader);
         //判断header头

src/main/resources/mapper/business/bchapter/mapper/BChapterMapper.xml

@@ -54,12 +54,13 @@
         IFNULL(t1.pdf_finish,0) as pdfFinish,
         IFNULL(t1.ppt_finish,0) as pptFinish,
         IFNULL(t1.video_finish,0) as videoFinish,
-        (SELECT count(*) FROM b_r_student_chapter brs WHERE brs.chapter_id = bc.business_id AND brs.score = - 1) AS studentNum
+        (SELECT count(*) FROM b_r_student_chapter brs WHERE brs.chapter_id = bc.business_id AND brs.score = - 1) AS studentNum,
+        IFNULL(t1.score ,-1) as stuScore
         FROM
         b_chapter bc
         LEFT JOIN b_file bf ON bf.chapter_id = bc.business_id
         LEFT JOIN t_paper_chapter pc on pc.chap_id = bc.business_id
-        LEFT JOIN (SELECT is_complete,ppt_finish,pdf_finish,video_finish,paper_finish,chapter_id from b_r_student_chapter brs
+        LEFT JOIN (SELECT is_complete,ppt_finish,pdf_finish,video_finish,paper_finish,chapter_id,score from b_r_student_chapter brs
                     LEFT JOIN b_student bs on brs.student_id = bs.business_id
                     LEFT JOIN s_user su on bs.`code` = su.login_name
                     LEFT JOIN b_chapter bc on bc.business_id = brs.chapter_id