From 143982ce873b4e868d52cb5315f939386c0fb22c Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 06 四月 2024 13:08:29 +0800
Subject: [PATCH] 新增样品管理文件，完成仓库新增和查询
---
inspect-server/src/main/resources/mapper/WarehouseCellMapper.xml | 24 ++
inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseHistoryMapper.java | 18 ++
inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java | 33 +++
inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseHistory.java | 56 ++++++
inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseCellMapper.java | 18 ++
inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseCell.java | 61 ++++++
inspect-server/src/main/java/com/yuanchu/mom/service/WarehouseService.java | 19 ++
inspect-server/src/main/java/com/yuanchu/mom/dto/WarehouseDto.java | 14 +
inspect-server/src/main/resources/mapper/WarehouseShelfMapper.xml | 18 ++
inspect-server/src/main/resources/mapper/WarehouseHistoryMapper.xml | 23 ++
inspect-server/src/main/java/com/yuanchu/mom/pojo/Warehouse.java | 48 +++++
inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseShelf.java | 61 ++++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java | 50 +++++
inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseMapper.java | 23 ++
inspect-server/src/main/resources/mapper/WarehouseMapper.xml | 33 +++
inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseShelfMapper.java | 18 ++
16 files changed, 517 insertions(+), 0 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java
new file mode 100644
index 0000000..73f113a
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java
@@ -0,0 +1,33 @@
+package com.yuanchu.mom.controller;
+
+import com.yuanchu.mom.service.WarehouseService;
+import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("/warehouse")
+@RestController
+@AllArgsConstructor
+@Api("鏍峰搧浠撳簱")
+public class WarehouseController {
+
+ private WarehouseService warehouseService;
+
+ @PostMapping("/addWarehouse")
+ @ApiOperation("娣诲姞浠撳簱")
+ public Result addWarehouse(String name) {
+ return Result.success(warehouseService.addWarehouse(name));
+ }
+
+ @GetMapping("/selectWarehouse")
+ @ApiOperation("鏌ヨ浠撳簱")
+ public Result selectWarehouse() {
+ return Result.success(warehouseService.selectWarehouse());
+ }
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/WarehouseDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/WarehouseDto.java
new file mode 100644
index 0000000..9fb5d89
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/WarehouseDto.java
@@ -0,0 +1,14 @@
+package com.yuanchu.mom.dto;
+
+import com.yuanchu.mom.pojo.Warehouse;
+import com.yuanchu.mom.pojo.WarehouseShelf;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class WarehouseDto extends Warehouse {
+
+ List<WarehouseShelf> warehouseShelfList;
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseCellMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseCellMapper.java
new file mode 100644
index 0000000..4227dcb
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseCellMapper.java
@@ -0,0 +1,18 @@
+package com.yuanchu.mom.mapper;
+
+import com.yuanchu.mom.pojo.WarehouseCell;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author z1292
+* @description 閽堝琛ㄣ�恮arehouse_cell(璐ф灦鍗曞厓鏍�)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-04-06 12:12:12
+* @Entity com.yuanchu.mom.pojo.WarehouseCell
+*/
+public interface WarehouseCellMapper extends BaseMapper<WarehouseCell> {
+
+}
+
+
+
+
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseHistoryMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseHistoryMapper.java
new file mode 100644
index 0000000..2d2a24b
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseHistoryMapper.java
@@ -0,0 +1,18 @@
+package com.yuanchu.mom.mapper;
+
+import com.yuanchu.mom.pojo.WarehouseHistory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author z1292
+* @description 閽堝琛ㄣ�恮arehouse_history(鍑哄叆搴撹褰�)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-04-06 12:12:12
+* @Entity com.yuanchu.mom.pojo.WarehouseHistory
+*/
+public interface WarehouseHistoryMapper extends BaseMapper<WarehouseHistory> {
+
+}
+
+
+
+
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseMapper.java
new file mode 100644
index 0000000..e699369
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseMapper.java
@@ -0,0 +1,23 @@
+package com.yuanchu.mom.mapper;
+
+import com.yuanchu.mom.dto.WarehouseDto;
+import com.yuanchu.mom.pojo.Warehouse;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+* @author z1292
+* @description 閽堝琛ㄣ�恮arehouse(浠撳簱)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-04-06 12:12:12
+* @Entity com.yuanchu.mom.pojo.Warehouse
+*/
+public interface WarehouseMapper extends BaseMapper<Warehouse> {
+
+ List<WarehouseDto> selectWarehouseList();
+
+}
+
+
+
+
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseShelfMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseShelfMapper.java
new file mode 100644
index 0000000..1ee2509
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseShelfMapper.java
@@ -0,0 +1,18 @@
+package com.yuanchu.mom.mapper;
+
+import com.yuanchu.mom.pojo.WarehouseShelf;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author z1292
+* @description 閽堝琛ㄣ�恮arehouse_shelf(璐ф灦)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-04-06 12:12:12
+* @Entity com.yuanchu.mom.pojo.WarehouseShelf
+*/
+public interface WarehouseShelfMapper extends BaseMapper<WarehouseShelf> {
+
+}
+
+
+
+
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/Warehouse.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/Warehouse.java
new file mode 100644
index 0000000..7f8e764
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/Warehouse.java
@@ -0,0 +1,48 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yuanchu.mom.annotation.ValueTableShow;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 浠撳簱
+ * @TableName warehouse
+ */
+@TableName(value ="warehouse")
+@Data
+public class Warehouse implements Serializable {
+ /**
+ *
+ */
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 浠撳簱鍚嶇О
+ */
+ private String name;
+
+ /**
+ *
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseCell.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseCell.java
new file mode 100644
index 0000000..f6ffeab
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseCell.java
@@ -0,0 +1,61 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+/**
+ * 璐ф灦鍗曞厓鏍�
+ * @TableName warehouse_cell
+ */
+@TableName(value ="warehouse_cell")
+@Data
+public class WarehouseCell implements Serializable {
+ /**
+ *
+ */
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 琛�
+ */
+ private Integer row;
+
+ /**
+ * 鍒�
+ */
+ private Integer col;
+
+ /**
+ *
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ /**
+ * 鏄惁鏈夋晥 1锛氭湁鏁� 0锛氭棤鏁�
+ */
+ private Integer state;
+
+ /**
+ * 澶栨锛氳揣鏋秈d
+ */
+ private Integer shelfId;
+}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseHistory.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseHistory.java
new file mode 100644
index 0000000..4d140f6
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseHistory.java
@@ -0,0 +1,56 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+/**
+ * 鍑哄叆搴撹褰�
+ * @TableName warehouse_history
+ */
+@TableName(value ="warehouse_history")
+@Data
+public class WarehouseHistory implements Serializable {
+ /**
+ *
+ */
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 澶栭敭锛氭牱鍝乮d
+ */
+ private Integer insSampleId;
+
+ /**
+ * 鐘舵�侊細1锛氬叆搴� 2锛氬嚭搴�
+ */
+ private Integer state;
+
+ /**
+ *
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ /**
+ * 澶栭敭锛氬崟鍏冩牸id
+ */
+ private Integer cellId;
+}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseShelf.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseShelf.java
new file mode 100644
index 0000000..426cb92
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/WarehouseShelf.java
@@ -0,0 +1,61 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+/**
+ * 璐ф灦
+ * @TableName warehouse_shelf
+ */
+@TableName(value ="warehouse_shelf")
+@Data
+public class WarehouseShelf implements Serializable {
+ /**
+ *
+ */
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 璐ф灦鍚嶇О
+ */
+ private String name;
+
+ /**
+ * 琛�
+ */
+ private Integer row;
+
+ /**
+ * 鍒�
+ */
+ private Integer col;
+
+ /**
+ *
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ /**
+ * 澶栭敭锛氫粨搴搃d
+ */
+ private Integer warehouseId;
+}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/WarehouseService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/WarehouseService.java
new file mode 100644
index 0000000..f2b3f10
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/WarehouseService.java
@@ -0,0 +1,19 @@
+package com.yuanchu.mom.service;
+
+import com.yuanchu.mom.dto.WarehouseDto;
+import com.yuanchu.mom.pojo.Warehouse;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+* @author z1292
+* @description 閽堝琛ㄣ�恮arehouse(浠撳簱)銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2024-04-06 12:13:57
+*/
+public interface WarehouseService extends IService<Warehouse> {
+
+ int addWarehouse(String name);
+
+ List<WarehouseDto> selectWarehouse();
+}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java
new file mode 100644
index 0000000..77b514b
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java
@@ -0,0 +1,50 @@
+package com.yuanchu.mom.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.dto.WarehouseDto;
+import com.yuanchu.mom.mapper.WarehouseCellMapper;
+import com.yuanchu.mom.mapper.WarehouseHistoryMapper;
+import com.yuanchu.mom.mapper.WarehouseMapper;
+import com.yuanchu.mom.mapper.WarehouseShelfMapper;
+import com.yuanchu.mom.pojo.Warehouse;
+import com.yuanchu.mom.pojo.WarehouseHistory;
+import com.yuanchu.mom.service.WarehouseService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恑ns_sample_user(鏍峰搧璐熻矗浜鸿褰�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2024-03-14 17:12:02
+*/
+@Service
+@AllArgsConstructor
+public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse>
+ implements WarehouseService {
+
+ private WarehouseMapper warehouseMapper;
+
+ private WarehouseShelfMapper warehouseShelfMapper;
+
+ private WarehouseCellMapper warehouseCellMapper;
+
+ private WarehouseHistoryMapper warehouseHistoryMapper;
+
+ @Override
+ public int addWarehouse(String name) {
+ Warehouse warehouse = new Warehouse();
+ warehouse.setName(name);
+ return warehouseMapper.insert(warehouse);
+ }
+
+ @Override
+ public List<WarehouseDto> selectWarehouse() {
+ return warehouseMapper.selectWarehouseList();
+ }
+}
+
+
+
+
diff --git a/inspect-server/src/main/resources/mapper/WarehouseCellMapper.xml b/inspect-server/src/main/resources/mapper/WarehouseCellMapper.xml
new file mode 100644
index 0000000..c9e1121
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/WarehouseCellMapper.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yuanchu.mom.mapper.WarehouseCellMapper">
+
+ <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.WarehouseCell">
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="row" column="row" jdbcType="INTEGER"/>
+ <result property="col" column="col" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+ <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
+ <result property="state" column="state" jdbcType="INTEGER"/>
+ <result property="shelfId" column="shelf_id" jdbcType="INTEGER"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,row,col,
+ create_time,update_time,create_user,
+ update_user,state,shelf_id
+ </sql>
+</mapper>
diff --git a/inspect-server/src/main/resources/mapper/WarehouseHistoryMapper.xml b/inspect-server/src/main/resources/mapper/WarehouseHistoryMapper.xml
new file mode 100644
index 0000000..3e75545
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/WarehouseHistoryMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yuanchu.mom.mapper.WarehouseHistoryMapper">
+
+ <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.WarehouseHistory">
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="insSampleId" column="ins_sample_id" jdbcType="INTEGER"/>
+ <result property="state" column="state" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+ <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
+ <result property="cellId" column="cell_id" jdbcType="INTEGER"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,ins_sample_id,state,
+ create_time,update_time,create_user,
+ update_user,cell_id
+ </sql>
+</mapper>
diff --git a/inspect-server/src/main/resources/mapper/WarehouseMapper.xml b/inspect-server/src/main/resources/mapper/WarehouseMapper.xml
new file mode 100644
index 0000000..0be1e14
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/WarehouseMapper.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yuanchu.mom.mapper.WarehouseMapper">
+
+ <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.Warehouse">
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+ <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
+ </resultMap>
+
+ <resultMap id="Warehouse" type="com.yuanchu.mom.dto.WarehouseDto">
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <collection property="warehouseShelfList" resultMap="shelf"/>
+ </resultMap>
+
+ <resultMap id="shelf" type="com.yuanchu.mom.pojo.WarehouseShelf">
+ <id property="id" column="sId" jdbcType="INTEGER"/>
+ <result property="name" column="sName" jdbcType="VARCHAR"/>
+ <result property="row" column="row" jdbcType="INTEGER"/>
+ <result property="col" column="col" jdbcType="INTEGER"/>
+ </resultMap>
+
+ <select id="selectWarehouseList" resultMap="Warehouse">
+ select w.id,w.name,ws.id sId,ws.name sName,ws.row,ws.col,ws.warehouse_id from warehouse w
+ left join warehouse_shelf ws on w.id = ws.warehouse_id
+ </select>
+</mapper>
diff --git a/inspect-server/src/main/resources/mapper/WarehouseShelfMapper.xml b/inspect-server/src/main/resources/mapper/WarehouseShelfMapper.xml
new file mode 100644
index 0000000..4e5a281
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/WarehouseShelfMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yuanchu.mom.mapper.WarehouseShelfMapper">
+
+ <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.WarehouseShelf">
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <result property="row" column="row" jdbcType="INTEGER"/>
+ <result property="col" column="col" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+ <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
+ <result property="warehouseId" column="warehouse_id" jdbcType="INTEGER"/>
+ </resultMap>
+</mapper>
--
Gitblit v1.9.3