fix conflict

mooctest-user-server/pom.xml

@@ -24,7 +24,7 @@
         <dependency>
             <groupId>cn.iselab.mooctest</groupId>
             <artifactId>user-dubbo-api</artifactId>
-            <version>1.0.25</version>
+            <version>1.0.27</version>
         </dependency>
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>

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

@@ -47,7 +47,9 @@ public interface UserMapper {
     @Update("UPDATE user SET availability=#{availability} WHERE id=#{id}")
     void updateAvailability(User user);
 
-    @Select("SELECT * FROM user WHERE name LIKE concat('%',#{username},'%')")
+    @Select("SELECT * FROM user WHERE name LIKE concat('%',#{username},'%') or email LIKE concat('%',#{username},'%')" +
+            "or school LIKE concat('%',#{username},'%') or province LIKE concat('%',#{username},'%') or city LIKE concat('%',#{username},'%')" +
+            "or mobile LIKE concat('%',#{username},'%')")
     List<User> findByFuzzyName(String name);
 
     @Select("SELECT * FROM user WHERE email LIKE concat('%',#{username},'%')")
@@ -55,4 +57,7 @@ public interface UserMapper {
 
     @Select("SELECT * FROM user WHERE name LIKE concat('%',#{keyword},'%') OR email LIKE CONCAT('%',#{keyword},'%')")
     List<User> findByFuzzyNameOrEmail(String keyword);
+
+    @Select("SELECT * FROM user WHERE id in (${userIds})")
+    List<User> findAll(@Param("userIds") String userIds);
 }

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

@@ -7,8 +7,6 @@ import cn.iselab.mooctest.rpc.user.data.UserIntegralDTO;
 import cn.iselab.mooctest.user.web.logic.IntegralLogic;
 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;

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

@@ -79,4 +79,14 @@ public class UserRPC implements UserService {
     public List<UserDTO> getUserByFuzzyCity(UserDTO var1){
         return null;
     }
+
+    @Override
+    public List<UserDTO> findAll(List<Long> list) {
+        return userLogic.findAll(list);
+    }
+
+    @Override
+    public List<UserDTO> findByEmails(List<String> list) {
+        return userLogic.findByEmails(list);
+    }
 }

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

@@ -26,5 +26,9 @@ public interface UserService {
     List<User> findByFuzzyEmail(String email);
 
     List<User> findByFuzzyNameOrEmail(String keyword);
+
+    List<User> findAll(List<Long> userIds);
+
+    List<User> findAllByEmails(List<String> emails);
 }
 

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

@@ -6,6 +6,7 @@ import cn.iselab.mooctest.user.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -67,4 +68,22 @@ public class UserServiceImpl implements UserService {
     public List<User> findByFuzzyNameOrEmail(String keyword) {
         return userMapper.findByFuzzyNameOrEmail(keyword);
     }
+
+    @Override
+    public List<User> findAll(List<Long> userIds) {
+        List<User> users = new ArrayList<>();
+        for (Long id : userIds) {
+            users.add(userMapper.findById(id));
+        }
+        return users;
+    }
+
+    @Override
+    public List<User> findAllByEmails(List<String> emails) {
+        List<User> users = new ArrayList<>();
+        for (String s : emails) {
+            users.add(userMapper.findByEmail(s));
+        }
+        return users;
+    }
 }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/ctrl/UserController.java

@@ -6,6 +6,9 @@ import cn.iselab.mooctest.user.web.logic.UserLogic;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author sean
  * @date 2018-03-05.
@@ -27,9 +30,14 @@ public class UserController extends BaseController {
     }
 
     @RequestMapping(value = UrlConstants.API + "user", method = RequestMethod.POST)
-    public UserDTO save(@RequestBody UserDTO userDTO){
+    public UserDTO save(@RequestBody UserDTO userDTO) {
         return userLogic.save(userDTO);
     }
 
 
+//    @RequestMapping(value = UrlConstants.API + "userList", method = RequestMethod.GET)
+//    public List<UserDTO> getUsers() {
+//        List<Long> userIds = new ArrayList<>();
+//        return userLogic.getUserList(userIds);
+//    }
 }

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

@@ -3,7 +3,6 @@ package cn.iselab.mooctest.user.web.logic;
 import cn.iselab.mooctest.rpc.user.data.UserDTO;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author sean
@@ -29,4 +28,8 @@ public interface UserLogic {
 
     List<UserDTO> getUserByFuzzyNameOrEmail(UserDTO userDTO);
 
+    List<UserDTO> findAll(List<Long> userIds);
+
+    List<UserDTO> findByEmails(List<String> emails);
+
 }

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

@@ -14,7 +14,6 @@ import org.springframework.stereotype.Service;
 
 import java.sql.Timestamp;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author sean
@@ -130,7 +129,7 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
     @Override
     public List<UserDTO> getUserByFuzzyNameOrEmail(UserDTO userDTO) {
         String keyword = null;
-        if(userDTO.getName() != null) {
+        if (userDTO.getName() != null) {
             keyword = userDTO.getName();
         } else if (userDTO.getEmail() != null) {
             keyword = userDTO.getEmail();
@@ -138,4 +137,20 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
         List<User> userList = userService.findByFuzzyNameOrEmail(keyword);
         return userWrapper.wrap(userList);
     }
+
+    @Override
+    public List<UserDTO> findAll(List<Long> userIds) {
+        if (userIds.size() < 1) {
+            throw new HttpBadRequestException("userId length <1");
+        }
+        return userWrapper.wrap(userService.findAll(userIds));
+    }
+
+    @Override
+    public List<UserDTO> findByEmails(List<String> emails) {
+        if (emails.size() < 1) {
+            throw new HttpBadRequestException("emails length <1");
+        }
+        return userWrapper.wrap(userService.findAllByEmails(emails));
+    }
 }

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

@@ -38,7 +38,7 @@ spring:
         driverClassName: com.mysql.jdbc.Driver
         url: jdbc:mysql://127.0.0.1:3306/mooctest_user?useUnicode=yes&characterEncoding=UTF-8
         username: root
-        password: cxz6518
+        password: zhangxin
 
     dubbo:
         application.name: user-service-provider