Merge branch 'develop' into develop-zhaojw

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/dto/WarehouseAreaDto.java

+package com.junmp.jyzb.api.bean.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class WarehouseAreaDto implements Serializable {
+    private String id;
+
+    private String areaName;
+
+    private String photo;
+}

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

+package com.junmp.jyzb.api.bean.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class WarehouseDto implements Serializable {
+    private String id;
+
+    private String name;
+
+    private String location;
+
+    private String phone;
+
+    private Long orgId;
+
+    private Boolean isLocked;
+
+    private Integer sum;
+
+    private Integer outSum;
+
+    private Integer inSum;
+    private String state;
+    private String orgName;
+}

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-api/src/main/java/com/junmp/jyzb/api/bean/query/WarehouseAreaReq.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 javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class WarehouseAreaReq extends BaseRequest {
-    @NotNull(message = "地区主键不能为空", groups = {edit.class, delete.class, detail.class})
+    @NotBlank(message = "地区主键不能为空", groups = {edit.class, delete.class, detail.class})
     private String id;
 
     private String areaName;

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

@@ -10,6 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -18,7 +19,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class WarehouseReq extends BaseRequest {
-    @NotNull(message = "仓库主键不能为空", groups = {edit.class, delete.class, detail.class})
+    @NotBlank(message = "仓库主键不能为空", groups = {edit.class, delete.class, detail.class})
     private String id;
 
     private Long departmentId;
@@ -50,6 +51,7 @@ public class WarehouseReq extends BaseRequest {
 
     private BigDecimal priceTotal;
 
+    @NotNull(message = "仓库状态不能为空", groups = {edit.class})
     private Integer state;
 
     private Long orderId;

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateCabinetReq.java

@@ -89,7 +89,6 @@ public class UpdateCabinetReq extends BaseRequest {
     private List<UpdateCabinetBoxReq> cabinetBoxList;
 
     //单警柜id列表
-    @NotBlank(message = "单警柜不能为空", groups = {delete.class})
     private List<String> cabinetList;
 
     private static final long serialVersionUID = 1L;

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdatePolicemanReq.java

@@ -11,25 +11,23 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 public class UpdatePolicemanReq extends BaseRequest {
 
-    @NotNull(message = "警员主键不能为空", groups = {edit.class, delete.class, detail.class})
+    @NotNull(message = "警员主键不能为空", groups = {add.class,edit.class, delete.class, detail.class})
     private String id;
 
-    @NotNull(message = "警员名字不能为空", groups = {edit.class, delete.class, detail.class})
+    @NotNull(message = "警员名字不能为空", groups = {add.class,edit.class, delete.class, detail.class})
     private String name;
 
     private String cabinetBoxId;
 
-    @NotNull(message = "组织机构不能为空", groups = {edit.class, delete.class, detail.class})
-    private String orgId;
-
-    private Long orgIdInt;
+    @NotNull(message = "组织机构id不能为空", groups = {add.class,edit.class, delete.class, detail.class})
+    private Long orgId;
 
     private Long departmentId;
 
-    @NotNull(message = "警员编号不能为空", groups = {edit.class, delete.class, detail.class})
+    @NotNull(message = "警员编号不能为空", groups = {add.class,edit.class, delete.class, detail.class})
     private String policeCode;
 
-    @NotNull(message = "性别不能为空", groups = {edit.class, delete.class, detail.class})
+    @NotNull(message = "性别不能为空", groups = {add.class,edit.class, delete.class, detail.class})
     private String sex;
 
     private String faceInfo;
@@ -40,7 +38,7 @@ public class UpdatePolicemanReq extends BaseRequest {
 
     private String password;
 
-    @NotNull(message = "电话不能为空", groups = {edit.class, delete.class, detail.class})
+    @NotNull(message = "电话不能为空", groups = {add.class,edit.class, delete.class, detail.class})
     private String photo;
 
     private String phone;
@@ -49,7 +47,7 @@ public class UpdatePolicemanReq extends BaseRequest {
 
     private Date updateTime;
 
-    @NotNull(message = "身份证号不能为空", groups = {edit.class, delete.class, detail.class})
+    @NotNull(message = "身份证号不能为空", groups = {add.class,edit.class, delete.class, detail.class})
     private String idCard;
 
     private String updateUser;

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateShelfReq.java

+package com.junmp.jyzb.api.bean.req;
+
+import com.junmp.v2.common.bean.request.BaseRequest;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class UpdateShelfReq extends BaseRequest {
+    @NotBlank(message = "货架id不能为空",groups = {edit.class, delete.class})
+    private String shelfId;
+
+    private Long areaId;
+
+    @NotBlank(message = "货架名称不能为空",groups = {add.class,edit.class})
+    private String shelfName;
+
+    @NotBlank(message = "货架编号不能为空",groups = {add.class,edit.class})
+    private String code;
+
+    @NotBlank(message = "货架类型不能为空",groups = {add.class,edit.class})
+    private String type;
+
+    @NotBlank(message = "仓库id不能为空",groups = {add.class})
+    private String warehouseId;
+
+    @NotNull(message = "货架层数不能为空",groups = {add.class,edit.class})
+    private Integer shelfRows;
+
+    @NotNull(message = "货架列数不能为空",groups = {add.class,edit.class})
+    private Integer shelfColumns;
+
+    @NotNull(message = "货架排数不能为空",groups = {add.class,edit.class})
+    private Integer shelfRanges;
+
+    /**
+     * 只能货架地址，普通则为空
+     */
+    private String url;
+
+    @NotBlank(message = "型号信息不能为空",groups = {add.class,edit.class})
+    private String sizeInfo;
+}

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateWarehouseAreaReq.java

+package com.junmp.jyzb.api.bean.req;
+
+import com.junmp.v2.common.bean.request.BaseRequest;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+@Data
+public class UpdateWarehouseAreaReq extends BaseRequest {
+    @NotBlank(message = "地区主键不能为空", groups = {edit.class, delete.class, detail.class})
+    private String areaId;
+    @NotBlank(message = "区域名称不能为空", groups = {add.class,edit.class, detail.class})
+    private String areaName;
+
+    private Long orgIdInt;
+
+    @NotBlank(message = "仓库id不能为空", groups = {add.class,edit.class, detail.class})
+    private String warehouseId;
+
+    @NotBlank(message = "照片不能为空", groups = {add.class,edit.class, detail.class})
+    private String photo;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private String createUser;
+
+    private String updateUser;
+}

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateWarehouseReq.java

+package com.junmp.jyzb.api.bean.req;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.junmp.v2.common.bean.request.BaseRequest;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class UpdateWarehouseReq extends BaseRequest {
+    @NotBlank(message = "仓库主键不能为空", groups = {edit.class, delete.class, detail.class})
+    private String id;
+
+    private Long departmentId;
+
+    @NotBlank(message = "仓库名称不能为空", groups = {add.class,edit.class, delete.class, detail.class})
+    private String name;
+
+    @NotBlank(message = "仓库地点不能为空", groups = {add.class,edit.class, delete.class, detail.class})
+    private String location;
+
+    @NotBlank(message = "联系方式不能为空", groups = {add.class,edit.class, delete.class, detail.class})
+    private String phone;
+
+    private String video;
+
+    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    private Date updateTime;
+
+    private String updateUser;
+
+    @JsonProperty(value = "orgId")
+    @NotNull(message = "组织机构id不能为空", groups = {add.class,edit.class, delete.class, detail.class})
+    private Long orgId;
+
+    private Boolean isLocked;
+
+    private Integer sum;
+
+    private Integer outSum;
+
+    private Integer inSum;
+
+    private BigDecimal priceTotal;
+
+    private Integer state;
+
+    private Long orderId;
+
+    //仓库id列表做批量操作
+    private List<String> warehouseList;
+}

jyzb-biz/src/main/java/com/junmp/jyzb/exception/enums/CabinetBoxExceptionEnum.java → jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/CabinetBoxExceptionEnum.java

-package com.junmp.jyzb.exception.enums;
+package com.junmp.jyzb.api.exception.enums;
 
 import com.junmp.v2.common.constant.CommonConstant;
 import com.junmp.v2.common.exception.IExceptionEnum;

jyzb-biz/src/main/java/com/junmp/jyzb/exception/enums/CabinetExceptionEnum.java → jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/CabinetExceptionEnum.java

 
-package com.junmp.jyzb.exception.enums;
+package com.junmp.jyzb.api.exception.enums;
 
 import com.junmp.v2.common.constant.CommonConstant;
 import com.junmp.v2.common.exception.IExceptionEnum;

jyzb-biz/src/main/java/com/junmp/jyzb/exception/enums/PolicemanExceptionEnum.java → jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/PolicemanExceptionEnum.java

-package com.junmp.jyzb.exception.enums;
+package com.junmp.jyzb.api.exception.enums;
 
 import com.junmp.v2.common.constant.CommonConstant;
 import com.junmp.v2.common.exception.IExceptionEnum;

jyzb-biz/src/main/java/com/junmp/jyzb/exception/enums/PolicemanFingerExceptionEnum.java → jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/PolicemanFingerExceptionEnum.java

-package com.junmp.jyzb.exception.enums;
+package com.junmp.jyzb.api.exception.enums;
 
 import com.junmp.v2.common.constant.CommonConstant;
 import com.junmp.v2.common.exception.IExceptionEnum;

jyzb-biz/src/main/java/com/junmp/jyzb/exception/enums/PubOrgExceptionEnum.java → jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/PubOrgExceptionEnum.java

-package com.junmp.jyzb.exception.enums;
+package com.junmp.jyzb.api.exception.enums;
 
 import com.junmp.v2.common.constant.CommonConstant;
 import com.junmp.v2.common.exception.IExceptionEnum;

jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/WarehouseAreaExceptionEnum.java

@@ -11,54 +11,11 @@ public enum WarehouseAreaExceptionEnum implements IExceptionEnum {
      * 仓库地区信息不存在
      */
     WAREHOUSEAREA_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 12, "地区信息不存在"),
-
-
-    /**
-     * 批次信息不存在
-     */
-    BATCH_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 14, "批次不存在"),
-
-    /**
-     * 批次信息不存在
-     */
-    BATCH_PROCESSED(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 15, "批次已生产"),
-
     /**
-     * 批次生产已完成
+     * 区域已存在
      */
-    BATCH_PROCESSED_DONE(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 16, "批次生产已完成"),
-
-    /**
-     * 批次生产已完成
-     */
-    MODIFY_NUM_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 17, "批次生产已完成,数量不能小于原数量"),
-
-    /**
-     * 标签信息不存在
-     */
-    TAG_INFO_NOT_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 19, "标签信息不存在"),
-
-
-    /**
-     * 标签信息初始化完成
-     */
-    TAG_INFO_INIT_DONE(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 20, "检查标签信息是否绑定完成"),
-
-    /**
-     * 标签已绑定
-     */
-    TAG_INFO_HAD_BINDING(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 21, "标签已绑定"),
-
-
-    /**
-     * 确认绑定是否已完成
-     */
-    TAG_UID_BINDING_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 22, "确认绑定是否已完成"),
-
-    /**
-     * 标签重复
-     */
-    TAG_INFO_REPEAT_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 23, "标签重复"),
+    AREA_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE,"区域已经存在")
+    ;
     ;
 
 

jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/WarehouseExceptionEnum.java

@@ -12,57 +12,6 @@ public enum WarehouseExceptionEnum implements IExceptionEnum {
      */
     WAREHOUSE_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 12, "仓库信息不存在"),
 
-    /**
-     * 产品信息不存在
-     */
-    PRODUCT_SKU_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 13, "号型不存在"),
-
-    /**
-     * 批次信息不存在
-     */
-    BATCH_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 14, "批次不存在"),
-
-    /**
-     * 批次信息不存在
-     */
-    BATCH_PROCESSED(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 15, "批次已生产"),
-
-    /**
-     * 批次生产已完成
-     */
-    BATCH_PROCESSED_DONE(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 16, "批次生产已完成"),
-
-    /**
-     * 批次生产已完成
-     */
-    MODIFY_NUM_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 17, "批次生产已完成,数量不能小于原数量"),
-
-    /**
-     * 标签信息不存在
-     */
-    TAG_INFO_NOT_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 19, "标签信息不存在"),
-
-
-    /**
-     * 标签信息初始化完成
-     */
-    TAG_INFO_INIT_DONE(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 20, "检查标签信息是否绑定完成"),
-
-    /**
-     * 标签已绑定
-     */
-    TAG_INFO_HAD_BINDING(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 21, "标签已绑定"),
-
-
-    /**
-     * 确认绑定是否已完成
-     */
-    TAG_UID_BINDING_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 22, "确认绑定是否已完成"),
-
-    /**
-     * 标签重复
-     */
-    TAG_INFO_REPEAT_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 23, "标签重复"),
     ;
 
 

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

@@ -54,7 +54,7 @@ public class CabinetController {
 
     @PostMapping("/DeleteCabinetInfo")
     @ApiOperation("删除单警柜信息")
-    public ApiRes<Boolean> deleteCabinetInfo(@RequestBody @Validated(ValidationApi.delete.class) UpdateCabinetReq req) {
+    public ApiRes<Boolean> deleteCabinetInfo(@RequestBody UpdateCabinetReq req) {
         return ApiRes.success(cabinetService.deleteCabinetInfo(req));
     }
 

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

@@ -30,7 +30,7 @@ public class PoliceController {
 
     @PostMapping("/AddPoliceman")
     @ApiOperation("添加警员信息")
-    public ApiRes<String> AddPoliceman(@RequestBody UpdatePolicemanReq req) {
+    public ApiRes<String> AddPoliceman(@RequestBody @Validated(ValidationApi.add.class) UpdatePolicemanReq req) {
         String policeId = policemanService.AddPoliceman(req);
         return ApiRes.success(policeId);
     }
@@ -68,7 +68,6 @@ public class PoliceController {
 
 
 
-
     //根据组织机构id查询,只查询本级，不包含下级
      @PostMapping("/ShowPoliceList")
     @ApiOperation("查询某个组织机构下的所有警员信息")
@@ -116,7 +115,7 @@ public class PoliceController {
 
     @PostMapping("/AddFaceInfo")
     @ApiOperation("添加警员面部信息")
-    public ApiRes<Boolean> AddFaceInfo(@RequestBody PolicemanReq req) {
+    public ApiRes<Boolean> AddFaceInfo(@RequestBody UpdatePolicemanReq req) {
         boolean b = policemanService.AddFaceInfo(req);
         if (!b){
             return ApiRes.failure("添加失败");

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;
 import com.junmp.jyzb.api.bean.query.WarehouseAreaReq;
 import com.junmp.jyzb.api.bean.query.WarehouseReq;
+import com.junmp.jyzb.api.bean.req.UpdateShelfReq;
+import com.junmp.jyzb.api.bean.req.UpdateWarehouseAreaReq;
+import com.junmp.jyzb.api.bean.req.UpdateWarehouseReq;
 import com.junmp.jyzb.entity.*;
 import com.junmp.jyzb.service.*;
+import com.junmp.v2.common.bean.request.ValidationApi;
 import com.junmp.v2.common.bean.response.ApiRes;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -35,15 +42,15 @@ public class WarehouseController {
 
     @PostMapping("/AddWarehouse")
     @ApiOperation("添加仓库")
-    public ApiRes<Boolean> addWarehouse(@RequestBody @Validated(WarehouseReq.add.class) WarehouseReq req) {
-        return ApiRes.success(warehouseService.addWarehouse(req));
+    public ApiRes<String> AddWarehouse(@RequestBody @Validated(ValidationApi.add.class) UpdateWarehouseReq req) {
+        return ApiRes.success(warehouseService.AddWarehouse(req));
     }
 
 
     @PostMapping("/DeleteWarehouse")
     @ApiOperation("删除仓库信息")
-    public ApiRes<Boolean> deleteWarehouse(@RequestBody @Validated(WarehouseReq.delete.class)WarehouseReq req) {
-        return ApiRes.success(warehouseService.deleteWarehouse(req));
+    public ApiRes<Boolean> DeleteWarehouse(@RequestBody UpdateWarehouseReq req) {
+        return ApiRes.success(warehouseService.DeleteWarehouse(req));
     }
 
     @PostMapping("/ChangeWarehouseState")
@@ -54,68 +61,68 @@ public class WarehouseController {
 
     @PostMapping("/ShowWarehouse")
     @ApiOperation("查询仓库列表")
-    public ApiRes<List<Warehouse>> getAllWarehouse(@RequestBody WarehouseReq req){
+    public ApiRes<List<WarehouseDto>> getAllWarehouse(@RequestBody WarehouseReq req){
         return ApiRes.success(warehouseService.getAllWarehouse(req));
     }
 
     @PostMapping("/GetWarehouseDetail")
     @ApiOperation("查询单个仓库信息")
-    public ApiRes<Warehouse> getOneWarehouse(@RequestBody @Validated(WarehouseReq.detail.class)WarehouseReq req) {
+    public ApiRes<WarehouseDto> getOneWarehouse(@RequestBody @Validated(WarehouseReq.detail.class)WarehouseReq req) {
         return ApiRes.success(warehouseService.getOneWarehouse(req));
     }
 
     @PostMapping("/UpdateWarehouse")
     @ApiOperation("修改仓库信息")
-    public ApiRes<Boolean> updateWarehouse(@RequestBody @Validated(WarehouseReq.edit.class) WarehouseReq req) {
+    public ApiRes<Boolean> updateWarehouse(@RequestBody @Validated(WarehouseReq.edit.class) UpdateWarehouseReq req) {
         return ApiRes.success(warehouseService.updateWarehouse(req));
     }
 
     @PostMapping("/AddArea")
     @ApiOperation("添加区域")
-    public ApiRes<Boolean> addArea(@RequestBody @Validated(WarehouseAreaReq.add.class) WarehouseAreaReq req) {
+    public ApiRes<Boolean> addArea(@RequestBody @Validated(ValidationApi.add.class) UpdateWarehouseAreaReq req) {
         return ApiRes.success(warehouseAreaService.addArea(req));
     }
 
     @PostMapping("/UpdateArea")
     @ApiOperation("修改区域")
-    public ApiRes<Boolean> updateArea(@RequestBody @Validated(WarehouseAreaReq.edit.class) WarehouseAreaReq req) {
+    public ApiRes<Boolean> updateArea(@RequestBody @Validated(ValidationApi.edit.class) UpdateWarehouseAreaReq req) {
         return ApiRes.success(warehouseAreaService.updateArea(req));
     }
 
     @PostMapping("/DeleteArea")
     @ApiOperation("删除区域")
-    public ApiRes<Boolean> deleteArea(@RequestBody @Validated(WarehouseAreaReq.delete.class) WarehouseAreaReq req) {
+    public ApiRes<Boolean> deleteArea(@RequestBody @Validated(ValidationApi.delete.class) UpdateWarehouseAreaReq req) {
         return ApiRes.success(warehouseAreaService.deleteArea(req));
     }
 
     @PostMapping("/GetAreaList")
     @ApiOperation("查询区域信息")
-    public ApiRes<List<WarehouseArea>> getAreaList(@RequestBody WarehouseAreaReq req){
+    public ApiRes<List<WarehouseAreaDto>> getAreaList(@RequestBody WarehouseAreaReq req){
         return ApiRes.success(warehouseAreaService.getAreaList(req));
     }
 
 
     @PostMapping("/AddShelf")
     @ApiOperation("添加货架")
-    public ApiRes<Boolean> addShelf(@RequestBody @Validated(ShelfReq.add.class) ShelfReq req) {
-        return ApiRes.success(shelfService.addShelf(req));
+    public ApiRes<Boolean> AddShelf(@RequestBody @Validated(ValidationApi.add.class) UpdateShelfReq req) {
+        return ApiRes.success(shelfService.AddShelf(req));
     }
 
     @PostMapping("/UpdateShelf")
     @ApiOperation("修改货架")
-    public ApiRes<Boolean> updateShelf(@RequestBody @Validated(ShelfReq.edit.class) ShelfReq req) {
-        return ApiRes.success(shelfService.updateShelf(req));
+    public ApiRes<Boolean> UpdateShelf(@RequestBody @Validated(ValidationApi.edit.class) UpdateShelfReq req) {
+        return ApiRes.success(shelfService.UpdateShelf(req));
     }
 
     @PostMapping("/DeleteShelf")
     @ApiOperation("删除货架")
-    public ApiRes<Boolean> deleteShelf(@RequestBody @Validated(ShelfReq.delete.class) ShelfReq req) {
-        return ApiRes.success(shelfService.deleteShelf(req));
+    public ApiRes<Boolean> DeleteShelf(@RequestBody @Validated(ShelfReq.delete.class) UpdateShelfReq req) {
+        return ApiRes.success(shelfService.DeleteShelf(req));
     }
 
     @PostMapping("/GetShelfList")
-    @ApiOperation("查询区域信息")
-    public ApiRes<List<Shelf>> getShelfList(@RequestBody ShelfReq req){
-        return ApiRes.success(shelfService.getShelfList(req));
+    @ApiOperation("查询货架信息")
+    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,10 +6,6 @@ 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> {
 
@@ -29,7 +25,8 @@ public interface PolicemanService extends IService<Policeman> {
     boolean UpdatePolice(UpdatePolicemanReq req);
 
 
-    boolean AddFaceInfo(PolicemanReq req);
+
+    boolean AddFaceInfo(UpdatePolicemanReq req);
 
 
     //修改警员状态
@@ -48,7 +45,6 @@ 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;
 
 import java.util.List;
 
 public interface ShelfService extends IService<Shelf> {
-    boolean addShelf(ShelfReq msg);
+    boolean AddShelf(UpdateShelfReq req);
 
-    boolean updateShelf(ShelfReq msg);
+    boolean UpdateShelf(UpdateShelfReq req);
 
-    boolean deleteShelf(ShelfReq msg);
+    boolean DeleteShelf(UpdateShelfReq req);
 
-    List<Shelf> getShelfList(ShelfReq msg);
+    List<ShelfDto> GetShelfList(ShelfReq req);
 }

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

 package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.api.bean.dto.WarehouseAreaDto;
 import com.junmp.jyzb.api.bean.query.WarehouseAreaReq;
+import com.junmp.jyzb.api.bean.req.UpdateWarehouseAreaReq;
 import com.junmp.jyzb.entity.WarehouseArea;
 
 import java.util.List;
 
 public interface WarehouseAreaService extends IService<WarehouseArea> {
 
-    boolean addArea(WarehouseAreaReq msg);
+    boolean addArea(UpdateWarehouseAreaReq msg);
 
-    boolean updateArea(WarehouseAreaReq msg);
+    boolean updateArea(UpdateWarehouseAreaReq msg);
 
-    boolean deleteArea(WarehouseAreaReq msg);
+    boolean deleteArea(UpdateWarehouseAreaReq msg);
 
-    List<WarehouseArea> getAreaList(WarehouseAreaReq msg);
+    List<WarehouseAreaDto> getAreaList(WarehouseAreaReq msg);
 }

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

 package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.api.bean.dto.WarehouseDto;
 import com.junmp.jyzb.api.bean.query.WarehouseReq;
+import com.junmp.jyzb.api.bean.req.UpdateWarehouseReq;
 import com.junmp.jyzb.entity.Warehouse;
 import com.junmp.jyzb.utils.ResponseResult;
 
@@ -16,29 +18,29 @@ public interface WarehouseService extends IService<Warehouse> {
      *
      * @param req
      */
-    boolean addWarehouse(WarehouseReq req);
+    String AddWarehouse(UpdateWarehouseReq req);
 
     /**
      * 查询单个仓库信息
      *
      * @param req
      */
-    Warehouse getOneWarehouse(WarehouseReq req);
+    WarehouseDto getOneWarehouse(WarehouseReq req);
 
 //    ResponseResult deleteWarehouse(Map<String, Object> msg);
-    boolean deleteWarehouse(WarehouseReq req);
+    boolean DeleteWarehouse(UpdateWarehouseReq req);
 
     /**
      * 编辑
      *
      * @param req
      */
-    boolean updateWarehouse(WarehouseReq req);
+    boolean updateWarehouse(UpdateWarehouseReq req);
 
 
     boolean changeWarehouseState(WarehouseReq req);
 
-    List<Warehouse> getAllWarehouse(WarehouseReq orgId);
+    List<WarehouseDto> getAllWarehouse(WarehouseReq orgId);
 
 
     ResponseResult setWarehouseInventory(Map<String, Object> msg);

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

@@ -7,9 +7,8 @@ import com.junmp.jyzb.api.bean.query.CabinetReq;
 import com.junmp.jyzb.api.bean.req.UpdateCabinetBoxReq;
 import com.junmp.jyzb.entity.Cabinet;
 import com.junmp.jyzb.entity.CabinetBox;
-import com.junmp.jyzb.entity.Policeman;
-import com.junmp.jyzb.exception.enums.CabinetBoxExceptionEnum;
-import com.junmp.jyzb.exception.enums.CabinetExceptionEnum;
+import com.junmp.jyzb.api.exception.enums.CabinetBoxExceptionEnum;
+import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum;
 import com.junmp.jyzb.mapper.CabinetBoxMapper;
 import com.junmp.jyzb.mapper.PoliceFingerMapper;
 import com.junmp.jyzb.mapper.PolicemanMapper;
@@ -21,10 +20,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 
 @Service
 public class CabinetBoxServiceImpl extends ServiceImpl<CabinetBoxMapper, CabinetBox> implements CabinetBoxService {

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.api.bean.dto.CabinetDto;
 import com.junmp.jyzb.api.bean.dto.CabinetBoxDto;
-import com.junmp.jyzb.api.bean.dto.CabinetDto;
 import com.junmp.jyzb.api.bean.query.CabinetBoxReq;
 import com.junmp.jyzb.api.bean.query.CabinetReq;
 import com.junmp.jyzb.api.bean.req.UpdateCabinetBoxReq;
@@ -14,9 +13,9 @@ import com.junmp.jyzb.entity.Cabinet;
 import com.junmp.jyzb.entity.CabinetBox;
 import com.junmp.jyzb.entity.Policeman;
 import com.junmp.jyzb.entity.PubOrg;
-import com.junmp.jyzb.exception.enums.CabinetExceptionEnum;
-import com.junmp.jyzb.exception.enums.PolicemanExceptionEnum;
-import com.junmp.jyzb.exception.enums.PubOrgExceptionEnum;
+import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum;
+import com.junmp.jyzb.api.exception.enums.PolicemanExceptionEnum;
+import com.junmp.jyzb.api.exception.enums.PubOrgExceptionEnum;
 import com.junmp.jyzb.mapper.*;
 import com.junmp.jyzb.service.CabinetBoxService;
 import com.junmp.jyzb.service.CabinetService;
@@ -149,6 +148,9 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
     public boolean deleteCabinetInfo(UpdateCabinetReq req) {
         //获取传递的id列表
         List<String> cabinetIdList = req.getCabinetList();
+        if (cabinetIdList.size()==0){
+            throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
+        }
         List<Cabinet> cabinetList=new ArrayList<>();
         //遍历单警柜id列表
         for (String id:cabinetIdList) {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.api.bean.query.PolicemanFingerReq;
 import com.junmp.jyzb.entity.PoliceFinger;
-import com.junmp.jyzb.exception.enums.PolicemanFingerExceptionEnum;
+import com.junmp.jyzb.api.exception.enums.PolicemanFingerExceptionEnum;
 import com.junmp.jyzb.service.PoliceFingerService;
 import com.junmp.jyzb.utils.DateTimeUtil;
 import com.junmp.v2.common.exception.base.ServiceException;

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

@@ -3,9 +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;
@@ -13,48 +18,66 @@ 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 ShelfMapper shelfMapper;
+    private WarehouseService warehouseService;
 
     @Override
-    public boolean addShelf(ShelfReq req) {
+    public boolean AddShelf(UpdateShelfReq req) {
         Shelf shelf = new Shelf();
         BeanPlusUtil.copyProperties(req,shelf);
         return this.save(shelf);
     }
 
     @Override
-    public boolean updateShelf(ShelfReq req) {
-        Shelf shelf = this.queryShelf(req);
+    public boolean UpdateShelf(UpdateShelfReq req) {
+        //判断货架id是否正确
+        Shelf shelf = this.QueryShelf(req);
         BeanPlusUtil.copyProperties(req, shelf);
         return this.updateById(shelf);
     }
 
     @Override
-    public boolean deleteShelf(ShelfReq req) {
-        Shelf shelf = queryShelf(req);
-        this.removeById(req.getShelfId());
-        return true;
+    public boolean DeleteShelf(UpdateShelfReq req) {
+        QueryShelf(req);
+        return removeById(req.getShelfId());
     }
 
     @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;
     }
 
-    private Shelf queryShelf(ShelfReq req) {
-        Shelf app = this.getById(req.getShelfId());
-
-        if (ObjectUtil.isNull(app)) {
+    /**
+     * 判断货架id是否存在
+     * @param req
+     * @return
+     */
+    private Shelf QueryShelf(UpdateShelfReq req) {
+        Shelf shelf = this.getById(req.getShelfId());
+        if (ObjectUtil.isNull(shelf)) {
             throw new ServiceException(ShelfExceptionEnum.SHELF_NOT_EXIST);
         }
-        return app;
+        return shelf;
     }
 
     private LambdaQueryWrapper<Shelf> createWrapper(ShelfReq req) {

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

@@ -3,9 +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.WarehouseAreaDto;
 import com.junmp.jyzb.api.bean.query.WarehouseAreaReq;
+import com.junmp.jyzb.api.bean.req.UpdateWarehouseAreaReq;
 import com.junmp.jyzb.api.exception.enums.WarehouseAreaExceptionEnum;
+import com.junmp.jyzb.api.exception.enums.WarehouseExceptionEnum;
+import com.junmp.jyzb.entity.Warehouse;
 import com.junmp.jyzb.entity.WarehouseArea;
+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;
@@ -13,6 +18,7 @@ import javax.annotation.Resource;
 import com.junmp.jyzb.mapper.WarehouseAreaMapper;
 import com.junmp.jyzb.service.WarehouseAreaService;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -21,53 +27,79 @@ public class WarehouseAreaServiceImpl extends ServiceImpl<WarehouseAreaMapper, W
     @Resource
     private WarehouseAreaMapper warehouseAreaMapper;
 
+    @Resource
+    private WarehouseService warehouseService;
+
+
 
     @Override
-    public boolean addArea(WarehouseAreaReq req) {
+    public boolean addArea(UpdateWarehouseAreaReq req) {
         WarehouseArea area = new WarehouseArea();
         BeanPlusUtil.copyProperties(req, area);
+        //判断仓库是否存在
+        WarehouseExist(req.getWarehouseId());
+        //判断区域名称是否存在如果存在则抛出异常
+        List<WarehouseArea> list = list(new LambdaQueryWrapper<WarehouseArea>()
+                .eq(WarehouseArea::getWarehouseId, req.getWarehouseId())
+                .eq(WarehouseArea::getAreaName, req.getAreaName()));
+        if (list.size()>0){
+            throw new ServiceException(WarehouseAreaExceptionEnum.AREA_IS_EXISTS);
+        }
         return this.save(area);
     }
 
     @Override
-    public boolean updateArea(WarehouseAreaReq req) {
-        WarehouseArea area = this.queryWarehouseArea(req);
-        BeanPlusUtil.copyProperties(req, area);
-        return this.updateById(area);
+    public boolean updateArea(UpdateWarehouseAreaReq req) {
+        WarehouseArea warehouseArea = new WarehouseArea();
+        BeanPlusUtil.copyProperties(req,warehouseArea);
+        //判断仓库是否存在
+        WarehouseExist(req.getWarehouseId());
+        //判断传入的区域id是否存在
+        WarehouseAreaExist(req.getAreaId());
+        return this.updateById(warehouseArea);
     }
 
     @Override
-    public boolean deleteArea(WarehouseAreaReq req) {
-        WarehouseArea warehouseArea = queryWarehouseArea(req);
-        this.removeById(req.getId());
-        return true;
+    public boolean deleteArea(UpdateWarehouseAreaReq req) {
+        //判断传入的区域id是否存在
+        WarehouseAreaExist(req.getAreaId());
+        WarehouseArea warehouseArea = new WarehouseArea();
+        BeanPlusUtil.copyProperties(req,warehouseArea);
+        return this.removeById(warehouseArea.getId());
     }
 
     @Override
-    public List<WarehouseArea> getAreaList(WarehouseAreaReq req) {
-        LambdaQueryWrapper<WarehouseArea> wrapper = createWrapper(req);
-        return this.list(wrapper);
+    public List<WarehouseAreaDto> getAreaList(WarehouseAreaReq req) {
+        //判断仓库是否存在
+        WarehouseExist(req.getWarehouseId());
+        List<WarehouseArea> list = list(new LambdaQueryWrapper<WarehouseArea>()
+                .eq(WarehouseArea::getWarehouseId, req.getWarehouseId()));
+        List<WarehouseAreaDto> warehouseAreaDtoList=new ArrayList<>();
+        for (WarehouseArea warehouseArea:list) {
+            WarehouseAreaDto warehouseAreaDto = new WarehouseAreaDto();
+            BeanPlusUtil.copyProperties(warehouseArea,warehouseAreaDto);
+            warehouseAreaDtoList.add(warehouseAreaDto);
+        }
+        return warehouseAreaDtoList;
     }
 
-    private WarehouseArea queryWarehouseArea(WarehouseAreaReq req) {
-        WarehouseArea app = this.getById(req.getId());
 
-        if (ObjectUtil.isNull(app)) {
-            throw new ServiceException(WarehouseAreaExceptionEnum.WAREHOUSEAREA_NOT_EXIST);
+    //判断仓库是否存在
+    private Warehouse WarehouseExist(String id){
+        Warehouse one = warehouseService.getOne(new LambdaQueryWrapper<Warehouse>()
+                .eq(Warehouse::getId, id));
+        if (ObjectUtil.isNull(one)){
+            throw new ServiceException(WarehouseExceptionEnum.WAREHOUSE_NOT_EXIST);
         }
-        return app;
+        return one;
     }
 
-    private LambdaQueryWrapper<WarehouseArea> createWrapper(WarehouseAreaReq req) {
-        LambdaQueryWrapper<WarehouseArea> wrapper = new LambdaQueryWrapper<>();
-        if (ObjectUtil.isEmpty(req)) {
-            return wrapper;
+    //判断区域id是否正确存在
+    private WarehouseArea WarehouseAreaExist(String id){
+        WarehouseArea warehouseArea = this.getById(id);
+        if (ObjectUtil.isNull(warehouseArea)){
+            throw new ServiceException(WarehouseAreaExceptionEnum.WAREHOUSEAREA_NOT_EXIST);
         }
-        //根据地区id查询
-        wrapper.eq(ObjectUtil.isNotEmpty(req.getId()), WarehouseArea::getId, req.getId());
-        //根据地区名称模糊查询
-        wrapper.like(ObjectUtil.isNotEmpty(req.getAreaName()), WarehouseArea::getAreaName, req.getAreaName());
-        wrapper.orderByDesc(WarehouseArea::getCreateTime);
-        return wrapper;
+        return warehouseArea;
     }
 }

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

@@ -3,11 +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.query.WarehouseAreaReq;
+import com.junmp.jyzb.api.bean.dto.WarehouseDto;
 import com.junmp.jyzb.api.bean.query.ProductReq;
 import com.junmp.jyzb.api.bean.query.WarehouseReq;
+import com.junmp.jyzb.api.bean.req.UpdateWarehouseReq;
 import com.junmp.jyzb.api.exception.enums.WarehouseExceptionEnum;
 import com.junmp.jyzb.entity.*;
+import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum;
+import com.junmp.jyzb.api.exception.enums.PubOrgExceptionEnum;
 import com.junmp.jyzb.mapper.*;
 import com.junmp.jyzb.service.PubOrgService;
 import com.junmp.jyzb.service.WarehouseService;
@@ -16,12 +19,12 @@ import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.util.BeanPlusUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import javax.annotation.Resource;
 
 import java.util.*;
 
-import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
-
 @Service
 @Slf4j
 public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse> implements WarehouseService {
@@ -36,56 +39,86 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
 
 
     @Override
-    public boolean addWarehouse(WarehouseReq req) {
+    public String AddWarehouse(UpdateWarehouseReq req) {
         Warehouse warehouse = new Warehouse();
         BeanPlusUtil.copyProperties(req, warehouse);
-        return this.save(warehouse);
+        save(warehouse);
+        return warehouse.getId();
     }
 
     @Override
-    public Warehouse getOneWarehouse(WarehouseReq req) {
-
+    public WarehouseDto getOneWarehouse(WarehouseReq req) {
         Warehouse warehouseMsg=this.getById(req.getId());
-        if (warehouseMsg == null) {
-            return null;
+        if (ObjectUtil.isNull(warehouseMsg)){
+            throw new ServiceException(WarehouseExceptionEnum.WAREHOUSE_NOT_EXIST);
         }
-        // 填充其他关联信息的字段和对象引用
-        return warehouseMsg;
+        WarehouseDto warehouseDto = new WarehouseDto();
+        BeanPlusUtil.copyProperties(warehouseMsg,warehouseDto);
+        //获取组织机构名称
+        PubOrg one = pubOrgService.getOne(new LambdaQueryWrapper<PubOrg>()
+                .eq(PubOrg::getOrgId, warehouseMsg.getOrgId()));
+        warehouseDto.setOrgName(one.getOrgName());
+        return warehouseDto;
     }
 
 
     @Override
-    public boolean deleteWarehouse(WarehouseReq req) {
-        this.removeById(req.getId());
+    @Transactional(rollbackFor = Exception.class)
+    public boolean DeleteWarehouse(UpdateWarehouseReq req) {
+        List<String> warehouseList = req.getWarehouseList();
+        if (warehouseList.size()<1){
+            //抛出参数传递异常
+            throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
+        }
+        removeBatchByIds(warehouseList);
         return true;
     }
 
     @Override
-    public boolean updateWarehouse(WarehouseReq req) {
-        Warehouse warehouse = this.queryWarehouse(req);
-        BeanPlusUtil.copyProperties(req, warehouse);
+    public boolean updateWarehouse(UpdateWarehouseReq req) {
+        Warehouse warehouse = new Warehouse();
+        BeanPlusUtil.copyProperties(req,warehouse);
         return this.updateById(warehouse);
     }
 
 
 
     @Override
-    public List<Warehouse> getAllWarehouse(WarehouseReq msg) {
+    public List<WarehouseDto> getAllWarehouse(WarehouseReq msg) {
         List<Warehouse> allWarehouse=new ArrayList<>();
-
+        List<WarehouseDto> warehouseDtoList=new ArrayList<>();
+        //判断组织机构是否存在
+        PubOrg one = pubOrgService.getOne(new LambdaQueryWrapper<PubOrg>()
+                .eq(PubOrg::getOrgId, msg.getOrgId()));
+        if (ObjectUtil.isNull(one)){
+            throw new ServiceException(PubOrgExceptionEnum.PUBORG_NOT_EXIST);
+        }
+        //根据组织机构id查询组织机构名称
+        String orgName = one.getOrgName();
         //如果组织机构是浙江省公安厅
-        if (msg.getOrgId().equals(1369509498032808905l) && msg.getIncludeLowerLevel().equals("true")){
+        if (msg.getOrgId().equals(1369509498032808905L) && msg.getIncludeLowerLevel().equals("true")){
             allWarehouse = this.list();
-            return allWarehouse;
+            for (Warehouse warehouse:allWarehouse) {
+                WarehouseDto warehouseDto = new WarehouseDto();
+                BeanPlusUtil.copyProperties(warehouse,warehouseDto);
+                warehouseDto.setOrgName(orgName);
+                warehouseDtoList.add(warehouseDto);
+            }
+            return warehouseDtoList;
         }
 
         //获取组织机构Id
         List<String> allOrgId =getAllOrgId(msg);
 
-        //根据获取的组织机构查询警员信息
         allWarehouse = getAllWarehouseByOrg(allOrgId);
 
-        return allWarehouse;
+        for (Warehouse warehouse:allWarehouse) {
+            WarehouseDto warehouseDto = new WarehouseDto();
+            BeanPlusUtil.copyProperties(warehouse,warehouseDto);
+            warehouseDto.setOrgName(orgName);
+            warehouseDtoList.add(warehouseDto);
+        }
+        return warehouseDtoList;
     }
 
 

pom.xml

@@ -264,6 +264,7 @@
             <dependency>
                 <groupId>org.springframework.security</groupId>
                 <artifactId>spring-security-web</artifactId>
+                <version>5.0.5.RELEASE</version>
             </dependency>
         </dependencies>