Merge branch 'dev-Cofortest' into 'ReleaseForCofortest'

Dev cofortest

See merge request crowd-2019/crowd-test-service-backend!211

core/src/main/java/com/mooctest/crowd/domain/factory/CrowdTestProjectFactory.java

@@ -23,14 +23,14 @@ public class CrowdTestProjectFactory {
         return new CrowdTestProject();
     }
 
-    public static CrowdTestProject defaultCrowdTestProject() {
+    public static CrowdTestProject defaultCrowdTestProject(Long userId) {
         CrowdTestProject project = new CrowdTestProject();
         project.setStatus(CrowdTestProjectStatus.HAS_FINISHED);
         project.setIsDeleted(0);
         project.setProjectDistributionTypeId(1L);
         project.setDistributionProvince("江苏省");
         project.setDistributionCity("南京市");
-        project.setRegionalManagerId(99222L);
+        project.setRegionalManagerId(userId);
         project.setUserId(1L);
         project.setProjectFile("");
         project.setRequirementFile("");

site/src/main/java/com/mooctest/crowd/site/service/CrowdProjectService.java

@@ -46,6 +46,8 @@ public interface CrowdProjectService {
 
     List<CrowdTestProject> generateProjectByExcel(Long userId, MultipartFile file);
 
+    List<CrowdTestProject> generateProjectByExcelAndUserId(Long userId,MultipartFile file);
+
     List<RegionalManagerVO> getRegionalManagerList();
 
     ProjectDetailsDTO receiveProject(String projectCode, Long userId);

site/src/main/java/com/mooctest/crowd/site/service/impl/CrowdProjectServiceImpl.java

@@ -273,9 +273,20 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
     }
 
     @Override
+    public List<CrowdTestProject> generateProjectByExcelAndUserId(Long userId, MultipartFile file){
+        List<RegionalManagerVO> RegionalManagetList = getRegionalManagerList();
+        for (RegionalManagerVO regionalManagerVO : RegionalManagetList) {
+            if(regionalManagerVO.getId().equals(userId)){
+                return transferExcel2Projects(userId, file);
+            }
+        }
+        return transferExcel2Projects(99222L,file);
+    }
+
+    @Override
     public List<CrowdTestProject> generateProjectByExcel(Long userId, MultipartFile file) {
         User user = userRepo.getByID(userId);
-        List<CrowdTestProject> projects = transferExcel2Projects(file);
+        List<CrowdTestProject> projects = generateProjectByExcelAndUserId(userId,file);
         projects.forEach(project -> {
             project.setCode(GenerateFlowCodeUtil.generateProjCode());
             project.setUserId(userId);
@@ -509,7 +520,7 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
 		return userProjectDTO;
 	}
 
-	private List<CrowdTestProject> transferExcel2Projects(MultipartFile file) {
+	private List<CrowdTestProject> transferExcel2Projects(Long userId,MultipartFile file) {
         List<String> logList = new ArrayList<>();
         List<CrowdTestProject> projects = new ArrayList<>();
         Workbook workbook = null;
@@ -534,7 +545,7 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
         log.info("CellCount: " + cellCount);
         log.info("Rows: " + sheet.getPhysicalNumberOfRows());
         for (int i = 1; i < sheet.getPhysicalNumberOfRows(); i++) {
-            CrowdTestProject project = CrowdTestProjectFactory.defaultCrowdTestProject();
+            CrowdTestProject project = CrowdTestProjectFactory.defaultCrowdTestProject(userId);
             CrowdTestReport report = CrowdTestProjectFactory.defaultProjectReport();
             Row row = sheet.getRow(i);
             if (row == null) {

site/src/main/resources/application.yml

@@ -46,34 +46,45 @@ green:
 spring:
   profiles: dev
   datasource:
-    url: jdbc:mysql://101.37.175.111:3306/crowd-test-service-online?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-    username: mooctest
-    password: secr3t!
+    url: jdbc:mysql://106.14.81.62:3308/crowd-test-service-online?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+    username: root
+    password: Customs2019
   redis:
-    host: 121.40.93.243
-    port: 16379
-    password:
+    host: 106.14.81.62
+    port: 6378
+    password: Customs2019
     jedis:
       pool:
         max-active: 8
         max-idle: 8
         max-wait: -1
         min-idle: 0
-    database: 6
+    database: 0
 user:
   service:
-    baseUrl: http://121.40.93.243:8082
-
-file:
-  save:
-    path: /var/www/
+    baseUrl: http://106.14.81.62:8281
 
+#file:
+#  save:
+#    path: /var/www/
 feature:
   client:
     oss: true
+  task:
+    import: true  #任务导入
+    recommend: false #任务推荐
+    acceptedPWD: true #使用密码接收任务
+
+file:
+  save:
+    path: /Users/guochao/Desktop/project/data/cofortest/
+
+#feature:
+#  client:
+#    oss: false
 
 website:
-  domain: mooctest.net
+  domain: .mooctest.net
 
 ---
 # 线上版本