中间库设备增加子类型

zc-business/src/main/java/com/zc/business/domain/MdDevice.java

@@ -56,6 +56,20 @@ public class MdDevice
     @Excel(name = "设备类型")
     private String typeCode;
 
+    /** 设备子类型
+     1-1 高清网络枪型固定摄像机
+     1-2 高清网络球形摄像机
+     1-3 桥下高清网络球形摄像机
+     1-4 360°全景摄像机
+     1-5 180°全景摄像机
+     2-1 门架式可变信息标志
+     2-2 站前可变信息标志
+     2-3 雨棚可变信息标志
+     2-4 站前悬臂式可变信息标志
+     */
+    @Excel(name = "设备子类型")
+    private String childTypeCode;
+
     /** 设施归属类型（0:默认1: 道路沿线2:桥梁3: 隧道4:收费广场5: 收费站6: 服务区等 */
     @Excel(name = "设施归属类型（0:默认1: 道路沿线2:桥梁3: 隧道4:收费广场5: 收费站6: 服务区等 ")
     private String facilitiesType;
@@ -265,6 +279,14 @@ public class MdDevice
         this.deletionTime = deletionTime;
     }
 
+    public String getChildTypeCode() {
+        return childTypeCode;
+    }
+
+    public void setChildTypeCode(String childTypeCode) {
+        this.childTypeCode = childTypeCode;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this)
@@ -298,7 +320,8 @@ public class MdDevice
         this.devName = dcDevice.getDeviceName();
         this.stakeNum = dcDevice.getStakeMark();
         this.direction = dcDevice.getDirection();
-        this.typeCode = dcDevice.getDeviceType().toString();
+        this.typeCode = dcDevice.getDeviceType();
+        this.childTypeCode = dcDevice.getChildType();
         if (StringUtils.isNotEmpty(dcDevice.getFacilitiesType())){
             this.facilitiesType = dcDevice.getFacilitiesType();
         }

zc-business/src/main/resources/mapper/business/MiddleDatabaseMapper.xml

@@ -130,6 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stakeNum != null">stake_num,</if>
             <if test="direction != null">direction,</if>
             <if test="typeCode != null">type_code,</if>
+            <if test="childTypeCode != null">child_type_code,</if>
             <if test="facilitiesType != null">facilities_type,</if>
             <if test="devStatus != null">dev_status,</if>
             <if test="opmaManagerId != null">opma_manager_id,</if>
@@ -151,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stakeNum != null">#{stakeNum},</if>
             <if test="direction != null">#{direction},</if>
             <if test="typeCode != null">#{typeCode},</if>
+            <if test="childTypeCode != null">#{childTypeCode},</if>
             <if test="facilitiesType != null">#{facilitiesType},</if>
             <if test="devStatus != null">#{devStatus},</if>
             <if test="opmaManagerId != null">#{opmaManagerId},</if>
@@ -178,6 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="mdDevice.stakeNum != null">stake_num,</if>
                 <if test="mdDevice.direction != null">direction,</if>
                 <if test="mdDevice.typeCode != null">type_code,</if>
+                <if test="mdDevice.childTypeCode != null">child_type_code,</if>
                 <if test="mdDevice.facilitiesType != null">facilities_type,</if>
                 <if test="mdDevice.devStatus != null">dev_status,</if>
                 <if test="mdDevice.opmaManagerId != null">opma_manager_id,</if>
@@ -199,6 +202,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="mdDevice.stakeNum != null">#{mdDevice.stakeNum},</if>
                 <if test="mdDevice.direction != null">#{mdDevice.direction},</if>
                 <if test="mdDevice.typeCode != null">#{mdDevice.typeCode},</if>
+                <if test="mdDevice.childTypeCode != null">#{mdDevice.childTypeCode},</if>
                 <if test="mdDevice.facilitiesType != null">#{mdDevice.facilitiesType},</if>
                 <if test="mdDevice.devStatus != null">#{mdDevice.devStatus},</if>
                 <if test="mdDevice.opmaManagerId != null">#{mdDevice.opmaManagerId},</if>
@@ -220,6 +224,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="mdDevice.stakeNum != null">stake_num = #{mdDevice.stakeNum},</if>
                 <if test="mdDevice.direction != null">direction = #{mdDevice.direction},</if>
                 <if test="mdDevice.typeCode != null">type_code = #{mdDevice.typeCode},</if>
+                <if test="mdDevice.childTypeCode != null">child_type_code = #{mdDevice.childTypeCode},</if>
                 <if test="mdDevice.facilitiesType != null">facilities_type = #{mdDevice.facilitiesType},</if>
                 <if test="mdDevice.devStatus != null">dev_status = #{mdDevice.devStatus},</if>
                 <if test="mdDevice.opmaManagerId != null">opma_manager_id = #{mdDevice.opmaManagerId},</if>
@@ -333,6 +338,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stakeNum != null">stake_num = #{stakeNum},</if>
             <if test="direction != null">direction = #{direction},</if>
             <if test="typeCode != null">type_code = #{typeCode},</if>
+            <if test="childTypeCode != null">child_type_code = #{childTypeCode},</if>
             <if test="facilitiesType != null">facilities_type = #{facilitiesType},</if>
             <if test="devStatus != null">dev_status = #{devStatus},</if>
             <if test="opmaManagerId != null">opma_manager_id = #{opmaManagerId},</if>