合并

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/ShelfDto.java

+package com.junmp.jyzb.api.bean.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ShelfDto implements Serializable {
+
+    private String shelfId;
+
+    private String shelfName;
+
+    private String code;
+
+    private String type;
+
+    private Integer shelfRows;
+
+    private Integer shelfColumns;
+
+    private Integer shelfRanges;
+
+    private String url;
+
+    private String sizeInfo;
+}

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/ShelfReq.java

 package com.junmp.jyzb.api.bean.query;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.junmp.v2.common.bean.request.BaseRequest;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
+import javax.validation.constraints.NotBlank;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class ShelfReq extends BaseRequest {
+
     private String shelfId;
 
     private Long areaId;
@@ -21,6 +20,7 @@ public class ShelfReq extends BaseRequest {
 
     private String type;
 
+    @NotBlank(message = "仓库id不能为空",groups = {detail.class})
     private String warehouseId;
 
     private Integer shelfRows;

jyzb-biz/src/main/java/com/junmp/jyzb/controller/WarehouseController.java

 package com.junmp.jyzb.controller;
 
+import com.junmp.jyzb.api.bean.dto.ShelfDto;
 import com.junmp.jyzb.api.bean.dto.WarehouseAreaDto;
 import com.junmp.jyzb.api.bean.dto.WarehouseDto;
 import com.junmp.jyzb.api.bean.query.ShelfReq;
@@ -121,7 +122,7 @@ public class WarehouseController {
 
     @PostMapping("/GetShelfList")
     @ApiOperation("查询货架信息")
-    public ApiRes<List<Shelf>> getShelfList(@RequestBody ShelfReq req){
-        return ApiRes.success(shelfService.getShelfList(req));
+    public ApiRes<List<ShelfDto>> GetShelfList(@RequestBody @Validated(ValidationApi.detail.class) ShelfReq req){
+        return ApiRes.success(shelfService.GetShelfList(req));
     }
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/PolicemanService.java

@@ -6,21 +6,21 @@ import com.junmp.jyzb.api.bean.dto.PolicemanDto;
 import com.junmp.jyzb.api.bean.query.PolicemanReq;
 import com.junmp.jyzb.api.bean.req.UpdatePolicemanReq;
 import com.junmp.jyzb.entity.Policeman;
-import com.junmp.jyzb.utils.ResponseResult;
-
-import java.util.List;
-import java.util.Map;
 
 public interface PolicemanService extends IService<Policeman> {
 
-    //获取单个警员信息
-    PolicemanDto GetOnePolice(PolicemanReq req);
+    //添加警员
+    String AddPoliceman(UpdatePolicemanReq req);
 
 
     //获取单个警员信息
     PolicemanDto GetOnePolice(PolicemanReq req);
 
 
+    //删除警员
+    boolean DeletePolice(UpdatePolicemanReq req);
+
+
     //修改警员信息
     boolean UpdatePolice(UpdatePolicemanReq req);
 
@@ -51,14 +51,3 @@ public interface PolicemanService extends IService<Policeman> {
 
 
 }
-
-    Policeman SearchFaceInfo(PolicemanReq req);
-
-
-
-    boolean PoliceBindUser(PolicemanReq req);
-
-    boolean PoliceBindBox(PolicemanReq req);
-
-
-}

jyzb-biz/src/main/java/com/junmp/jyzb/service/ShelfService.java

 package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.api.bean.dto.ShelfDto;
 import com.junmp.jyzb.api.bean.query.ShelfReq;
 import com.junmp.jyzb.api.bean.req.UpdateShelfReq;
 import com.junmp.jyzb.entity.Shelf;
@@ -8,11 +9,11 @@ import com.junmp.jyzb.entity.Shelf;
 import java.util.List;
 
 public interface ShelfService extends IService<Shelf> {
-    boolean AddShelf(UpdateShelfReq msg);
+    boolean AddShelf(UpdateShelfReq req);
 
-    boolean UpdateShelf(UpdateShelfReq msg);
+    boolean UpdateShelf(UpdateShelfReq req);
 
-    boolean DeleteShelf(UpdateShelfReq msg);
+    boolean DeleteShelf(UpdateShelfReq req);
 
-    List<Shelf> getShelfList(ShelfReq msg);
+    List<ShelfDto> GetShelfList(ShelfReq req);
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ShelfServiceImpl.java

@@ -3,10 +3,14 @@ package com.junmp.jyzb.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.jyzb.api.bean.dto.ShelfDto;
 import com.junmp.jyzb.api.bean.query.ShelfReq;
 import com.junmp.jyzb.api.bean.req.UpdateShelfReq;
 import com.junmp.jyzb.api.exception.enums.ShelfExceptionEnum;
+import com.junmp.jyzb.api.exception.enums.WarehouseExceptionEnum;
 import com.junmp.jyzb.entity.Shelf;
+import com.junmp.jyzb.entity.Warehouse;
+import com.junmp.jyzb.service.WarehouseService;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.util.BeanPlusUtil;
 import org.springframework.stereotype.Service;
@@ -14,11 +18,14 @@ import javax.annotation.Resource;
 import com.junmp.jyzb.mapper.ShelfMapper;
 import com.junmp.jyzb.service.ShelfService;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 public class ShelfServiceImpl extends ServiceImpl<ShelfMapper, Shelf> implements ShelfService {
 
+    @Resource
+    private WarehouseService warehouseService;
 
     @Override
     public boolean AddShelf(UpdateShelfReq req) {
@@ -42,9 +49,22 @@ public class ShelfServiceImpl extends ServiceImpl<ShelfMapper, Shelf> implements
     }
 
     @Override
-    public List<Shelf> getShelfList(ShelfReq req) {
+    public List<ShelfDto> GetShelfList(ShelfReq req) {
+        //判断仓库id是否存在
+        Warehouse one = warehouseService.getOne(new LambdaQueryWrapper<Warehouse>()
+                .eq(Warehouse::getId, req.getWarehouseId()));
+        if (ObjectUtil.isNull(one)){
+            throw new ServiceException(WarehouseExceptionEnum.WAREHOUSE_NOT_EXIST);
+        }
         LambdaQueryWrapper<Shelf> wrapper = createWrapper(req);
-        return this.list(wrapper);
+        List<Shelf> list = list(wrapper);
+        List<ShelfDto> shelfDtoList=new ArrayList<>();
+        for (Shelf shelf:list) {
+            ShelfDto shelfDto = new ShelfDto();
+            BeanPlusUtil.copyProperties(shelf,shelfDto);
+            shelfDtoList.add(shelfDto);
+        }
+        return shelfDtoList;
     }
 
     /**