前台公共资源接口添加查询专家

app/resource/src/main/java/com/zrqx/resource/fg/mapper/questionlibrary/FgExamPaperLibrarDiyTypeMapper.java

+package com.zrqx.resource.fg.mapper.questionlibrary;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.resource.commons.model.questionlibrary.ExamPaperLibraryDiyType;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * @author Jsx
+ * @version 1.0
+ * @date 2021/1/4 8:26
+ */
+public interface FgExamPaperLibrarDiyTypeMapper extends BaseMapper<ExamPaperLibraryDiyType> {
+
+    /**
+     * 查询试卷分类编码
+     * @param id
+     * @return
+     */
+    @Select("<script>"
+            +" select code"
+            +" FROM res_exampaper_library_diy_type"
+            +" where 1=1"
+            +" eq(epid,id)"
+            +"</script>")
+    String selectCode(@Param("id")Integer id);
+}

app/resource/src/main/java/com/zrqx/resource/fg/mapper/questionlibrary/FgExamPaperLibraryMapper.java

@@ -48,4 +48,25 @@ public interface FgExamPaperLibraryMapper extends BaseMapper<ExamPaperLibrary> {
             +" eq(id,oid)"
             +"</script>")
     Integer getUserVip(@Param("oid") Integer oid);
+
+    @Select("<script>"
+            +" SELECT level"
+            +" from `hxkf-member`.m_member"
+            +" where 1=1"
+            +" eq(id,oid)"
+            +"</script>")
+    Integer getUserLevel(@Param("oid") Integer oid);
+
+    /**
+     * 查询机构用户oid
+     * @param id
+     * @return
+     */
+    @Select("<script>"
+            +" select oid"
+            +" FROM `hxkf-member`.m_organ_member"
+            +" where 1=1"
+            +" eq(id,id)"
+            +"</script>")
+    Integer getOrganMember(@Param("id") Integer id);
 }

app/resource/src/main/java/com/zrqx/resource/fg/service/questionlibray/FgExamPaperLibraryServiceImpl.java

@@ -2,6 +2,7 @@ package com.zrqx.resource.fg.service.questionlibray;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.zrqx.core.client.member.fg.OrganClient;
 import com.zrqx.core.commons.form.LoginMemberInfo;
 import com.zrqx.core.commons.model.resource.questionlibrary.ExamRecordInfo;
 import com.zrqx.core.enums.AllResourceTypeEnum;
@@ -12,6 +13,7 @@ import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.questionlibrary.ExamUtils;
+import com.zrqx.core.util.response.CallBack;
 import com.zrqx.resource.commons.form.fg.courselibrary.FgMyLearningForm;
 import com.zrqx.resource.commons.form.fg.questionlibrary.FgSelectExamPaperForm;
 import com.zrqx.resource.commons.form.fg.questionlibrary.FgSelectExamRecordForm;
@@ -73,7 +75,10 @@ public class FgExamPaperLibraryServiceImpl extends BaseServiceImpl<ExamPaperLibr
     private FgResourcLibraryExampaperDiyTypeMapper diyTypeMapper;
     @Autowired
     private FgVideoLibraryDiyTypeMapper videoLibraryDiyTypeMapper;
-
+    @Autowired
+    private OrganClient organClient;
+    @Autowired
+    private FgExamPaperLibrarDiyTypeMapper fgExamPaperLibrarDiyTypeMapper;
     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     @Override
@@ -326,23 +331,38 @@ public class FgExamPaperLibraryServiceImpl extends BaseServiceImpl<ExamPaperLibr
     @Override
     public List<ExamRecordInfo> simulatePractice(FgSelectExamRecordForm form){
         FgSelectExamRecordForm examRecordForm = new FgSelectExamRecordForm();
-        //判断该用户是否有相应的权限
-        //if (1!=mapper.getUserVip(redis.getMember().getId())){
-            FgMyLearningForm form1 = new FgMyLearningForm();
-            form1.setMemberId(redis.getMember().getId());
-            form1.setResourceType(AllResourceTypeEnum.COURSE.getCode());
-            List<FgMyLearningListVo> list = courseLibraryMapper.getMyLearningList(form1); //获取我的学习资源
-            List<String> list1 = list.stream().map(FgMyLearningListVo::getId).collect(toList());
-            List<ResourcLibraryExampaerDiyType> diyTypes = diyTypeMapper.getResourcLibrary(list1,form);
-            if (diyTypes == null || diyTypes.size()<=0) {
+        //机构用户
+        if (2== mapper.getUserLevel(redis.getMember().getId())){
+            Integer oid = mapper.getOrganMember(redis.getMember().getId());
+            CallBack<String> member = organClient.getCurrentOrganByMember(oid);
+            String[] split = member.getData().split(",");
+            String code = fgExamPaperLibrarDiyTypeMapper.selectCode(form.getExampaperid());
+            boolean contains = Arrays.toString(split).contains(code);
+            if (contains){
+                examRecordForm.setExampaperid(form.getExampaperid());
+            }else {
                 throw new BusinessValidateException("暂无权限");
             }
-            ResourcLibraryExampaerDiyType diyType = diyTypes.get(0);
-            examRecordForm.setExampaperid(diyType.getExampaperId());
-            examRecordForm.setResourcId(diyType.getResourcId());
-       // }else {
-       //     examRecordForm.setExampaperid(form.getExampaperid());
-       // }
+        }else {
+            if (1!=mapper.getUserVip(redis.getMember().getId())){
+                //普通用户
+                FgMyLearningForm form1 = new FgMyLearningForm();
+                form1.setMemberId(redis.getMember().getId());
+                form1.setResourceType(AllResourceTypeEnum.COURSE.getCode());
+                List<FgMyLearningListVo> list = courseLibraryMapper.getMyLearningList(form1); //获取我的学习资源
+                List<String> list1 = list.stream().map(FgMyLearningListVo::getId).collect(toList());
+                List<ResourcLibraryExampaerDiyType> diyTypes = diyTypeMapper.getResourcLibrary(list1,form);
+                if (diyTypes == null || diyTypes.size()<=0) {
+                    throw new BusinessValidateException("暂无权限");
+                }
+                ResourcLibraryExampaerDiyType diyType = diyTypes.get(0);
+                examRecordForm.setExampaperid(diyType.getExampaperId());
+                examRecordForm.setResourcId(diyType.getResourcId());
+            }else {
+                //会员用户
+                examRecordForm.setExampaperid(form.getExampaperid());
+            }
+        }
         List<ExamRecordInfo> examRecordInfo = saveOrUpdateExamRecord(examRecordForm);
         return examRecordInfo;
     }
@@ -350,14 +370,25 @@ public class FgExamPaperLibraryServiceImpl extends BaseServiceImpl<ExamPaperLibr
     @Override
     public List<ExamRecordInfo> autoConnectQuestion(FgSelectExamPaperForm form){
         FgMyLearningForm form1 = new FgMyLearningForm();
+        List<String> diyType = new ArrayList<>();
         form1.setMemberId(redis.getMember().getId());
         form1.setResourceType(AllResourceTypeEnum.COURSE.getCode());
         List<FgMyLearningListVo> list = courseLibraryMapper.getMyLearningList(form1); //获取我的学习资源
         List<String> list1 = list.stream().map(FgMyLearningListVo::getId).collect(toList());
-        if (1==mapper.getUserVip(redis.getMember().getId())){
+        if (2== mapper.getUserLevel(redis.getMember().getId())){
+            Integer oid = mapper.getOrganMember(redis.getMember().getId());
+            CallBack<String> member = organClient.getCurrentOrganByMember(oid);
+            String[] split = member.getData().split(",");
             list1.clear();
+            for (String stt : split){
+                diyType.add(stt);
+            }
+        }else {
+            if (1==mapper.getUserVip(redis.getMember().getId())){
+                list1.clear();
+            }
+            diyType = videoLibraryDiyTypeMapper.getDiyType(list1, form);
         }
-        List<String> diyType = videoLibraryDiyTypeMapper.getDiyType(list1, form);
         if (diyType == null) {
             throw new BusinessValidateException("暂无权限");
         }