解决冲突。。。。

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/dao/GroupDao.java

@@ -82,10 +82,4 @@ public interface GroupDao extends PagingAndSortingRepository<Group, Long>, Updat
            "set group_entity.class_size=manager_2_property.class_size\n" +
            "where group_entity.owner_id=manager_2_property.user_id AND group_entity.id=?",nativeQuery = true)
     int updateGroupSize(@Param("groupId") long groupId);
-
-
-    @Modifying
-    @Query(value="\n" +
-            "UPDATE group_entity SET is_active='0' WHERE id=?",nativeQuery = true)
-    int updateActive(@Param("id") long id);
     }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/data/ReportPDF.java

@@ -43,4 +43,8 @@ public class ReportPDF {
     private String barGraph;
 
     private List<CasePDF> cases;
+    /*
+    下载pdf失败原因
+     */
+    private  String  failReason;
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/models/CaseExtends.java

@@ -65,6 +65,6 @@ public class CaseExtends implements Serializable {
     private String properties;
 
     @Column(name = "hidden")
-    private Boolean hidden = false;
+    private int hidden = 0;
 }
 

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/GroupService.java

@@ -63,9 +63,6 @@ public interface GroupService {
 
     Map<Long, Long> getOwnerAndWorkersCountDTO(List<Long> ownerIds);
 
-    User batchAddUserIntoGroup(long userId);
-
     int  updateGroupSize(long groupId);
 
-    int updateActive(long id);
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/impl/GroupServiceImpl.java

@@ -286,30 +286,8 @@ public class GroupServiceImpl implements GroupService {
     }
 
     @Override
-    public User batchAddUserIntoGroup(long userId) {
-        this.privateAddUserIntoGroup(userId);
-        return null;
-    }
-
-    @Override
     public int updateGroupSize(long groupId) {
         return  groupDao.updateGroupSize(groupId);
     }
 
-    @Override
-    public int updateActive(long id) {
-        return groupDao.updateActive(id);
-    }
-
-    private void privateAddUserIntoGroup(long userId) {
-        Group2Worker group2Worker = new Group2Worker();
-        group2Worker.setParticipantId(userId);
-        group2Worker.setRecordCreateTime(new Timestamp(System.currentTimeMillis()));
-        group2WorkerDao.save(group2Worker);
-        //GroupPermission groupPermission = groupPermissionService.joinGroup(userId);
-       // if (groupPermission == null) {
-            //throw new IllegalOperationException("Can not create Group Permission!");
-       // }
-
-    }
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/impl/UserRPCServiceImpl.java

@@ -223,23 +223,27 @@ public class UserRPCServiceImpl implements UserService {
     public Page<UserDTOForMT> getUserPageByGroupId(Long groupId, String keyword, Pageable pageable) {
         List<Group2Worker> group2Workers = group2WorkerDao.findByGroupId(groupId);
         List<Long> userIds = group2Workers.stream().map(group2Worker -> group2Worker.getParticipantId()).collect(Collectors.toList());
-        List<UserDTOForMT> userDTOForMTs = new ArrayList<>();
-        List<UserDTO> userDTOS = userService.findAll(userIds);
-        for(UserDTO userDTO : userDTOS){
-            if (keyword.isEmpty() || keyword.equals("")) {
-                userDTOForMTs.add(Converter.convert(UserDTOForMT.class, userDTO));
-            } else {
-                if ((userDTO.getEmail() != null && userDTO.getEmail().contains(keyword)) ||
-                        userDTO.getName().contains(keyword) ||
-                        (userDTO.getSchool() != null && userDTO.getSchool().contains(keyword)) ||
-                        (userDTO.getMobile() != null && userDTO.getMobile().contains(keyword))) {
+        if(userIds.size()!=0){
+            List<UserDTOForMT> userDTOForMTs = new ArrayList<>();
+            List<UserDTO> userDTOS = userService.findAll(userIds);
+            for(UserDTO userDTO : userDTOS){
+                if (keyword.isEmpty() || keyword.equals("")) {
                     userDTOForMTs.add(Converter.convert(UserDTOForMT.class, userDTO));
+                } else {
+                    if ((userDTO.getEmail() != null && userDTO.getEmail().contains(keyword)) ||
+                            userDTO.getName().contains(keyword) ||
+                            (userDTO.getSchool() != null && userDTO.getSchool().contains(keyword)) ||
+                            (userDTO.getMobile() != null && userDTO.getMobile().contains(keyword))) {
+                        userDTOForMTs.add(Converter.convert(UserDTOForMT.class, userDTO));
+                    }
                 }
             }
+            List<UserDTOForMT> userDTOForMTList = getSubList(pageable, userDTOForMTs);
+            Page<UserDTOForMT> userDTOForMTPage = new PageImpl<UserDTOForMT>(userDTOForMTList, pageable, userDTOForMTs.size());
+            return userDTOForMTPage;
+        }else{
+          return null;
         }
-        List<UserDTOForMT> userDTOForMTList = getSubList(pageable, userDTOForMTs);
-        Page<UserDTOForMT> userDTOForMTPage = new PageImpl<UserDTOForMT>(userDTOForMTList, pageable, userDTOForMTs.size());
-        return userDTOForMTPage;
     }
 
     private List<UserDTOForMT> getSubList(Pageable pageable, List<UserDTOForMT> userDTOForMTs) {

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/impl/UserServiceImpl.java

@@ -141,7 +141,7 @@ public class UserServiceImpl extends BaseService implements UserService {
     @Override
     public Page<UserDTOForMT> findByRoleId(Long roleId, Pageable pageable) {
         Page<User> users = userDao.findByRoleId(roleId, pageable);
-        return users.map(user ->  Converter.convert(UserDTOForMT.class, user));
+        return users.map(user -> Converter.convert(UserDTOForMT.class, user));
     }
 
 
@@ -149,7 +149,7 @@ public class UserServiceImpl extends BaseService implements UserService {
     public Page<UserDTOForMT> getUserOfFuzzySearch(Map<String, String> condition, Pageable pageable) {
         Specification<User> where = Specifications.where(getUserWhereClause(condition));
         Page<User> users = userDao.findAll(where, pageable);
-        return users.map( user ->  Converter.convert(UserDTOForMT.class, user));
+        return users.map(user -> Converter.convert(UserDTOForMT.class, user));
     }
 
     private Specification<User> getUserWhereClause(Map<String, String> condition) {
@@ -186,6 +186,6 @@ public class UserServiceImpl extends BaseService implements UserService {
     @Override
     public Page<UserDTOForMT> getUserPageByGroupId(Long groupId, String keyword, Pageable pageable) {
         Page<User> users = groupDao.findByIdAndKeyWord(groupId, keyword, pageable);
-        return users.map( user ->  Converter.convert(UserDTOForMT.class, user));
+        return users.map(user -> Converter.convert(UserDTOForMT.class, user));
     }
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/CaseExtendsVO.java

@@ -29,7 +29,7 @@ public class CaseExtendsVO extends CaseVO {
     private Boolean isAPFD;
     private Boolean isMutation;
     private Boolean targetVisable;
-    private Boolean hidden;
+    private int hidden;
 
     //对应测试案例的评估指标
     private List<Dimension> dimensions;

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/wrapper/GroupVOWrapper.java

@@ -19,6 +19,7 @@ public class GroupVOWrapper extends BaseWrapper<GroupVO, Group> {
         vo.setName(group.getName());
         vo.setInformation(vo.getInformation());
         vo.setAllowJoin(group.getAllowJoin());
+        vo.setClassSize(group.getClassSize());
 
         return vo;
 
@@ -32,6 +33,7 @@ public class GroupVOWrapper extends BaseWrapper<GroupVO, Group> {
         group.setId(vo.getId());
         group.setName(vo.getName());
         group.setAllowJoin(vo.getAllowJoin());
+        group.setClassSize(vo.getClassSize());
 
         return group;
     }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/CaseLogicImpl.java

@@ -284,7 +284,7 @@ public class CaseLogicImpl implements CaseLogic {
         if(!isAdmin){
             throw new HttpBadRequestException("当前用户无此操作权限");
         }
-        caseExtends.setHidden(!caseExtends.getHidden());
+        caseExtends.setHidden(caseExtends.getHidden() == 0 ? 1 : 0);
         CaseExtends savedCase = caseService.saveOnly(caseExtends);
         return Converter.convert(CaseExtendsVO.class, savedCase);
     }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/GroupLogicImpl.java

@@ -72,12 +72,12 @@ public class GroupLogicImpl extends BaseLogic implements GroupLogic {
         List<Integer> workerCounts = groupService.getWorkerCounts(groupVOs.stream()
                 .map(GroupVO::getId).collect(Collectors.toList()));
         ManagerProperty managerProperty = managerPropertyService.getManagerPropertyByUserId(ownerId);
-        for (int i = 0; i < groupVOs.size(); i++) {
-            if (workerCounts.get(i).intValue() > managerProperty.getClassSize().intValue()) {
-                groupService.updateActive(groupVOs.get(i).getId());
+        for(int i=0;i < groupVOs.size(); i++){
+            if(groupVOs.get(i).getId()!=0&&groupVOs.get(i).getClassSize().intValue()>managerProperty.getClassSize().intValue()&&groupService.ifExamsAssignedtoGroup(groupVOs.get(i).getId())){
                 groupVOs.remove(i);
                 workerCounts.remove(i);
-            } else {
+                i--;
+            }else {
                 groupVOs.get(i).setWorkerCount(workerCounts.get(i));
             }
         }
@@ -109,7 +109,6 @@ public class GroupLogicImpl extends BaseLogic implements GroupLogic {
 
     @Override
     public GroupVO getGroupDetail(long groupId) {
-        groupService.updateGroupSize(groupId);
         Group group = groupService.getGroup(groupId);
         if (group == null) {
             throw new HttpNotFoundException(String.format("Group[id=%s] doesn't exist", groupId));
@@ -143,7 +142,6 @@ public class GroupLogicImpl extends BaseLogic implements GroupLogic {
     public Page<UserVO> getManagerWorkersInGroupPageable(long groupId, String keyword, Pageable pageable) {
         Page<UserDTOForMT> users = userService.getUserPageByGroupId(groupId, keyword, pageable);
         Page<UserVO> userVOS = users.map(user -> Converter.convert(UserVO.class, user));
-        ;
         return userVOS;
     }
 
@@ -165,6 +163,7 @@ public class GroupLogicImpl extends BaseLogic implements GroupLogic {
             Group g = Converter.convert(Group.class, groupVO);
             g.setIsActive(true);
             Group group = groupService.save(g);
+            groupService.updateGroupSize(group.getId());
             groupPermissionService.createGroup(userId, group.getId());
             return Converter.convert(GroupVO.class, group);
         }
@@ -213,10 +212,10 @@ public class GroupLogicImpl extends BaseLogic implements GroupLogic {
 
     public UserVO addUserIntoGroup(UserDTOForMT userDto, long groupId) {
         Group group = groupService.getGroup(groupId);
-        if (group.getOwnerId() == userDto.getId()) {
+        if(group.getOwnerId() == userDto.getId()) {
             throw new IllegalOperationException("Cannot join Group YOU OWN!");
         }
-        if (groupService.getWorkerCount(groupId) >= group.getClassSize()) {
+        if(groupService.getWorkerCount(groupId) >= group.getClassSize()) {
             throw new HttpBadRequestException("班级人数已达上限，请联系管理员");
         }
         UserVO uv = Converter.convert(UserVO.class, groupService.addUserIntoGroup(userDto.getId(), groupId));
@@ -354,7 +353,7 @@ public class GroupLogicImpl extends BaseLogic implements GroupLogic {
         List<User> result = ExcelImportUtil.importExcel(file.getInputStream(),
                 User.class, params);
         Group group = groupService.getGroup(groupId);
-        if (result.size() > (group.getClassSize() - groupService.getWorkerCount(groupId))) {
+        if(result.size()>(group.getClassSize() - groupService.getWorkerCount(groupId))) {
             throw new HttpBadRequestException("批量添加人数超出班级上限");
         }
         List<UserVO> batchAddList = new ArrayList<>();

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/OSSLogicImpl.java

@@ -30,6 +30,7 @@ import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.profile.IClientProfile;
 import com.aliyuncs.sts.model.v20150401.AssumeRoleRequest;
 import com.aliyuncs.sts.model.v20150401.AssumeRoleResponse;
+import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import net.lingala.zip4j.core.ZipFile;
 import net.lingala.zip4j.model.ZipParameters;
@@ -211,7 +212,7 @@ public class OSSLogicImpl implements OSSLogic {
             ossClientConfigVO.setExpiration(response.getCredentials().getExpiration());
             ossClientConfigVO.setSecurityToken(response.getCredentials().getSecurityToken());
         } catch (ClientException e) {
-            log.error("获取STS权限失败", e);
+            log.error("获取STS权限失败",e);
         }
         return ossClientConfigVO;
     }
@@ -259,7 +260,7 @@ public class OSSLogicImpl implements OSSLogic {
     @Override
     public String downloadContentByUrlToString(String url) throws IOException {
 
-        OSSObject ossObject = ossClient.getObject(bucketName, url);
+        OSSObject ossObject = ossClient.getObject(bucketName,url);
         BufferedReader reader = new BufferedReader(new InputStreamReader(ossObject.getObjectContent()));
         StringBuilder sb = new StringBuilder();
         String line;
@@ -274,47 +275,45 @@ public class OSSLogicImpl implements OSSLogic {
 
     /**
      * （默认）文件流上传到oss的main bucket
-     *
      * @param ossfilenameWithPath 文件流在oss中的全路径
-     * @param inputStream         要上传的文件流
+     * @param inputStream 要上传的文件流
      * @return 上传的完整url
      * @throws Exception
      */
     @Override
-    public String uploadByUrl(String ossfilenameWithPath, InputStream inputStream, String host) {
-        if (!ossFeatureSwitch) {
-            String fileName = SAVE_PATH + ossfilenameWithPath;
+    public String uploadByUrl(String ossfilenameWithPath, InputStream inputStream, String host){
+        if(!ossFeatureSwitch){
+            String fileName = SAVE_PATH+ossfilenameWithPath;
             File file = new File(fileName);
-            if (!file.getParentFile().exists()) {
+            if(!file.getParentFile().exists()){
                 file.getParentFile().mkdirs();
             }
             try {
-                FileUtils.copyInputStreamToFile(inputStream, file);
+                FileUtils.copyInputStreamToFile(inputStream,file);
             } catch (Exception e) {
                 System.out.println("编程社区代码上传出错");
                 e.printStackTrace();
             }
-            return host + UPLOADED_PATH + ossfilenameWithPath;
+            return host+UPLOADED_PATH+ossfilenameWithPath;
 
         }
         //打开OSS连接
-        return uploadByUrl(bucketName, ossfilenameWithPath, inputStream);
+        return uploadByUrl(bucketName,ossfilenameWithPath,inputStream);
     }
 
     /**
      * 文件流上传到oss指定的bucket中
-     *
-     * @param bucketName          指定bucket
+     * @param bucketName 指定bucket
      * @param ossfilenameWithPath 文件流在oss中的全路径
-     * @param inputStream         要上传的文件
+     * @param inputStream 要上传的文件
      * @return
      */
     @Override
     public String uploadByUrl(String bucketName, String ossfilenameWithPath, InputStream inputStream) {
-        PutObjectResult result = ossClient.putObject(bucketName, ossfilenameWithPath, inputStream);
+        PutObjectResult result = ossClient.putObject(bucketName, ossfilenameWithPath , inputStream);
 
         StringBuilder sb = new StringBuilder("http://");
-        String nohttpEndPoint = endPoint.replace("http://", "");
+        String nohttpEndPoint = endPoint.replace("http://","");
         sb.append(bucketName).append(".").append(nohttpEndPoint).append("/").append(ossfilenameWithPath);
         return sb.toString();
     }
@@ -326,15 +325,14 @@ public class OSSLogicImpl implements OSSLogic {
 
     /**
      * 根据签名上传文件
-     *
-     * @param signedUrl     oss上传许可签名
+     * @param signedUrl oss上传许可签名
      * @param localFilePath 本地文件所在位置
      * @return 上传成功或者失败
      */
     @Override
     public boolean upload2DevBySigUrl(String signedUrl, File localFilePath) {
         // 使用签名URL发送请求。
-        try (FileInputStream fin = new FileInputStream(localFilePath)) {
+        try(FileInputStream fin = new FileInputStream(localFilePath)) {
             // 添加PutObject请求头。
             Map<String, String> customHeaders = new HashMap<String, String>();
             customHeaders.put("Content-Type", "application/octet-stream");
@@ -351,10 +349,10 @@ public class OSSLogicImpl implements OSSLogic {
 
     @Override
     public boolean deleteByUrl(String bucketName, String ossFileNameWithPath) {
-        try {
+        try{
             ossClient.deleteObject(bucketName, ossFileNameWithPath);
             return true;
-        } catch (Exception e) {
+        } catch (Exception e){
             log.error("删除OSS存储对象出错", e);
             return false;
         }
@@ -365,7 +363,7 @@ public class OSSLogicImpl implements OSSLogic {
     public String copyFileInOss(String bucketName, String sourceFileNameWithPath, String targetFileNameWithPath) {
         ossClient.copyObject(bucketName, sourceFileNameWithPath, bucketName, targetFileNameWithPath);
         StringBuilder sb = new StringBuilder("http://");
-        String nohttpEndPoint = endPoint.replace("http://", "");
+        String nohttpEndPoint = endPoint.replace("http://","");
         sb.append(bucketName).append(".").append(nohttpEndPoint).append("/").append(targetFileNameWithPath);
         return sb.toString();
     }
@@ -379,7 +377,7 @@ public class OSSLogicImpl implements OSSLogic {
 
     @Override
     public List<String> listObjectsByPrefix(String prefix) {
-        ObjectListing objectListing = ossClient.listObjects(bucketName, prefix);
+        ObjectListing objectListing = ossClient.listObjects(bucketName,prefix);
         List<OSSObjectSummary> sums = objectListing.getObjectSummaries();
         return sums.stream().map(OSSObjectSummary::getKey).collect(Collectors.toList());
     }
@@ -408,10 +406,10 @@ public class OSSLogicImpl implements OSSLogic {
     public String saveFileTemp(MultipartFile file, String filePath) throws IOException {
         Long size = file.getSize();
         if (file.isEmpty()) {
-            throw new HttpBadRequestException("please select a file to upload");
+            throw new HttpBadRequestException ("please select a file to upload");
         }
         if (size > maxUploadSizeInMb) {
-            throw new HttpBadRequestException("file size is over limit");
+            throw new HttpBadRequestException ("file size is over limit");
         }
 
         File saveFile = new File(filePath);
@@ -430,7 +428,7 @@ public class OSSLogicImpl implements OSSLogic {
         if (!saveFile.getParentFile().exists()) {
             saveFile.getParentFile().mkdirs();
         }
-        FileUtils.copyFile(file, saveFile);
+        FileUtils.copyFile(file,saveFile);
         return fileName;
 
 
@@ -516,29 +514,18 @@ public class OSSLogicImpl implements OSSLogic {
 
     @Override
     public String getPdf(Long examId, Long workerId, String fileName) throws Exception {
-           //MD5加密
-
-        String md5_fileName = MD5Util.string2MD5(fileName);
-        //判断文件是否存在  如果存在 直接返回路径不用重新生成pdf
-        File file1 = new File(PdfServiceImpl.SAVE_PATH + PdfServiceImpl.PDF_PATH + md5_fileName + ".pdf");
-        if (file1.exists()) {
-            log.info("文件已经存在 直接返回下载链接");
-            return UPLOADED_PATH + PDF_PATH + md5_fileName + ".pdf";
+        ReportPDF reportPDF = pdfService.getReportPDF(examId, workerId);
+        if(reportPDF.getFailReason()!=null){
+            return reportPDF.getFailReason();
+        }
+        File file = new File(SAVE_PATH + getBarGraphKey(examId.toString()));
+        if (file.exists()){
+            reportPDF.setBarGraph(SAVE_PATH + getBarGraphKey(examId.toString()));
         } else {
-
-            ReportPDF reportPDF = pdfService.getReportPDF(examId, workerId);
-            if (reportPDF.getFailReason() != null) {
-                return reportPDF.getFailReason();
-            }
-            File file = new File(SAVE_PATH + getBarGraphKey(examId.toString()));
-            if (file.exists()) {
-                reportPDF.setBarGraph(SAVE_PATH + getBarGraphKey(examId.toString()));
-            } else {
-                reportPDF.setBarGraph(null);
-            }
-            pdfService.generatePDF(reportPDF, fileName);
-            return UPLOADED_PATH + PDF_PATH + fileName + ".pdf";
+            reportPDF.setBarGraph(null);
         }
+        pdfService.generatePDF(reportPDF, fileName);
+        return UPLOADED_PATH + PDF_PATH + fileName + ".pdf";
     }
 
     @Override
@@ -598,27 +585,27 @@ public class OSSLogicImpl implements OSSLogic {
         Map<String, Object> result = new HashMap<>();
         try {
             inputStream = file.getInputStream();
-            File localFile = new File(SAVE_PATH + "slides/" + file.getOriginalFilename());
+            File localFile = new File( SAVE_PATH + "slides/" + file.getOriginalFilename());
             if (!localFile.getParentFile().exists())
                 localFile.getParentFile().mkdirs();
             log.info("开始本地暂存...");
             FileUtils.copyInputStreamToFile(inputStream, localFile);
             log.info("文件上传OSS...");
             String slidesUrl = uploadByUrl("mooctest-course",
-                    "slides/" + file.getOriginalFilename(), new FileInputStream(localFile));
+                    "slides/"+file.getOriginalFilename(), new FileInputStream(localFile));
             log.info("开始进行PDF转图片...");
-            Map<String, Object> imageResult = pdfService.pdf2imageList(localFile, "png");
+            Map<String,Object> imageResult = pdfService.pdf2imageList(localFile, "png");
             log.info(String.format("转换成功，结果信息：%s", imageResult.toString()));
             File imagePath = new File((String) imageResult.get("url"));
             File[] files = imagePath.listFiles();
             log.info("上传图片至OSS...");
-            for (File f : files) {
-                uploadByUrl("mooctest-course", "slides/images/" + imagePath.getName() + "/" + f.getName(), new FileInputStream(f));
+            for (File f:files){
+                uploadByUrl("mooctest-course", "slides/images/"+imagePath.getName()+"/"+f.getName(), new FileInputStream(f));
             }
             log.info("上传结束");
             StringBuilder sb = new StringBuilder("http://");
-            String nohttpEndPoint = endPoint.replace("http://", "");
-            sb.append(courseBucket).append(".").append(nohttpEndPoint).append("/").append("slides/images/" + imagePath.getName());
+            String nohttpEndPoint = endPoint.replace("http://","");
+            sb.append(courseBucket).append(".").append(nohttpEndPoint).append("/").append("slides/images/"+imagePath.getName());
             String imagesUrl = sb.toString();
             result.put("slidesUrl", slidesUrl);
             result.put("pageCount", imageResult.get("pageCount"));
@@ -631,6 +618,7 @@ public class OSSLogicImpl implements OSSLogic {
         }
 
 
+
         return result;
     }
 
@@ -647,9 +635,11 @@ public class OSSLogicImpl implements OSSLogic {
     }
 
 
+
     private String getStatisticalDiagramKey(String s) {
         return null;
     }
 
 
+
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/UserLogicImpl.java

@@ -128,7 +128,7 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
         Object username = userVO.getEmail();
         Date date = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        LOG.error("用户{}注册失败,失败时间：{},失败原因：{}",new Object[]{username,df.format(date), reason});
+        LOG.error("用户{}注册失败,失败时间：{},失败原因：{}", new Object[]{username, df.format(date), reason});
     }
 
 
@@ -463,7 +463,7 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
         if (managerPropertyVO.getExpireTime() != null) {
             managerProperty.setExpireTime(new Timestamp(managerPropertyVO.getExpireTime()));
         }
-        if(managerPropertyVO.getClassSize()!=null){
+        if (managerPropertyVO.getClassSize() != null) {
             managerProperty.setClassSize(managerPropertyVO.getClassSize());
         }
         managerPropertyService.save(managerProperty);
@@ -601,7 +601,7 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
             throw new HttpBadRequestException("this role does not exist");
         }
         Page<UserDTOForMT> userList = userService.findByRoleId(roleId, pageable);
-        Page<UserVO> userVOs = userList.map( userDTOForMT ->  Converter.convert(UserVO.class, userDTOForMT));
+        Page<UserVO> userVOs = userList.map(userDTOForMT -> Converter.convert(UserVO.class, userDTOForMT));
         if (roleId == 2L) {
             for (UserVO UserVO : userVOs) {
                 ManagerProperty managerProperty = managerPropertyService.getManagerPropertyByUserId(UserVO.getId());
@@ -616,13 +616,13 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
     @Override
     public Page<UserVO> getByUserPackage(Long serviceId, Long packageId, Pageable pageable) {
         Page<UserDTOForMT> userList = userService.getByUserPackage(serviceId, packageId, pageable);
-        return userList.map( userDTOForMT ->  Converter.convert(UserVO.class, userDTOForMT));
+        return userList.map(userDTOForMT -> Converter.convert(UserVO.class, userDTOForMT));
     }
 
     @Override
     public Page<UserVO> getUserListOfFuzzySearch(Map<String, String> condition, Pageable pageable) {
         Page<UserDTOForMT> userDTOForMTs = userService.getUserOfFuzzySearch(condition, pageable);
-        Page<UserVO> userVOs = userDTOForMTs.map( userDTOForMT ->  Converter.convert(UserVO.class, userDTOForMT));
+        Page<UserVO> userVOs = userDTOForMTs.map(userDTOForMT -> Converter.convert(UserVO.class, userDTOForMT));
         for (UserVO UserVO : userVOs) {
             if (roleService.getRolesOfUser(UserVO.getId()).contains(roleService.getRoleByRoleName("manager"))) {
                 ManagerProperty managerProperty = managerPropertyService.getManagerPropertyByUserId(UserVO.getId());
@@ -706,7 +706,7 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
         List<UserDTOForMT> checkedTeachers = new ArrayList<>();
         for (Long id : teacherIds) {
             UserDTOForMT user = userService.findByUserId(id);
-            if (user != null && user.getManualCheckValid()!=null && user.getManualCheckValid().equals(Boolean.TRUE)) {
+            if (user != null && user.getManualCheckValid() != null && user.getManualCheckValid().equals(Boolean.TRUE)) {
                 checkedTeachers.add(user);
             }
         }
@@ -746,9 +746,9 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
         userVO.setMenuMap(menuMap);
         userVO.setOpenId(openId2UserIdService.findOpenIdByUserId(userVO.getId()));
         userVO.setPassword("");
-        if(clientFeatureConfiguration.isMedal()) {
-            UserIntegralDTO integralDTO=integralService.getUserIntegral(userVO.getId());
-            if (integralDTO!=null) {
+        if (clientFeatureConfiguration.isMedal()) {
+            UserIntegralDTO integralDTO = integralService.getUserIntegral(userVO.getId());
+            if (integralDTO != null) {
                 userVO.setIntegral(integralDTO.getTotal());
             }
         }
@@ -765,16 +765,16 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
         Map<Long, ManagerProperty> managerProperties = managerPropertyService
                 .getAllManagerProperty()
                 .stream()
-                .collect(Collectors.toMap(ManagerProperty::getUserId,managerProperty -> managerProperty));
+                .collect(Collectors.toMap(ManagerProperty::getUserId, managerProperty -> managerProperty));
 
-        Map<Long,ExamForUserSituation> examForUserSituations = examService.getExamForUserSituation();
+        Map<Long, ExamForUserSituation> examForUserSituations = examService.getExamForUserSituation();
 
         List<Long> userIds = new ArrayList<>(managerProperties.keySet());
         //获取用户信息并进行过滤
-        Map<Long,UserDTOForMT> userDTOForMTMap = Maps.newHashMap();
-        if(keyword == null || "".equals(keyword))  {
+        Map<Long, UserDTOForMT> userDTOForMTMap = Maps.newHashMap();
+        if (keyword == null || "".equals(keyword)) {
             userDTOForMTMap = userService.getUserMap(userIds);
-        }else {
+        } else {
             userDTOForMTMap = userService.getUserMap(userIds).values()
                     .stream()
                     .filter(user -> keyword.equals(String.valueOf(user.getId())) ||
@@ -798,7 +798,7 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
                             managerProperties.get(userId),
                             examForUserSituations.getOrDefault(userId, new ExamForUserSituation(userId)),
                             user,
-                            ownerAndWorkersCountDTOS.getOrDefault(userId,0L));
+                            ownerAndWorkersCountDTOS.getOrDefault(userId, 0L));
                 }).collect(Collectors.toList());
     }
 }

mooctest-site-server/src/test/java/cn/iselab/mooctest/site/web/logic/impl/GroupLogicImplTest.java

@@ -116,6 +116,7 @@ public class GroupLogicImplTest extends AbstractShiroTest{
         count.add(3);
         when(groupService.getGroupsByOwnerId(123L)).thenReturn(groups);
         when(groupVOWrapper.wrap(groups)).thenReturn(groupVOS);
+        groupVOS.get(0).setClassSize(60);
         when(groupService.getWorkerCounts(anyList())).thenReturn(count);
         //action
         List<GroupVO> result = groupLogic.getOwnerGroups(123L);