合并冲突并上传

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

@@ -24,7 +24,7 @@ public class InventoryDto implements Serializable {
     /**
      * 装备类型ID
      */
-    private String typeId;
+    private String typeName;
     /**
      * 装备类型
      */
@@ -32,39 +32,27 @@ public class InventoryDto implements Serializable {
     /**
      * 装备号型ID
      */
-    private String sizeId;
+    private String sizeName;
 
     /**
      * 装备号型
      */
-//    private  EquipmentSizeDto eqSize;
+    //    private  EquipmentSizeDto eqSize;
 
     /**
      * 供应商
      */
     private String supplierName;
-    /**
-     * 供应商ID
-     */
-    private String supplierId;
 
     /**
-     * 部门ID
-     */
-    private long departmentId;
-    /**
      * 部门
      */
-    private long departmentName;
+    private String departmentName;
     /**
      * 货架位置
      */
     private String shelfLocation;
 
-    /**
-     * 货架位置
-     */
-    private String shelfId;
 
     /**
      * epc
@@ -72,10 +60,6 @@ public class InventoryDto implements Serializable {
     private String epc;
 
     /**
-     * 组织机构ID
-     */
-    private String orgId;
-    /**
      * 组织机构
      */
     private String orgName;
@@ -98,7 +82,7 @@ public class InventoryDto implements Serializable {
     /**
      * 生产日期
      */
-    private DateTime productionDate;
+    private Date productionDate;
 
     /**
      * 质保期
@@ -121,10 +105,6 @@ public class InventoryDto implements Serializable {
     private String locationType;
 
     /**
-     * 位置ID
-     */
-    private String locationId ;
-    /**
      * 位置
      */
     private String locationName ;

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

@@ -51,7 +51,7 @@ public class InventoryController {
 
     @PostMapping("/GetDetail")
     @ApiOperation("查询库存明细信息")
-    public ApiRes<Inventory> getDetail(@RequestBody InventoryReq req) {
+    public ApiRes<InventoryDto> getDetail(@RequestBody InventoryReq req) {
         return   ApiRes.success(inventoryService.getInventoryDetail(req));
     }
 

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

@@ -19,7 +19,7 @@ import java.util.Date;
 @TableName("base_inventory")
 public class Inventory implements Serializable {
 
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableField("id")
     private String ID;
 
     /**
@@ -34,19 +34,11 @@ public class Inventory implements Serializable {
     @TableField("type_id")
     private String typeId;
     /**
-     * 装备类型名称
-     */
-    private String typeName;
-    /**
      * 装备类型ID
      */
     @TableField("size_id")
     private String sizeId;
     /**
-     * 装备类型名称
-     */
-    private String sizeName;
-    /**
      * 供应商ID
      */
     @TableField("supplier_id")

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

 package com.junmp.jyzb.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.junmp.jyzb.domain.Policeman;
 import com.junmp.jyzb.domain.PubOrg;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -8,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 
 @Mapper
-public interface PubOrgMapper {
+public interface PubOrgMapper extends BaseMapper<PubOrg> {
     List<PubOrg> selectAllOrg();
 
     Long getOnePubOrg(String orgId);

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

@@ -11,7 +11,7 @@ import com.junmp.jyzb.utils.ResponseResult;
 import java.util.Map;
 
 public interface InventoryService extends IService<Inventory> {
-    Inventory getInventoryDetail(InventoryReq msg);
+    InventoryDto getInventoryDetail(InventoryReq msg);
 
     ResponseResult getEquipmentInfo(Map<String, Object> msg);
 

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

 package com.junmp.jyzb.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.entity.Inventory;
 import com.junmp.jyzb.utils.ResponseResult;
 
 import java.util.List;
 import java.util.Map;
+import com.junmp.jyzb.domain.PubOrg;
 
-public interface PubOrgService{
+public interface PubOrgService extends IService<PubOrg> {
 
     ResponseResult showPubOrgList(Map<String, Object> orgId);
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.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.InventoryReq;
 import com.junmp.jyzb.domain.EquipmentSize;
 import com.junmp.jyzb.domain.EquipmentType;
-import com.junmp.jyzb.domain.PubOrg;
 import com.junmp.jyzb.entity.Inventory;
+
 import com.junmp.jyzb.service.CabinetService;
 import com.junmp.jyzb.service.InventoryService;
+import com.junmp.jyzb.service.ProductService;
 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.junmp.jyzb.mapper.InventoryMapper;
@@ -25,6 +30,7 @@ import java.util.*;
 import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
 
 @Service
+@Slf4j
 public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory> implements InventoryService {
 
     @Resource
@@ -35,26 +41,31 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
     private EquipmentSizeServiceImpl equipmentSizeService;
     @Resource
     private WarehouseService warehouseService;
+    @Resource
+    private PubOrgServiceImpl PubOrgService;
 
     @Resource
     private CabinetService cabinetService;
-
     @Override
-    public Inventory getInventoryDetail(InventoryReq req) {
+    public InventoryDto getInventoryDetail(InventoryReq req) {
+
         Inventory invMap=this.getById(req.getID());
         if (invMap == null) {
             return null;
         }
-
+        InventoryDto bean = BeanUtil.toBean(invMap, InventoryDto.class);
         // 查询与库存表关联的其他数据
-        EquipmentType equipmentTypeInfo = equipmentTypeService.getById(invMap.getTypeId());
-        EquipmentSize equipmentSizeInfo = equipmentSizeService.getById(invMap.getSizeId());
+        String orgName= PubOrgService.getById(invMap.getOrgId()).getOrgName();
+        String TypeName = equipmentTypeService.getById(invMap.getTypeId()).getName();
+        String SizeName = equipmentSizeService.getById(invMap.getSizeId()).getName();
         // 创建并填充对象
-        invMap.setSizeName(equipmentSizeInfo.getName());
-        invMap.setTypeName(equipmentTypeInfo.getName());
+        bean.setSizeName(SizeName);
+        bean.setTypeName(TypeName);
+        bean.setOrgName(orgName);
+
         // 填充其他关联信息的字段和对象引用
-        return invMap;
-//        return this.list(wrapper).get(0);
+        return bean;
+
     }
 
     @Override

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

 package com.junmp.jyzb.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.jyzb.domain.EquipmentType;
 import com.junmp.jyzb.domain.PubOrg;
+import com.junmp.jyzb.mapper.EquipmentTypeMapper;
+import com.junmp.jyzb.service.EquipmentTypeService;
 import com.junmp.jyzb.utils.HttpStatus;
 import com.junmp.jyzb.utils.RedisUtils;
 import com.junmp.jyzb.utils.ResponseResult;
@@ -17,7 +21,7 @@ import java.util.*;
 import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
 
 @Service
-public class PubOrgServiceImpl implements PubOrgService{
+public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implements PubOrgService{
 
     @Resource
     private PubOrgMapper pubOrgMapper;