Merge branch 'master' of http://gitlab.scsmile.cn/zxf/sample-form-platform

common-lib/src/main/java/com/mortals/xhx/common/pdu/device/DevicePdu.java

@@ -41,6 +41,10 @@ public class DevicePdu extends BaseEntityLong {
     * 站点名称
     */
     private String siteName;
+    /**
+     * 产品ID
+     */
+    private Long productId;
     /**
     * 产品编码
     */

sample-form-manager/db/add.sql

@@ -14,8 +14,6 @@ ALTER TABLE mortals_xhx_device
 ALTER TABLE mortals_xhx_device
     ADD COLUMN `enabled` tinyint(2) DEFAULT NULL COMMENT '启用状态 (0.停止，1.启用)' AFTER port;
 
-ALTER TABLE mortals_xhx_device
-    ADD COLUMN `deviceRemark` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '备注' AFTER enabled;
 ALTER TABLE mortals_xhx_device
     ADD COLUMN `onlineTime` datetime DEFAULT NULL COMMENT '最近上线时间' AFTER deviceRemark;
 ALTER TABLE mortals_xhx_device

sample-form-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java

@@ -78,7 +78,8 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
             siteRest.getData().forEach(site -> {
                 log.info("站点名称:{}", site.getSiteName());
                 DevicePdu devicePdu = new DevicePdu();
-                devicePdu.setProductCode("ybj");
+                //devicePdu.setProductCode("ybj");
+                devicePdu.setProductId(10L);
                 devicePdu.setSiteId(site.getId());
                 devicePdu.setSize(-1);
                 Rest<RespData<List<DevicePdu>>> deviceRest = deviceFeign.list(devicePdu);