按组织级别分页查询返回配件仓信息

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

@@ -31,7 +31,7 @@ public class BusinessController {
     }
 
     @GetMapping("/business/team/warehouse/list")
-    public Result<?> getWarehouses(@Validated BusinessWarehousesDTO.Request reqDTO) {
+    public Result<?> getTeamWarehouses(@Validated BusinessTeamWarehousesDTO.Request reqDTO) {
         Result<?> res = null;
         try {
             res = businessTeamService.getWarehouses(reqDTO);
@@ -41,6 +41,17 @@ public class BusinessController {
         return res;
     }
 
+    @GetMapping("/business/warehouse/list")
+    public Result<?> getOrgWarehouses(@Validated BusinessOrgWarehousesDTO.Request reqDTO) {
+        Result<?> res = null;
+        try {
+            res = businessBaseService.getOrgWarehouses(reqDTO);
+        } catch (BusinessException e) {
+            return Result.failed(e.getMessage());
+        }
+        return res;
+    }
+
     @PostMapping("/business/team/add")
     public Result<?> addTeam(@Validated @RequestBody BusinessTeamAddDTO.Request reqDTO) {
         Result<?> res = null;

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

 package com.dituhui.pea.order.dao;
 
 import com.dituhui.pea.order.entity.OrgWarehouseInfoEntity;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
-public interface WarehouseInfoDao extends JpaRepository<OrgWarehouseInfoEntity, Long> {
+public interface OrgWarehouseInfoDao extends JpaRepository<OrgWarehouseInfoEntity, Long> {
 
     // 返回工作队所在的分部所有的配件仓
     @Query("select a from OrgWarehouseInfoEntity a join OrgTeamEntity o on a.branchId=o.branchId where o.teamId= :teamId")
@@ -25,4 +27,11 @@ public interface WarehouseInfoDao extends JpaRepository<OrgWarehouseInfoEntity,
 
     List<OrgWarehouseInfoEntity> findByBranchId(String branchId);
 
+
+    @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);
+
+    Page<OrgWarehouseInfoEntity> findByBranchId(String branchId, Pageable pageable);
+
+    Page<OrgWarehouseInfoEntity> findByGroupId(String groupId, Pageable pageable);
 }

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

+package com.dituhui.pea.order.dto;
+
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+import static com.dituhui.pea.order.config.OrderConfig.DEFAULT_PAGE_SIZE;
+
+public class BusinessOrgWarehousesDTO {
+
+    @lombok.Data
+    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;
+    }
+
+    @lombok.Data
+    @Accessors(chain = true)
+    public static class Content {
+        private String warehouserName;
+        private String warehouseId;
+        private String groupName;
+        private String address;
+        private String location;
+        private String managerName;
+        private String managerPhone;
+        private String updateTime;
+        private String type;
+    }
+
+}

project-order/src/main/java/com/dituhui/pea/order/dto/BusinessWarehousesDTO.java → project-order/src/main/java/com/dituhui/pea/order/dto/BusinessTeamWarehousesDTO.java

@@ -4,7 +4,7 @@ import lombok.experimental.Accessors;
 
 import java.util.List;
 
-public class BusinessWarehousesDTO {
+public class BusinessTeamWarehousesDTO {
 
     @lombok.Data
     public static class Request {

project-order/src/main/java/com/dituhui/pea/order/entity/OrgWarehouseInfoEntity.java

@@ -80,7 +80,7 @@ public class OrgWarehouseInfoEntity {
     /**
      * 管理员手机号码
      */
-    private String namagerPhone;
+    private String managerPhone;
 
     /**
      * 备注

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

 package com.dituhui.pea.order.service;
 
 import com.dituhui.pea.common.Result;
+import com.dituhui.pea.order.dto.BusinessOrgWarehousesDTO;
 import com.dituhui.pea.order.dto.BusinessSkillListDTO;
+import com.dituhui.pea.order.dto.BusinessTeamWarehousesDTO;
 
 public interface BusinessBaseService {
     Result<?> getSkillList(BusinessSkillListDTO.Request req);
+
+
+    Result<?> getOrgWarehouses(BusinessOrgWarehousesDTO.Request reqDTO);
 }

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

@@ -7,7 +7,7 @@ import com.dituhui.pea.order.dto.*;
 public interface BusinessTeamService {
     Result<?> getTeams(BusinessTeamsDTO.Request req);
 
-    Result<?> getWarehouses(BusinessWarehousesDTO.Request req);
+    Result<?> getWarehouses(BusinessTeamWarehousesDTO.Request req);
 
     Result<?> addTeam(BusinessTeamAddDTO.Request req);
 

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

 package com.dituhui.pea.order.service.impl;
 
 import com.dituhui.pea.common.Result;
-import com.dituhui.pea.order.dao.MapLayerCustomizeDao;
-import com.dituhui.pea.order.dao.MapLayerDao;
-import com.dituhui.pea.order.dao.SkillGroupDao;
-import com.dituhui.pea.order.dao.SkillInfoDao;
+import com.dituhui.pea.order.dao.*;
+import com.dituhui.pea.order.dto.BusinessOrgWarehousesDTO;
 import com.dituhui.pea.order.dto.BusinessSkillListDTO;
-import com.dituhui.pea.order.entity.MapLayerCustomizeEntity;
-import com.dituhui.pea.order.entity.MapLayerEntity;
-import com.dituhui.pea.order.entity.SkillGroupEntity;
-import com.dituhui.pea.order.entity.SkillInfoEntity;
+import com.dituhui.pea.order.entity.*;
 import com.dituhui.pea.order.service.BusinessBaseService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -43,6 +38,8 @@ public class BusinessBaseServiceImpl implements BusinessBaseService {
     private Map<String, String> mapLayer = null;
 
     private Map<String, String> mapSkillGroup = null;
+    @Autowired
+    private OrgWarehouseInfoDao orgWarehouseInfoDao;
 
     @Override
     public Result<?> getSkillList(BusinessSkillListDTO.Request req) {
@@ -65,6 +62,47 @@ public class BusinessBaseServiceImpl implements BusinessBaseService {
         return Result.success(rs);
     }
 
+    @Override
+    public Result<?> getOrgWarehouses(BusinessOrgWarehousesDTO.Request req) {
+        Pageable pageable = PageRequest.of(req.getPage() - 1, req.getSize());
+        Page<OrgWarehouseInfoEntity> page = null;
+        if (req.getLevelType().equals("cluster")) {
+            page = orgWarehouseInfoDao.findByClusterId(req.getLevelValue(), pageable);
+        } else if (req.getLevelType().equals("branch")) {
+
+            page = orgWarehouseInfoDao.findByBranchId(req.getLevelValue(), pageable);
+        } else {
+            page = orgWarehouseInfoDao.findByGroupId(req.getLevelValue(), pageable);
+        }
+        List<BusinessOrgWarehousesDTO.Content> contents = page.getContent().stream().map(e -> {
+            BusinessOrgWarehousesDTO.Content content = new BusinessOrgWarehousesDTO.Content();
+            content.setWarehouseId(e.getWarehouseId());
+            content.setWarehouserName(e.getWarehouseName());
+            content.setAddress(e.getAddress());
+            content.setLocation(String.format("%s,%s", e.getX(), e.getY()));
+            content.setGroupName(getGroupName(e.getGroupId()));
+            content.setManagerName(e.getManagerName());
+            content.setManagerPhone(e.getManagerPhone());
+            if (e.getGroupId() != null && !e.getGroupId().equals("0")) {
+                content.setType("");
+            } else {
+                content.setType("分部仓 - 可分发");
+            }
+            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);
+    }
+
+    private String getGroupName(String groupId) {
+        return null;
+    }
+
     private void initMaps() {
         // 图层
         mapLayer = new HashMap<>();

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

@@ -35,7 +35,7 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
     private OrgTeamDao orgTeamDao;
 
     @Autowired
-    private WarehouseInfoDao warehouseInfoDao;
+    private OrgWarehouseInfoDao orgWarehouseInfoDao;
 
     @Autowired
     private OrgTeamEngineerDao orgTeamEngineerDao;
@@ -68,7 +68,7 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
             content.setTeamId(e.getTeamId()).setTeamName(e.getTeamName());
             content.setWorkdays(String.join("、", getWorkdaysChinese(e.getWorkdays())));
             content.setEngineers(String.join(";", engineers));
-            OrgWarehouseInfoEntity warehouse = warehouseInfoDao.getByTeamAssigned(e.getTeamId());
+            OrgWarehouseInfoEntity warehouse = orgWarehouseInfoDao.getByTeamAssigned(e.getTeamId());
             if (warehouse != null) {
                 content.setWarehouseName(warehouse.getWarehouseName());
             }
@@ -94,17 +94,17 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
     }
 
     @Override
-    public Result<?> getWarehouses(BusinessWarehousesDTO.Request req) {
-        List<OrgWarehouseInfoEntity> warehouseInfoEntityList = warehouseInfoDao.getAllByGroupId(req.getGroupId());
-        List<BusinessWarehousesDTO.Content> contents = warehouseInfoEntityList.stream().map(entity -> {
-            BusinessWarehousesDTO.Content dto = new BusinessWarehousesDTO.Content();
+    public Result<?> getWarehouses(BusinessTeamWarehousesDTO.Request req) {
+        List<OrgWarehouseInfoEntity> warehouseInfoEntityList = orgWarehouseInfoDao.getAllByGroupId(req.getGroupId());
+        List<BusinessTeamWarehousesDTO.Content> contents = warehouseInfoEntityList.stream().map(entity -> {
+            BusinessTeamWarehousesDTO.Content dto = new BusinessTeamWarehousesDTO.Content();
             dto.setWarehouseId(entity.getWarehouseId());
             dto.setWarehouseName(entity.getWarehouseName());
             // 手工赋值其他字段
             return dto;
         }).collect(Collectors.toList());
 
-        return Result.success(new BusinessWarehousesDTO.Result().setContent(contents));
+        return Result.success(new BusinessTeamWarehousesDTO.Result().setContent(contents));
     }
 
     @Override

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

@@ -32,7 +32,7 @@ public class EngineerBusinessServiceImpl implements EngineerBusinessService {
     private EngineerInfoDao engineerInfoDao;
 
     @Autowired
-    private WarehouseInfoDao warehouseInfoDao;
+    private OrgWarehouseInfoDao orgWarehouseInfoDao;
 
     @Autowired
     private MapBlockInfoDao mapBlockInfoDao;
@@ -96,7 +96,7 @@ public class EngineerBusinessServiceImpl implements EngineerBusinessService {
 
     @Override
     public EngineerBusinessDTO.WareHouse getWareHouse(String wareHouseId) {
-        OrgWarehouseInfoEntity item = warehouseInfoDao.getOrgWarehouseInfoEntityByWarehouseId(wareHouseId);
+        OrgWarehouseInfoEntity item = orgWarehouseInfoDao.getOrgWarehouseInfoEntityByWarehouseId(wareHouseId);
         EngineerBusinessDTO.WareHouse wareHouse = new EngineerBusinessDTO.WareHouse();
         if (item != null) {
             wareHouse.setWareHouseId(item.getWarehouseId());

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

@@ -6,7 +6,6 @@ import com.dituhui.pea.order.dao.*;
 import com.dituhui.pea.order.dto.EngineerTimelineResp;
 import com.dituhui.pea.order.entity.*;
 import com.dituhui.pea.order.service.EngineerTimelineService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,7 +19,6 @@ import javax.persistence.criteria.Root;
 import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 
 @Service
@@ -33,7 +31,7 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 	private EngineerInfoDao engineerInfoDao;
 
 	@Autowired
-	private WarehouseInfoDao warehouseInfoDao;
+	private OrgWarehouseInfoDao orgWarehouseInfoDao;
 
 	@Autowired
 	private OrgGroupDao orgGroupDao;
@@ -113,7 +111,7 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 
 	private String getWarehouseLocation(String branchId) {
 		// 获取配送站location
-		List<OrgWarehouseInfoEntity> wares = warehouseInfoDao.findByBranchId(branchId);
+		List<OrgWarehouseInfoEntity> wares = orgWarehouseInfoDao.findByBranchId(branchId);
 		OrgWarehouseInfoEntity w = wares.get(0);
 		return String.format("%s,%s", w.getX(), w.getY());
 	}