数据同步,

master
anthonywj 2 years ago
parent 4785613797
commit 4236c930bf

@ -27,7 +27,7 @@ public class BasicProcessStatus {
public static final int BASIC_THIRD_ORDER = 6; //往来单位 public static final int BASIC_THIRD_ORDER = 6; //往来单位
public static final int NEW_ALL_DATA = 7; //所有最新数据 public static final int NEW_ALL_DATA = 7; //所有最新数据
public static final int NEW_ALL_BUS = 8; public static final int NEW_ALL_BUS = 8;
public static final int NEW_ALL_ORDER = 9; public static final String NEW_ALL_ORDER = "9";
public static final int NEW_ALL_DI = 10; public static final int NEW_ALL_DI = 10;
public static final int SCHEDULE_NORMAL = 1; //常规任务 public static final int SCHEDULE_NORMAL = 1; //常规任务

@ -207,6 +207,11 @@ public class Constant {
*/ */
public static final String ORDER_STATUS_AUDITED = "audited"; public static final String ORDER_STATUS_AUDITED = "audited";
/**
*
*/
public static final String ORDER_STATUS_WAIT_AUDITED = "waitAudited";
/** /**
* - * -
*/ */

@ -18,7 +18,7 @@ public class BasicDownloadStatusEntity {
private String taskId; private String taskId;
private String idDatas; private String idDatas;
private Integer status; private Integer status;
private Integer type; private String type;
private Date updateTime; private Date updateTime;
private Integer scheduleType; private Integer scheduleType;
private Date startTime; private Date startTime;

@ -9,7 +9,7 @@ public class BasicExportStatusEntity {
private String id; private String id;
private String idDatas; private String idDatas;
private Integer status; private Integer status;
private Integer type; private String type;
private Date updateTime; private Date updateTime;
private Integer scheduleType; private Integer scheduleType;
private Date startTime; private Date startTime;

@ -547,6 +547,10 @@ public class IoOrderServiceImpl implements IoOrderService {
filterOrderRequest.setStatuses(Arrays.asList(1, 3, 5, 10, 7)); filterOrderRequest.setStatuses(Arrays.asList(1, 3, 5, 10, 7));
filterOrderRequest.setDealStatuses(Arrays.asList(1, 2, 3, 4)); filterOrderRequest.setDealStatuses(Arrays.asList(1, 2, 3, 4));
break; break;
case Constant.ORDER_STATUS_WAIT_AUDITED:
filterOrderRequest.setStatuses(Arrays.asList(10, 7));
filterOrderRequest.setDealStatuses(Arrays.asList(3, 4));
break;
default: default:
break; break;
} }

@ -36,7 +36,7 @@ public class AsyncSpsTask implements SchedulingConfigurer {
scheduledRequest.setCronName("syncIdcSps"); scheduledRequest.setCronName("syncIdcSps");
logger.info("syncIdcSps----------------"); logger.info("syncIdcSps----------------");
ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest); ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
String cron = scheduledEntity != null ? scheduledEntity.getCron() : "* 0/30 * * * ?"; String cron = scheduledEntity != null ? scheduledEntity.getCron() : "0 0/1 * * * ?";
if (cron.isEmpty()) { if (cron.isEmpty()) {
logger.error("cron is null"); logger.error("cron is null");

Loading…
Cancel
Save