fix conlict

mooctest-user-server/pom.xml

@@ -24,7 +24,7 @@
         <dependency>
             <groupId>cn.iselab.mooctest</groupId>
             <artifactId>user-dubbo-api</artifactId>
-            <version>1.0.12</version>
+            <version>1.0.14</version>
         </dependency>
         <dependency>
             <groupId>cn.iselab.mooctest</groupId>

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/constants/Converter.java

@@ -8,11 +8,8 @@ import org.springframework.cglib.beans.BeanCopier;
 
 import java.util.Map;
 
-/**
- * @author sean
- * @date 2018-03-06.
- */
 public class Converter {
+
     private static Map<CopierIdentity, BeanCopier> copierCache = Maps.newConcurrentMap();
     private static PrimitiveConverter primitiveConverter = new PrimitiveConverter();
 
@@ -83,4 +80,3 @@ public class Converter {
 
 }
 
-

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/dao/UserDao.java

@@ -11,7 +11,9 @@ import javax.transaction.Transactional;
  * @date 2018-03-04.
  */
 @Transactional
-public interface UserDao extends CrudRepository<User, Long> , JpaSpecificationExecutor<User> {
+public interface UserDao extends CrudRepository<User, Long>, JpaSpecificationExecutor<User> {
+
+    User findById(Long id);
 
     User findByEmail(String email);
 

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/model/User.java

@@ -45,8 +45,13 @@ public class User {
     @Column(name = "manual_check_valid")
     private Boolean manualCheckValid;
 
-    @Column(name = "is_available")
-    private Boolean isAvailable;
+    /**
+     * -1 用户被删除
+     * 0  用户被禁用
+     * 1  用户解除禁用 可以正常使用
+     */
+    @Column(name = "availability")
+    private Integer availability;
 
     public Long getId() {
         return id;
@@ -136,11 +141,11 @@ public class User {
         this.manualCheckValid = manualCheckValid;
     }
 
-    public Boolean getAvailable() {
-        return isAvailable;
+    public Integer getAvailability() {
+        return availability;
     }
 
-    public void setAvailable(Boolean available) {
-        isAvailable = available;
+    public void setAvailability(Integer availability) {
+        this.availability = availability;
     }
 }

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

@@ -5,6 +5,8 @@ import cn.iselab.mooctest.rpc.user.data.UserDTO;
 import cn.iselab.mooctest.user.web.logic.UserLogic;
 import com.alibaba.dubbo.config.annotation.Service;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -56,4 +58,8 @@ public class UserRPC implements UserService {
         return  userLogic.findByCondition(condition);
     }
 
+    @Override
+    public Page<UserDTO> getUserPageByUserIds(List<Long> list, Pageable pageable) {
+        return null;
+    }
 }

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

@@ -43,7 +43,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public User findById(Long userId) {
-        return userDao.findOne(userId);
+        return userDao.findById(userId);
     }
 
     @Override
@@ -52,10 +52,11 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public List<User> findByCondition(Map<String,String> condition) {
+    public List<User> findByCondition(Map<String, String> condition) {
         Specification<User> where = Specifications.where(getUserWhereClause(condition));
         return userDao.findAll(where);
     }
+
     private Specification<User> getUserWhereClause(Map<String, String> condition) {
         return new Specification<User>() {
             @Override

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

@@ -91,16 +91,14 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
 
     @Override
     public UserDTO save(UserDTO userDTO) {
-        User user = Converter.convert(User.class, userDTO);
-        user = userService.register(user);
-        return Converter.convert(UserDTO.class, user);
+        User user = userWrapper.unwrap(userDTO);
+        return userWrapper.wrap(userService.register(user));
     }
 
     @Override
     public UserDTO updateUser(UserDTO userDTO) {
-        User user = Converter.convert(User.class, userDTO);
-        user = userService.update(user);
-        return Converter.convert(UserDTO.class, user);
+        User user = userWrapper.unwrap(userDTO);
+        return userWrapper.wrap(userService.update(user));
     }
 
     private void setIntegral(UserDTO dto,User user){

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

@@ -4,6 +4,8 @@ import cn.iselab.mooctest.rpc.user.data.UserDTO;
 import cn.iselab.mooctest.user.model.User;
 import org.springframework.stereotype.Service;
 
+import java.sql.Timestamp;
+
 /**
  * @author sean
  * @date 2018-03-04.
@@ -15,7 +17,7 @@ public class UserWrapper extends BaseWrapper<UserDTO, User> {
     public UserDTO wrap(User user) {
         UserDTO userDTO = new UserDTO();
 
-        userDTO.setAvailable(user.getAvailable());
+        userDTO.setAvailability(user.getAvailability());
         userDTO.setCity(user.getCity());
         userDTO.setCreateTime(user.getCreateTime().getTime());
         userDTO.setEmail(user.getEmail());
@@ -32,6 +34,21 @@ public class UserWrapper extends BaseWrapper<UserDTO, User> {
 
     @Override
     public User unwrap(UserDTO data) {
-        return null;
+        User user = new User();
+
+        user.setSchool(data.getSchool());
+        user.setProvince(data.getProvince());
+        user.setPhotoUrl(data.getPhotoUrl());
+        user.setAvailability(data.getAvailability());
+        user.setCity(data.getCity());
+        user.setCreateTime(new Timestamp(data.getCreateTime()));
+        user.setEmail(data.getEmail());
+        user.setId(data.getId());
+        user.setManualCheckValid(data.getManualCheckValid());
+        user.setMobile(data.getMobile());
+        user.setName(data.getName());
+        user.setPassword(data.getPassword());
+
+        return user;
     }
 }