From 8468308a01179377461f82a92de562419d861332 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Mon, 15 Aug 2022 09:35:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/udidl/admin/entity/udid/Device.java    | 9 ++++++++-
 .../udidl/admin/service/dataSync/DeviceSaveService.java  | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/udidl/admin/entity/udid/Device.java b/src/main/java/com/glxp/udidl/admin/entity/udid/Device.java
index 6692782..da414bb 100644
--- a/src/main/java/com/glxp/udidl/admin/entity/udid/Device.java
+++ b/src/main/java/com/glxp/udidl/admin/entity/udid/Device.java
@@ -155,12 +155,19 @@ public class Device {
 
     @ApiModelProperty(value = "请求日期")
     private Date requestDate;
-
+    @ApiModelProperty(value = "耗材或者设备")
     private String hchzsb;
 
     @ApiModelProperty(value = "产品类型")
     private String cplx;
 
+
+    private String deviceHistoryKey;
+    private String deviceRecordKey;
+    private int versionNumber;
+    private String versionStatus;
+    private String versionTime;
+
     public Date getRequestDate() {
         return requestDate;
     }
diff --git a/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSaveService.java b/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSaveService.java
index 4176a6e..4b7144e 100644
--- a/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSaveService.java
+++ b/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSaveService.java
@@ -6,6 +6,7 @@ import com.glxp.udidl.admin.service.inout.DeviceService;
 import com.glxp.udidl.admin.service.inout.ProductInfoService;
 import com.glxp.udidl.admin.service.udi.UdiCompanyService;
 import com.glxp.udidl.admin.thread.UdiTransferUtils;
+import com.glxp.udidl.admin.util.BeanUtils;
 import com.glxp.udidl.admin.util.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -157,6 +158,7 @@ public class DeviceSaveService {
      */
     private Device responseToDevice(DataSetResult.DeviceInfo dataSetBean) {
         Device device = new Device();
+        BeanUtils.copyProperties(dataSetBean, device);
         device.setDevicehistoryrecordkey(dataSetBean.getDeviceHistoryKey());
         device.setDevicerecordkey(dataSetBean.getDeviceRecordKey());
         device.setBtcpbs(dataSetBean.getBtcpbs());