Merge branch 'master' of git.mooctest.net:summer/mooctest-user & Add

mybatis

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/config/NullValueHandler.java

@@ -1,40 +0,0 @@
-package cn.iselab.mooctest.user.config;
-
-import org.apache.ibatis.type.JdbcType;
-import org.apache.ibatis.type.TypeHandler;
-
-import java.sql.*;
-
-/**
- * @author sean
- * @date 2018-03-15.
- */
-public class NullValueHandler implements TypeHandler<String> {
-
-    @Override
-    public String getResult(ResultSet rs, String columnName) throws SQLException {
-        return rs.getString(columnName);
-    }
-
-    @Override
-    public String getResult(ResultSet rs, int columnIndex) throws SQLException {
-        return rs.getString(columnIndex);
-    }
-
-    @Override
-    public void setParameter(PreparedStatement preparedStatement, int i, String s, JdbcType jdbcType) throws SQLException {
-        if (s == null &&
-                jdbcType == JdbcType.VARCHAR
-//                        || jdbcType == JdbcType.TIMESTAMP || jdbcType == JdbcType.BIGINT || jdbcType == JdbcType.TINYINT || jdbcType == JdbcType.INTEGER)
-                ) {
-            preparedStatement.setString(i, "");
-        } else {
-            preparedStatement.setString(i, s);
-        }
-    }
-
-    @Override
-    public String getResult(CallableStatement callableStatement, int i) throws SQLException {
-        return callableStatement.getString(i);
-    }
-}

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

@@ -4,7 +4,6 @@ import cn.iselab.mooctest.user.model.User;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
-import org.springframework.data.repository.PagingAndSortingRepository;
 
 import java.util.List;
 
@@ -12,8 +11,7 @@ import java.util.List;
  * @author sean
  * @date 2018-03-04.
  */
-
-public interface UserMapper extends PagingAndSortingRepository<User, Long> {
+public interface UserMapper {
 
     @Select("SELECT * FROM user WHERE id = #{id}")
     User findById(Long id);

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

@@ -57,7 +57,7 @@ public class MedalRPC implements MedalService{
     }
 
     /**
-     * save medal list
+     * get medal list
      * @param keyword
      * @return medalTO
      */

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

@@ -42,6 +42,18 @@ public class IntegralLogicImpl extends BaseLogic implements IntegralLogic {
         User2Integral integral= integralCaughtWrapper.unwrap(dto);
         integral.setCreateTime(new Timestamp(System.currentTimeMillis()));
         integral=integralService.saveUser2Integral(integral);
+
+        UserIntegral userIntegral=integralService.findByUserId(dto.getUserId());
+        if(userIntegral!=null) {
+            userIntegral.setTotal(userIntegral.getTotal() + integral.getPoints());
+        }else {
+            UserIntegral integral1=new UserIntegral();
+            integral1.setUserId(dto.getUserId());
+            integral1.setTotal(integral.getPoints());
+            integral1.setCreateTime(new Timestamp(System.currentTimeMillis()));
+            integral1.setEnabled(true);
+            integralService.saveIntegral(integral1);
+        }
         return integralCaughtWrapper.wrap(integral);
     }
 

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

@@ -2,6 +2,8 @@ package cn.iselab.mooctest.user.web.logic.impl;
 
 import cn.iselab.mooctest.rpc.user.data.UserDTO;
 import cn.iselab.mooctest.user.model.User;
+import cn.iselab.mooctest.user.model.UserIntegral;
+import cn.iselab.mooctest.user.service.IntegralService;
 import cn.iselab.mooctest.user.service.UserService;
 import cn.iselab.mooctest.user.web.exception.HttpBadRequestException;
 import cn.iselab.mooctest.user.web.logic.BaseLogic;
@@ -10,6 +12,7 @@ import cn.iselab.mooctest.user.web.wrapper.UserWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.sql.Timestamp;
 import java.util.List;
 
 /**
@@ -25,13 +28,18 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
     @Autowired
     private UserWrapper userWrapper;
 
+    @Autowired
+    private IntegralService integralService;
+
     @Override
     public UserDTO getUserByEmail(String s) {
         User user = userService.findByEmail(s);
         if (user == null) {
             return null;
         }
-        return userWrapper.wrap(user);
+        UserDTO dto = userWrapper.wrap(user);
+        setIntegral(dto,user);
+        return dto;
     }
 
     @Override
@@ -40,7 +48,9 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
         if (user == null) {
             return null;
         }
-        return userWrapper.wrap(user);
+        UserDTO dto = userWrapper.wrap(user);
+        setIntegral(dto,user);
+        return dto;
     }
 
     @Override
@@ -49,7 +59,9 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
         if (user == null) {
             return null;
         }
-        return userWrapper.wrap(user);
+        UserDTO dto = userWrapper.wrap(user);
+        setIntegral(dto,user);
+        return dto;
     }
 
     @Override
@@ -87,9 +99,25 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
         return userWrapper.wrap(user);
     }
 
+    private void setIntegral(UserDTO dto,User user){
+        UserIntegral integral=integralService.findByUserId(user.getId());
+        if (integral == null) {
+            UserIntegral integral1 = new UserIntegral();
+            integral1.setEnabled(true);
+            integral1.setTotal(0);
+            integral1.setUserId(user.getId());
+            integral1.setCreateTime(new Timestamp(System.currentTimeMillis()));
+            integralService.saveIntegral(integral1);
+            dto.setIntegral(integral1.getTotal());
+        }else {
+            dto.setIntegral(integral.getTotal());
+        }
+    }
+
     @Override
     public List<UserDTO> getUserByFuzzyName(UserDTO userDTO) {
         List<User> users = userService.findByFuzzyName(userDTO.getName());
         return userWrapper.wrap(users);
+
     }
 }

mooctest-user-server/src/main/resources/application.yaml

@@ -30,6 +30,7 @@ spring:
         url: jdbc:mysql://127.0.0.1:3306/mooctest_user?useUnicode=yes&characterEncoding=UTF-8
         username: root
         password: zhangxin
+
     dubbo:
         application.name: user-service-provider
         registry.address: zookeeper://118.178.131.206:2181
@@ -58,15 +59,15 @@ logging.config: classpath:log4j2.yaml
 spring:
     profiles: test
     datasource:
-        url: jdbc:mysql://127.0.0.1:3306/mooctest_user # please modify manually
-        username: test-username # please modify manually
-        password: test-password # please modify manually
+        url: jdbc:mysql://101.37.175.111:3306/mooctest_user # please modify manually
+        username: mooctest # please modify manually
+        password: secr3t! # please modify manually
 
     dubbo:
         application.name: user-service-provider
-        registry.address: zookeeper://127.0.0.1:2181
+        registry.address: zookeeper://118.178.131.206:2181
         protocol.name: dubbo
-        protocol.port: 20878
+        protocol.port: 20900
         protocol.host: 127.0.0.1
         scan: cn.iselab.mooctest.user.rpc
         monitor.protocal: registry