更新部分模块

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

+package com.junmp.jyzb.api.bean.req;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.junmp.v2.common.bean.request.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EquipmentSizeReq extends BaseRequest {
+
+    @NotNull(message = "装备号型主键不能为空", groups = {edit.class, delete.class, detail.class})
+    private String id;
+
+    private String typeId;
+
+    private String code;
+
+    private String name;
+
+    private String note;
+
+    private BigDecimal price;
+
+    private Integer state;
+
+    private Integer epcType;
+}

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

+package com.junmp.jyzb.api.bean.req;
+
+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;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ShelfReq extends BaseRequest {
+    private String shelfId;
+
+    private Long areaId;
+
+    private String shelfName;
+
+    private String code;
+
+    private String type;
+
+    private String warehouseId;
+
+    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/req/WarehouseAreaReq.java

+package com.junmp.jyzb.api.bean.req;
+
+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 java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WarehouseAreaReq extends BaseRequest {
+    @NotNull(message = "地区主键不能为空", groups = {edit.class, delete.class, detail.class})
+    private String id;
+
+    private String areaName;
+
+    private Long orgIdInt;
+
+    private String warehouseId;
+
+    private String photo;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private String createUser;
+
+    private String updateUser;
+}

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

+package com.junmp.jyzb.api.exception.enums;
+
+import com.junmp.jyzb.api.constant.JYZBConstant;
+import com.junmp.v2.common.constant.CommonConstant;
+import com.junmp.v2.common.exception.IExceptionEnum;
+import lombok.Getter;
+
+@Getter
+public enum ShelfExceptionEnum implements IExceptionEnum {
+    /**
+     * 货架信息不存在
+     */
+    SHELF_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, "标签重复"),
+    ;
+
+
+    /**
+     * 错误编码
+     */
+    private final Integer code;
+
+    /**
+     * 提示用户信息
+     */
+    private final String message;
+
+    ShelfExceptionEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

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

+package com.junmp.jyzb.api.exception.enums;
+
+import com.junmp.jyzb.api.constant.JYZBConstant;
+import com.junmp.v2.common.constant.CommonConstant;
+import com.junmp.v2.common.exception.IExceptionEnum;
+import lombok.Getter;
+
+@Getter
+public enum WarehouseAreaExceptionEnum implements IExceptionEnum {
+    /**
+     * 仓库地区信息不存在
+     */
+    WAREHOUSEAREA_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, "标签重复"),
+    ;
+
+
+    /**
+     * 错误编码
+     */
+    private final Integer code;
+
+    /**
+     * 提示用户信息
+     */
+    private final String message;
+
+    WarehouseAreaExceptionEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

jyzb-biz/src/main/java/com/junmp/jyzb/beanReq/PolicemanFingerReq.java

@@ -28,7 +28,7 @@ public class PolicemanFingerReq extends BaseRequest {
     /**
      * 指纹名称
      */
-    @ApiModelProperty(value = "警员id")
+    @ApiModelProperty(value = "指纹名称")
     private String name;
 
     /**

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

 package com.junmp.jyzb.controller;
 
+import com.junmp.jyzb.api.bean.req.EquipmentSizeReq;
+import com.junmp.jyzb.api.bean.req.ProductReq;
+import com.junmp.jyzb.entity.EquipmentSize;
 import com.junmp.jyzb.service.EquipmentSizeService;
 import com.junmp.jyzb.service.WarehouseService;
 import com.junmp.jyzb.utils.HttpStatus;
 import com.junmp.jyzb.utils.ResponseResult;
 import com.junmp.jyzb.utils.ReturnMsg;
+import com.junmp.v2.common.bean.response.ApiRes;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,50 +33,47 @@ public class EquipmentSizeController {
 
     @PostMapping("/AddSize")
     @ApiOperation("添加号型信息")
-    public ResponseResult addSize(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = equipmentSizeService.addSize(msg);
-        return returnMsg;
+    public ApiRes<Boolean> addSize(@RequestBody @Validated(EquipmentSizeReq.add.class) EquipmentSizeReq req) {
+        return ApiRes.success(equipmentSizeService.addSize(req));
     }
 
     @PostMapping("/DeleteSize")
     @ApiOperation("删除号型信息")
-    public ResponseResult deleteSize(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = equipmentSizeService.deleteSize(msg);
-        return returnMsg;
+    public ApiRes<Boolean> deleteSize(@RequestBody @Validated(EquipmentSizeReq.delete.class)EquipmentSizeReq req) {
+//        ResponseResult returnMsg = equipmentSizeService.deleteSize(msg);
+//        return returnMsg;
+        return ApiRes.success(equipmentSizeService.deleteSize(req));
     }
 
     @PostMapping("/GetOneSize")
     @ApiOperation("查询单个号型信息")
-    public ResponseResult getOneSize(@RequestBody Map<String, Object> msg) {
-        ResponseResult returnMsg = equipmentSizeService.getOneSize(msg);
-        return returnMsg;
+    public ApiRes<EquipmentSize> getOneSize(@RequestBody EquipmentSizeReq req) {
+        //ResponseResult returnMsg =
+        return ApiRes.success(equipmentSizeService.getOneSize(req));
     }
 
     @PostMapping("/ShowSize")
     @ApiOperation("根据装备类型查询号型")
-    public ResponseResult getAllSize(@RequestBody Map<String, Object> msg){
-        ResponseResult returnMsg = equipmentSizeService.getAllSize(msg);
-        return returnMsg;
+    public ApiRes<List<EquipmentSize>> getAllSize(@RequestBody EquipmentSizeReq req){
+        return ApiRes.success(equipmentSizeService.getAllSize(req));
     }
 
     @PostMapping("/UpdateSize")
     @ApiOperation("修改号型信息")
-    public ResponseResult updateSize(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = equipmentSizeService.updateSize(msg);
-        return returnMsg;
+    public ApiRes<Boolean> updateSize(@RequestBody @Validated(EquipmentSizeReq.edit.class) EquipmentSizeReq req) {
+        return ApiRes.success(equipmentSizeService.updateSize(req));
     }
 
     @PostMapping("/ChangeSizeState")
     @ApiOperation("禁用/启用装备号型")
-    public ResponseResult changeSizeState(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = equipmentSizeService.changeSizeState(msg);
-        return returnMsg;
+    public ApiRes<Boolean> changeSizeState(@RequestBody @Validated(EquipmentSizeReq.edit.class) EquipmentSizeReq req) {
+        return ApiRes.success(equipmentSizeService.changeSizeState(req));
     }
 
     @PostMapping("/GetSizeDevelop")
     @ApiOperation("获取号型表所有信息(非树表)")
-    public ResponseResult getSizeDevelop() {
+    public ApiRes<EquipmentSize> getSizeDevelop() {
         ResponseResult returnMsg = equipmentSizeService.getSizeDevelop();
-        return returnMsg;
+        return null;
     }
 }

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

@@ -3,6 +3,7 @@ package com.junmp.jyzb.controller;
 import com.junmp.jyzb.service.EquipmentTypeService;
 import com.junmp.jyzb.utils.HttpStatus;
 import com.junmp.jyzb.utils.ResponseResult;
+import com.junmp.v2.common.bean.response.ApiRes;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -35,7 +36,7 @@ public class EquipmentTypeController {
     }
 
     @PostMapping("/DeleteEquipment")
-    @ApiOperation("删除仓库信息")
+    @ApiOperation("删除装备信息")
     public ResponseResult deleteEquipment(@RequestBody Map<String,Object> msg) {
         ResponseResult returnMsg = equipmentTypeService.deleteEquipment(msg);
         return returnMsg;
@@ -50,16 +51,16 @@ public class EquipmentTypeController {
 
     @PostMapping("/ShowEquipmentList")
     @ApiOperation("查询类别列表")
-    public ResponseResult ShowEquipmentList() {
-        ResponseResult returnMsg = equipmentTypeService.getEquipmentList();
-        return returnMsg;
+    public ApiRes<List<Map<String,Object>>> ShowEquipmentList() {
+        return ApiRes.success(equipmentTypeService.getEquipmentList());
     }
 
     @PostMapping("/ShowAllEquipment")
     @ApiOperation("查询整颗物资树")
     public ResponseResult showAllEquipment() {
         List<Map<String, Object>> equipmentList = equipmentTypeService.showAllEquipment();
-        return new ResponseResult(HttpStatus.SUCCESS,"操作成功",equipmentList);
+//        return new ResponseResult(HttpStatus.SUCCESS,"操作成功",equipmentList);
+        return null;
     }
 
     @PostMapping("/GetEquipmentDetail")

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

@@ -25,27 +25,27 @@ public class OrderController {
     @ApiOperation("新增任务单")
     public ResponseResult addOrder(@RequestBody Map<String,Object> msg) {
         ResponseResult returnMsg = orderService.addOrder(msg);
-        return returnMsg;
+        return null;
     }
 
     @PostMapping("/ShowOrder")
     @ApiOperation("查询任务列表")
     public ResponseResult showOrder(@RequestBody Map<String,Object> msg) {
         ResponseResult returnMsg = orderService.showOrder(msg);
-        return returnMsg;
+        return null;
     }
 
     @PostMapping("/UpdateOrder")
     @ApiOperation("修改任务单")
     public ResponseResult updateOrder(@RequestBody Map<String,Object> msg) {
         ResponseResult returnMsg =orderService.updateOrder(msg);
-        return returnMsg;
+        return null;
     }
 
     @PostMapping("/GetOrderDetail")
     @ApiOperation("根据订单id查看业务明细")
     public ResponseResult getOrderDetail(@RequestBody Map<String, Object> msg){
         ResponseResult returnMsg = orderService.getOrderDetail(msg);
-        return returnMsg;
+        return null;
     }
 }

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

@@ -3,6 +3,7 @@ package com.junmp.jyzb.controller;
 import com.junmp.jyzb.api.bean.req.OrgUpdateReq;
 import com.junmp.jyzb.service.PubOrgService;
 import com.junmp.jyzb.utils.ResponseResult;
+import com.junmp.v2.common.bean.response.ApiRes;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -25,10 +26,10 @@ public class PubOrgController {
 
     @PostMapping("/ShowPubOrgList")
     @ApiOperation("查询组织机构列表_简化版")
-    public ResponseResult ShowEquipmentList(@RequestBody Map<String, Object> orgId) {
+    public ApiRes<List<Map<String,Object>>> ShowEquipmentList(@RequestBody Map<String, Object> orgId) {
         //传入当前的组织机构id，展示所有本级及下级的
-        ResponseResult returnMsg = pubOrgService.showPubOrgList(orgId);
-        return returnMsg;
+        //ResponseResult returnMsg = pubOrgService.showPubOrgList(orgId);
+        return ApiRes.success(pubOrgService.showPubOrgList(orgId));
     }
 
 //    @PostMapping("/ChangeOrgState")
@@ -47,13 +48,13 @@ public class PubOrgController {
 //        return returnMsg;
 //    }
 
-//    @PostMapping("/ShowPubOrgListOld")
-//    @ApiOperation("查询组织机构列表_完整版")
-//    public ResponseResult showPubOrgListOld(@RequestBody Map<String, Object> orgId) {
-//        //传入当前的组织机构id，展示所有本级及下级的
-//        ResponseResult returnMsg = pubOrgService.showPubOrgListOld(orgId);
-//        return returnMsg;
-//    }
+    @PostMapping("/ShowPubOrgListOld")
+    @ApiOperation("查询组织机构列表_完整版")
+    public ResponseResult showPubOrgListOld(@RequestBody Map<String, Object> orgId) {
+        //传入当前的组织机构id，展示所有本级及下级的
+        ResponseResult returnMsg = pubOrgService.showPubOrgListOld(orgId);
+        return returnMsg;
+    }
 
     @PostMapping("/SetOrgParentIds")
     @ApiOperation("填充组织机构的parent_ids字段")

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

 package com.junmp.jyzb.controller;
 
-import com.junmp.jyzb.api.bean.req.ProductReq;
-import com.junmp.jyzb.api.bean.req.SupplierReq;
-import com.junmp.jyzb.api.bean.req.WarehouseReq;
-import com.junmp.jyzb.entity.Product;
-import com.junmp.jyzb.entity.Warehouse;
-import com.junmp.jyzb.service.PoliceFingerService;
-import com.junmp.jyzb.service.PolicemanService;
-import com.junmp.jyzb.service.WarehouseService;
-import com.junmp.jyzb.utils.HttpStatus;
-import com.junmp.jyzb.utils.ResponseResult;
-import com.junmp.jyzb.utils.ReturnData;
-import com.junmp.jyzb.utils.ReturnMsg;
-import com.junmp.v2.common.bean.request.ValidationApi;
+import com.junmp.jyzb.api.bean.req.*;
+import com.junmp.jyzb.entity.*;
+import com.junmp.jyzb.service.*;
 import com.junmp.v2.common.bean.response.ApiRes;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -24,9 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @Slf4j
@@ -36,6 +24,12 @@ public class WarehouseController {
     @Resource
     public WarehouseService warehouseService;
 
+    @Resource
+    public WarehouseAreaService warehouseAreaService;
+
+    @Resource
+    public ShelfService shelfService;
+
 //    @PostMapping("/AddWarehouse")
 //    @ApiOperation("添加仓库")
 //    public ResponseResult addWarehouse(@RequestBody Map<String,Object> msg) {
@@ -93,64 +87,56 @@ public class WarehouseController {
 
     @PostMapping("/UpdateWarehouse")
     @ApiOperation("修改仓库信息")
-    public ResponseResult updateWarehouse(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = warehouseService.updateWarehouse(msg);
-        return returnMsg;
+    public ApiRes<Boolean> updateWarehouse(@RequestBody @Validated(WarehouseReq.edit.class) WarehouseReq req) {
+        return ApiRes.success(warehouseService.updateWarehouse(req));
     }
 
     @PostMapping("/AddArea")
     @ApiOperation("添加区域")
-    public ResponseResult addArea(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = warehouseService.addArea(msg);
-        return returnMsg;
+    public ApiRes<Boolean> addArea(@RequestBody @Validated(WarehouseAreaReq.add.class) WarehouseAreaReq req) {
+        return ApiRes.success(warehouseAreaService.addArea(req));
     }
 
     @PostMapping("/UpdateArea")
     @ApiOperation("修改区域")
-    public ResponseResult updateArea(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = warehouseService.updateArea(msg);
-        return returnMsg;
+    public ApiRes<Boolean> updateArea(@RequestBody @Validated(WarehouseAreaReq.edit.class) WarehouseAreaReq req) {
+        return ApiRes.success(warehouseAreaService.updateArea(req));
     }
 
     @PostMapping("/DeleteArea")
     @ApiOperation("删除区域")
-    public ResponseResult deleteArea(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = warehouseService.deleteArea(msg);
-        return returnMsg;
+    public ApiRes<Boolean> deleteArea(@RequestBody @Validated(WarehouseAreaReq.delete.class) WarehouseAreaReq req) {
+        return ApiRes.success(warehouseAreaService.deleteArea(req));
     }
 
     @PostMapping("/GetAreaList")
     @ApiOperation("查询区域信息")
-    public ResponseResult getAreaList(@RequestBody Map<String, Object> msg){
-        ResponseResult returnMsg = warehouseService.getAreaList(msg);
-        return  returnMsg;
+    public ApiRes<List<WarehouseArea>> getAreaList(@RequestBody WarehouseAreaReq req){
+        return ApiRes.success(warehouseAreaService.getAreaList(req));
     }
 
+
     @PostMapping("/AddShelf")
     @ApiOperation("添加货架")
-    public ResponseResult addShelf(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = warehouseService.addShelf(msg);
-        return returnMsg;
+    public ApiRes<Boolean> addShelf(@RequestBody @Validated(ShelfReq.add.class) ShelfReq req) {
+        return ApiRes.success(shelfService.addShelf(req));
     }
 
     @PostMapping("/UpdateShelf")
     @ApiOperation("修改货架")
-    public ResponseResult updateShelf(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = warehouseService.updateShelf(msg);
-        return returnMsg;
+    public ApiRes<Boolean> updateShelf(@RequestBody @Validated(ShelfReq.edit.class) ShelfReq req) {
+        return ApiRes.success(shelfService.updateShelf(req));
     }
 
     @PostMapping("/DeleteShelf")
     @ApiOperation("删除货架")
-    public ResponseResult deleteShelf(@RequestBody Map<String,Object> msg) {
-        ResponseResult returnMsg = warehouseService.deleteShelf(msg);
-        return returnMsg;
+    public ApiRes<Boolean> deleteShelf(@RequestBody @Validated(ShelfReq.delete.class) ShelfReq req) {
+        return ApiRes.success(shelfService.deleteShelf(req));
     }
 
     @PostMapping("/GetShelfList")
     @ApiOperation("查询区域信息")
-    public ResponseResult getShelfList(@RequestBody Map<String, Object> msg){
-        ResponseResult returnMsg = warehouseService.getShelfList(msg);
-        return  returnMsg;
+    public ApiRes<List<Shelf>> getShelfList(@RequestBody ShelfReq req){
+        return ApiRes.success(shelfService.getShelfList(req));
     }
 }

jyzb-biz/src/main/java/com/junmp/jyzb/entity/EquipmentSize.java

 package com.junmp.jyzb.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
@@ -21,6 +20,7 @@ public class EquipmentSize implements Serializable {
      * 装备号型ID
      */
     @ApiModelProperty(value = "装备号型ID")
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 
     /**
@@ -47,14 +47,14 @@ public class EquipmentSize implements Serializable {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     /**
      * 更新时间
      */
     @ApiModelProperty(value = "更新时间")
-    @TableField("update_time")
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     /**

jyzb-biz/src/main/java/com/junmp/jyzb/entity/EquipmentType.java

 package com.junmp.jyzb.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -20,6 +22,7 @@ public class EquipmentType implements Serializable {
      * 装备类型ID
      */
     @ApiModelProperty(value = "装备类型ID")
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 
     /**

jyzb-biz/src/main/java/com/junmp/jyzb/entity/Shelf.java

 package com.junmp.jyzb.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
@@ -15,76 +15,49 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @TableName("base_shelf")
 public class Shelf implements Serializable {
-    /**
-     * 货架id
-     */
-    @ApiModelProperty(value="货架id")
+    @TableId(value = "shelf_id", type = IdType.ASSIGN_UUID)
     private String shelfId;
 
-    /**
-     * 货架名称
-     */
-    @ApiModelProperty(value="货架名称")
+    @TableField("area_id")
+    private Long areaId;
+
+    @TableField("shelf_name")
     private String shelfName;
 
-    /**
-     * 编码
-     */
-    @ApiModelProperty(value="编码")
+    @TableField("code")
     private String code;
 
-    /**
-     * 货架类型Normal:普通货架Smart:智能货架
-     */
-    @ApiModelProperty(value="货架类型Normal:普通货架Smart:智能货架")
+    @TableField("type")
     private String type;
 
-    /**
-     * 仓库
-     */
-    @ApiModelProperty(value="仓库")
+    @TableField("warehouse_id")
     private String warehouseId;
 
-    /**
-     * 货架层数
-     */
-    @ApiModelProperty(value="货架层数")
+    @TableField("shelf_rows")
     private Integer shelfRows;
 
-    /**
-     * 单层货架列数
-     */
-    @ApiModelProperty(value="单层货架列数")
+    @TableField("shelf_columns")
     private Integer shelfColumns;
 
-    /**
-     * 货架排数（智能货架多货架拼接）
-     */
-    @ApiModelProperty(value="货架排数（智能货架多货架拼接）")
+    @TableField("shelf_ranges")
     private Integer shelfRanges;
 
-    /**
-     * 智能货架地址
-     */
-    @ApiModelProperty(value="智能货架地址")
+    @TableField("url")
     private String url;
 
-    /**
-     * 型号
-     */
-    @ApiModelProperty(value="型号")
+    @TableField("size_info")
     private String sizeInfo;
 
-    @ApiModelProperty(value="")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
-    @ApiModelProperty(value="")
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
-    @ApiModelProperty(value="")
+    @TableField("create_user")
     private String createUser;
 
-    @ApiModelProperty(value="")
+    @TableField("update_user")
     private String updateUser;
 
     private static final long serialVersionUID = 1L;

jyzb-biz/src/main/java/com/junmp/jyzb/entity/Warehouse.java

@@ -34,7 +34,7 @@ public class Warehouse implements Serializable {
     @TableField("video")
     private String video;
 
-    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT_UPDATE)
     private Date createTime;
 
     @TableField(value = "update_time", fill = FieldFill.UPDATE)

jyzb-biz/src/main/java/com/junmp/jyzb/entity/WarehouseArea.java

 package com.junmp.jyzb.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
@@ -16,8 +15,8 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @TableName("base_warehouse_area")
 public class WarehouseArea implements Serializable {
-    @TableField("area_id")
-    private String areaId;
+    @TableId(value = "area_id", type = IdType.ASSIGN_UUID)
+    private String id;
 
     @TableField("area_name")
     private String areaName;
@@ -31,10 +30,10 @@ public class WarehouseArea implements Serializable {
     @TableField("photo")
     private String photo;
 
-    @TableField("create_time")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
-    @TableField("update_time")
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @TableField("create_user")

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/ShelfMapper.java

 package com.junmp.jyzb.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.junmp.jyzb.entity.Shelf;
+import com.junmp.jyzb.entity.WarehouseArea;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 import java.util.Map;
 
 @Mapper
-public interface ShelfMapper {
+public interface ShelfMapper extends BaseMapper<Shelf> {
     void addShelf(Shelf shelf);
 
     void updateShelf(Shelf shelf);

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/WarehouseAreaMapper.java

 package com.junmp.jyzb.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.junmp.jyzb.entity.Product;
 import com.junmp.jyzb.entity.Shelf;
 import com.junmp.jyzb.entity.WarehouseArea;
 import org.apache.ibatis.annotations.Mapper;
@@ -8,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 
 @Mapper
-public interface WarehouseAreaMapper {
+public interface WarehouseAreaMapper extends BaseMapper<WarehouseArea> {
     void addArea(WarehouseArea warehouseArea);
 
     void updateArea(WarehouseArea warehouseArea);

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

 package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.api.bean.req.EquipmentSizeReq;
 import com.junmp.jyzb.entity.EquipmentSize;
 import com.junmp.jyzb.entity.Product;
 import com.junmp.jyzb.utils.ResponseResult;
@@ -9,19 +10,19 @@ import java.util.List;
 import java.util.Map;
 
 public interface EquipmentSizeService extends IService<EquipmentSize> {
-    ResponseResult addSize(Map<String, Object> msg);
+    boolean addSize(EquipmentSizeReq req);
 
-    ResponseResult getOneSize(Map<String,Object> id);
+    EquipmentSize getOneSize(EquipmentSizeReq req);
 
-    ResponseResult deleteSize(Map<String, Object> msg);
+    boolean deleteSize(EquipmentSizeReq req);
 
-    ResponseResult updateSize(Map<String, Object> msg);
+    boolean updateSize(EquipmentSizeReq req);
 
     List<String> getAllSizeId(Map<String, Object> orgId);
 
-    ResponseResult changeSizeState(Map<String, Object> msg);
+    boolean changeSizeState(EquipmentSizeReq req);
 
-    ResponseResult getAllSize(Map<String, Object> msg);
+    List<EquipmentSize> getAllSize(EquipmentSizeReq req);
 
     ResponseResult getSizeDevelop();
 }

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

@@ -20,7 +20,7 @@ public interface EquipmentTypeService extends IService<EquipmentType> {
 
     ResponseResult changeEquipmentState(Map<String, Object> msg);
 
-    ResponseResult getEquipmentList();
+    List<Map<String,Object>> getEquipmentList();
 
     ResponseResult getOneEquipment(Map<String, Object> msg);
 

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

@@ -11,7 +11,7 @@ import com.junmp.jyzb.entity.PubOrg;
 
 public interface PubOrgService extends IService<PubOrg> {
 
-    ResponseResult showPubOrgList(Map<String, Object> orgId);
+    List<Map<String,Object>> showPubOrgList(Map<String, Object> orgId);
 
     ResponseResult showPubOrgListOld(Map<String, Object> orgId);
 

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

 package com.junmp.jyzb.service;
 
-public interface ShelfService{
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.api.bean.req.ShelfReq;
+import com.junmp.jyzb.entity.Shelf;
 
+import java.util.List;
 
+public interface ShelfService extends IService<Shelf> {
+    boolean addShelf(ShelfReq msg);
+
+    boolean updateShelf(ShelfReq msg);
+
+    boolean deleteShelf(ShelfReq msg);
+
+    List<Shelf> getShelfList(ShelfReq msg);
 }

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

 package com.junmp.jyzb.service;
 
-public interface WarehouseAreaService{
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.api.bean.req.WarehouseAreaReq;
+import com.junmp.jyzb.entity.Warehouse;
+import com.junmp.jyzb.entity.WarehouseArea;
 
+import java.util.List;
 
+public interface WarehouseAreaService extends IService<WarehouseArea> {
+
+    boolean addArea(WarehouseAreaReq msg);
+
+    boolean updateArea(WarehouseAreaReq msg);
+
+    boolean deleteArea(WarehouseAreaReq msg);
+
+    List<WarehouseArea> 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.req.ProductReq;
-import com.junmp.jyzb.api.bean.req.SupplierReq;
 import com.junmp.jyzb.api.bean.req.WarehouseReq;
-import com.junmp.jyzb.entity.Product;
 import com.junmp.jyzb.entity.Warehouse;
 import com.junmp.jyzb.utils.ResponseResult;
 
@@ -31,7 +28,12 @@ public interface WarehouseService extends IService<Warehouse> {
 //    ResponseResult deleteWarehouse(Map<String, Object> msg);
     boolean deleteWarehouse(WarehouseReq req);
 
-    ResponseResult updateWarehouse(Map<String, Object> msg);
+    /**
+     * 编辑
+     *
+     * @param req
+     */
+    boolean updateWarehouse(WarehouseReq req);
 
     List<String> getAllWarehouseId(Map<String, Object> orgId);
 
@@ -39,24 +41,6 @@ public interface WarehouseService extends IService<Warehouse> {
 
     List<Warehouse> getAllWarehouse(WarehouseReq orgId);
 
-    /**
-     * 新增8接口
-     * */
-    ResponseResult addArea(Map<String, Object> msg);
-
-    ResponseResult updateArea(Map<String, Object> msg);
-
-    ResponseResult deleteArea(Map<String, Object> msg);
-
-    ResponseResult getAreaList(Map<String, Object> msg);
-
-    ResponseResult addShelf(Map<String, Object> msg);
-
-    ResponseResult updateShelf(Map<String, Object> msg);
-
-    ResponseResult deleteShelf(Map<String, Object> msg);
-
-    ResponseResult getShelfList(Map<String, Object> msg);
 
     ResponseResult setWarehouseInventory(Map<String, Object> msg);
 }

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

 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.req.EquipmentSizeReq;
+import com.junmp.jyzb.api.bean.req.ProductReq;
+import com.junmp.jyzb.api.util.GenCodeUtil;
 import com.junmp.jyzb.entity.EquipmentSize;
+import com.junmp.jyzb.entity.Product;
 import com.junmp.jyzb.mapper.EquipmentTypeMapper;
 import com.junmp.jyzb.service.EquipmentSizeService;
 import com.junmp.jyzb.utils.DateTimeUtil;
 import com.junmp.jyzb.utils.HttpStatus;
 import com.junmp.jyzb.utils.ResponseResult;
 import com.junmp.jyzb.utils.ReturnMsg;
+import com.junmp.v2.common.util.BeanPlusUtil;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.junmp.jyzb.mapper.EquipmentSizeMapper;
@@ -27,7 +34,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
 
     private static final String REDIS_SIZE = "Size_";
 
-    @Override
+    //@Override
     public ResponseResult addSize(Map<String, Object> msg) {
         try {
             checkNotBlank(msg.get("typeId"), "typeId不能为空");
@@ -74,7 +81,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
         return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,uuid);
     }
 
-    @Override
+    //@Override
     public ResponseResult getOneSize(Map<String,Object> msg) {
         try {
             checkNotBlank(msg.get("id"), "id不能为空");
@@ -86,7 +93,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
         return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,oneSize);
     }
 
-    @Override
+    //@Override
     public ResponseResult deleteSize(Map<String, Object> msg) {
         // 进行参数校验
         try {
@@ -101,7 +108,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
         return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS);
     }
 
-    @Override
+    //@Override
     public ResponseResult updateSize(Map<String, Object> msg) {
         try {
             checkNotBlank(msg.get("id"), "id不能为空");
@@ -140,14 +147,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
         return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS);
     }
 
-    @Override
-    public List<String> getAllSizeId(Map<String, Object> typeId) {
-
-        List<String> msg = equipmentSizeMapper.getAllSizeId(typeId.get("typeId").toString());
-        return msg;
-    }
-
-    @Override
+    //@Override
     public ResponseResult changeSizeState(Map<String, Object> msg) {
         try {
             checkNotBlank(msg.get("id"), "id不能为空");
@@ -164,7 +164,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
         return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
     }
 
-    @Override
+    //@Override
     public ResponseResult getAllSize(Map<String, Object> msg) {
         try {
             checkNotBlank(msg.get("typeId"), "typeId不能为空");
@@ -182,8 +182,59 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
     }
 
     @Override
+    public List<String> getAllSizeId(Map<String, Object> typeId) {
+        List<String> msg = equipmentSizeMapper.getAllSizeId(typeId.get("typeId").toString());
+        return msg;
+    }
+
+    @Override
     public ResponseResult getSizeDevelop() {
         List<Map<String,Object>> returnMsg = equipmentSizeMapper.getSizeDevelop();
         return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,returnMsg);
     }
+
+    @Override
+    public boolean addSize(EquipmentSizeReq req) {
+        EquipmentSize size = new EquipmentSize();
+        BeanPlusUtil.copyProperties(req, size);
+        return this.save(size);
+    }
+
+    @Override
+    public EquipmentSize getOneSize(EquipmentSizeReq req) {
+        LambdaQueryWrapper<EquipmentSize> wrapper = createWrapperById(req);
+        return null;
+    }
+
+    private LambdaQueryWrapper<EquipmentSize> createWrapperById(EquipmentSizeReq req) {
+        LambdaQueryWrapper<EquipmentSize> wrapper = new LambdaQueryWrapper<>();
+        if (ObjectUtil.isEmpty(req)) {
+            return wrapper;
+        }
+        //根据id编码查询
+//        wrapper.eq(ObjectUtil.isNotEmpty(req.getProductCode()), Product::getProductCode, req.getProductCode());
+//
+//        wrapper.orderByDesc(Product::getCreateTime);
+        return wrapper;
+    }
+
+    @Override
+    public boolean deleteSize(EquipmentSizeReq msg) {
+        return false;
+    }
+
+    @Override
+    public boolean updateSize(EquipmentSizeReq msg) {
+        return false;
+    }
+
+    @Override
+    public boolean changeSizeState(EquipmentSizeReq msg) {
+        return false;
+    }
+
+    @Override
+    public List<EquipmentSize> getAllSize(EquipmentSizeReq msg) {
+        return null;
+    }
 }

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

@@ -28,7 +28,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
     private static final String REDIS_TYPE = "Type_";
 
     @Override
-    public ResponseResult getEquipmentList() {
+    public List<Map<String, Object>> getEquipmentList() {
         List<EquipmentType> menuList = equipmentTypeMapper.selectAllEquipment();
 
         List<Map<String, Object>> topList = new ArrayList<>();
@@ -92,13 +92,9 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
             }
         }
         // 返回结果
-        return new ResponseResult(HttpStatus.SUCCESS, "操作成功", resultList);
+        return resultList;
     }
 
-
-
-
-
 //    @Override
 //    public List<Map<String, Object>> getEquipmentList() {
 //        List<EquipmentType> menuList = equipmentTypeMapper.selectAllEquipment();
@@ -228,24 +224,6 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
 
         equipmentTypeMapper.addEquipment(equipmentType);
 
-//        // 将uuid、创建时间、更新时间加入到msg中
-//        msg.put("id",numStr);
-//        long timestamp = currentDate.getTime(); // 将Date对象转换为long类型的时间戳
-//        msg.put("updateTime",timestamp);
-//
-//        /**
-//         * 更新缓存
-//         * */
-//        //构建Redis缓存键
-//        String redisKey = REDIS_TYPE;
-//        // 从 Redis 中获取数据
-//        List<Map<String, Object>> cachedData = redisUtils.findCachedData(redisKey);
-//        if (cachedData != null) {
-//            cachedData.add(0,msg);
-//            //将查询结果存入 Redis 中
-//            redisUtils.set(redisKey, cachedData);
-//
-//        }
         return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS, numStr);
     }
 

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

@@ -107,6 +107,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         wrapper.like(ObjectUtil.isNotEmpty(req.getProductCode()), Product::getProductCode, req.getProductCode());
         //根据企业名称模糊查询
         wrapper.like(ObjectUtil.isNotEmpty(req.getName()), Product::getName, req.getName());
+
         wrapper.orderByDesc(Product::getCreateTime);
         return wrapper;
     }

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

@@ -33,7 +33,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
     @Autowired
     private RedisUtils redisUtils;
 
-    public ResponseResult showPubOrgList(Map<String, Object> orgId) {
+    public List<Map<String,Object>> showPubOrgList(Map<String, Object> orgId) {
         // 构建 Redis 缓存键
         String redisKey = "showPubOrgList";
 
@@ -109,7 +109,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
         }
 
         if (orgInfo == -1) {
-            modifyList(resultList);
+            //modifyList(resultList);
 
             // 如果输入的是浙江省公安厅,就将下级的组织机构进行排序
             for (Map<String, Object> orgMsg : resultList) {
@@ -118,7 +118,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
                 children.sort(Comparator.comparing(m -> m.get("findCode").toString()));
             }
 
-            return new ResponseResult(HttpStatus.SUCCESS, "操作成功", resultList);
+            return resultList;
         }
 
         //将resultList的内容放在顶级菜单的resultList中
@@ -136,11 +136,11 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
                 // 根据findCode从小到大排序
                 children.sort(Comparator.comparing(m -> m.get("findCode").toString()));
             }
-            return new ResponseResult(HttpStatus.SUCCESS, "操作成功", topList);
+            return topList;
         }
 
         // 返回结果
-        return new ResponseResult(HttpStatus.SUCCESS, "操作成功", topList);
+        return topList;
     }
 
     //将父类信息放在children的第一个位置
@@ -159,7 +159,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
             List<Map<String, Object>> children = (List<Map<String, Object>>) item.get("children");
             if (children != null && children.size() > 0) {
                 //将父类的相关信息放在children的第一个位置
-                children.set(0,setMsg);
+                children.add(0,setMsg);
 
                 // 递归处理子节点
                 modifyList(children);
@@ -283,7 +283,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
         }
 
         List<String> resultList = new ArrayList<>();  // 存储最终的菜单树结果
-        Map<Long, List<String>> childrenMap = new HashMap<>();  // 存储每个菜单项的子菜单映射
+        Map<String, List<String>> childrenMap = new HashMap<>();  // 存储每个菜单项的子菜单映射
 
         resultList.add(orgId); //将自己加入到返回的List中
 
@@ -291,38 +291,43 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
         for (PubOrg menu : menuList) {
             String org = menu.getOrgId().toString();
 
-            if (!childrenMap.containsKey(menu.getOrgParentId())) {  // 如果父菜单还不存在于映射表中
-                childrenMap.put(menu.getOrgParentId(), new ArrayList<>());  // 创建一个新的子菜单列表
+            if (!childrenMap.containsKey(menu.getOrgParentId().toString())) {  // 如果父菜单还不存在于映射表中
+                childrenMap.put(menu.getOrgParentId().toString(), new ArrayList<>());  // 创建一个新的子菜单列表
             }
-            childrenMap.get(menu.getOrgParentId()).add(org);  // 将当前菜单项放入对应的子菜单列表中
+            childrenMap.get(menu.getOrgParentId().toString()).add(org);  // 将当前菜单项放入对应的子菜单列表中
         }
 
         Long orgInfo = Long.valueOf(orgId);//获取输入的组织机构id信息
         //Long orgInfo = new BigInteger(orgId);  // 获取顶级菜单的标识符
 
         // 获取顶级菜单
-        List<String> topMenus = childrenMap.get(orgInfo);
+        List<String> topMenus = childrenMap.get(orgId);
 
         // 迭代构建菜单树
         if (topMenus != null) {
-            Queue<String> queue = new LinkedList<>();  // 使用队列结构辅助构建菜单树
-            queue.addAll(topMenus);  // 将当前顶级菜单项放入队列中
 
-            while (!queue.isEmpty()) {
-                String currentMenu = queue.poll();  // 取出队首的当前菜单项
-                //Long currentMenuId = currentMenu;  // 获取当前菜单项的标识符
+            for (String topMenu : topMenus) {
+                Stack<String> stack = new Stack<>();  // 使用栈结构辅助构建菜单树
+                stack.push(topMenu);  // 将当前顶级菜单项放入栈中
 
-                if (childrenMap.containsKey(currentMenu)) {  // 如果当前菜单项有子菜单
-                    List<String> children = childrenMap.get(currentMenu);  // 获取子菜单列表
-                    //currentMenu.put("children", children);  // 将子菜单列表放入当前菜单项中的"children"字段
-                    queue.addAll(children);  // 将子菜单项放入队列中
-                }
+                while (!stack.isEmpty()) {
+                    String currentMenu = stack.pop(); // 取出队首的当前菜单项
+                    //Long currentMenuId = currentMenu;  // 获取当前菜单项的标识符
+
+                    if (childrenMap.containsKey(currentMenu)) {  // 如果当前菜单项有子菜单
+                        List<String> children = childrenMap.get(currentMenu);  // 获取子菜单列表
 
-                resultList.add(currentMenu);  // 将已经处理完的当前菜单项添加到结果列表中
+                        for (int i = children.size() - 1; i >= 0; i--) {
+                            stack.push(children.get(i));
+                        }
+                    }
+
+                    resultList.add(currentMenu);  // 将已经处理完的当前菜单项添加到结果列表中
+                }
             }
+
         }
 
-        //redisUtils.set(redisKey, resultList);
         return resultList;
     }
 

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

 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.req.ProductReq;
+import com.junmp.jyzb.api.bean.req.ShelfReq;
+import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
+import com.junmp.jyzb.api.exception.enums.ShelfExceptionEnum;
+import com.junmp.jyzb.api.util.GenCodeUtil;
+import com.junmp.jyzb.entity.Product;
+import com.junmp.jyzb.entity.Shelf;
+import com.junmp.jyzb.entity.WarehouseArea;
+import com.junmp.jyzb.mapper.WarehouseAreaMapper;
+import com.junmp.jyzb.service.WarehouseAreaService;
+import com.junmp.v2.common.exception.base.ServiceException;
+import com.junmp.v2.common.util.BeanPlusUtil;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.junmp.jyzb.mapper.ShelfMapper;
 import com.junmp.jyzb.service.ShelfService;
+
+import java.util.List;
+
 @Service
-public class ShelfServiceImpl implements ShelfService{
+public class ShelfServiceImpl extends ServiceImpl<ShelfMapper, Shelf> implements ShelfService {
 
     @Resource
     private ShelfMapper shelfMapper;
 
+    @Override
+    public boolean addShelf(ShelfReq req) {
+        Shelf shelf = new Shelf();
+        BeanPlusUtil.copyProperties(req,shelf);
+        return this.save(shelf);
+    }
+
+    @Override
+    public boolean updateShelf(ShelfReq req) {
+        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;
+    }
+
+    @Override
+    public List<Shelf> getShelfList(ShelfReq req) {
+        LambdaQueryWrapper<Shelf> wrapper = createWrapper(req);
+        return this.list(wrapper);
+    }
+
+    private Shelf queryShelf(ShelfReq req) {
+        Shelf app = this.getById(req.getShelfId());
+
+        if (ObjectUtil.isNull(app)) {
+            throw new ServiceException(ShelfExceptionEnum.SHELF_NOT_EXIST);
+        }
+        return app;
+    }
+
+    private LambdaQueryWrapper<Shelf> createWrapper(ShelfReq req) {
+        LambdaQueryWrapper<Shelf> wrapper = new LambdaQueryWrapper<>();
+        if (ObjectUtil.isEmpty(req)) {
+            return wrapper;
+        }
+        //根据货架id查询
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getShelfId()), Shelf::getShelfId, req.getShelfId());
+        //根据货架名称、货架编号模糊查询
+        wrapper.like(ObjectUtil.isNotEmpty(req.getShelfName()), Shelf::getCode, req.getShelfName());
+
+        wrapper.orderByDesc(Shelf::getCreateTime);
+        return wrapper;
+    }
 }

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

 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.req.ProductReq;
+import com.junmp.jyzb.api.bean.req.WarehouseAreaReq;
+import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
+import com.junmp.jyzb.api.exception.enums.WarehouseAreaExceptionEnum;
+import com.junmp.jyzb.entity.Product;
+import com.junmp.jyzb.entity.Warehouse;
+import com.junmp.jyzb.entity.WarehouseArea;
+import com.junmp.jyzb.mapper.ProductMapper;
+import com.junmp.v2.common.exception.base.ServiceException;
+import com.junmp.v2.common.util.BeanPlusUtil;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.junmp.jyzb.mapper.WarehouseAreaMapper;
 import com.junmp.jyzb.service.WarehouseAreaService;
+
+import java.util.List;
+
 @Service
-public class WarehouseAreaServiceImpl implements WarehouseAreaService{
+public class WarehouseAreaServiceImpl extends ServiceImpl<WarehouseAreaMapper, WarehouseArea> implements WarehouseAreaService{
 
     @Resource
     private WarehouseAreaMapper warehouseAreaMapper;
 
+
+    @Override
+    public boolean addArea(WarehouseAreaReq req) {
+        WarehouseArea area = new WarehouseArea();
+        BeanPlusUtil.copyProperties(req, area);
+        return this.save(area);
+    }
+
+    @Override
+    public boolean updateArea(WarehouseAreaReq req) {
+        WarehouseArea area = this.queryWarehouseArea(req);
+        BeanPlusUtil.copyProperties(req, area);
+        return this.updateById(area);
+    }
+
+    @Override
+    public boolean deleteArea(WarehouseAreaReq req) {
+        WarehouseArea warehouseArea = queryWarehouseArea(req);
+        this.removeById(req.getId());
+        return true;
+    }
+
+    @Override
+    public List<WarehouseArea> getAreaList(WarehouseAreaReq req) {
+        LambdaQueryWrapper<WarehouseArea> wrapper = createWrapper(req);
+        return this.list(wrapper);
+    }
+
+    private WarehouseArea queryWarehouseArea(WarehouseAreaReq req) {
+        WarehouseArea app = this.getById(req.getId());
+
+        if (ObjectUtil.isNull(app)) {
+            throw new ServiceException(WarehouseAreaExceptionEnum.WAREHOUSEAREA_NOT_EXIST);
+        }
+        return app;
+    }
+
+    private LambdaQueryWrapper<WarehouseArea> createWrapper(WarehouseAreaReq req) {
+        LambdaQueryWrapper<WarehouseArea> wrapper = new LambdaQueryWrapper<>();
+        if (ObjectUtil.isEmpty(req)) {
+            return wrapper;
+        }
+        //根据地区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;
+    }
 }

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

 package com.junmp.jyzb.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 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.InventoryDto;
+import com.junmp.jyzb.api.bean.req.WarehouseAreaReq;
 import com.junmp.jyzb.api.bean.req.ProductReq;
 import com.junmp.jyzb.api.bean.req.WarehouseReq;
-import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
-import com.junmp.jyzb.api.exception.enums.SupplierExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.WarehouseExceptionEnum;
-import com.junmp.jyzb.api.util.GenCodeUtil;
 import com.junmp.jyzb.entity.*;
 import com.junmp.jyzb.mapper.*;
-import com.junmp.jyzb.service.PolicemanService;
 import com.junmp.jyzb.service.PubOrgService;
 import com.junmp.jyzb.service.WarehouseService;
 import com.junmp.jyzb.utils.*;
@@ -174,6 +169,13 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
     }
 
     @Override
+    public boolean updateWarehouse(WarehouseReq req) {
+        Warehouse warehouse = this.queryWarehouse(req);
+        BeanPlusUtil.copyProperties(req, warehouse);
+        return this.updateById(warehouse);
+    }
+
+    //@Override
     public ResponseResult updateWarehouse(Map<String, Object> msg) {
         try {
             checkNotBlank(msg.get("warehouseId"), "warehouseId不能为空");
@@ -259,6 +261,11 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
         return allWarehouse;
     }
 
+    //@Override
+    public boolean addArea(WarehouseAreaReq msg) {
+        return false;
+    }
+
     private List<String> getAllOrgId(WarehouseReq msg) {
         List<String> allOrg = new ArrayList<>();
         if (msg.getIncludeLowerLevel().equals("false")){
@@ -280,7 +287,7 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
         return allWarehouse;
     }
 
-    @Override
+    //@Override
     public ResponseResult addArea(Map<String, Object> msg) {
         try {
             checkNotBlank(msg.get("name"), "name不能为空");
@@ -301,7 +308,7 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
         String uuid = UUID.randomUUID().toString().replaceAll("-", "");
         //生成当前时间
         Date currentDate = DateTimeUtil.getCurrentDateTime();
-        warehouseArea.setAreaId(uuid);
+        warehouseArea.setId(uuid);
         warehouseArea.setCreateTime(currentDate);
         warehouseArea.setUpdateTime(currentDate);
 
@@ -313,7 +320,7 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
         return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,uuid);
     }
 
-    @Override
+    //@Override
     public ResponseResult updateArea(Map<String, Object> msg) {
         try {
             checkNotBlank(msg.get("areaId"), "areaId不能为空");
@@ -334,7 +341,7 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
         Date currentDate = DateTimeUtil.getCurrentDateTime();
         warehouseArea.setUpdateTime(currentDate);
 
-        warehouseArea.setAreaId((String) msg.get("areaId"));
+        warehouseArea.setId((String) msg.get("areaId"));
         warehouseArea.setAreaName((String) msg.get("name"));
         warehouseArea.setWarehouseId((String) msg.get("warehouseId"));
         warehouseArea.setPhoto((String) msg.get("photo"));
@@ -344,7 +351,7 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
         return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
     }
 
-    @Override
+    //@Override
     public ResponseResult deleteArea(Map<String, Object> msg) {
         // 进行参数校验
         try {
@@ -357,7 +364,7 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
         return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS);
     }
 
-    @Override
+    //@Override
     public ResponseResult getAreaList(Map<String, Object> msg) {
         try {
             checkNotBlank(msg.get("warehouseId"), "warehouseId不能为空");
@@ -370,7 +377,7 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
         return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,areaList);
     }
 
-    @Override
+    //@Override
     public ResponseResult addShelf(Map<String, Object> msg) {
         try {
             checkNotBlank(msg.get("shelfName"), "shelfName不能为空");
@@ -413,7 +420,7 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
         return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,uuid);
     }
 
-    @Override
+    //@Override
     public ResponseResult updateShelf(Map<String, Object> msg) {
         try {
             checkNotBlank(msg.get("shelfId"), "shelfId不能为空");
@@ -447,7 +454,7 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
         return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
     }
 
-    @Override
+    //@Override
     public ResponseResult deleteShelf(Map<String, Object> msg) {
         // 进行参数校验
         try {
@@ -461,7 +468,7 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
         return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS);
     }
 
-    @Override
+    //@Override
     public ResponseResult getShelfList(Map<String, Object> msg) {
         try {
             checkNotBlank(msg.get("warehouseId"), "warehouseId不能为空");
@@ -560,7 +567,7 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
         wrapper.like(ObjectUtil.isNotEmpty(req.getProductCode()), Product::getProductCode, req.getProductCode());
         //根据企业名称模糊查询
         wrapper.like(ObjectUtil.isNotEmpty(req.getName()), Product::getName, req.getName());
-        wrapper.orderByDesc(Product::getCreateTime);
+        wrapper.orderByDesc(Product::getUpdateTime);
         return wrapper;
     }
 }