Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education

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

@@ -294,7 +294,7 @@ public interface BChapterRepository extends BaseMapper<BChapter> {
 
     @Update("<script>update b_r_student_chapter " +
             "set score = #{score}," +
-            "automatic = '0' " +
+            "automatic = '0', " +
             "where student_id = #{studentId} " +
             "and chapter_id = #{chapterId}</script>")
     int remark(@Param("chapterId") String chapterId, @Param("studentId") String studentId, @Param("score") String score);
@@ -326,14 +326,14 @@ public interface BChapterRepository extends BaseMapper<BChapter> {
     String queryStuIdByCode(String code);
 
 
-    @Update("<script>update b_r_student_chapter\n" +
-            "<if test=\"pptFinish !=null and pptFinish != ''\"> set ppt_finish = '1' </if>" +
-            "<if test=\"pdfFinish !=null and pdfFinish != '' \"> set pdf_finish = '1' </if>" +
-            "<if test=\"videoFinish !=null and videoFinish != ''\"> set video_finish = '1' </if>" +
-            "<if test=\"paperFinish !=null and paperFinish != ''\"> set paper_finish = '1' </if>" +
-            "<if test=\"score !=null and score != ''\"> set score = #{score}, </if>" +
-            "<if test=\"isComplete !=null and isComplete != ''\"> is_complete = #{isComplete} </if>" +
-            "<if test=\"automatic !=null and automatic != ''\"> automatic = #{automatic} </if>" +
+    @Update("<script>update b_r_student_chapter set \n" +
+            "<if test=\"pptFinish !=null and pptFinish != ''\"> ppt_finish = '1', </if>" +
+            "<if test=\"pdfFinish !=null and pdfFinish != '' \"> pdf_finish = '1', </if>" +
+            "<if test=\"videoFinish !=null and videoFinish != ''\"> video_finish = '1', </if>" +
+            "<if test=\"paperFinish !=null and paperFinish != ''\"> paper_finish = '1', </if>" +
+            "<if test=\"isComplete !=null and isComplete != ''\"> is_complete = #{isComplete}, </if>" +
+            "<if test=\"automatic !=null and automatic != ''\"> automatic = #{automatic}, </if>" +
+            "<if test=\"score !=null and score != ''\"> score = #{score} </if>" +
             "where student_id = #{studentId} and chapter_id = #{chapterId} </script>")
     int updateToFinish(ScoreInfoDTO scoreInfoDTO);
 

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

@@ -107,6 +107,7 @@ public class BCodeLxcServiceImpl implements BCodeLxcService {
 
         /*2.docker-compose 起容器*/
         log.info("执行路径:{}",dockerPath);
+        /*这里要做删除*/
         result = lxcCommand.startOrDownLxc(dockerPath);
         if(!result.isSuccess()) {
             result = new CommandResult(ResultCode.FAIL,"容器启动失败!",lxc);

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

@@ -176,6 +176,7 @@ public class BCodeServiceImpl implements BCodeService {
         lxc.setUserCode(StudentCode);
         lxc.setSl(slId);
         lxc.setChapterId(chapterId);
+
         /*容器是否已启动*/
         byte[] results = rcRedisServiceImpl.getBytes(global.getLxcPrefix() + "_" + lxc.getUserId());
         if(null != results) {

src/main/java/org/rcisoft/business/bopinion/service/impl/BOpinionServiceImpl.java

@@ -68,7 +68,13 @@ public class BOpinionServiceImpl implements BOpinionService{
             //查询该排课任务下所有子任务的状态
             String arrangeId = bSubtaskRepository.queryArrangeIdById(subTaskId);
             List<String> subTaskStatus = bSubtaskRepository.querySubTaskStatusById(arrangeId);
-            if(subTaskStatus.size()==1&&subTaskStatus.get(0).equals("3")){//审核全部通过，将排课任务状态置为完成
+            boolean finish = true;
+            for(String status : subTaskStatus){//子任务状态：0不能开课 3可以开课 5已开课
+                if(status.equals("0")){//表示还有未通过的子任务，不能将排课任务完成
+                    finish = false;
+                }
+            }
+            if(finish){//审核全部通过，将排课任务状态置为完成
                 BArrange bArrange = new BArrange(arrangeId,"3");
                 bArrangeRepository.updateByPrimaryKeySelective(bArrange);
             }

src/main/java/org/rcisoft/business/brclassstudent/controller/BRClassStudentController.java

@@ -55,12 +55,12 @@ public class BRClassStudentController extends PaginationController<BRClassStuden
                 stuCode);
     }
 
-    @ApiOperation(value="行政班excel导入", notes="行政班excel导入")
+    @ApiOperation(value="excel导入", notes="excel导入")
     @ApiImplicitParam(name = "importFile", value = "excel文件", required = true, dataType = "MultipartFile")
     @PreAuthorize("hasRole('ROLE_1001')")
-    @PostMapping(value = "administrationExcelImport")
-    public Result administrationExcelImport(MultipartFile importFile) throws Exception {
-        PersistModel data = bRClassStudentService.administrationExcelImport(MultipartFile2HSSFWorkbookConverter.convert(importFile));
+    @PostMapping(value = "excelImport")
+    public Result excelImport(MultipartFile importFile) throws Exception {
+        PersistModel data = bRClassStudentService.excelImport(MultipartFile2HSSFWorkbookConverter.convert(importFile));
         return Result.builder(data,
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
@@ -68,18 +68,6 @@ public class BRClassStudentController extends PaginationController<BRClassStuden
 
     }
 
-    @ApiOperation(value="企业班excel导入", notes="企业班excel导入")
-    @ApiImplicitParam(name = "importFile", value = "excel文件", required = true, dataType = "MultipartFile")
-    @PreAuthorize("hasRole('ROLE_1001')")
-    @PostMapping(value = "enterpriseExcelImport")
-    public Result enterpriseExcelImport(MultipartFile importFile) throws Exception {
-        PersistModel data = bRClassStudentService.enterpriseExcelImport(MultipartFile2HSSFWorkbookConverter.convert(importFile));
-        return Result.builder(data,
-                MessageConstant.MESSAGE_ALERT_SUCCESS,
-                MessageConstant.MESSAGE_ALERT_ERROR,
-                data.getInfluenceReason());
-
-    }
 
     @ApiOperation(value="唯一查找", notes="根据ID查找一条记录")
     @ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")

src/main/java/org/rcisoft/business/brclassstudent/service/BRClassStudentService.java

@@ -47,7 +47,7 @@ public interface BRClassStudentService{
      * @param hwb
      * @return
      */
-    PersistModel administrationExcelImport(HSSFWorkbook hwb) throws IOException;
+    PersistModel excelImport(HSSFWorkbook hwb) throws IOException;
 
     /**
      * 物理删除
@@ -55,5 +55,4 @@ public interface BRClassStudentService{
      */
     PersistModel removeBRClassStudents(String stuCode, String classCode);
 
-    PersistModel enterpriseExcelImport(HSSFWorkbook convert);
 }

src/main/java/org/rcisoft/business/brclassstudent/service/impl/BRClassStudentServiceImpl.java

@@ -80,14 +80,14 @@ public class BRClassStudentServiceImpl implements BRClassStudentService {
 
     @Override
     @Transactional(propagation = Propagation.REQUIRED,readOnly = false)
-    public PersistModel administrationExcelImport(HSSFWorkbook hwb) throws IOException {
+    public PersistModel excelImport(HSSFWorkbook hwb) throws IOException {
         ArrayList<BRClassStudent> brClassStudents = new ArrayList<BRClassStudent>();
         ArrayList<String> studentCode = new ArrayList<String>();
         ArrayList<String> classCode = new ArrayList<String>();
         ArrayList<String> repeatCode = new ArrayList<String>();
         List<String> valuesGrade = new ArrayList<>();
 
-        String[] headers = {"班级编号","学号","年级编号"};
+        String[] headers = {"班级编号","学号"};
         ArrayList<String[]> values = ExcelUtil.importExcel(hwb,headers,false,1);  //获取excel数据
 
         if (values.size()<=0){
@@ -125,14 +125,6 @@ public class BRClassStudentServiceImpl implements BRClassStudentService {
                 continue;
             }
 
-            //判断:学年是否存在，存在才能录入
-            BClass b1 = new BClass();
-            b1.setGradeCode(value[2]);
-            if (bClassRepository.checkGrade(b1).size() == 0){
-                valuesGrade.add(value[2]);
-                continue;
-            }
-
 
             //1.4 构造学生班级信息
             brClassStudent= new BRClassStudent(value[0],value[1]);
@@ -169,9 +161,6 @@ public class BRClassStudentServiceImpl implements BRClassStudentService {
             nullResult.append("以下学生学号不存在：").append(JSON.toJSONString(studentCode)).append("。");
           //  nullResult.append("部分学生不存在，请检查后重新上传");
         }
-        if(valuesGrade.size()>0){
-            result+="以下年级不存在："+ JSON.toJSONString(valuesGrade)+"。";
-        }
 
 
         result+=nullResult;
@@ -206,127 +195,6 @@ public class BRClassStudentServiceImpl implements BRClassStudentService {
         return new PersistModel(line);
     }
 
-    @Override
-    @Transactional(propagation = Propagation.REQUIRED,readOnly = false)
-    public PersistModel enterpriseExcelImport(HSSFWorkbook hwb){
-        ArrayList<BRClassStudent> brClassStudents = new ArrayList<BRClassStudent>();
-        ArrayList<String> studentCode = new ArrayList<String>();
-        ArrayList<String> classCode = new ArrayList<String>();
-        ArrayList<String> repeatCode = new ArrayList<String>();
-        List<String> valuesGrade = new ArrayList<>();
-        ArrayList<String> AgencyCode = new ArrayList<String>();
-
-        String[] headers = {"班级编号","学号","年级编号","教学单位编号"};
-        ArrayList<String[]> values = ExcelUtil.importExcel(hwb,headers,false,1);  //获取excel数据
-
-        if (values.size()<=0){
-            throw new ServiceException(ResultServiceEnums.EXCEL_IMPORT_DATA_NOT_EXIST);
-        }
-
-        for(String[] value:values){   //将数据封装到entity
-
-            //1.0 检查信息是否为空
-            BRClassStudent brClassStudent = null;
-            if(value[0]==null||value[0].equals("")||value[1]==null||value[1].equals("")){
-                continue;
-            }
-
-            //1.1 检查班级是否存在
-            if((bClassRepository.selectOne(new BClass(value[0])))==null) {
-                if(!classCode.contains(value[0]))
-                    classCode.add(value[0]);
-                continue;
-            }
-
-            //1.2 检查学生是否存在
-            if((bStudentRepository.selectOne(new BStudent(value[1])))==null) {
-                if(!studentCode.contains(value[1]))
-                    studentCode.add(value[1]);
-                continue;
-            }
-
-            //1.3 检查班级学生是否存在
-            BRClassStudent classStudent = new BRClassStudent();
-            //classStudent.setClassCode(value[0]);
-            classStudent.setStudentCode(value[1]);
-            if((bRClassStudentRepository.selectOne(classStudent))!=null) {
-                repeatCode.add(value[1]);
-                continue;
-            }
-
-            //判断:学年是否存在，存在才能录入
-            BClass b1 = new BClass();
-            b1.setGradeCode(value[2]);
-            if (bClassRepository.checkGrade(b1).size() == 0){
-                valuesGrade.add(value[2]);
-                continue;
-            }
-
-            //判断教学单位是否存在
-            List<BAgency> bAgencies =  bAgencyRepository.queryBAgencysByCode(value[3]);
-            if(bAgencies.size()<1){
-                AgencyCode.add(value[3]);
-                continue;
-            }
-
-
-            //1.4 构造学生班级信息
-            brClassStudent= new BRClassStudent(value[0],value[1]);
-            brClassStudent.setCommonBusinessId();
-            //UserUtils.setCurrentPersistOperation(brClassStudent);
-
-            if(!brClassStudents.contains(brClassStudent)){
-                brClassStudents.add(brClassStudent);
-            }
-        }
-        String result ="";
-        if (brClassStudents.size()>0){
-            int line = bRClassStudentRepository.insertList(brClassStudents);
-            if (line>0){
-                result  = "成功导入"+brClassStudents.size()+"条数据。";
-            }else{
-                throw new ServiceException(ResultServiceEnums.EXCEL_IMPORT_DB_INSERT_ERROR);
-            }
-        }
-
-        StringBuilder nullResult = new StringBuilder();
-        if(repeatCode.size()>0){
-            //nullResult.append("以下学生班级关系已存在：").append(JSON.toJSONString(repeatCode)).append("。");
-            nullResult.append("以下学生已存在于其他班级：").append(JSON.toJSONString(repeatCode)).append("。");
-            //  nullResult.append("部分学生不存在，请检查后重新上传");
-        }
-        //2. 检查重复
-
-        if(classCode.size()>0){
-            nullResult.append("以下班级编号不存在：").append(JSON.toJSONString(classCode)).append("。");
-            //  nullResult.append("部分班级不存在，请检查后重新上传");
-        }
-        if(studentCode.size()>0){
-            nullResult.append("以下学生学号不存在：").append(JSON.toJSONString(studentCode)).append("。");
-            //  nullResult.append("部分学生不存在，请检查后重新上传");
-        }
-        if(valuesGrade.size()>0){
-            result+="以下年级不存在："+ JSON.toJSONString(valuesGrade)+"。";
-        }
-        if(AgencyCode.size()>0){
-            result+="以下教学单位不存在："+ JSON.toJSONString(AgencyCode)+"。";
-        }
-
-
-        result+=nullResult;
-
-        if(brClassStudents.size()<1){
-            throw new ServiceException(ResultServiceEnums.EXCEL_IMPORT_DATA_NOT_EXIST.getCode(),result);
-        }
-        //4.调用存储过程
-        Map<String,Object> map = new HashedMap();
-        map.put("result",null);
-        bClassRepository.updateStudentNum(map);
-        int l1 = MapUtils.getInteger(map,"result",-2);
-        if(l1<=0)
-            throw new ServiceException(ResultServiceEnums.UPDATE_STUDENT_NUM_ERROR);
-        return new PersistModel(1,result.toString());
-    }
 
 
 }

src/main/java/org/rcisoft/business/bterm/controller/BTermController.java

@@ -134,11 +134,10 @@ public class BTermController extends PaginationController<BTerm> {
 
     @ApiOperation(value="查询学期列表", notes="查询学期列表赋值在下拉框中")
     @ApiImplicitParams({@ApiImplicitParam(name = "current", value = "是否将当前学期排在最前 0否1是", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "hideCurrent", value = "是否隐藏当前学期 0否1是", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "arrange", value = "是否是排课任务的下拉 0否1是", required = false, dataType = "varchar")})
     @GetMapping(value = "/queryBTermList")
-    public Result queryBTermList(String current, String arrange, String hideCurrent) {
-        List<SelectModel> bTerm = bTermService.queryBTermList(current,arrange,hideCurrent);
+    public Result queryBTermList(String current, String arrange, String flag) {
+        List<SelectModel> bTerm = bTermService.queryBTermList(current,arrange,flag);
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,

src/main/java/org/rcisoft/business/bterm/dao/BTermRepository.java

@@ -35,13 +35,13 @@ public interface BTermRepository extends BaseMapper<BTerm> {
     List<BTerm> queryBtermByCode(String code);
 
     @Select("<script>select * from b_term " +
-            "where del_flag != 1 and flag = 1 " +
-            "<if test=\"hideCurrent !=null and hideCurrent = '1' \">and current != '1' </if>" +
+            "where del_flag != 1 " +
+            "<if test=\"flag !=null and flag = '' \">and flag = 1 </if>" +
             "order by " +
             "<if test=\"current !=null and current = '1' \">current desc, </if>" +
             "start_date DESC</script>")
     @ResultMap(value = "BaseResultMap" )
-    List<BTerm> queryBTermList(@Param("current") String current, @Param("hideCurrent") String hideCurrent);
+    List<BTerm> queryBTermList(@Param("current") String current, @Param("flag") String flag);
 
     @Update("<script>update b_term set current = '0'</script>")
     int changeAllTermNotCurrent();
@@ -80,9 +80,8 @@ public interface BTermRepository extends BaseMapper<BTerm> {
 
     @Select("<script>SELECT * FROM b_term bt \n" +
             "LEFT JOIN b_arrange ba ON bt.`code` = ba.term_code WHERE ba.term_code is NULL " +
-            "<if test=\"hideCurrent !=null and hideCurrent = '1' \">and bt.current != '1' </if>" +
             "<if test=\"current !=null and current = '1' \">order by bt.current desc </if></script>")
     @ResultMap(value = "BaseResultMap" )
-    List<BTerm> queryTermNotInArrange(@Param("current") String current, @Param("hideCurrent") String hideCurrent);
+    List<BTerm> queryTermNotInArrange(@Param("current") String currentt);
 }
 

src/main/java/org/rcisoft/business/bterm/service/BTermService.java

@@ -56,7 +56,7 @@ public interface BTermService{
      */
     PersistModel changeIS(String code, String token);
 
-    List<SelectModel> queryBTermList(String current, String arrange, String hideCurrent);
+    List<SelectModel> queryBTermList(String current, String arrange, String flag);
 
     PersistModel changeCurrent(String code);
 

src/main/java/org/rcisoft/business/bterm/service/impl/BTermServiceImpl.java

@@ -133,12 +133,12 @@ public class BTermServiceImpl implements BTermService {
      * @return
      */
     @Override
-    public List<SelectModel> queryBTermList(String current, String arrange, String hideCurrent) {
+    public List<SelectModel> queryBTermList(String current, String arrange, String flag) {
         List<BTerm> bTerm;
         if(arrange!=null&&arrange.equals("1")){
-            bTerm = bTermRepository.queryTermNotInArrange(current,hideCurrent);
+            bTerm = bTermRepository.queryTermNotInArrange(current);
         }else{
-            bTerm = bTermRepository.queryBTermList(current,hideCurrent);
+            bTerm = bTermRepository.queryBTermList(current,flag);
         }
 
         ArrayList<SelectModel> comBoxModel = new ArrayList<SelectModel>();

src/main/java/org/rcisoft/core/command/LxcCommand.java

@@ -73,7 +73,7 @@ public class LxcCommand {
                 if (isRemote)
                     remoteExecuteCommand.execute(START_LXC_COMMAND,dest);
                 else
-                Runtime.getRuntime().exec("cd " + dest + " && " + START_LXC_COMMAND);
+                    Runtime.getRuntime().exec("cd " + dest + " && " + START_LXC_COMMAND);
             else{
                 if (isRemote)
                     remoteExecuteCommand.execute(DOWN_LXC_COMMAND,dest);

src/main/java/org/rcisoft/core/service/impl/AuthenticationServiceImpl.java

@@ -102,7 +102,9 @@ public class AuthenticationServiceImpl implements AuthenticationService {
             //如果用户请求登录后台，并且但是其并没有任何后台权限，抛出异常
             if (userType.equals("1")&&rolePeration == 0)
                 throw new ServiceException(ResultServiceEnums.ROLE_ERROR);
-            else if(userType.equals("0")&&global.getAdminCode().equals(role.get(0).getCode()))
+            else if(userType.equals("0")&&
+                    !global.getTeacherCode().equals(role.get(0).getCode())&&
+                    !global.getStudentCode().equals(role.get(0).getCode()))
                 //代表请求前台，教师和学生可以请求，管理员不可以
                 throw new ServiceException(ResultServiceEnums.ROLE_ERROR);
         }else

src/main/resources/application-dev.yml

@@ -11,9 +11,8 @@ server:
 #    org.springframework.web: DEBUG
 
 druid:
-  #url: jdbc:mysql://192.168.1.125:13318/new_edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-  url: jdbc:mysql://127.0.0.1:3306/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-
+  url: jdbc:mysql://192.168.1.125:13318/new_edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+  #url: jdbc:mysql://127.0.0.1:3306/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
   username: root
   password: 123456
   initial-size: 1
@@ -58,8 +57,6 @@ spring:
   resources:
     add-mappings: false
   redis:
-#    host: 106.2.3.134
-#    port: 7482
     host: 127.0.0.1
     port: 6379
     pool:
@@ -145,7 +142,7 @@ global:
     student_code_location: studentCode
     xml_location: /xmlTemp
   other:
-    server_url:  http://127.0.0.1:8888/eduServer
+    server_url:  http://106.2.3.134:10180/eduServer
     is_server_linux: 5
     max_code_length: 15
     open_office_home: D:/oppenOffice/openOffice
@@ -162,10 +159,10 @@ global:
     html_project: '1002'
 
 serverLxc:
-  ip: 192.168.1.130
+  ip: 192.168.1.125
   username: root
   password: 123456
 
 libreoffice:
-  ip: 192.168.1.130
-  port: 8997
+  ip: 192.168.1.125
+  port: 10188

src/main/resources/application-prod.yml

@@ -157,13 +157,13 @@ global:
     html_project: '1002'
 
 serverLxc:
-  ip: 106.2.3.134
+  ip: 120.52.179.75
   username: root
   password: 91isoft_xunda
 
 
 libreoffice:
-  ip: 106.2.3.134
-  port: 10188
+  ip: edu2_libre
+  port: 8997
   #ip:edu2_libre
   #port:8997
\ No newline at end of file

src/main/resources/application-prod103.yml

@@ -54,8 +54,8 @@ spring:
   resources:
     add-mappings: false
   redis:
-    host: 103.249.252.109
-    port: 7482
+    host: edu2_redis
+    port: 6379
     pool:
       max-idle: 50
       max-active: 1000
@@ -154,7 +154,5 @@ serverLxc:
 
 
 libreoffice:
-  ip: 103.249.252.109
-  port: 10188
-  #ip:edu2_libre
+  ip: edu2_libre
+  port: 8997
\ No newline at end of file
-  #port:8997
\ No newline at end of file

src/main/resources/application-prod125.yml

@@ -163,7 +163,5 @@ serverLxc:
 
 
 libreoffice:
-  ip: 192.168.1.125
-  port: 10188
-  #ip:edu2_libre
+  ip: edu2_libre
+  port: 8997
\ No newline at end of file
-  #port:8997
\ No newline at end of file

src/main/resources/application-prod172.yml

@@ -54,7 +54,7 @@ spring:
   resources:
     add-mappings: false
   redis:
-    host: 172.16.98.108
+    host: edu2_redis
     port: 7482
     pool:
       max-idle: 50
@@ -154,7 +154,5 @@ serverLxc:
 
 
 libreoffice:
-  ip: 172.16.98.108
-  port: 10188
-  #ip:edu2_libre
+  ip: edu2_libre
+  port: 8997
\ No newline at end of file
-  #port:8997
\ No newline at end of file

src/main/resources/logback-spring.xml

@@ -74,4 +74,20 @@
         </root>
     </springProfile>
 
+    <springProfile name="prod125">
+        <root level="info">
+            <appender-ref ref="consoleLog" />
+            <appender-ref ref="fileInfoLog" />
+            <appender-ref ref="fileErrorLog" />
+        </root>
+    </springProfile>
+
+    <springProfile name="prod103">
+        <root level="info">
+            <appender-ref ref="consoleLog" />
+            <appender-ref ref="fileInfoLog" />
+            <appender-ref ref="fileErrorLog" />
+        </root>
+    </springProfile>
+
 </configuration>
\ No newline at end of file