Merge branch 'feature-hejq-b2c-201809' of ssh://10.10.101.21/source/platform-b2b into dev

src/main/java/com/uas/platform/b2b/b2capi/UserController.java

@@ -0,0 +1,42 @@
+package com.uas.platform.b2b.b2capi;
+
+import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.service.UserService;
+import com.uas.platform.b2b.support.UsageBufferedLogger;
+import com.uas.platform.core.logging.BufferedLoggerManager;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * B2C查询用户信息接口
+ *
+ * @author hejq
+ * @date 2018-09-26 17:13
+ */
+@RestController("b2capi.UserController")
+@RequestMapping(value = "/user")
+public class UserController {
+
+    @Autowired
+    private UserService userService;
+
+    private final static UsageBufferedLogger LOGGER = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+
+    /**
+     *  通过用户UU查询用户信息
+     *
+     * @param userUUJson 用户UU
+     * @return
+     */
+    @RequestMapping(value = "/findByUserUUList", method = RequestMethod.GET)
+    public List<User> findByUserUUList(String userUUJson) {
+        LOGGER.log("查询用户信息", "通过UU号查询用户信息", userUUJson);
+        List<Long> userUUs = FlexJsonUtils.fromJsonArray(userUUJson, Long.class);
+        return userService.findByUserUUList(userUUs);
+    }
+}

src/main/java/com/uas/platform/b2b/service/UserService.java

@@ -1,6 +1,10 @@
 package com.uas.platform.b2b.service;
 
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.model.UserInfo;
+import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.search.b2b.model.SPage;
 
@@ -346,4 +350,12 @@ public interface UserService {
 	 * @throws Exception
 	 */
 	void postToAccountCenter(User user) throws Exception ;
+
+    /**
+     * 通过用户UU查询用户信息
+     *
+     * @param userUUList 用户UU号
+     * @return List<User>
+     */
+    List<User> findByUserUUList(List<Long> userUUList);
 }

src/main/java/com/uas/platform/b2b/service/impl/UserServiceImpl.java

@@ -1,11 +1,27 @@
 package com.uas.platform.b2b.service.impl;
 
 import com.uas.message.mail.service.MailService;
-import com.uas.platform.b2b.dao.*;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.dao.CommonDao;
+import com.uas.platform.b2b.dao.DistributeDao;
+import com.uas.platform.b2b.dao.EnterpriseDao;
+import com.uas.platform.b2b.dao.UserDao;
+import com.uas.platform.b2b.dao.VendorDao;
+import com.uas.platform.b2b.model.Distribute;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.Role;
+import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.model.UserInfo;
+import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.service.VendorService;
-import com.uas.platform.b2b.support.*;
+import com.uas.platform.b2b.support.CommBufferedLogger;
+import com.uas.platform.b2b.support.MessageConf;
+import com.uas.platform.b2b.support.SPageUtils;
+import com.uas.platform.b2b.support.SendMailService;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.b2b.support.TokenService;
+import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.exception.SystemException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
@@ -26,7 +42,14 @@ import org.springframework.util.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * @since 2016-9-26 21:18:35 账户中心统一管理；部分功能保留，但转移到v2目录
@@ -316,12 +339,7 @@ public class UserServiceImpl implements UserService {
 				}
 			}
 		}
-		userInfos.setTotalPage(users.getTotalPages());
-		userInfos.setSize(users.getSize());
-		userInfos.setPage(users.getNumber());
-		userInfos.setTotalElement(users.getTotalElements());
-		userInfos.setContent(users.getContent());
-		return userInfos;
+		return SPageUtils.covertSPage(users);
 	}
 
 	private Page<User> getUsersByPage(final PageInfo pageInfo, String keyword) {
@@ -365,7 +383,32 @@ public class UserServiceImpl implements UserService {
 		AccountUtils.saveUser(detail, null);
 	}
 
-	static final String defaultPassword = "111111";
+    /**
+     * 通过用户UU查询用户信息
+     *
+     * @param userUUList 用户UU号
+     * @return List<User>
+     */
+    @Override
+    public List<User> findByUserUUList(List<Long> userUUList) {
+        List<User> users = userDao.findAll(userUUList);
+        users.forEach(user -> {
+            Set<Role> roles = user.getRoles();
+            Long enUU = SystemSession.getUser().getEnterprise().getUu();
+            if (!CollectionUtils.isEmpty(roles)) {
+                Iterator<Role> iterator = roles.iterator();
+                while (iterator.hasNext()) {
+                    Role role = iterator.next();
+                    if (!role.getEnUU().equals(enUU)) {
+                        iterator.remove();
+                    }
+                }
+            }
+        });
+        return users;
+    }
+
+    static final String defaultPassword = "111111";
 
 	@Override
 	public User addUser(User user, HttpServletRequest request) {