巡视设备模型按照规范文档新增字段

inspect-base/inspect-base-system/src/main/java/com/inspect/system/base/openDomain/BasedataEqpBookXml.java

@@ -19,10 +19,10 @@ import java.io.Serializable;
 @XmlAccessorType(XmlAccessType.FIELD)
 public class BasedataEqpBookXml implements Serializable {
     private static final long serialVersionUID = 1L;
-    @XmlAttribute(
-            name = "eqpbook_id"
-    )
-    private Long eqpBookId;
+//    @XmlAttribute(
+//            name = "eqpbook_id"
+//    )
+//    private Long eqpBookId;
     @Excel(
             name = "变电站名称"
     )
@@ -37,20 +37,20 @@ public class BasedataEqpBookXml implements Serializable {
             name = "station_code"
     )
     private String stationCode;
-    @Excel(
-            name = "区域ID"
-    )
-    @XmlAttribute(
-            name = "area_id"
-    )
-    private Long areaId;
-    @Excel(
-            name = "区域名称"
-    )
-    @XmlAttribute(
-            name = "area_name"
-    )
-    private String areaName;
+//    @Excel(
+//            name = "区域ID"
+//    )
+//    @XmlAttribute(
+//            name = "area_id"
+//    )
+//    private Long areaId;
+//    @Excel(
+//            name = "区域名称"
+//    )
+//    @XmlAttribute(
+//            name = "area_name"
+//    )
+//    private String areaName;
     @Excel(
             name = "设备名称"
     )
@@ -135,18 +135,18 @@ public class BasedataEqpBookXml implements Serializable {
             name = "place"
     )
     private String place;
-    @Excel(
-            name = "相对空间位置 x"
-    )
-    private String positionX;
-    @Excel(
-            name = "相对空间位置 y"
-    )
-    private String positionY;
-    @Excel(
-            name = "相对空间位置 z"
-    )
-    private String positionZ;
+//    @Excel(
+//            name = "相对空间位置 x"
+//    )
+//    private String positionX;
+//    @Excel(
+//            name = "相对空间位置 y"
+//    )
+//    private String positionY;
+//    @Excel(
+//            name = "相对空间位置 z"
+//    )
+//    private String positionZ;
     @Excel(
             name = "设备类型"
     )
@@ -161,29 +161,35 @@ public class BasedataEqpBookXml implements Serializable {
             name = "patroldevice_info"
     )
     private String patrolDeviceInfo;
-    @Excel(
-            name = "所属机器人"
-    )
+
     @XmlAttribute(
-            name = "robotsCode"
-    )
-    private String robotsCode;
-    @Excel(
-            name = "ip地址"
+            name = "mount_patroldevice_code"
     )
-    private String ipAddr;
-    @Excel(
-            name = "端口"
-    )
-    private String port;
-    @Excel(
-            name = "用户"
-    )
-    private String user;
-    @Excel(
-            name = "密码"
-    )
-    private String password;
-    private String delFlag;
+    private String mountPatrolDeviceCode;
+
+//    @Excel(
+//            name = "所属机器人"
+//    )
+//    @XmlAttribute(
+//            name = "robotsCode"
+//    )
+//    private String robotsCode;
+//    @Excel(
+//            name = "ip地址"
+//    )
+//    private String ipAddr;
+//    @Excel(
+//            name = "端口"
+//    )
+//    private String port;
+//    @Excel(
+//            name = "用户"
+//    )
+//    private String user;
+//    @Excel(
+//            name = "密码"
+//    )
+//    private String password;
+//    private String delFlag;
 
 }

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java

@@ -1760,9 +1760,54 @@ public class PatrolResultController extends BaseController {
                     BeanUtils.copyBeanProp(basedataEqpbookXml, book);
                     basedataEqpbookXml.setStationCode(stationNo);
                     basedataEqpbookXml.setStationName(stationName);
-                    if (StringUtils.isNotEmpty(basedataEqpbookXml.getDelFlag())) {
-                        basedataEqpbookXml.setDelFlag(null);
+
+                    if(basedataEqpbookXml.getDeviceModel() == null) {
+                        basedataEqpbookXml.setDeviceModel("");
+                    }
+
+                    if(basedataEqpbookXml.getManufacturer() == null) {
+                        basedataEqpbookXml.setManufacturer("");
+                    }
+
+                    if(basedataEqpbookXml.getUseUnit() == null) {
+                        basedataEqpbookXml.setUseUnit("");
+                    }
+
+                    if(basedataEqpbookXml.getDeviceSource() == null) {
+                        basedataEqpbookXml.setDeviceSource("");
+                    }
+
+                    if(basedataEqpbookXml.getProductionDate() == null) {
+                        basedataEqpbookXml.setProductionDate("");
                     }
+
+                    if(basedataEqpbookXml.getProductionCode() == null) {
+                        basedataEqpbookXml.setProductionCode("");
+                    }
+
+                    if(basedataEqpbookXml.getUseMode() == null) {
+                        basedataEqpbookXml.setUseMode("");
+                    }
+
+                    if(basedataEqpbookXml.getVideoMode() == null) {
+                        basedataEqpbookXml.setVideoMode("");
+                    }
+
+                    if(basedataEqpbookXml.getPlace() == null) {
+                        basedataEqpbookXml.setPlace("");
+                    }
+
+                    if(basedataEqpbookXml.getPatrolDeviceInfo() == null) {
+                        basedataEqpbookXml.setPatrolDeviceInfo("");
+                    }
+
+                    if(basedataEqpbookXml.getMountPatrolDeviceCode() == null) {
+                        basedataEqpbookXml.setMountPatrolDeviceCode("");
+                    }
+
+//                    if (StringUtils.isNotEmpty(basedataEqpbookXml.getDelFlag())) {
+//                        basedataEqpbookXml.setDelFlag(null);
+//                    }
                 }
 
                 pulseGet = new GenXmlByBean<>();