添加设备相关信息

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

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

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

@@ -67,13 +67,14 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
         if (siteRest.getCode() == YesNoEnum.YES.getValue()) {
             log.info("站点总数量：{}", siteRest.getData().size());
             siteRest.getData().forEach(site -> {
-                log.info("站点名称:{}",site.getSiteName());
+                log.info("站点名称:{}", site.getSiteName());
                 DevicePdu devicePdu = new DevicePdu();
-                devicePdu.setProductCode("tdj");
+                // devicePdu.setProductCode("tdj");
+                devicePdu.setProductId(9L);
                 devicePdu.setSiteId(site.getId());
                 devicePdu.setSize(-1);
                 Rest<RespData<List<DevicePdu>>> deviceRest = deviceFeign.list(devicePdu);
-                log.info("deviceRest：{}",JSON.toJSONString(deviceRest));
+                log.info("deviceRest：{}", JSON.toJSONString(deviceRest));
                 if (YesNoEnum.YES.getValue() == deviceRest.getCode()) {
                     List<DevicePdu> devicePduList = deviceRest.getData().getData();
                     log.info("填单机总数量：{}", devicePduList.size());
@@ -154,14 +155,14 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
 
         Rest<RespData<List<SkinBasePdu>>> skinBaseRest = skinBaseFeign.list(skinBasePdu);
         if (skinBaseRest.getCode() == YesNoEnum.YES.getValue()) {
-            List<SkinBasePdu>  skinBasePduList = skinBaseRest.getData().getData();
+            List<SkinBasePdu> skinBasePduList = skinBaseRest.getData().getData();
             log.info("填单机皮肤总数量：{}", skinBasePduList.size());
             if (!ObjectUtils.isEmpty(skinBasePduList)) {
                 List<SkinEntity> newSkinList = skinBasePduList.stream().map(newSkin -> {
                     SkinEntity skinEntity = new SkinEntity();
                     skinEntity.initAttrValue();
-                    newSkin.setCssFilePath("/"+StrUtil.subAfter(newSkin.getCssFilePath(), "/", true));
-                    newSkin.setPreviewImagePath("/"+StrUtil.subAfter(newSkin.getPreviewImagePath(), "/", true));
+                    newSkin.setCssFilePath("/" + StrUtil.subAfter(newSkin.getCssFilePath(), "/", true));
+                    newSkin.setPreviewImagePath("/" + StrUtil.subAfter(newSkin.getPreviewImagePath(), "/", true));
                     BeanUtils.copyProperties(newSkin, skinEntity, BeanUtil.getNullPropertyNames(newSkin));
                     return skinEntity;
                 }).collect(Collectors.toList());
@@ -201,7 +202,7 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
 
                 if (!ObjectUtils.isEmpty(updateSkinLsit)) {
                     log.info("皮肤更新，size:{}", updateSkinLsit.size());
-                   // skinService.update(updateSkinLsit);
+                    // skinService.update(updateSkinLsit);
                 }
 
                 if (!ObjectUtils.isEmpty(saveSkinList)) {