uncln 5 лет назад
Родитель
Сommit
7ff3cdd9d5
31 измененных файлов с 77 добавлено и 11 удалено
  1. 1 1
      .idea/compiler.xml
  2. 0 8
      .idea/vcs.xml
  3. 4 0
      seec-data-server/src/main/java/cn/seecoder/data/server/repository/GeneralRecordRepository.java
  4. 2 0
      seec-data-server/src/main/java/cn/seecoder/data/server/service/EvaluateService.java
  5. 38 1
      seec-data-server/src/main/java/cn/seecoder/data/server/service/Impl/EvaluateServiceImpl.java
  6. 3 1
      seec-data-server/src/test/java/cn/seecoder/data/server/schedule/EvaluateScheduleTest.java
  7. 29 0
      seec-data-server/src/test/java/cn/seecoder/data/server/service/Impl/EvaluateServiceImplTest.java
  8. BIN
      seec-data-server/target/classes/cn/seecoder/data/server/Repository/EvaluateRepository.class
  9. BIN
      seec-data-server/target/classes/cn/seecoder/data/server/Repository/GeneralRecordRepository.class
  10. BIN
      seec-data-server/target/classes/cn/seecoder/data/server/Repository/KnowledgeRepository.class
  11. BIN
      seec-data-server/target/classes/cn/seecoder/data/server/Repository/devcloud/BugListRepository.class
  12. BIN
      seec-data-server/target/classes/cn/seecoder/data/server/Repository/devcloud/CommitRepository.class
  13. BIN
      seec-data-server/target/classes/cn/seecoder/data/server/Repository/devcloud/TreeRepository.class
  14. BIN
      seec-data-server/target/classes/cn/seecoder/data/server/controller/EvaluateController.class
  15. BIN
      seec-data-server/target/classes/cn/seecoder/data/server/domain/devcloud/BugListDao.class
  16. BIN
      seec-data-server/target/classes/cn/seecoder/data/server/domain/devcloud/CommitDao.class
  17. BIN
      seec-data-server/target/classes/cn/seecoder/data/server/domain/devcloud/TreeDao.class
  18. BIN
      seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/BugListDTO$BugListDTOBuilder.class
  19. BIN
      seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/BugListDTO.class
  20. BIN
      seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/CommitDTO.class
  21. BIN
      seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/Response.class
  22. BIN
      seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/TreeDTO.class
  23. BIN
      seec-data-server/target/classes/cn/seecoder/data/server/schedule/DevcloudSchedule.class
  24. BIN
      seec-data-server/target/classes/cn/seecoder/data/server/schedule/EvaluateSchedule.class
  25. BIN
      seec-data-server/target/classes/cn/seecoder/data/server/service/Impl/evaluateServiceImpl.class
  26. BIN
      seec-data-server/target/classes/cn/seecoder/data/server/service/evaluateService.class
  27. BIN
      seec-data-server/target/test-classes/cn/seecoder/data/server/dto/devcloud/BugListDTOTest.class
  28. BIN
      seec-data-server/target/test-classes/cn/seecoder/data/server/schedule/DevcloudScheduleTest.class
  29. BIN
      seec-data-server/target/test-classes/cn/seecoder/data/server/schedule/EvaluateScheduleTest.class
  30. BIN
      seec-data-server/target/test-classes/cn/seecoder/data/server/service/Impl/EvaluateServiceImplTest.class
  31. BIN
      seec-data-server/target/test-classes/config/PropertyTestConfig.class

+ 1 - 1
.idea/compiler.xml

@@ -7,10 +7,10 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="seec-data-server" />
         <module name="seec-data-common" />
         <module name="demo" />
         <module name="seec-data-client" />
+        <module name="seec-data-server" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel target="8" />

+ 0 - 8
.idea/vcs.xml

@@ -1,14 +1,6 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-=======
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
->>>>>>> 3fcdc9a55d09f5e02b0c959a79c4251e0269f1b1
 </project>

+ 4 - 0
seec-data-server/src/main/java/cn/seecoder/data/server/repository/GeneralRecordRepository.java

@@ -4,6 +4,10 @@ import cn.seecoder.data.server.domain.GeneralRecordDao;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface GeneralRecordRepository extends JpaRepository<GeneralRecordDao,Integer>{
+
+        public List<GeneralRecordDao> getByUserIdAndDataSource(Integer userId,String dataSource);
 }

+ 2 - 0
seec-data-server/src/main/java/cn/seecoder/data/server/service/EvaluateService.java

@@ -1,4 +1,6 @@
 package cn.seecoder.data.server.service;
 
 public interface EvaluateService {
+
+    public double getEvaluateScore(int userId);
 }

+ 38 - 1
seec-data-server/src/main/java/cn/seecoder/data/server/service/Impl/EvaluateServiceImpl.java

@@ -1,10 +1,47 @@
 package cn.seecoder.data.server.service.Impl;
 
+import cn.seecoder.bok.client.SeecoderBokClient;
+import cn.seecoder.bok.common.vo.QuestionVO;
 import cn.seecoder.data.server.domain.GeneralRecordDao;
+import cn.seecoder.data.server.repository.GeneralRecordRepository;
 import cn.seecoder.data.server.service.EvaluateService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Service
 public class EvaluateServiceImpl implements EvaluateService {
-    private GeneralRecordDao evaluatedao;
+
+    @Autowired
+    private GeneralRecordRepository generalRecordRepository;
+
+    public EvaluateServiceImpl(GeneralRecordRepository generalRecordRepository){
+        this.generalRecordRepository = generalRecordRepository;
+    }
+
+    @Override
+    public double getEvaluateScore(int userId) {
+        SeecoderBokClient seecoderBokClient = new SeecoderBokClient("http://bok.seec.seecoder.cn");
+        List<GeneralRecordDao> generalRecordDaoList = generalRecordRepository.getByUserIdAndDataSource(userId,"evaluate");
+        ArrayList<String> questionIds = new ArrayList<String>();
+        for(int i=0;i<generalRecordDaoList.size();i++)
+            questionIds.add(generalRecordDaoList.get(i).getQuestionId());
+        double scoreTotal = 0;
+        double score = 0;
+        double[] weight = {1,1,1,1.05,1.1};
+        List<QuestionVO> questionVOS = seecoderBokClient.getQuestionListByIds(questionIds);
+        for(int i=0;i<generalRecordDaoList.size();i++){
+            QuestionVO questionVO = questionVOS.get(i);
+            GeneralRecordDao generalRecordDao = generalRecordDaoList.get(i);
+            scoreTotal = scoreTotal + generalRecordDao.getScoreTotal();
+            if(questionVO.getWeight()==null||questionVO.getWeight()==0)
+                score = score + generalRecordDao.getScore();
+            else
+                score = score + generalRecordDao.getScore() * weight[questionVO.getWeight()];
+        }
+        double ans = score/scoreTotal*100;
+        return ans;
+    }
 }

+ 3 - 1
seec-data-server/src/test/java/cn/seecoder/data/server/schedule/EvaluateScheduleTest.java

@@ -23,7 +23,7 @@ import java.util.Date;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @Rollback(value = false)
-//@SpringBootTest
+@SpringBootTest
 
 class EvaluateScheduleTest {
 
@@ -63,4 +63,6 @@ class EvaluateScheduleTest {
         }
     }
 
+
+
 }

+ 29 - 0
seec-data-server/src/test/java/cn/seecoder/data/server/service/Impl/EvaluateServiceImplTest.java

@@ -0,0 +1,29 @@
+package cn.seecoder.data.server.service.Impl;
+
+import cn.seecoder.data.server.repository.GeneralRecordRepository;
+import cn.seecoder.data.server.service.EvaluateService;
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@Rollback
+@SpringBootTest
+class EvaluateServiceImplTest {
+
+    @Autowired
+    GeneralRecordRepository generalRecordRepository;
+
+    @Test
+    void getEvaluateScore() {
+        EvaluateServiceImpl evaluateService = new EvaluateServiceImpl(generalRecordRepository);
+        double score = evaluateService.getEvaluateScore(332);
+        System.out.println(score);
+    }
+}

BIN
seec-data-server/target/classes/cn/seecoder/data/server/Repository/EvaluateRepository.class


BIN
seec-data-server/target/classes/cn/seecoder/data/server/Repository/GeneralRecordRepository.class


BIN
seec-data-server/target/classes/cn/seecoder/data/server/Repository/KnowledgeRepository.class


BIN
seec-data-server/target/classes/cn/seecoder/data/server/Repository/devcloud/BugListRepository.class


BIN
seec-data-server/target/classes/cn/seecoder/data/server/Repository/devcloud/CommitRepository.class


BIN
seec-data-server/target/classes/cn/seecoder/data/server/Repository/devcloud/TreeRepository.class


BIN
seec-data-server/target/classes/cn/seecoder/data/server/controller/EvaluateController.class


BIN
seec-data-server/target/classes/cn/seecoder/data/server/domain/devcloud/BugListDao.class


BIN
seec-data-server/target/classes/cn/seecoder/data/server/domain/devcloud/CommitDao.class


BIN
seec-data-server/target/classes/cn/seecoder/data/server/domain/devcloud/TreeDao.class


BIN
seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/BugListDTO$BugListDTOBuilder.class


BIN
seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/BugListDTO.class


BIN
seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/CommitDTO.class


BIN
seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/Response.class


BIN
seec-data-server/target/classes/cn/seecoder/data/server/dto/devcloud/TreeDTO.class


BIN
seec-data-server/target/classes/cn/seecoder/data/server/schedule/DevcloudSchedule.class


BIN
seec-data-server/target/classes/cn/seecoder/data/server/schedule/EvaluateSchedule.class


BIN
seec-data-server/target/classes/cn/seecoder/data/server/service/Impl/evaluateServiceImpl.class


BIN
seec-data-server/target/classes/cn/seecoder/data/server/service/evaluateService.class


BIN
seec-data-server/target/test-classes/cn/seecoder/data/server/dto/devcloud/BugListDTOTest.class


BIN
seec-data-server/target/test-classes/cn/seecoder/data/server/schedule/DevcloudScheduleTest.class


BIN
seec-data-server/target/test-classes/cn/seecoder/data/server/schedule/EvaluateScheduleTest.class


BIN
seec-data-server/target/test-classes/cn/seecoder/data/server/service/Impl/EvaluateServiceImplTest.class


BIN
seec-data-server/target/test-classes/config/PropertyTestConfig.class