场站管理、卡口管理、仓库管理基本完善，提交代码

@@ -2,9 +2,11 @@ package com.sunyo.wlpt.station.manage.domain;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -12,8 +14,8 @@ import lombok.NoArgsConstructor;
 
 /**
  * @author 子诚
- * Description：
- * 时间：2020/10/13 10:39
+ * Description：仓库静态资源表
+ * 时间：2020/10/13 11:59
  */
 @ApiModel(value = "仓库静态资源表")
 @Data
@@ -22,7 +24,8 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class Warehouse implements Serializable {
 
-    private static final long serialVersionUID = 1224656100260220596L;
+    private static final long serialVersionUID = 6900679815589018981L;
+
     /**
      * ID
      */
@@ -48,7 +51,7 @@ public class Warehouse implements Serializable {
     private String name;
 
     /**
-     * 仓库类型：001:进港仓库;002:出港仓库;003:监管仓库;004:危险品仓库
+     * 仓库类型：001:进港仓库;002:出港仓库;003:查验仓库;004:危险品仓库
      */
     @ApiModelProperty(value = "仓库类型：001:进港仓库;002:出港仓库;003:查验仓库;004:危险品仓库")
     private String warehouseType;
@@ -66,12 +69,24 @@ public class Warehouse implements Serializable {
     private BigDecimal warehouseWidth;
 
     /**
+     * 仓库高度
+     */
+    @ApiModelProperty(value = "仓库高度")
+    private BigDecimal warehouseHeight;
+
+    /**
      * 仓库面积
      */
     @ApiModelProperty(value = "仓库面积")
     private BigDecimal warehouseArea;
 
     /**
+     * 仓库体积
+     */
+    @ApiModelProperty(value = "仓库体积")
+    private BigDecimal warehouseVolume;
+
+    /**
      * 创建者
      */
     @ApiModelProperty(value = "创建者")

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;import java.util.List;
 /**
  * @author 子诚
  * Description：
- * 时间：2020/10/13 10:39
+ * 时间：2020/10/13 11:59
  */
 @Mapper
 public interface WarehouseMapper {

@@ -69,3 +69,4 @@ public interface WarehouseService {
     ResultJson selectListByPage(Warehouse warehouse, Integer pageNum, Integer pageSize);
 }
 
+

@@ -66,7 +66,6 @@ public class WarehouseServiceImpl implements WarehouseService {
             return ResultJson.error("400", "仓库长度与仓库宽度，不能为空！");
         }
 
-        warehouse.setWarehouseArea(BigDecimalUtil.mul(warehouseLength, warehouseWidth));
         return warehouseMapper.insertSelective(warehouse) > 0
                 ? ResultJson.success("200", "增加仓库信息，成功")
                 : ResultJson.error("500", "增加仓库信息，失败");
@@ -118,3 +117,4 @@ public class WarehouseServiceImpl implements WarehouseService {
     }
 }
 
+

@@ -11,7 +11,9 @@
     <result column="warehouse_type" jdbcType="VARCHAR" property="warehouseType"/>
     <result column="warehouse_length" jdbcType="DECIMAL" property="warehouseLength"/>
     <result column="warehouse_width" jdbcType="DECIMAL" property="warehouseWidth"/>
+    <result column="warehouse_height" jdbcType="DECIMAL" property="warehouseHeight"/>
     <result column="warehouse_area" jdbcType="DECIMAL" property="warehouseArea"/>
+    <result column="warehouse_volume" jdbcType="DECIMAL" property="warehouseVolume"/>
     <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
     <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
     <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
@@ -21,8 +23,9 @@
     </resultMap>
   <sql id="Base_Column_List">
       <!--@mbg.generated-->
-      id, yard_id, cop_code, `name`, warehouse_type, warehouse_length, warehouse_width, warehouse_area,
-    create_by, create_date, update_by, update_date, remarks, del_flag
+      id, yard_id, cop_code, `name`, warehouse_type, warehouse_length, warehouse_width,
+    warehouse_height, warehouse_area, warehouse_volume, create_by, create_date, update_by, 
+    update_date, remarks, del_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
       <!--@mbg.generated-->
@@ -41,14 +44,16 @@
       <!--@mbg.generated-->
       insert into warehouse (id, yard_id, cop_code,
                              `name`, warehouse_type, warehouse_length,
-                             warehouse_width, warehouse_area, create_by,
-                             create_date, update_by, update_date,
-                             remarks, del_flag)
+                             warehouse_width, warehouse_height, warehouse_area,
+                             warehouse_volume, create_by, create_date,
+                             update_by, update_date, remarks,
+                             del_flag)
       values (#{id,jdbcType=VARCHAR}, #{yardId,jdbcType=VARCHAR}, #{copCode,jdbcType=VARCHAR},
               #{name,jdbcType=VARCHAR}, #{warehouseType,jdbcType=VARCHAR}, #{warehouseLength,jdbcType=DECIMAL},
-              #{warehouseWidth,jdbcType=DECIMAL}, #{warehouseArea,jdbcType=DECIMAL}, #{createBy,jdbcType=VARCHAR},
-              #{createDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateDate,jdbcType=TIMESTAMP},
-              #{remarks,jdbcType=VARCHAR}, #{delFlag,jdbcType=CHAR})
+              #{warehouseWidth,jdbcType=DECIMAL}, #{warehouseHeight,jdbcType=DECIMAL}, #{warehouseArea,jdbcType=DECIMAL},
+              #{warehouseVolume,jdbcType=DECIMAL}, #{createBy,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},
+              #{updateBy,jdbcType=VARCHAR}, #{updateDate,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR},
+              #{delFlag,jdbcType=CHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.sunyo.wlpt.station.manage.domain.Warehouse">
       <!--@mbg.generated-->
@@ -75,9 +80,15 @@
       <if test="warehouseWidth != null">
           warehouse_width,
       </if>
+      <if test="warehouseHeight != null">
+          warehouse_height,
+      </if>
       <if test="warehouseArea != null">
           warehouse_area,
       </if>
+      <if test="warehouseVolume != null">
+          warehouse_volume,
+      </if>
       <if test="createBy != null">
           create_by,
       </if>
@@ -119,9 +130,15 @@
       <if test="warehouseWidth != null">
           #{warehouseWidth,jdbcType=DECIMAL},
       </if>
+      <if test="warehouseHeight != null">
+          #{warehouseHeight,jdbcType=DECIMAL},
+      </if>
       <if test="warehouseArea != null">
           #{warehouseArea,jdbcType=DECIMAL},
       </if>
+      <if test="warehouseVolume != null">
+          #{warehouseVolume,jdbcType=DECIMAL},
+      </if>
       <if test="createBy != null">
           #{createBy,jdbcType=VARCHAR},
       </if>
@@ -164,9 +181,15 @@
       <if test="warehouseWidth != null">
           warehouse_width = #{warehouseWidth,jdbcType=DECIMAL},
       </if>
+      <if test="warehouseHeight != null">
+          warehouse_height = #{warehouseHeight,jdbcType=DECIMAL},
+      </if>
       <if test="warehouseArea != null">
           warehouse_area = #{warehouseArea,jdbcType=DECIMAL},
       </if>
+      <if test="warehouseVolume != null">
+          warehouse_volume = #{warehouseVolume,jdbcType=DECIMAL},
+      </if>
       <if test="createBy != null">
           create_by = #{createBy,jdbcType=VARCHAR},
       </if>
@@ -197,7 +220,9 @@
           warehouse_type   = #{warehouseType,jdbcType=VARCHAR},
           warehouse_length = #{warehouseLength,jdbcType=DECIMAL},
           warehouse_width  = #{warehouseWidth,jdbcType=DECIMAL},
+          warehouse_height = #{warehouseHeight,jdbcType=DECIMAL},
           warehouse_area   = #{warehouseArea,jdbcType=DECIMAL},
+          warehouse_volume = #{warehouseVolume,jdbcType=DECIMAL},
           create_by        = #{createBy,jdbcType=VARCHAR},
           create_date      = #{createDate,jdbcType=TIMESTAMP},
           update_by        = #{updateBy,jdbcType=VARCHAR},
@@ -224,7 +249,9 @@
                w.warehouse_type,
                w.warehouse_length,
                w.warehouse_width,
+               w.warehouse_height,
                w.warehouse_area,
+               w.warehouse_volume,
                w.create_by,
                w.create_date,
                w.update_by,