feat:增加新接口，完成增加空库位查询需求，接口测试已完成，数据确认无误。ps：尚未去除预留库位

Leslie
1 parent e81595a6
Showing 7 changed files with 119 additions and 2 deletions
src/main/java/com/huaheng/pc/config/location/controller/LocationController.java
src/main/java/com/huaheng/pc/config/location/domain/bo/LocationIdleBO.java
src/main/java/com/huaheng/pc/config/location/domain/vo/LocationIdleVO.java
src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java
src/main/java/com/huaheng/pc/config/location/service/LocationService.java
src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
src/main/resources/mybatis/config/LocationMapper.xml
@@ -361,4 +361,12 @@ public class LocationController extends BaseController {
   {
     print.jasperPrint(ids, prefix);// 不用返回json打印
   }
+
+
+    @Log(title = "监控-库位空闲监控-库位管理", operating = "查看库位空闲结果", action = BusinessType.GRANT)
+    @PostMapping("/getIdleLocation")
+    @ResponseBody
+    public AjaxResult<?> getIdleLocation() {
+      return AjaxResult.success(locationService.getIdleLocation());
+    }
 }
+package com.huaheng.pc.config.location.domain.bo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author puff
+ * @date 2023-06-21
+ */
+@Data
+@Builder
+public class LocationIdleBO implements Serializable {
+
+    @ApiModelProperty(value = "层级")
+    private String ilayer;
+    @ApiModelProperty(value = "巷道")
+    private String roadway;
+    @ApiModelProperty(value = "行数")
+    private Integer irow;
+    @ApiModelProperty(value = "空闲数")
+    private Integer idleCount;
+}
+package com.huaheng.pc.config.location.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author puff
+ * @date 2023-06-21
+ */
+@Data
+public class LocationIdleVO implements Serializable {
+
+    @ApiModelProperty(value = "巷道")
+    private String roadway;
+    @ApiModelProperty(value = "行数")
+    private Integer irow;
+    @ApiModelProperty(value = "空闲数")
+    private Integer idleCount;
+}
@@ -2,6 +2,7 @@ package com.huaheng.pc.config.location.mapper;
  
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huaheng.pc.config.location.domain.Location;
+import com.huaheng.pc.config.location.domain.bo.LocationIdleBO;
 import org.apache.ibatis.annotations.Param;
  
 import java.util.LinkedHashMap;
@@ -33,4 +34,6 @@ public interface LocationMapper extends BaseMapper&lt;Location&gt; {
     int getLastRowOfZone(@Param("warehouseCode") String warehouseCode, @Param("locationType") String locationType);
  
     int updateStatusNew(@Param("code") String code, @Param("warehouseCode") String warehouseCode,@Param("status") String status, @Param("oldStatus") String oldStatus);
+
+    List<LocationIdleBO> getIdleLocation();
 }
@@ -4,6 +4,7 @@ import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.config.location.domain.Location;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huaheng.pc.config.location.domain.LocationInfo;
+import com.huaheng.pc.config.location.domain.vo.LocationIdleVO;
  
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -118,4 +119,11 @@ public interface LocationService extends IService&lt;Location&gt;{
     void upstatus(String code);
  
     int updateStatusNew(String locationCode, String warehouseCode, String status, String oldStatus);
+
+    /**
+     * 查询空闲库位数量
+     * @return
+     */
+    List<LocationIdleVO> getIdleLocation();
+
 }
@@ -12,17 +12,21 @@ import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.config.location.domain.Location;
 import com.huaheng.pc.config.location.domain.LocationInfo;
+import com.huaheng.pc.config.location.domain.bo.LocationIdleBO;
+import com.huaheng.pc.config.location.domain.vo.LocationIdleVO;
 import com.huaheng.pc.config.location.mapper.LocationMapper;
 import com.huaheng.pc.config.locationType.domain.LocationType;
 import com.huaheng.pc.config.locationType.service.LocationTypeService;
 import com.huaheng.pc.config.zone.domain.Zone;
 import com.huaheng.pc.config.zone.service.ZoneService;
 import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
+import io.swagger.models.auth.In;
 import org.springframework.stereotype.Service;
  
 import javax.annotation.Resource;
 import java.text.MessageFormat;
 import java.util.*;
+import java.util.stream.Collectors;
  
 @Service("LocationService")
 public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> implements LocationService {
@@ -361,7 +365,7 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
     }
  
     @Override
-  	public void updateContainerCodeAndStatus(String locationCode, String containerCode,
+    public void updateContainerCodeAndStatus(String locationCode, String containerCode,
                                              String status, String warehouseCode) {
         if (StringUtils.isNotEmpty(locationCode) || StringUtils.isNotEmpty(containerCode)) {
             LambdaUpdateWrapper<Location> updateWrapper = Wrappers.lambdaUpdate();
@@ -371,7 +375,10 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
                     .eq(Location::getCode, locationCode);
             this.update(updateWrapper);
         }
-    }    public LocationInfo getAllLocation(String type) {
+    }
+
+    @Override
+    public LocationInfo getAllLocation(String type) {
         if (StringUtils.isNotEmpty(type)) {
             Location location = locationMapper.getAllLocation(ShiroUtils.getWarehouseCode(), type);
             LocationInfo locationInfo = new LocationInfo();
@@ -667,4 +674,26 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
         }
         return 0;
     }
+
+    @Override
+    public List<LocationIdleVO> getIdleLocation() {
+        List<LocationIdleBO> idleBOList = locationMapper.getIdleLocation();
+        return idleBOList.stream()
+                .collect(Collectors.groupingBy(LocationIdleBO::getRoadway)) // 以巷道分组
+                .entrySet().stream()
+                .flatMap(entry -> entry.getValue().stream()
+                        .collect(Collectors.groupingBy(LocationIdleBO::getIrow)) // 获取当前巷道分组下的行级别数据
+                        .entrySet().stream()
+                        .map(rowEntry -> {
+                            Integer idleCount = rowEntry.getValue().stream()
+                                    .mapToInt(LocationIdleBO::getIdleCount)
+                                    .sum(); // 计算空闲库位数量
+                            LocationIdleVO idleInfo = new LocationIdleVO();
+                            idleInfo.setRoadway(entry.getKey());
+                            idleInfo.setIrow(rowEntry.getKey());
+                            idleInfo.setIdleCount(idleCount);
+                            return idleInfo;
+                        }))
+                .collect(Collectors.toList());
+    }
 }
@@ -32,6 +32,14 @@
     <result column="systemCreated" jdbcType="INTEGER" property="systemCreated" />
       <result column="deleted" jdbcType="BIT" property="deleted" />
   </resultMap>
+
+    <resultMap id="BaseResultLocationIdleBOMap" type="com.huaheng.pc.config.location.domain.bo.LocationIdleBO">
+        <result column="ilayer" jdbcType="VARCHAR" property="ilayer" />
+        <result column="roadway" jdbcType="VARCHAR" property="roadway" />
+        <result column="irow" jdbcType="INTEGER" property="irow" />
+        <result column="count" jdbcType="INTEGER" property="idleCount" />
+    </resultMap>
+
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, code, warehouseCode, zoneCode, locationType, containerCode, iRow, iColumn, iLayer,
@@ -47,6 +55,20 @@
     select code from location where #{locatingRule}
   </select>
  
+    <select id="getIdleLocation" resultMap="BaseResultLocationIdleBOMap">
+        select ilayer ,roadway, irow, COUNT(*) AS idleCount
+        FROM location
+        WHERE area = '1' -- 区域
+          AND warehouseCode = 'CS0001' -- 仓库
+          AND roadway IN ('1', '2', '3', '4') -- 巷道
+          AND status = 'empty' -- 状态：锁定、禁用，空闲
+          AND high IN (0, 1) -- 0 是低库位，1 是高库位
+          AND locationType IN ('L') -- 货位类型
+          AND containerCode = '' -- 容器编码
+        GROUP BY ilayer, irow
+        ORDER BY ilayer, irow;
+    </select>
+
   <insert id="addList" parameterType="com.huaheng.pc.config.location.domain.Location" keyProperty="id" useGeneratedKeys="true" >
     INSERT INTO location(
     code,