修改接口

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

@@ -25,11 +25,15 @@ import org.rcisoft.business.blesson.entity.BLesson;
 import org.rcisoft.business.bfile.dao.BFileRepository;
 import org.rcisoft.business.bfile.entity.BFile;
 import org.rcisoft.business.blesson.entity.BLessonPerson;
+import org.rcisoft.business.blesson.service.BLessonService;
+import org.rcisoft.business.blesson.util.QueryDepart;
 import org.rcisoft.business.bmaterial.dao.BMaterialRepository;
 import org.rcisoft.business.bmaterial.entity.BMaterial;
 import org.rcisoft.business.brstudentchapter.dao.BRStudentChapterRepository;
 import org.rcisoft.business.brstudentchapter.entity.BRStudentChapter;
 import org.rcisoft.common.component.Global;
+import org.rcisoft.common.util.feignDto.MTUserGetsReqDTO;
+import org.rcisoft.common.util.feignDto.MTUserInfoRspDTO;
 import org.rcisoft.common.util.outClient.MTCotactApiRequestClient;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.exception.ServiceException;
@@ -87,6 +91,8 @@ public class BChapterServiceImpl implements BChapterService {
     @Autowired
     BCollectRepository bCollectRepository;
     @Autowired
+    BLessonService bLessonService;
+    @Autowired
     OfficeToPdf officeToPdf;
 
     @Override
@@ -143,9 +149,26 @@ public class BChapterServiceImpl implements BChapterService {
         }
 //        map.put("totalProgress", i == 0 ? "0%" : df.format((float) percent / i) + "%");
         BLesson bLesson = bLessonRepository.selectByPrimaryKey(lessonId);
+        //判断课程是否存在
         if (bLesson == null){
             throw new ServiceException(ResultServiceEnums.LESSON_NOT_EXISTA);
         }
+        //判断课程是否被关闭
+        if ("4".equals(bLesson.getReleaseState())){
+            throw new ServiceException(ResultServiceEnums.LESSON_CLOSED);
+        }
+        //判断该登录人是否可见该课程
+        List<String> ids = Arrays.asList(new String[]{curUser.getUserId()});
+        MTUserGetsReqDTO mtUserGetsReqDTO = new MTUserGetsReqDTO();
+        mtUserGetsReqDTO.setCorpId(curUser.getCorpId());
+        mtUserGetsReqDTO.setIds(ids);
+        List<MTUserInfoRspDTO> mtUserInfoRspDTOList = mtCotactApiRequestClient.userGets(mtUserGetsReqDTO);
+        List<String> departs = QueryDepart.queryDepart(mtUserInfoRspDTOList);
+        int result = bLessonRepository.isInViewRange(curUser,lessonId,departs);
+        if (result < 1){
+            throw new ServiceException(ResultServiceEnums.NO_ACCESS);
+        }
+
         //查询该课程是否收藏
         int collectCount = bCollectRepository.selectCountbyLessonAndUser(curUser,bLesson.getBusinessId());
         if (collectCount>0){

src/main/java/org/rcisoft/business/bcourse/service/impl/BCourseServiceImpl.java

 package org.rcisoft.business.bcourse.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import org.apache.commons.lang.StringUtils;
 import org.rcisoft.business.bcourse.dao.BCourseRepository;
@@ -8,7 +7,7 @@ import org.rcisoft.business.bcourse.dto.AllCourseDTO;
 import org.rcisoft.business.bcourse.dto.QueryCourseResDTO;
 import org.rcisoft.business.bcourse.entity.BCourse;
 import org.rcisoft.business.bcourse.service.BCourseService;
-import org.rcisoft.business.blesson.util.recursion;
+import org.rcisoft.business.blesson.util.Recursion;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.constant.MessageConstant;
 import org.rcisoft.core.exception.ServiceException;
@@ -23,8 +22,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static java.util.Arrays.asList;
-
 @Service
 public class BCourseServiceImpl implements BCourseService {
 
@@ -98,7 +95,7 @@ public class BCourseServiceImpl implements BCourseService {
         List<String> courseIds = null;
         if (allCourse != null) {
             //查询出所有子分类
-            courseIds = recursion.FindSons(id, allCourse);
+            courseIds = Recursion.FindSons(id, allCourse);
             //将一级分类放入分类集合中
             courseIds.add(id);
         }

src/main/java/org/rcisoft/business/blesson/entity/BLessonLabel.java

@@ -9,6 +9,7 @@ import org.rcisoft.core.entity.IdEntity;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import javax.validation.constraints.NotBlank;
 
 @Entity
@@ -25,4 +26,7 @@ public class BLessonLabel  extends IdEntity<BLessonLabel> {
     @Length(min = 1,max = 64,message = "长度最小为1,最大为50")
     private String lessonId;
 
+    @NotBlank
+    private String sort;
+
 }

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java

 package org.rcisoft.business.blesson.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
-import net.sf.json.JSONArray;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.SystemUtils;
 import org.rcisoft.business.bcourse.dao.BCourseRepository;
 import org.rcisoft.business.bcourse.dto.AllCourseDTO;
 import org.rcisoft.business.bfile.dao.BTrainFileRepository;
@@ -16,7 +12,8 @@ import org.rcisoft.business.blesson.dao.*;
 import org.rcisoft.business.blesson.dto.*;
 import org.rcisoft.business.blesson.entity.*;
 import org.rcisoft.business.blesson.service.BLessonService;
-import org.rcisoft.business.blesson.util.recursion;
+import org.rcisoft.business.blesson.util.QueryDepart;
+import org.rcisoft.business.blesson.util.Recursion;
 import org.rcisoft.business.blesson.dao.BViewrangeRepository;
 import org.rcisoft.business.bmaterial.dao.BMaterialRepository;
 import org.rcisoft.business.bmaterial.entity.BMaterial;
@@ -26,7 +23,6 @@ import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.constant.MessageConstant;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
-import org.rcisoft.core.result.ResultExceptionEnum;
 import org.rcisoft.core.result.ResultServiceEnums;
 import org.rcisoft.core.util.IdGen;
 import org.rcisoft.core.util.UserUtil;
@@ -39,7 +35,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.*;
@@ -168,7 +163,7 @@ public class BLessonServiceImpl implements BLessonService {
         mtUserGetsReqDTO.setCorpId(curUser.getCorpId());
         mtUserGetsReqDTO.setIds(ids);
         List<MTUserInfoRspDTO> mtUserInfoRspDTOList = cotactApiRequestClient.userGets(mtUserGetsReqDTO);
-        List<String> departs = queryDepart(mtUserInfoRspDTOList);
+        List<String> departs = QueryDepart.queryDepart(mtUserInfoRspDTOList);
         //------------------------------
         return bLessonRepository.queryPersonMore(curUser, departs);
     }
@@ -182,7 +177,7 @@ public class BLessonServiceImpl implements BLessonService {
         mtUserGetsReqDTO.setCorpId(curUser.getCorpId());
         mtUserGetsReqDTO.setIds(ids);
         List<MTUserInfoRspDTO> mtUserInfoRspDTOList = cotactApiRequestClient.userGets(mtUserGetsReqDTO);
-        List<String> departs = queryDepart(mtUserInfoRspDTOList);
+        List<String> departs = QueryDepart.queryDepart(mtUserInfoRspDTOList);
         return bLessonRepository.queryRecommend(curUser, departs);
     }
 
@@ -196,7 +191,7 @@ public class BLessonServiceImpl implements BLessonService {
         mtUserGetsReqDTO.setCorpId(curUser.getCorpId());
         mtUserGetsReqDTO.setIds(ids);
         List<MTUserInfoRspDTO> mtUserInfoRspDTOList = cotactApiRequestClient.userGets(mtUserGetsReqDTO);
-        List<String> departs = queryDepart(mtUserInfoRspDTOList);
+        List<String> departs = QueryDepart.queryDepart(mtUserInfoRspDTOList);
         //------------------------------
         return bLessonRepository.queryConcern(curUser, departs);
     }
@@ -211,7 +206,7 @@ public class BLessonServiceImpl implements BLessonService {
         mtUserGetsReqDTO.setCorpId(curUser.getCorpId());
         mtUserGetsReqDTO.setIds(ids);
         List<MTUserInfoRspDTO> mtUserInfoRspDTOList = cotactApiRequestClient.userGets(mtUserGetsReqDTO);
-        List<String> departs = queryDepart(mtUserInfoRspDTOList);
+        List<String> departs = QueryDepart.queryDepart(mtUserInfoRspDTOList);
         //------------------------------
         return bLessonRepository.queryInterested(curUser, departs);
     }
@@ -220,13 +215,15 @@ public class BLessonServiceImpl implements BLessonService {
     @Override
     @Transactional(propagation = Propagation.REQUIRED, readOnly = false)
     public PersistModel persist(AddLessonDTO addLessonDTO) {
-        try {
-            if (Integer.parseInt(addLessonDTO.getMaxApplyPerson()) < 0){
+        if ("1".equals(addLessonDTO.getLessonType())){
+            try {
+                if (Integer.parseInt(addLessonDTO.getMaxApplyPerson()) < 0){
+                    throw new ServiceException(ResultServiceEnums.INPUT_FORMAT_ERROR);
+                }
+            } catch (NumberFormatException e) {
+                log.error(e.getMessage()+" 输入的格式不正确 ");
                 throw new ServiceException(ResultServiceEnums.INPUT_FORMAT_ERROR);
             }
-        } catch (NumberFormatException e) {
-            log.error(e.getMessage()+" 输入的格式不正确 ");
-            throw new ServiceException(ResultServiceEnums.INPUT_FORMAT_ERROR);
         }
 
         BLesson model = new BLesson();
@@ -397,7 +394,6 @@ public class BLessonServiceImpl implements BLessonService {
             if (bMaterialList!=null && bMaterialList.size()>0){
                 bMaterialRepository.insertMaterialList(bMaterialList);
             }
-            //更新
 
         }
         return new PersistModel(line, model);
@@ -436,12 +432,12 @@ public class BLessonServiceImpl implements BLessonService {
         mtUserGetsReqDTO.setCorpId(firstPageQueryDTO.getCorpId());
         mtUserGetsReqDTO.setIds(ids);
         List<MTUserInfoRspDTO> mtUserInfoRspDTOList = cotactApiRequestClient.userGets(mtUserGetsReqDTO);
-        List<String> departs = queryDepart(mtUserInfoRspDTOList);
+        List<String> departs = QueryDepart.queryDepart(mtUserInfoRspDTOList);
         firstPageQueryDTO.setDeparts(departs);
         List<String> courseIds = null;
         if (allCourse != null) {
             //查询出所有子分类
-            courseIds = recursion.FindSons(firstPageQueryDTO.getCourseLevelOne(), allCourse);
+            courseIds = Recursion.FindSons(firstPageQueryDTO.getCourseLevelOne(), allCourse);
             //将一级分类放入分类集合中
             courseIds.add(firstPageQueryDTO.getCourseLevelOne());
         }
@@ -780,7 +776,7 @@ public class BLessonServiceImpl implements BLessonService {
         mtUserGetsReqDTO.setCorpId(model.getCorpId());
         mtUserGetsReqDTO.setIds(ids);
         List<MTUserInfoRspDTO> mtUserInfoRspDTOList = cotactApiRequestClient.userGets(mtUserGetsReqDTO);
-        List<String> departs = queryDepart(mtUserInfoRspDTOList);
+        List<String> departs = QueryDepart.queryDepart(mtUserInfoRspDTOList);
         departs.forEach(depart -> {
             if (StringUtils.isEmpty(depart)) {
                 departs.remove(depart);
@@ -791,7 +787,7 @@ public class BLessonServiceImpl implements BLessonService {
         List<String> courseIds;
         if (allCourse != null) {
             //查询出所有子分类
-            courseIds = recursion.FindSons(model.getCourse(), allCourse);
+            courseIds = Recursion.FindSons(model.getCourse(), allCourse);
             //将一级分类放入分类集合中
             if (StringUtils.isNotEmpty(model.getCourse())) {
 
@@ -1087,12 +1083,15 @@ public class BLessonServiceImpl implements BLessonService {
         //标签集合
         List<BLessonLabel> bLessonLabels = new ArrayList<>();
         String[] labels = model.getLabels().split(",");
+        int sortNum = 0;
         for (int index = 0; index < labels.length; index++) {
             BLessonLabel bLessonLabel = new BLessonLabel();
             UserUtil.setCurrentPersistOperation(bLessonLabel);
             bLessonLabel.setLabelId(labels[index]);
             bLessonLabel.setLessonId(model.getBusinessId());
+            bLessonLabel.setSort(String.valueOf(sortNum));
             bLessonLabels.add(bLessonLabel);
+            sortNum++;
         }
         return bLessonLabels;
     }
@@ -1177,18 +1176,4 @@ public class BLessonServiceImpl implements BLessonService {
         }
     }
 
-    List<String> queryDepart(List<MTUserInfoRspDTO> mtUserInfoRspDTOList){
-        List<String> departs = new ArrayList<>();
-        mtUserInfoRspDTOList.forEach(mtUserInfoRspDTO -> {
-            List<MTUserInfoRspDTO.DeptsBean> deptsBeans = mtUserInfoRspDTO.getDepts();
-            deptsBeans.forEach(deptsBean -> {
-                departs.addAll(Arrays.asList(deptsBean.getPids().split(",")));
-                departs.add(deptsBean.getId());
-//                departs.addAll(Arrays.asList(deptsBean.getPid().split(",")));
-            });
-        });
-        return departs;
-    }
-
-
 }

src/main/java/org/rcisoft/business/blesson/util/QueryDepart.java

+package org.rcisoft.business.blesson.util;
+
+import org.rcisoft.common.util.feignDto.MTUserInfoRspDTO;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 遍历获取部门
+ */
+public class QueryDepart {
+    public static List<String> queryDepart(List<MTUserInfoRspDTO> mtUserInfoRspDTOList){
+        List<String> departs = new ArrayList<>();
+        mtUserInfoRspDTOList.forEach(mtUserInfoRspDTO -> {
+            List<MTUserInfoRspDTO.DeptsBean> deptsBeans = mtUserInfoRspDTO.getDepts();
+            deptsBeans.forEach(deptsBean -> {
+                departs.addAll(Arrays.asList(deptsBean.getPids().split(",")));
+                departs.add(deptsBean.getId());
+//                departs.addAll(Arrays.asList(deptsBean.getPid().split(",")));
+            });
+        });
+        return departs;
+    }
+}

src/main/java/org/rcisoft/business/blesson/util/recursion.java → src/main/java/org/rcisoft/business/blesson/util/Recursion.java

@@ -7,7 +7,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
-public class recursion {
+public class Recursion {
 
     /**
      * 查找当前分类下  多级子分类
@@ -20,7 +20,7 @@ public class recursion {
         for(AllCourseDTO course:allCourse){
             if(course.getPid() != null && (!("00000000".equals(course.getPid()))) && course.getPid().equals(fatherId)){
                 sonList.add(course.getBusinessId());
-                sonList.addAll(recursion.FindSons(course.getBusinessId(),allCourse));
+                sonList.addAll(Recursion.FindSons(course.getBusinessId(),allCourse));
             }
         }
         return sonList;

src/main/java/org/rcisoft/core/result/ResultServiceEnums.java

@@ -228,6 +228,8 @@ public enum ResultServiceEnums {
     NOT_APPLY_DATE(127,"当前时间不在报名时间范围内"),
     NOT_APPOINT_INFO(128,"指派信息不存在"),
     NOT_CLASS_HOUR(130,"该课程无课时,不允许发布"),
+    LESSON_CLOSED(131,"该课程已关闭"),
+    NO_ACCESS(132,"无权限"),
     ;
 
     private Integer code;