diff --git a/client/src/main/java/com/small/client/Schedule/DynamicTaskScheduler.java b/client/src/main/java/com/small/client/Schedule/DynamicTaskScheduler.java index a927fa98..7610aec2 100644 --- a/client/src/main/java/com/small/client/Schedule/DynamicTaskScheduler.java +++ b/client/src/main/java/com/small/client/Schedule/DynamicTaskScheduler.java @@ -2,6 +2,7 @@ package com.small.client.Schedule; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.small.client.Utils.CommonUtil; import com.small.client.dto.CommentModel; import com.small.client.dto.DataBaseInfo; import com.small.client.service.SxDataService; @@ -93,11 +94,23 @@ public class DynamicTaskScheduler { if(ObjectUtil.isNotEmpty(dataBaseInfo.getRefreshTime())){ commentModel.setSyncTime(DateUtil.formatDateTime(dataBaseInfo.getRefreshTime())); } + sxDataService.syncStoreData(dataBaseInfo,commentModel); sxDataService.SyncBranchList(dataBaseInfo,commentModel); sxDataService.SyncCategory(dataBaseInfo,commentModel); sxDataService.SyncGoods(dataBaseInfo,commentModel);//todo 暂时同步全部的商品如果后期修改,需要增加服务器的字段 + try { + if(ObjectUtil.isNotEmpty(dataBaseInfo.getShopGapTime())){ + long sleepTime= CommonUtil.convertExpressionToLong(dataBaseInfo.getShopGapTime()); + Thread.sleep(sleepTime);//两分钟之后执行 + }else { + Thread.sleep(1000*30); + } + } catch (InterruptedException e) { + throw new RuntimeException(e); + } sxDataService.SyncVipList(dataBaseInfo,commentModel); + sxDataService.syncAtive(dataBaseInfo,commentModel); sxDataService.syncAtiveShops(dataBaseInfo,commentModel); isRuning=false; } diff --git a/client/src/main/java/com/small/client/dto/DataBaseInfo.java b/client/src/main/java/com/small/client/dto/DataBaseInfo.java index bfe770c3..f19bfbb3 100644 --- a/client/src/main/java/com/small/client/dto/DataBaseInfo.java +++ b/client/src/main/java/com/small/client/dto/DataBaseInfo.java @@ -41,13 +41,4 @@ public class DataBaseInfo { @ApiModelProperty(value = "间隔时间") private String shopGapTime; - - @ApiModelProperty(value = "调价时间") - private String priceOperatiem; - - @ApiModelProperty(value = "库存条件") - private String stockOperateWhere; - - @ApiModelProperty(value = "营业员账号") - private String saleAccount; } diff --git a/client/src/main/java/com/small/client/dto/StoreDbConfig.java b/client/src/main/java/com/small/client/dto/StoreDbConfig.java index 780178ee..7aead91d 100644 --- a/client/src/main/java/com/small/client/dto/StoreDbConfig.java +++ b/client/src/main/java/com/small/client/dto/StoreDbConfig.java @@ -71,7 +71,4 @@ public class StoreDbConfig implements Serializable { @ApiModelProperty("商品同步间隔时间") private String shopGapTime; - - @ApiModelProperty(value = "营业员账号") - private String saleAccount; } diff --git a/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java b/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java index 4c997889..656f7f5c 100644 --- a/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java +++ b/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java @@ -682,6 +682,7 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService dataBaseInfo.setCategoryName(storeDbConfig.getCategoryName()); dataBaseInfo.setRefreshTime(storeDbConfig.getRefreshTime()); dataBaseInfo.setIsTowSync(storeDbConfig.getIsTowSync()); + dataBaseInfo.setShopGapTime(storeDbConfig.getShopGapTime()); return dataBaseInfo; } return new DataBaseInfo();