解决bug

src/main/java/org/rcisoft/business/bclass/controller/BClassController.java

@@ -153,8 +153,8 @@ public class BClassController extends PaginationController<BClass> {
 
     @ApiOperation(value="查询班级列表", notes="查询班级列表赋值在下拉框中")
     @GetMapping(value = "/queryBClassList")
-    public Result queryBClassList() {
-        List<SelectModel> bClass = bClassService.queryBClassList();
+    public Result queryBClassList(String type) {
+        List<SelectModel> bClass = bClassService.queryBClassList(type);
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,

src/main/java/org/rcisoft/business/bclass/dao/BClassRepository.java

 package org.rcisoft.business.bclass.dao;
 
 import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.ResultMap;
 import org.apache.ibatis.annotations.Select;
 import org.rcisoft.business.bclass.entity.BClass;
@@ -50,9 +51,10 @@ public interface BClassRepository extends BaseMapper<BClass> {
             "</foreach></script>")
     int insertBusinessClassList(List<BClass> bClasses);
 
-    @Select("select * from b_class where del_flag != 1 and flag = 1")
+    @Select("<script>select * from b_class where del_flag != 1 and flag = 1 " +
+            "<if test=\"type!=null and type!=''\">and type = #{type}</if></script>")
     @ResultMap(value = "BaseResultMap" )
-    List<BClass> queryBClassList();
+    List<BClass> queryBClassList(@Param("type") String type);
 
     @Select("select class_name from b_class where find_in_set(code,#{classesCode}) and del_flag != 1 and flag = 1")
     List<String> queryClassNamesByIds(String classesCode);

src/main/java/org/rcisoft/business/bclass/service/BClassService.java

@@ -75,5 +75,5 @@ public interface BClassService{
      */
     PersistModel businessImportExcel(HSSFWorkbook hwb, String token) throws IOException;
 
-    List<SelectModel> queryBClassList();
+    List<SelectModel> queryBClassList(String type);
 }

src/main/java/org/rcisoft/business/bclass/service/impl/BClassServiceImpl.java

@@ -272,8 +272,8 @@ public class BClassServiceImpl implements BClassService {
     }
 
     @Override
-    public List<SelectModel> queryBClassList() {
-        List<BClass> bClass = bClassRepository.queryBClassList();
+    public List<SelectModel> queryBClassList(String type) {
+        List<BClass> bClass = bClassRepository.queryBClassList(type);
         ArrayList<SelectModel> comBoxModel = new ArrayList<SelectModel>();
         for(BClass c : bClass){
             SelectModel selectModel = new SelectModel();

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

@@ -156,20 +156,27 @@ public class BFileController extends PaginationController<BFile> {
      */
     @ApiOperation(value="下载文件", notes="下载文件")
     @ApiImplicitParam(name = "chapterId", value = "章节ID", required = true, dataType = "varchar")
-    @PostMapping(value = "/downloadFile")
-    public Result downloadFile(String chapterId, HttpServletResponse response){
-        BFile video = bFileService.queryFileUrlByChapterId(chapterId);
+    @PostMapping(value = "/downloadFileWithoutAuth")
+    public Result downloadFileWithoutAuth(String chapterId, HttpServletResponse response){
+        BFile bFile = bFileService.queryFileUrlByChapterId(chapterId);
         BufferedInputStream bis = null;
         BufferedOutputStream bos = null;
-        if(video.getVideoUrl()!=""&&video.getVideoUrl()!=null){
+        if(bFile.getFileUrl()!=""&&bFile.getFileUrl()!=null){
             try {
-                File file=new File(global.getBASE_UPLOAD_SERVER_LOCATION()+video.getVideoUrl());
+                File file=new File(global.getBASE_UPLOAD_SERVER_LOCATION()+bFile.getFileUrl());
                 bis = new BufferedInputStream(new FileInputStream(file));
                 bos = new BufferedOutputStream(response.getOutputStream());
 
+                String fileName = "";
+                if(bFile.getVideoName()!=null&&!bFile.getVideoName().equals("")&&bFile.getVideoName().endsWith(".zip")){
+                    fileName = bFile.getVideoName();
+                }else{
+                    fileName = file.getName();
+                }
+
                 response.reset();
                 response.setContentType("application/octet-stream;charset=utf-8");
-                response.setHeader("Content-Disposition", "attachment;filename="+ new String((video.getVideoName()).getBytes(), "iso-8859-1"));
+                response.setHeader("Content-Disposition", "attachment;filename="+ new String((fileName).getBytes(), "iso-8859-1"));
                 response.setHeader("Access-Control-Allow-Origin", "*");
                 IOUtils.copy(bis, bos);
             }catch (Exception e){
@@ -199,5 +206,6 @@ public class BFileController extends PaginationController<BFile> {
                     "");
         }
     }
+
 }
 

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

@@ -267,7 +267,10 @@ public class BFileServiceImpl implements BFileService {
                 e.printStackTrace();
             }
         }
-        bFile.setVideoName(name+ "." +uploadFileSuffix);//文件名
+        //上传的是文件时才存文件名，方便下载时取
+        if(bFile.getType().equals("1")){
+            bFile.setVideoName(name+ "." +uploadFileSuffix);//文件名
+        }
 
 
         if (bFile.getType().equals("0")){

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

@@ -140,9 +140,9 @@ public class BStudentServiceImpl implements BStudentService {
         List<String> valuesEmailExist = new ArrayList<>();
         List<String> valuesGrade = new ArrayList<>();
 
-        int i = 1;
+        int i = 0;
         for (String[] value : values) {
-
+            i++;
             String stuCode = value[0];
 
             //判断1:学号是否满足8~15位；
@@ -225,7 +225,6 @@ public class BStudentServiceImpl implements BStudentService {
                 users.add(user);
                 userRoles.add(userRole);
             }
-            i++;
         }
 
 

src/main/java/org/rcisoft/business/bteacher/service/impl/BTeacherServiceImpl.java

@@ -93,9 +93,9 @@ public class BTeacherServiceImpl implements BTeacherService {
         List<String> valuesShort = new ArrayList<>();
         List<String> valuesIncomplete = new ArrayList<>();
         List<String> valuesAgencyExist = new ArrayList<>();
-        int i = 1;
+        int i = 0;
         for (String[] value : values) {
-
+            i++;
             String teaCode = value[0];
 
             //判断1:学号是否满足8~15位；
@@ -176,7 +176,6 @@ public class BTeacherServiceImpl implements BTeacherService {
                 users.add(user);
                 userRoles.add(userRole);
             }
-            i++;
         }
         String result = "";
         if (teachers.size()>0){

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

@@ -52,14 +52,14 @@ public class JwtAuthenTokenFilter extends OncePerRequestFilter {
         /**/
         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;
-//            }
-//        }
+        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/java/org/rcisoft/sys/role/dao/SysRoleRepository.java

@@ -209,8 +209,8 @@ public interface SysRoleRepository extends BaseMapper<SysRole> {
      * @param businessId
      * @return
      */
-    @Delete("DELETE sr " +
-            "FROM" +
+    @Delete("DELETE " +
+            "FROM " +
             "s_r_user_role sr " +
             "LEFT JOIN s_user s on s.business_id = sr.user_id " +
             "LEFT JOIN ${tb} c ON c. CODE = s.login_name " +