diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java index 08df61ee..0c546a1f 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java @@ -231,7 +231,16 @@ public class SpsSyncExportStatusController { @PostMapping("/spssync/basic/schedule/updateLastTime") @Log(title = "定时任务", businessType = BusinessType.UPDATE) public BaseResponse updateLastTime(@RequestBody BasicExportStatusTimeEntity basicExportStatusTimeEntity) { - basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDateTime(new Date())); + + if (basicExportStatusTimeEntity.getKey().equals("AutoDownloadOrder")) { + BasicExportStatusEntity basicExportStatusEntity = basicExportService.findLast("AutoUploadOrder"); + if (basicExportStatusEntity != null) { + basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDateTime(basicExportStatusEntity.getStartTime())); + } else { + basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDateTime(new Date())); + } + } else + basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDateTime(new Date())); boolean b = basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); if (b) return ResultVOUtils.success("更新成功!"); diff --git a/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java b/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java index 4cb3a2de..d4703e85 100644 --- a/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java +++ b/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java @@ -23,4 +23,6 @@ public interface BasicExportDao extends BaseMapper { boolean updateExportStatus(BasicExportStatusEntity warehouseEntity); void deleteByDate(@Param("date") String date); + + BasicExportStatusEntity findLast(@Param("idDatas") String idDatas); } diff --git a/src/main/java/com/glxp/api/service/sync/BasicExportService.java b/src/main/java/com/glxp/api/service/sync/BasicExportService.java index 6d43f5a9..9c7342aa 100644 --- a/src/main/java/com/glxp/api/service/sync/BasicExportService.java +++ b/src/main/java/com/glxp/api/service/sync/BasicExportService.java @@ -22,4 +22,12 @@ public interface BasicExportService extends IService { boolean deleteByTime(); boolean updateExportStatus(BasicExportStatusEntity warehouseEntity); + + /** + * 获取最后一次同步记录时间 + * + * @param idDatas + * @return + */ + BasicExportStatusEntity findLast(String idDatas); } diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java index 632eaa16..500c23c5 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java @@ -64,4 +64,9 @@ public class BasicExportServiceImpl extends ServiceImpl - - order by ${orderBy} ${sort} + + order by ${orderBy} ${sort} ORDER BY updateTime DESC - - - @@ -51,23 +48,23 @@ INTO basic_export_status(id, idDatas, status, `type`, updateTime, scheduleType, startTime, endTime, remark, receiveStatus - - ,cacheFilePath + + , cacheFilePath ) - values (#{id}, - #{idDatas}, - #{status}, - #{type}, - #{updateTime}, - #{scheduleType}, - #{startTime}, - #{endTime}, - #{remark}, - #{receiveStatus} - - ,#{cacheFilePath} + values (#{id}, + #{idDatas}, + #{status}, + #{type}, + #{updateTime}, + #{scheduleType}, + #{startTime}, + #{endTime}, + #{remark}, + #{receiveStatus} + + , #{cacheFilePath} ) @@ -120,6 +117,16 @@ - delete from basic_export_status where date_format(#{date}, '%Y-%m-%d') >= date_format(startTime, '%Y-%m-%d') + delete + from basic_export_status + where date_format(#{date}, '%Y-%m-%d') >= date_format(startTime, '%Y-%m-%d') +