Merge branch 'master' of http://118.31.7.2:3000/tianzeOrg/financial_bigdata

src/main/java/com/sztzjy/financial_bigdata/config/Constant.java

@@ -33,5 +33,6 @@ public class Constant {
     public static final String THEORY = "理论考试模块";
     public static final String RESOURCE = "资源中心模块";
     public static final String API_URL = "http://120.79.54.255:8889";
+//    public static final String API_URL = "http://192.168.2.11:8889";
 
 }

src/main/java/com/sztzjy/financial_bigdata/controller/stu/ExerciseExperimentalTraining.java

@@ -240,7 +240,7 @@ public class ExerciseExperimentalTraining {
         } catch (IOException e) {
             return false;
         }
-        if (resourceDataList != null) {
+        if(resourceDataList.size()>0){
             return true;
         }else {
             return false;

src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java

@@ -110,11 +110,8 @@ public class StuIndexController {
     @PostMapping("getIndexResourceCenter")
     public ResultEntity<Map<String, Integer>> getIndexResourceCenter(@RequestParam String schoolId, @RequestParam String systemOwner) {
         Map<String, Integer> resourceTypeCount = null;
-        try {
         resourceTypeCount = ResourceCenterApi.getResourceTypeCount(schoolId, systemOwner);
-        } catch (IOException e) {
+//        return new ResultEntity(HttpStatus.BAD_REQUEST, "资源中心获取资源数量异常");
-            return new ResultEntity(HttpStatus.BAD_REQUEST, "资源中心获取资源数量异常");
-        }
         return new ResultEntity<>(resourceTypeCount);
     }
 

src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuScoreController.java

@@ -6,7 +6,6 @@ import com.sztzjy.financial_bigdata.entity.*;
 import com.sztzjy.financial_bigdata.entity.resource_entity.SysThreeCatalog;
 import com.sztzjy.financial_bigdata.entity.stu_dto.StuTrainingDto;
 import com.sztzjy.financial_bigdata.mapper.StuTrainingMapper;
-import com.sztzjy.financial_bigdata.mapper.SysCourseChapterMapper;
 import com.sztzjy.financial_bigdata.mapper.SysWeightMapper;
 import com.sztzjy.financial_bigdata.mapper.TrainingReportMapper;
 import com.sztzjy.financial_bigdata.resourceCenterAPI.CourseAPI;
@@ -91,9 +90,10 @@ public class StuScoreController {
     @AnonymousAccess
     @ApiOperation("实验报告展示")
     @PostMapping("getReportByUserId")
-    public ResultEntity<List<TrainingReport>> getReportByUserId(@RequestParam String userId) {
+    public ResultEntity<List<TrainingReport>> getReportByUserId(@RequestParam String userId,
+                                                                @RequestParam String systemOwner) {
         TrainingReportExample trainingReportExample = new TrainingReportExample();
-        trainingReportExample.createCriteria().andUserIdEqualTo(userId);
+        trainingReportExample.createCriteria().andUserIdEqualTo(userId).andSystemOwnerEqualTo(systemOwner);
         List<TrainingReport> trainingReports = trainingReportMapper.selectByExampleWithBLOBs(trainingReportExample);
         return new ResultEntity<>(trainingReports);
     }
@@ -107,7 +107,8 @@ public class StuScoreController {
                                              @RequestParam String trainingId,
                                              @ApiParam("章节ID") @RequestParam String chapterId,
                                              @ApiParam("章节名称") @RequestParam String chapterName,
-                                             @RequestParam String schoolId) {
+                                             @RequestParam String schoolId,
+                                             @RequestParam String systemOwner) {
         int size = (int) file.getSize() / (1024 * 1024); //拿到MB为单位的大小
         String originalFilename = file.getOriginalFilename();
         assert originalFilename != null;
@@ -117,7 +118,7 @@ public class StuScoreController {
         }
         //老师评分后不允许上传
         TrainingReportExample example = new TrainingReportExample();
-        example.createCriteria().andSchoolIdEqualTo(schoolId).andUserIdEqualTo(userId).andChapterIdEqualTo(chapterId);
+        example.createCriteria().andSchoolIdEqualTo(schoolId).andUserIdEqualTo(userId).andChapterIdEqualTo(chapterId).andSystemOwnerEqualTo(systemOwner);
         List<TrainingReport> trainingReports = trainingReportMapper.selectByExampleWithBLOBs(example);
         if (!trainingReports.isEmpty()) {   //上传过
             TrainingReport trainingReport = trainingReports.get(0);
@@ -145,6 +146,7 @@ public class StuScoreController {
             trainingReport.setUserId(userId);
             trainingReport.setSchoolId(schoolId);
             trainingReport.setReportSize(size);
+            trainingReport.setSystemOwner(systemOwner);
             StuTrainingWithBLOBs stuTrainingWithBLOBs = stuTrainingMapper.selectByPrimaryKey(trainingId);
             stuTrainingWithBLOBs.setReportId(trainingReport.getReportId());     // 第一次上传时设置实训表的报告ID
             trainingReportMapper.insert(trainingReport);

src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaExamManageController.java

@@ -4,12 +4,14 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sztzjy.financial_bigdata.annotation.AnonymousAccess;
 import com.sztzjy.financial_bigdata.entity.*;
-import com.sztzjy.financial_bigdata.entity.resource_entity.SysObjectiveQuestions;
 import com.sztzjy.financial_bigdata.entity.resource_entity.dto.SysObjectiveQuestionsDto;
 import com.sztzjy.financial_bigdata.entity.tea_dto.TeaExamManageCountDto;
 import com.sztzjy.financial_bigdata.entity.tea_dto.TeaExamManageDto;
 import com.sztzjy.financial_bigdata.entity.tea_dto.TrainingDto;
-import com.sztzjy.financial_bigdata.mapper.*;
+import com.sztzjy.financial_bigdata.mapper.StuClassMapper;
+import com.sztzjy.financial_bigdata.mapper.StuStudentExamMapper;
+import com.sztzjy.financial_bigdata.mapper.TeaAndStudentExamMapper;
+import com.sztzjy.financial_bigdata.mapper.TeaExamManageMapper;
 import com.sztzjy.financial_bigdata.resourceCenterAPI.CaseApi;
 import com.sztzjy.financial_bigdata.resourceCenterAPI.ObjectiveApi;
 import com.sztzjy.financial_bigdata.service.tea.ITeaExamManageService;
@@ -127,11 +129,12 @@ public class TeaExamManageController {
     public ResultEntity<PageInfo<TeaExamManageWithBLOBs>> selectExamList(@RequestParam Integer index,
                                                                          @RequestParam Integer size,
                                                                          @RequestParam(required = false) @ApiParam("考试名称") String examName,
-                                                                         @RequestParam String schoolId) {
+                                                                         @RequestParam String schoolId,
+                                                                         @RequestParam String systemOwner) {
         PageHelper.startPage(index, size);
         TeaExamManageExample teaExamManageExample = new TeaExamManageExample();
         TeaExamManageExample.Criteria criteria = teaExamManageExample.createCriteria();
-        criteria.andSchoolIdEqualTo(schoolId);
+        criteria.andSchoolIdEqualTo(schoolId).andSystemOwnerEqualTo(systemOwner);
         if (StringUtils.isNotBlank(examName)) {
             criteria.andExamNameEqualTo(examName);
         }

src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java

@@ -41,7 +41,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -78,9 +77,10 @@ public class TeaGradeManageController {
     @ApiOperation("考试模式--页面展示(学生端实战考核复用)")
     public ResultEntity<PageInfo<TeaExamManageCountDto>> getExamInfo(@RequestParam Integer index,
                                                                      @RequestParam Integer size,
-                                                                     @ApiParam("ManyAnswer为考试时间，JudgeAnswer为发布人") @RequestParam String schoolId) {
+                                                                     @ApiParam("ManyAnswer为考试时间，JudgeAnswer为发布人") @RequestParam String schoolId,
+                                                                     @ApiParam("系统名称") @RequestParam String systemOwner) {
 
-        List<TeaExamManage> teaExamManages = teaExamManageMapper.selectBySchoolId(schoolId);
+        List<TeaExamManage> teaExamManages = teaExamManageMapper.selectBySchoolIdAndSystemOwner(schoolId, systemOwner);
         if (teaExamManages.isEmpty()) {
             return null;
         }
@@ -457,10 +457,11 @@ public class TeaGradeManageController {
     @ApiOperation("练习模式--实训报告展示")
     public ResultEntity<PageInfo<TrainingReportDto>> getReportBySchoolID(@RequestParam Integer index,
                                                                          @RequestParam Integer size,
-                                                                         @RequestParam String schoolId) {
+                                                                         @RequestParam String schoolId,
+                                                                         @RequestParam String systemOwner) {
         PageHelper.startPage(index, size);
         TrainingReportExample reportExample = new TrainingReportExample();
-        reportExample.createCriteria().andSchoolIdEqualTo(schoolId);
+        reportExample.createCriteria().andSchoolIdEqualTo(schoolId).andSystemOwnerEqualTo(systemOwner);
         List<TrainingReportDto> list = new AstList();
         List<TrainingReport> trainingReports = reportMapper.selectByExampleWithBLOBs(reportExample);
         if (!trainingReports.isEmpty()) {
@@ -553,7 +554,7 @@ public class TeaGradeManageController {
     @ApiOperation("练习模式--成绩详情页面设置权重")
     public void updateWeightByModule(@ApiParam("所有框必须传") @RequestBody SysWeight sysWeight) {
         SysWeightExample sysWeightExample = new SysWeightExample();
-        sysWeightExample.createCriteria().andCourseIdEqualTo(sysWeight.getCourseId());
+        sysWeightExample.createCriteria().andCourseIdEqualTo(sysWeight.getCourseId()).andSystemOwnerEqualTo(sysWeight.getSystemOwner());
         List<SysWeight> sysWeights = sysWeightMapper.selectByExample(sysWeightExample);
         if (!sysWeights.isEmpty()) {//有 update
             sysWeightMapper.updateByPrimaryKey(sysWeight);
@@ -586,9 +587,10 @@ public class TeaGradeManageController {
     @PostMapping("/getModuleByCourseId")
     @ApiOperation("练习模式--权重回显")
     public ResultEntity<SysWeight> getModuleByCourseId(@RequestParam String courseId,
-                                                       @RequestParam String schoolId) {
+                                                       @RequestParam String schoolId,
+                                                       @RequestParam String systemOwner) {
         SysWeightExample sysWeightExample = new SysWeightExample();
-        sysWeightExample.createCriteria().andSchoolIdEqualTo(schoolId).andCourseIdEqualTo(courseId);
+        sysWeightExample.createCriteria().andSchoolIdEqualTo(schoolId).andCourseIdEqualTo(courseId).andSystemOwnerEqualTo(systemOwner);
         List<SysWeight> sysWeights = sysWeightMapper.selectByExample(sysWeightExample);
         if (sysWeights.isEmpty()) {
             //todo 是否需要设置默认权重
@@ -605,8 +607,9 @@ public class TeaGradeManageController {
                                                                  @RequestParam Integer size,
                                                                  @RequestParam String schoolId,
                                                                  @RequestParam(required = false) String classId,
-                                                                 @ApiParam("学号/姓名搜索框") @RequestParam(required = false) String keyWord) {
+                                                                 @ApiParam("学号/姓名搜索框") @RequestParam(required = false) String keyWord,
-        return new ResultEntity<>(iTeaGradeManageService.getTheoryInfo(index, size, schoolId, classId, keyWord));
+                                                                 @RequestParam String systemOwner) {
+        return new ResultEntity<>(iTeaGradeManageService.getTheoryInfo(index, size, schoolId, classId, keyWord,systemOwner));
     }
 
 

src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java

@@ -217,6 +217,7 @@ public class UserController {
     @AnonymousAccess
     public String checkOrCreateForexSimulationUser(@RequestBody List<ZYUserInfo> zyUserInfoList,
                                                    @RequestParam String systemOwner) {
+        System.out.println(systemOwner);
         List<StuUser> users = new ArrayList<>();
         Map<String, StuClass> map = new HashMap<>();
         for (int i = 0; i < zyUserInfoList.size(); i++) {

src/main/java/com/sztzjy/financial_bigdata/entity/tea_dto/TeaExamManageDto.java

@@ -87,6 +87,9 @@ public class TeaExamManageDto {
     @ApiModelProperty("判断题答案(id, answer)")
     private String judgeAnswer;
 
+    @ApiModelProperty("系统名称")
+    private String systemOwner;
+
     @Nullable
     private MultipartFile file;
 }

src/main/java/com/sztzjy/financial_bigdata/entity/tea_dto/TrainingReportDto.java

@@ -58,4 +58,6 @@ public class TrainingReportDto {
     @ApiModelProperty("教师评语")
     private String teacherComment;
 
+    @ApiModelProperty("归属系统")
+    private String systemOwner;
 }

src/main/java/com/sztzjy/financial_bigdata/mapper/TeaExamManageMapper.java

@@ -3,16 +3,14 @@ package com.sztzjy.financial_bigdata.mapper;
 import com.sztzjy.financial_bigdata.entity.TeaExamManage;
 import com.sztzjy.financial_bigdata.entity.TeaExamManageExample;
 import com.sztzjy.financial_bigdata.entity.TeaExamManageWithBLOBs;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
 import com.sztzjy.financial_bigdata.entity.stu_dto.ReceiveDto;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+import java.util.Map;
+
 @Mapper
 public interface TeaExamManageMapper {
     long countByExample(TeaExamManageExample example);
@@ -49,7 +47,8 @@ public interface TeaExamManageMapper {
     List<TeaExamManageWithBLOBs> selectByUserId(@Param("userId") String userId);
 
 
-    List<TeaExamManage> selectBySchoolId(@Param("schoolId")String schoolId);
+    List<TeaExamManage> selectBySchoolIdAndSystemOwner(@Param("schoolId") String schoolId,
+                                                       @Param("systemOwner") String systemOwner);
 
     @Select("select exam_name,exam_manage_id from tea_exam_manage where school_id =#{schoolId}")
     List<Map<String, String>> selectNameAndIdBySchoolId(@Param("schoolId") String schoolId);

src/main/java/com/sztzjy/financial_bigdata/resourceCenterAPI/ResourceCenterApi.java

@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -88,11 +89,19 @@ public class ResourceCenterApi {
     /**
      * 获取资源类型数量
      */
-    public static Map<String,Integer> getResourceTypeCount(String schoolId ,String systemOwner) throws IOException {
+    public static Map<String,Integer> getResourceTypeCount(String schoolId ,String systemOwner){
         String requestBody="schoolId="+schoolId+"&systemOwner="+systemOwner;
-        JSONObject object = HttpUtils.sendPost(
+        JSONObject object = null;
+        try {
+            object = HttpUtils.sendPost(
                     getResourceTypeCount,
                     requestBody);
+        } catch (IOException e) {
+            if(object==null){
+                return new HashMap<>();
+            }
+            e.printStackTrace();
+        }
         Gson gson = new GsonBuilder()
                 .registerTypeAdapter(Date.class, new DateTypeAdapter())
                 .create();

src/main/java/com/sztzjy/financial_bigdata/service/tea/ITeaGradeManageService.java

@@ -28,7 +28,7 @@ public interface ITeaGradeManageService {
 
     PageInfo<StuUserDto> getReportCorrect(String schoolId, Integer index, Integer size, String module, String classId, String keyWord);
 
-    PageInfo<StuTheoryRecord> getTheoryInfo(Integer index, Integer size, String schoolId, String classId, String keyWord);
+    PageInfo<StuTheoryRecord> getTheoryInfo(Integer index, Integer size, String schoolId, String classId, String keyWord,String systemOwner);
 
     void exportTheoryExamInfo(HttpServletResponse response,String classId, String schoolId);
 }

src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaExamManageServiceImpl.java

@@ -66,6 +66,7 @@ public class TeaExamManageServiceImpl implements ITeaExamManageService {
         teaAndStudentExam.setExamManageId(examManageId);
         teaAndStudentExam.setClassId(teaExamManagedto.getClassId());
         teaAndStudentExam.setClassName(teaExamManagedto.getClassName());
+        teaAndStudentExam.setSystemOwner(teaExamManagedto.getSystemOwner());
         teaAndStudentExam.setId(IdUtil.randomUUID());
         teaAndStudentExamMapper.insert(teaAndStudentExam);
         teaExamManageWithBLOBs.setExamManageId(examManageId);

src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java

@@ -229,20 +229,20 @@ public class TeaGradeManageServiceImpl implements ITeaGradeManageService {
     }
 
     @Override
-    public PageInfo<StuTheoryRecord> getTheoryInfo(Integer index, Integer size, String schoolId, String classId, String keyWord) {
+    public PageInfo<StuTheoryRecord> getTheoryInfo(Integer index, Integer size, String schoolId, String classId, String keyWord, String systemOwner) {
         PageHelper.startPage(index, size);
-        List<StuTheoryRecord> list = getStuTheoryRecordPageInfo(schoolId, classId, keyWord);
+        List<StuTheoryRecord> list = getStuTheoryRecordPageInfo(schoolId, classId, keyWord, systemOwner);
         PageInfo<StuTheoryRecord> pageInfo = new PageInfo<>(list);
         return pageInfo;
     }
 
     //查询方法
-    private List<StuTheoryRecord> getStuTheoryRecordPageInfo(String schoolId, String classId, String keyWord) {
+    private List<StuTheoryRecord> getStuTheoryRecordPageInfo(String schoolId, String classId, String keyWord, String systemOwner) {
         StuTheoryRecordExample s = new StuTheoryRecordExample();
         StuTheoryRecordExample.Criteria criteria = s.createCriteria();
         StuTheoryRecordExample.Criteria orCriteria = s.createCriteria();
-        criteria.andSchoolIdEqualTo(schoolId);
+        criteria.andSchoolIdEqualTo(schoolId).andSystemOwnerEqualTo(systemOwner);
-        orCriteria.andSchoolIdEqualTo(schoolId);
+        orCriteria.andSchoolIdEqualTo(schoolId).andSystemOwnerEqualTo(systemOwner);
         if (StringUtils.isNotBlank(classId)) {
             criteria.andClassIdEqualTo(classId);
             orCriteria.andClassIdEqualTo(classId);

src/main/resources/mapper/TeaExamManageMapper.xml

@@ -541,11 +541,12 @@
     where exam_manage_id = #{examManageId,jdbcType=VARCHAR}
   </update>
 
-    <select id="selectBySchoolId" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    <select id="selectBySchoolIdAndSystemOwner" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
         select
         <include refid="Base_Column_List" />
         from tea_exam_manage
         where school_id = #{schoolId,jdbcType=VARCHAR}
+        and system_owner = #{systemOwner,jdbcType=VARCHAR}
     </select>
 
     <resultMap id="ReceiveDto" type="com.sztzjy.financial_bigdata.entity.stu_dto.ReceiveDto">