Merge branch 'Test' of git.mooctest.net:summer/mooctest-user into Test

mooctest-user-server/pom.xml

@@ -24,18 +24,18 @@
         <dependency>
             <groupId>cn.iselab.mooctest</groupId>
             <artifactId>user-dubbo-api</artifactId>
-            <version>1.0.27</version>
+            <version>1.0.28</version>
         </dependency>
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>1.1.1</version>
         </dependency>
-        <dependency>
-            <groupId>cn.iselab.mooctest</groupId>
-            <artifactId>mooctest-user-common</artifactId>
-            <version>0.0.1</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>cn.iselab.mooctest</groupId>-->
+            <!--<artifactId>mooctest-user-common</artifactId>-->
+            <!--<version>0.0.1</version>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/mapper/User2IntegralDao.java

@@ -18,4 +18,6 @@ import java.util.List;
 public interface User2IntegralDao extends CrudRepository<User2Integral, Long> ,JpaSpecificationExecutor<User2Integral> {
 
     List<User2Integral> findByUserId(long userId);
+
+    List<User2Integral> findByUserIdAndAndTypeAndSource(long userId, long type, String source);
 }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/rpc/IntegralRPC.java

@@ -75,4 +75,9 @@ public class IntegralRPC implements IntegralService {
     public UserIntegralDTO getUserIntegral(Long userId){
         return integralLogic.getUserIntegral(userId);
     }
+
+    @Override
+    public List<IntegralCaughtDTO> getUserIntegralRecord(long userId, long type, String source) {
+        return integralLogic.getUserIntegralRecord(userId, type, source);
+    }
 }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/service/IntegralService.java

@@ -31,4 +31,6 @@ public interface IntegralService {
     List<Integral> findIntegrals();
 
     User2Integral findIntegralBySource(String source,long userId);
+
+    List<User2Integral> findUserIntegralCaught(long userId, long type, String source);
 }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/service/impl/IntegralServiceImpl.java

@@ -90,6 +90,11 @@ public class IntegralServiceImpl implements IntegralService {
         return user2Integrals.size()>0?user2Integrals.get(0):null;
     }
 
+    @Override
+    public List<User2Integral> findUserIntegralCaught(long userId, long type, String source) {
+        return user2IntegralDao.findByUserIdAndAndTypeAndSource(userId, type, source);
+    }
+
     private Specification<User2Integral> getUser2Integral(Timestamp startTime, Timestamp endTime){
         return new Specification<User2Integral>() {
             @Override

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/logic/IntegralLogic.java

@@ -29,4 +29,6 @@ public interface IntegralLogic {
     boolean addIntegral(AddIntegralDTO dto);
 
     Map<String,Integral> reloadIntegralMap();
+
+    List<IntegralCaughtDTO> getUserIntegralRecord(long userId, long type, String source);
 }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/logic/impl/IntegralLogicImpl.java

@@ -5,6 +5,7 @@ import cn.iselab.mooctest.rpc.user.data.AddIntegralDTO;
 import cn.iselab.mooctest.rpc.user.data.IntegralCaughtDTO;
 import cn.iselab.mooctest.rpc.user.data.UserIntegralDTO;
 import cn.iselab.mooctest.user.configure.IntegralMap;
+import cn.iselab.mooctest.user.mapper.User2IntegralDao;
 import cn.iselab.mooctest.user.model.Integral;
 import cn.iselab.mooctest.user.model.User2Integral;
 import cn.iselab.mooctest.user.model.UserIntegral;
@@ -106,6 +107,15 @@ public class IntegralLogicImpl extends BaseLogic implements IntegralLogic {
         return integralMap.reload();
     }
 
+    @Override
+    public List<IntegralCaughtDTO> getUserIntegralRecord(long userId, long type, String source) {
+        List<User2Integral> user2IntegralList = integralService.findUserIntegralCaught(userId,
+                type, source);
+        return user2IntegralList.stream()
+                .map(user2Integral -> integralCaughtWrapper.wrap(user2Integral))
+                .collect(Collectors.toList());
+    }
+
     public UserIntegral addIntegral(User2Integral integral){
         UserIntegral userIntegral=integralService.findByUserId(integral.getUserId());
         if(userIntegral!=null) {

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/wrapper/IntegralCaughtWrapper.java

@@ -31,6 +31,7 @@ public class IntegralCaughtWrapper extends BaseWrapper<IntegralCaughtDTO,User2In
         integral.setPoints(dto.getPoints());
         integral.setSource(dto.getSource());
         integral.setType(dto.getType());
+        integral.setUserId(dto.getUserId());
         return integral;
     }
 }