add：repo中获取用户数、机构数、资源数、项目数、任务数、报告数的

core/src/main/java/com/mooctest/crowd/domain/controller/CrowdTestProjectController.java

@@ -479,151 +479,10 @@ public class CrowdTestProjectController {
     }
 
 
-    /**
-     * 通过EXCEL向数据库中导入众包项目文件，并补全项目中任务和报告的数据
-     * @param file
-     * @return
-     */
-//    @RequestMapping(value = "projectImportByExcel", method = RequestMethod.POST)
-//    public String projectImportByExcel(MultipartFile file) {
-//        List<String> logList = new ArrayList<>();
-//        List<Map<Integer,Object>> recordList = new ArrayList<>();
-//        HSSFWorkbook workbook=null;
-//        try {
-//            workbook = new HSSFWorkbook(file.getInputStream());
-//        } catch (FileNotFoundException e) {
-//            e.printStackTrace();
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-//
-//        //获取指定标签页
-//        HSSFSheet sheet = workbook.getSheetAt(0);
-//        if(sheet==null){
-//            throw new RuntimeException("标签页不存在！");
-//        }
-//
-//        //总行数
-//        int rows = sheet.getPhysicalNumberOfRows();
-//        if (rows < 2) {
-//            throw new RuntimeException(file.getName()+" 内容为空，请重新编辑！");
-//        }
-//
-//        //不为空的单元格数  ，第一行是标题列
-//        HSSFRow keyRow = sheet.getRow(0);
-//        int cellNumber = keyRow.getPhysicalNumberOfCells();
-//
-//        //循环遍历，第一行是标题，所以从 1 开始遍历（0表示第一行，1表示第二行）
-//        for (int r = 1; r < rows; r++) {
-//            Map<Integer,Object> record = new LinkedHashMap<Integer,Object>();//使用HashMap的话，存进去的顺序与取出来的顺序是不一致的，此处需要使用LinkedHashMap
-//            HSSFRow row = sheet.getRow(r);
-//            if(row == null){
-//                logList.add("表中存在错误的单元格，请把与内容无关的单元格置空");
-//                break;
-//            }
-//
-//            for (int c = 0; c < cellNumber; c++){ //共cellNumber列
-//                HSSFCell cell = row.getCell(c);
-//                String cellValue = "";
-//                DecimalFormat df = new DecimalFormat("#");
-//                //如果单元格不为空
-//                if (cell != null) {
-//                    if(c == 1){
-//                        String platform =cell.getRichStringCellValue().getString().trim();
-//                        if(platform.length() == 0){
-//                            logList.add("第"+(r+1)+"行第"+(c+1)+"列数据为空");
-//                        }else{
-//                            if(!isPlatform(platform)){
-//                                logList.add("第"+(r+1)+"行第"+(c+1)+"列数据不符合要求");
-//                            }else{
-//                                String platformSave = "[" + platform + "]";
-//                                record.put(c,platformSave);
-//                                continue;
-//                            }
-//
-//                        }
-//                    }
-//
-//                    if(c == 4){
-//                        String type =cell.getRichStringCellValue().getString().trim();
-//                        if(type.length() == 0){
-//                            logList.add("第"+(r+1)+"行第"+(c+1)+"列数据为空");
-//                        }else{
-//                            if(!isType(type)){
-//                                logList.add("第"+(r+1)+"行第"+(c+1)+"列数据不符合要求");
-//                            }else{
-//                                String typeSave = "[" + type + "]";
-//                                record.put(c,typeSave);
-//                                continue;
-//                            }
-//
-//                        }
-//                    }
-//
-//                    if(c == 3){
-//                        String phone = cell.getRichStringCellValue().getString().trim();
-//                        if(!isRightPhone(phone)){
-//                            logList.add("第"+(r+1)+"行第"+(c+1)+"列手机号格式不正确");
-//                        }
-//                    }
-//
-//                    switch (cell.getCellType()) {
-//                        case HSSFCell.CELL_TYPE_STRING:
-//                            cellValue =cell.getRichStringCellValue().getString().trim();
-//                            if(cellValue.indexOf(" ") != -1){
-//                                logList.add("第"+(r+1)+"行第"+(c+1)+"列数据中存在空格");
-//                            }
-//                            break;
-//                        case HSSFCell.CELL_TYPE_NUMERIC:
-//                            cellValue =df.format(cell.getNumericCellValue());
-//                            break;
-//                        case HSSFCell.CELL_TYPE_BOOLEAN:
-//                            cellValue =String.valueOf(cell.getBooleanCellValue()).trim();
-//                            break;
-//                        case HSSFCell.CELL_TYPE_FORMULA:
-//                            cellValue =cell.getCellFormula();
-//                            break;
-//                        case HSSFCell.CELL_TYPE_BLANK:
-//                            logList.add("第"+(r+1)+"行第"+(c+1)+"列数据为空");
-//                            break;
-//                        default:
-//                            cellValue = "";
-//                    }
-//                }else{
-//                    logList.add("第"+(r+1)+"行第"+(c+1)+"列为空");
-//                }
-//                record.put(c,cellValue);
-//            }
-//            recordList.add(record);
-//        }
-//
-////        System.out.println("logList.toString() " + logList.toString());
-//        System.out.println("recordList.toString()  " + recordList.toString());
-//
-//        if(logList.size() != 0){
-//            String mes = "表格中存在问题，导入失败！";
-//            return mes + logList.toString();
-//        }else{
-//            List<CrowdTestProjectPO> crowdTestProjectPOList = new ArrayList<>();
-//            CrowdTestProjectPO crowdTestProjectPO = new CrowdTestProjectPO();
-//            for(Map<Integer,Object> map : recordList){
-//                crowdTestProjectPO.setName(map.get(0).toString());
-//                crowdTestProjectPO.setPlatform(map.get(1).toString());
-//                crowdTestProjectPO.setLinkMan(map.get(2).toString());
-//                crowdTestProjectPO.setLinkManMobile(map.get(3).toString());
-//                crowdTestProjectPO.setType(map.get(4).toString());
-//                crowdTestProjectPO.setDescription(map.get(5).toString());
-//                crowdTestProjectPOList.add(crowdTestProjectPO);
-//            }
-//            for(int i = 0; i < crowdTestProjectPOList.size(); i++){
-//                CrowdTestProject crowdTestProject = Converter.convert(CrowdTestProject.class, crowdTestProjectPOList.get(i));
-//                CrowdTestProject crowdTestProjectResult = crowdTestProject.generateDefaultTaskAndReportData();
-//                //TODO 保存数据库
-////                crowdTestProjectRepo.saveCrowdTestProject(crowdTestProjectResult);
-//            }
-//            return "SUCCESS";
-//        }
-//    }
+    @RequestMapping(value = "getNum", method = RequestMethod.GET)
+    public String getNum(){
+        return "项目数：" + crowdTestProjectRepo.getAllProjectNum() + " 任务数：" + crowdTestProjectRepo.getAllTaskNum() + " 报告数：" + crowdTestProjectRepo.getAllReportNum() ;
+    }
 
     /**
      * 计算指定时间的后几天
@@ -722,4 +581,9 @@ public class CrowdTestProjectController {
         Matcher m = p.matcher(str);
         return m.matches();
     }
+
+    @RequestMapping(value = "getAllNum", method = RequestMethod.GET)
+    public String getAllUserNum(){
+        return "用户数：" + userRepo.getAllUserNum() + " 测评机构数：" + userRepo.getAllAgencyNum() + " 测试资源数量：" + userRepo.getAllResourceNum() ;
+    }
 }

core/src/main/java/com/mooctest/crowd/domain/dao/UserDao.java

@@ -1,14 +1,10 @@
 package com.mooctest.crowd.domain.dao;
 
-import com.mooctest.crowd.domain.model.RankInfo;
 import com.mooctest.crowd.domain.model.UserPO;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
 import javax.transaction.Transactional;
-import java.util.List;
 import java.util.Optional;
 
 @Transactional
@@ -31,5 +27,6 @@ public interface UserDao extends PagingAndSortingRepository<UserPO, Long>, JpaSp
 
     UserPO save(UserPO userPo);
 
-
+    @Override
+    long count();
 }

core/src/main/java/com/mooctest/crowd/domain/repository/CrowdTestProjectRepo.java

@@ -233,4 +233,16 @@ public class CrowdTestProjectRepo implements ICrowdTestProjectRepo {
         }
         return crowdTestProjectListResult;
     }
+
+    public long getAllProjectNum(){
+        return crowdTestProjectDao.count();
+    }
+
+    public long getAllTaskNum(){
+        return crowdTestTaskDao.count();
+    }
+
+    public long getAllReportNum(){
+        return crowdTestReportDao.count();
+    }
 }

core/src/main/java/com/mooctest/crowd/domain/repository/UserRepo.java

@@ -47,9 +47,6 @@ public class UserRepo implements IUserRepo {
     private RegionalManagerToRegionalDao regionalManagerToRegionalDao;
 
     @Autowired
-    private RegionalDao regionalDao;
-
-    @Autowired
     private AgencyResourceDao agencyResourceDao;
 
     @Autowired
@@ -404,4 +401,16 @@ public class UserRepo implements IUserRepo {
         BeanUtils.copyProperties(roleDao.findByName(roleName), role);
         return role;
     }
+
+    public long getAllUserNum(){
+        return userDao.count();
+    }
+
+    public long getAllAgencyNum(){
+        return evaluationAgencyDao.count();
+    }
+
+    public long getAllResourceNum(){
+        return agencyResourceDao.count();
+    }
 }