修复查看任务下的报告时，同步bug到bugdata中报错

src/main/java/com/mooctest/config/AbstractMongoConfig.java

@@ -1,20 +1,12 @@
 package com.mooctest.config;
 
-import com.google.common.collect.ImmutableList;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoCredential;
-import com.mongodb.ServerAddress;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
-
-import java.util.ArrayList;
-import java.util.List;
 
 public abstract class AbstractMongoConfig {
 
-    abstract public MongoDbFactory mongoDbFactory() throws Exception;
+    abstract public MongoDbFactory mongoDbFactory();
 
-    abstract public MongoTemplate getMongoTemplate() throws Exception;
+    abstract public MongoTemplate getMongoTemplate();
 
 }

src/main/java/com/mooctest/config/MongoOneConfig.java

@@ -1,12 +1,7 @@
 package com.mooctest.config;
 
-import com.google.common.collect.ImmutableList;
 import com.mongodb.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.mongo.MongoProperties;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -14,51 +9,32 @@ import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
-import org.springframework.core.env.Environment;
-
-import java.util.ArrayList;
-import java.util.List;
 
 @Configuration
-@EnableMongoRepositories(
-        basePackages = "com.mooctest.dao",
-        mongoTemplateRef = "mongoTemplate1")
+@EnableMongoRepositories(basePackages = "com.mooctest.dao",mongoTemplateRef = "mongoTemplate1")
 public class MongoOneConfig extends AbstractMongoConfig {
-    @Value("${mongodb1.host}")
+    @Value("${mongodb.host}")
     private String host;
-    @Value("${mongodb1.database}")
+    @Value("${mongodb.database}")
     private String database;
-    @Value("${mongodb1.port}")
+    @Value("${mongodb.port}")
     private int port;
-    @Value("${mongodb1.username}")
+    @Value("${mongodb.username}")
     private String username;
-    @Value("${mongodb1.password}")
+    @Value("${mongodb.password}")
     private String password;
-    //Setter methods go here..
-    /*
-     * 创建MongoDBFactory的方法
-     * 两个MongoDB连接共用
-     */
 
-    public MongoDbFactory mongoDbFactory() throws Exception {
+    public MongoDbFactory mongoDbFactory() {
         String uriStr="mongodb://"+username+":"+password+"@"+host+":"+port+"/"+database;
-        System.out.println(uriStr);
         MongoClientURI mongoClientURI=new MongoClientURI(uriStr);
         MongoDbFactory mongoDbFactory=new SimpleMongoDbFactory(mongoClientURI);
         return mongoDbFactory;
-//        System.out.println(host + port + username);
-//        List<ServerAddress> seeds = new ArrayList<>();
-//        ServerAddress serverAddress = new ServerAddress(host, port);
-//        seeds.add(serverAddress);
-//        List<MongoCredential> mongoCredentialList = new ArrayList<>();
-//        mongoCredentialList.add(MongoCredential.createCredential(username, database, password.toCharArray()));
-//        MongoClient mongoClient = new MongoClient(new ServerAddress(), ImmutableList.of(MongoCredential.createCredential(username, database, password.toCharArray())));
-//        return new SimpleMongoDbFactory(mongoClient, database);
-//        return new SimpleMongoDbFactory(new MongoClient(host, port), database);
+        // 无密码使用
+        // return new SimpleMongoDbFactory(new MongoClient(host, port), database);
     }
 
     @Primary
-    public @Bean(name = "mongoTemplate1") MongoTemplate getMongoTemplate() throws Exception {
+    public @Bean(name = "mongoTemplate1") MongoTemplate getMongoTemplate() {
         return new MongoTemplate(mongoDbFactory());
     }
 }

src/main/java/com/mooctest/config/MongoTwoConfig.java

@@ -1,63 +1,39 @@
 package com.mooctest.config;
 
-import com.mongodb.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
+import com.mongodb.MongoClientURI;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.mongo.MongoProperties;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.core.env.Environment;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 
-import java.util.ArrayList;
-import java.util.List;
-
 
 @Configuration
-@EnableMongoRepositories(
-        basePackages = "com.mooctest.dao2",
-        mongoTemplateRef = "mongoTemplate2")
-public class MongoTwoConfig{
+@EnableMongoRepositories(basePackages = "com.mooctest.dao2", mongoTemplateRef = "mongoTemplate2")
+public class MongoTwoConfig extends AbstractMongoConfig {
 
-    @Value("${mongodb2.host}")
+    @Value("${mongodb.host}")
     private String host;
-    @Value("${mongodb2.database}")
+    @Value("${mongodb.database}")
     private String database;
-    @Value("${mongodb2.port}")
+    @Value("${mongodb.port}")
     private int port;
-    @Value("${mongodb2.username}")
+    @Value("${mongodb.username}")
     private String username;
-    @Value("${mongodb2.password}")
+    @Value("${mongodb.password}")
     private String password;
-    //Setter methods go here..
-    /*
-     * 创建MongoDBFactory的方法
-     * 两个MongoDB连接共用
-     */
-    public MongoDbFactory mongoDbFactory2() throws Exception {
+
+    public MongoDbFactory mongoDbFactory() {
         String uriStr="mongodb://"+username+":"+password+"@"+host+":"+port+"/"+database;
-        System.out.println(uriStr);
         MongoClientURI mongoClientURI=new MongoClientURI(uriStr);
         MongoDbFactory mongoDbFactory=new SimpleMongoDbFactory(mongoClientURI);
         return mongoDbFactory;
-//        System.out.println(host + port + username);
-//        List<ServerAddress> seeds = new ArrayList<>();
-//        ServerAddress serverAddress = new ServerAddress(host, port);
-//        seeds.add(serverAddress);
-//        List<MongoCredential> mongoCredentialList = new ArrayList<>();
-//        mongoCredentialList.add(MongoCredential.createCredential(username, database, password.toCharArray()));
-//        return new SimpleMongoDbFactory(new MongoClient(seeds, mongoCredentialList), database);
-//        return new SimpleMongoDbFactory(new MongoClient(host, port), database);
     }
 
-    public @Bean(name = "mongoTemplate2") MongoTemplate getMongoTemplate() throws Exception {
-        return new MongoTemplate(mongoDbFactory2());
+    public @Bean(name = "mongoTemplate2") MongoTemplate getMongoTemplate() {
+        return new MongoTemplate(mongoDbFactory());
     }
 }
 

src/main/java/com/mooctest/controller/AuditController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
 public class AuditController {
-    @Value("${report.host}")
+    @Value("${baseUrl.report.host}")
     String reportHost ;
     @Autowired
     AuditTaskService auditTaskService;

src/main/java/com/mooctest/controller/JobController.java

@@ -1,23 +1,18 @@
 package com.mooctest.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.mooctest.data.ResponseDTO;
 import com.mooctest.service.JobService;
 import com.mooctest.service.PaperService;
 import com.mooctest.util.TimeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.ui.Model;
-
+import org.springframework.web.bind.annotation.*;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 @Controller
@@ -27,7 +22,7 @@ public class JobController {
     /**
      * 用于reviewJob  众包审核系统的review
      */
-    @Value("${report.host}")
+    @Value("${baseUrl.report.host}")
     String reportHost;
     @Autowired
     PaperService paperService;

src/main/java/com/mooctest/controller/PaperController.java

@@ -21,7 +21,7 @@ import java.util.Map;
 @Controller
 public class PaperController {
 
-    @Value("${report.host}")
+    @Value("${baseUrl.report.host}")
     String reportHost ;
     @Autowired
     PaperService paperService;

src/main/java/com/mooctest/controller/TaskController.java

@@ -56,12 +56,12 @@ public class TaskController {
     @Autowired
     ConfigurationService configurationService;
 
-    @Value("${report.host}")
+    @Value("${baseUrl.report.host}")
     String reportHost;
 
     @Value("${useOss}")
     boolean useOss;
-    @Value("${urlPath}")
+    @Value("${baseUrl.urlPath}")
     String urlPrefix;
 
     /**
@@ -222,7 +222,8 @@ public class TaskController {
      */
     @PostMapping("/addCrowdTaskDefault")
     @ResponseBody
-    public SimpleResponse addCrowdTaskDefault(@RequestParam("name")String name, @RequestParam("description")String description,@RequestParam("collaborativeType")int collaborativeType,
+    public SimpleResponse addCrowdTaskDefault(@RequestParam("name")String name, @RequestParam("description")String description,
+                                              @RequestParam("time")String time, @RequestParam("collaborativeType")int collaborativeType,
                                               @RequestParam("threePageUrl") String threePageUrl, @RequestParam("fileName") String fileName){
         Map<String, Object> configurationMap = configurationService.getConfigurationMap();
         String os = configurationMap.get("os").toString();

src/main/java/com/mooctest/service/AuditTaskService.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Service
 public class AuditTaskService {
 
-    @Value("${report.host}")
+    @Value("${baseUrl.report.host}")
     String reportHost ;
     private final String HTTP = "http://";
 

src/main/java/com/mooctest/service/BugDataService.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -89,6 +90,7 @@ public class BugDataService {
         if(bugs.size()!=count){
             // 报告数量不一致 ， 重新引入
             List<BugData> savedBugs = bugDataDao.findByExamIdAndCaseId( examId,  caseId);
+            AtomicInteger allCount = new AtomicInteger((int) bugDataDao.count());
             // ？
             List<String > bugIds = savedBugs.stream().map(BugData::getBugId).collect(Collectors.toList());
             List<BugData> toSave = new ArrayList<>();
@@ -99,8 +101,9 @@ public class BugDataService {
                             .examId(examId)
                             .status(0)
                             .reviewTimeMillis(s.getCreateTimeMillis())
-//                    .reviewerId()
                             .bugId(s.getId()).build();
+                    allCount.getAndIncrement();
+                    tempData.setId(allCount.get() + 1);
                     toSave.add(tempData);
                 }
             });

src/main/java/com/mooctest/service/FinalReportService.java

@@ -6,7 +6,6 @@ import com.mooctest.dao.FinalReportDao;
 import com.mooctest.data.BugDTO;
 import com.mooctest.data.FinalReportDTO;
 import com.mooctest.data.TaskDTO;
-import com.mooctest.model.Bug;
 import com.mooctest.model.FinalReport;
 import com.mooctest.util.HttpUtil;
 import com.mooctest.util.ReportUtil;
@@ -30,10 +29,10 @@ public class FinalReportService {
     @Autowired
     FinalReportDao finalReportDao;
 
-    @Value("${report.export.addr}")
+    @Value("${baseUrl.report.export}")
     String reportExportAddr;
 
-    @Value("${report.export.excel.addr}")
+    @Value("${baseUrl.report.excel}")
     String reportExportExcelAttr;
 
 //    @Autowired

src/main/java/com/mooctest/service/JobService.java

@@ -27,12 +27,12 @@ import java.util.stream.Collectors;
 public class JobService {
     //  转发 job的请求
 
-    @Value("${report.host}")
+    @Value("${baseUrl.report.host}")
     String reportHost ;
     private final String HTTP = "http://";
-    @Value("${audit.distribute.addr}")
+    @Value("${baseUrl.auditDistribute}")
     String auditDistributeUrl ;
-    @Value("${mooctest.host}")
+    @Value("${baseUrl.mooctest}")
     String mootestHost;
 
 

src/main/java/com/mooctest/service/PaperService.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Service
 public class PaperService {
 
-    @Value("${report.host}")
+    @Value("${baseUrl.report.host}")
     private String reportHost;
     private final String HTTP = "http://";
     private final String CHARSET = "UTF-8";

src/main/java/com/mooctest/service/TaskService.java

@@ -67,10 +67,10 @@ public class TaskService {
     @Autowired
     ConfigurationService configurationService;
 
-    @Value("${task.distribute.url}")
+    @Value("${baseUrl.taskDistribute}")
     String distributeUrl;
 
-    @Value("${report.host}")
+    @Value("${baseUrl.report.host}")
     String reportHost ;
     private final String HTTP = "http://";
 

src/main/java/com/mooctest/service/impl/NginxFileService.java

@@ -15,7 +15,7 @@ public class NginxFileService implements FileService {
 
     @Value("${filePath}")
     private String filePath;
-    @Value("${urlPath}")
+    @Value("${baseUrl.urlPath}")
     private String urlPath;
 
     @Override

src/main/resources/application.yml

@@ -3,8 +3,6 @@ spring:
   mvc:
     favicon:
       enabled: false
-
-  # thymeleaf
   thymeleaf:
     prefix: classpath:/templates/
     check-template-location: true # 这个可以不配置，检查模板位置
@@ -14,168 +12,56 @@ spring:
     mode: HTML5
     cache: false   #避免改了模版还要重启服务器
 
-mongodb1:
-  database: test
-  host: 121.196.124.158
-  port: 27117
-  username: mooctest
-  password: mooctest
-
-mongodb2:
-  database: test
-  host: 121.196.124.158
-  port: 27117
-  username: mooctest
-  password: mooctest
-
-report.host: 127.0.0.1:8090
-
----
-spring:
-  profiles: dev-xc
-  thymeleaf:
-    cache: false
-
-mongodb1:
-  database: test
-  host: 121.196.124.158
-  port: 27117
-  username: mooctest
-  password: mooctest
-
-mongodb2:
-  database: test
-  host: 121.196.124.158
-  port: 27117
-  username: mooctest
-  password: mooctest
-
-report.export.addr: http://47.99.140.117:9002/generateReport
-report.export.excel.addr: http://47.99.140.117:9003/generateReport
-task.info.addr: http://127.0.0.1:8090/Bug/api/extra/getExamList
-
-server:
-  port: 9004
-#    port: 8090
 logging:
   level:
     com.mooctest: debug
   pattern:
     console: "%d{yyyy-MM-dd HH:mm:ss} [%p] [%t] [%c] %m%n"
+
+server.port: 9004
 ---
 spring:
-  profiles: dev
-  thymeleaf:
-    cache: false
+  profiles: dev-online
 
-mongodb1:
+mongodb:
   database: test
   host: 121.196.124.158
   port: 27117
   username: mooctest
   password: mooctest
 
-mongodb2:
+baseUrl:
+  auditDistribute: http://129.211.185.102:8082/
+  mooctest: http://101.37.175.111:8191
+  taskDistribute: http://47.102.206.109:6379/
+  report:
+    export: http://47.99.140.117:9002/generateReport
+    excel: http://localhost:9003/generateReport
+    host: 127.0.0.1:8090
+  urlPath: http://47.98.174.59:8100/resourcesXinchuang/
+
+useOss: true
+filePath: /Users/insomnialee/Desktop/now/
+---
+spring:
+  profiles: private-cloud
+
+mongodb:
   database: test
   host: 121.196.124.158
   port: 27117
   username: mooctest
   password: mooctest
 
-report.export.addr: http://47.99.140.117:9002/generateReport
-report.export.excel.addr: http://47.99.140.117:9003/generateReport
-task.info.addr: http://127.0.0.1:8090/Bug/api/extra/getExamList
-#task.info.addr: http://47.99.140.117:9001/Bug/api/extra/getExamList
-
-server:
-  port: 9004
-#    port: 8090
-logging:
-  level:
-    com.mooctest: debug
-  pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} [%p] [%t] [%c] %m%n"
----
-spring:
-  profiles: test
-  thymeleaf:
-    cache: false
-
-server:
-  port: 9004
-#    port: 8090
-logging:
-  level:
-    com.mooctest: debug
-  pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} [%p] [%t] [%c] %m%n"
----
-spring:
-  profiles: private-cloud
-  thymeleaf:
-    cache: false
+baseUrl:
+  auditDistribute: test
+  mooctest: http://101.37.175.111:8191
+  taskDistribute: http://47.102.206.109:6379/
+  report:
+    export: http://47.99.140.117:9002/generateReport
+    excel: http://47.98.174.59:8095/generateReport
+    host: 47.98.174.59:8100
+  urlPath: http://47.98.174.59:8100/resourcesXinchuang/
 
-task:
-  info:
-    addr: http://47.98.174.59:8100/Bug/api/extra/getExamList
-  distribute:
-    url: test
-server:
-  port: 9004
-report.host: 47.98.174.59:8100
-audit:
-  distribute:
-    addr: test
-mooctest:
-  host: http://101.37.175.111:8191
-report.export.addr: http://47.99.140.117:9002/generateReport
-report.export.excel.addr: http://47.98.174.59:8095/generateReport
-mongodb1.database: crowd_review_enterprise
-mongodb1.host: 47.98.174.59
-mongodb1.port: 27117
-mongodb2.database: co-enterprise
-mongodb2.host: 47.98.174.59
-mongodb2.port: 27117
 useOss: false
-filePath: /xinchuang/data/
-urlPath: http://47.98.174.59:8100/resourcesXinchuang/
-logging:
-  level:
-    com:
-      mooctest: debug
-  pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} [%p] [%t] [%c] %m%n"
----
-spring:
-  profiles: dev-online
-#  data:
-#    mongodb:
-#      uri: mongodb://mooctest:mooctest@121.196.124.158:27117/test
-
-server.port: 9004
-spring.profiles: dev-online
-spring.thymeleaf.cache: false
-
-audit.distribute.addr: http://129.211.185.102:8082/
-filePath: /Users/insomnialee/Desktop/now/
-foo: bar
-logging.level.com.mooctest: debug
-logging.pattern.console: "%d{yyyy-MM-dd HH:mm:ss} [%p] [%t] [%c] %m%n"
-mongodb1.database: test
-mongodb1.host: 121.196.124.158
-mongodb1.password: mooctest
-mongodb1.port: 27117
-mongodb1.username: mooctest
-mongodb2.database: test
-mongodb2.host: 121.196.124.158
-mongodb2.password: mooctest
-mongodb2.port: 27117
-mongodb2.username: mooctest
-mooctest.host: http://101.37.175.111:8191
-report.export.addr: http://47.99.140.117:9002/generateReport
-report.export.excel.addr: http://localhost:9003/generateReport
-report.host: 127.0.0.1:8090
-task.distribute.url: http://47.102.206.109:6379/
-task.info.addr: http://127.0.0.1:8090/Bug/api/extra/getExamList
-urlPath: localhost:9004/
-useOss: true
+filePath: /xinchuang/data/