Merge branch 'feat-user'

project-order/src/main/java/com/dituhui/pea/order/controller/UserController.java

@@ -2,6 +2,7 @@ package com.dituhui.pea.order.controller;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.dituhui.pea.pojo.UserLoginParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -12,7 +13,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.order.dto.UserLoginDTO;
-import com.dituhui.pea.order.service.UserService;
 import com.dituhui.pea.pojo.UserInfo;
 import com.dituhui.pea.pojo.WebResult;
 import com.dituhui.pea.user.IUser;
@@ -25,22 +25,23 @@ import lombok.extern.slf4j.Slf4j;
 public class UserController {
 
     @Autowired
-	private UserService userService;
-
-	@Autowired
     private IUser user;
 
     @Autowired
     private HttpServletRequest request;
 
     @PostMapping("/user/login")
-	public Result<?> userLogin(@RequestBody UserLoginDTO user) {
-		return userService.userLogin(user.getAccount(), user.getAccount());
+    public Result<?> userLogin(@RequestBody UserLoginDTO userLoginDTO) {
+        UserLoginParam userLoginParam = new UserLoginParam();
+        userLoginParam.setAccount(userLoginDTO.getAccount());
+        userLoginParam.setPassword(userLoginDTO.getPassword());
+        return user.userLogin(userLoginParam);
     }
 
     @GetMapping("/user/userInfo")
     public Result<?> getUserInfo(@RequestHeader(name = "Authorization", required = true) String authorization) {
-		return userService.getUserInfo(authorization, true);
+        String userId = request.getHeader("userId");
+        return user.getUserInfo(userId);
     }
 
     @GetMapping("/user/test")

project-order/src/main/java/com/dituhui/pea/order/dao/OrgWarehouseInfoDao.java

@@ -29,9 +29,7 @@ public interface OrgWarehouseInfoDao extends JpaRepository<OrgWarehouseInfoEntit
 
 
     @Query("select a from OrgWarehouseInfoEntity a join OrgBranchEntity o on a.branchId=o.branchId where o.clusterId=:clusterId")
-    Page<OrgWarehouseInfoEntity> findByClusterId(String clusterId, Pageable pageable);
+    List<OrgWarehouseInfoEntity> findByClusterId(String clusterId);
 
-    Page<OrgWarehouseInfoEntity> findByBranchId(String branchId, Pageable pageable);
-
-    Page<OrgWarehouseInfoEntity> findByGroupId(String groupId, Pageable pageable);
+    List<OrgWarehouseInfoEntity> findByGroupId(String groupId);
 }

project-order/src/main/java/com/dituhui/pea/order/dto/BusinessOrgWarehousesDTO.java

@@ -12,17 +12,11 @@ public class BusinessOrgWarehousesDTO {
     public static class Request {
         private String levelType;
         private String levelValue;
-        private Integer size = DEFAULT_PAGE_SIZE;
-        private Integer page = 1;
     }
 
     @lombok.Data
     @Accessors(chain = true)
     public static class Result {
-        private long pageCurrent;
-        private long pages;
-        private long pageSize;
-        private long total;
         private List<Content> content;
     }
 

project-order/src/main/java/com/dituhui/pea/order/service/UserService.java

-package com.dituhui.pea.order.service;
-
-import com.dituhui.pea.common.Result;
-
-public interface UserService {
-
-	Result<?> userLogin(String account, String password);
-	Result<?> getUserInfo(String token, boolean needTeamInfo);
-
-}

project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessBaseServiceImpl.java

@@ -67,17 +67,16 @@ public class BusinessBaseServiceImpl implements BusinessBaseService {
 
     @Override
     public Result<?> getOrgWarehouses(BusinessOrgWarehousesDTO.Request req) {
-        Pageable pageable = PageRequest.of(req.getPage() - 1, req.getSize());
-        Page<OrgWarehouseInfoEntity> page = null;
+        List<OrgWarehouseInfoEntity> entities = null;
         if (req.getLevelType().equals("cluster")) {
-            page = orgWarehouseInfoDao.findByClusterId(req.getLevelValue(), pageable);
+            entities = orgWarehouseInfoDao.findByClusterId(req.getLevelValue());
         } else if (req.getLevelType().equals("branch")) {
 
-            page = orgWarehouseInfoDao.findByBranchId(req.getLevelValue(), pageable);
+            entities = orgWarehouseInfoDao.findByBranchId(req.getLevelValue());
         } else {
-            page = orgWarehouseInfoDao.findByGroupId(req.getLevelValue(), pageable);
+            entities = orgWarehouseInfoDao.findByGroupId(req.getLevelValue());
         }
-        List<BusinessOrgWarehousesDTO.Content> contents = page.getContent().stream().map(e -> {
+        List<BusinessOrgWarehousesDTO.Content> contents = entities.stream().map(e -> {
             BusinessOrgWarehousesDTO.Content content = new BusinessOrgWarehousesDTO.Content();
             content.setWarehouseId(e.getWarehouseId());
             content.setWarehouseName(e.getWarehouseName());
@@ -95,10 +94,6 @@ public class BusinessBaseServiceImpl implements BusinessBaseService {
             return content;
         }).collect(Collectors.toList());
         BusinessOrgWarehousesDTO.Result rs = new BusinessOrgWarehousesDTO.Result();
-        rs.setTotal(page.getTotalElements())
-                .setPages(page.getTotalPages())
-                .setPageSize(page.getSize())
-                .setPageCurrent(page.getNumber());
         rs.setContent(contents);
         return Result.success(rs);
     }

project-order/src/main/java/com/dituhui/pea/order/service/impl/UserServiceImpl.java

-package com.dituhui.pea.order.service.impl;
-
-import com.dituhui.pea.common.Result;
-import com.dituhui.pea.order.service.UserService;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-
-@Service
-public class UserServiceImpl implements UserService {
-	@Override
-	public Result<?> userLogin(String account, String password) {
-		HashMap<String, String> map = new HashMap<>();
-		map.put("token", "88d89f379a634867b1c7274a8b86bba6");  //TODO
-		return Result.success(map);
-	}
-
-	@Override
-	public Result<?> getUserInfo(String token, boolean needTeamInfo) {
-		HashMap<String, String> map = new HashMap<>();
-		map.put("account", "ID9192");
-		map.put("nickname", "测试用户");
-		map.put("clusterId", "csuzhou");
-		map.put("branchId", "bsuzhou");
-		map.put("groupId", "gsuzhou");
-		map.put("levelType", "branch");
-		map.put("levelValue", "bsuzhou");
-		return Result.success(map);
-	}
-}