Merge remote-tracking branch 'origin/orderChange' into zhairh

zhairh
x_z 3 years ago
commit 9dde72d2ee

@ -17,6 +17,8 @@ public interface BasicDownloadDao {
boolean deleteById(@Param("id") String id);
boolean deleteByTime();
boolean updateDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity);

@ -17,6 +17,8 @@ public interface BasicExportDao {
boolean deleteById(@Param("id") String id);
boolean deleteByTime();
boolean updateExportStatus(BasicExportStatusEntity warehouseEntity);
}

@ -18,4 +18,6 @@ public interface ThrCorpExportLogDao {
boolean updateThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity);
boolean deleteById(@Param("id") String id);
boolean deleteByTime();
}

@ -20,4 +20,6 @@ public interface ThrCorpImportDetailDao {
boolean deleteById(@Param("id") String id);
boolean deleteByGenkey(@Param("genKey") String genKey);
boolean deleteByTime();
}

@ -18,4 +18,6 @@ public interface ThrCorpImportLogDao {
boolean deleteById(@Param("id") String id);
boolean deleteByTime();
}

@ -19,5 +19,7 @@ public interface ThrImportLogDao {
boolean deleteById(@Param("id") String id);
boolean deleteByTime();
}

@ -26,4 +26,6 @@ public interface ThrOrderDetailDao {
boolean deleteAll();
boolean deleteByTime();
}

@ -17,4 +17,6 @@ public interface ThrOrderExportLogDao {
boolean updateThrOrderExportLog(ThrOrderExportLogEntity thrOrderExportLogEntity);
boolean deleteById(@Param("id") String id);
boolean deleteByTime();
}

@ -21,4 +21,6 @@ public interface ThrOrderImportDetailDao {
boolean deleteById(@Param("id") String id);
boolean deleteByGenkey(@Param("genKey") String genKey);
boolean deleteByTime();
}

@ -18,4 +18,6 @@ public interface ThrOrderImportLogDao {
boolean deleteById(@Param("id") String id);
boolean deleteByTime();
}

@ -17,4 +17,6 @@ public interface ThrProductsExportLogDao {
boolean updateThrProductsExportLog(ThrProductsExportLogEntity thrProductsExportLogEntity);
boolean deleteById(@Param("id") String id);
boolean deleteByTime();
}

@ -21,6 +21,8 @@ public interface ThrProductsImportDetailDao {
boolean deleteById(@Param("id") String id);
boolean deleteByTime();
boolean deleteByGenkey(@Param("genKey") String genKey);
}

@ -16,4 +16,6 @@ public interface ThrProductsImportLogDao {
boolean updateImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity);
boolean deleteById(@Param("id") String id);
boolean deleteByTime();
}

@ -16,5 +16,7 @@ public interface BasicDownloadService {
boolean deleteById(String id);
boolean deleteByTime();
boolean updateDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity);
}

@ -17,5 +17,7 @@ public interface BasicExportService {
boolean deleteById(String id);
boolean deleteByTime();
boolean updateExportStatus(BasicExportStatusEntity warehouseEntity);
}

@ -52,6 +52,11 @@ public class BasicDownloadServiceImpl implements BasicDownloadService {
return basicDownloadDao.deleteById(id);
}
@Override
public boolean deleteByTime() {
return basicDownloadDao.deleteByTime();
}
@Override
public boolean updateDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity) {
return basicDownloadDao.updateDownloadStatus(basicDownloadStatusEntity);

@ -52,6 +52,11 @@ public class BasicExportServiceImpl implements BasicExportService {
return basicExportDao.deleteById(id);
}
@Override
public boolean deleteByTime() {
return basicExportDao.deleteByTime();
}
@Override
public boolean updateExportStatus(BasicExportStatusEntity basicExportStatusEntity) {
return basicExportDao.updateExportStatus(basicExportStatusEntity);

@ -20,4 +20,6 @@ public interface ThrCorpExportLogService {
boolean deleteById(String id);
boolean deleteByTime();
}

@ -21,4 +21,6 @@ public interface ThrCorpImportDetailService {
boolean deleteByGenkey( String genKey);
boolean deleteByTime();
}

@ -17,4 +17,6 @@ public interface ThrCorpImportLogService {
boolean deleteById(String id);
boolean deleteByTime();
}

@ -17,5 +17,7 @@ public interface ThrImportLogService {
boolean deleteById(String id);
boolean deleteByTime();
ThrImportLogEntity selectByGenKey(String genKey);
}

@ -23,4 +23,6 @@ public interface ThrOrderDetailService {
boolean deleteAll();
boolean deleteByTime();
}

@ -17,4 +17,6 @@ public interface ThrOrderExportLogService {
boolean updateThrOrderExportLog(ThrOrderExportLogEntity thrOrderExportLogEntity);
boolean deleteById(String id);
boolean deleteByTime();
}

@ -18,5 +18,7 @@ public interface ThrOrderImportDetailService {
boolean deleteById(String id);
boolean deleteByTime();
boolean deleteByGenkey(String genKey);
}

@ -17,4 +17,6 @@ public interface ThrOrderImportLogService {
boolean deleteById(String id);
boolean deleteByTime();
}

@ -18,4 +18,6 @@ public interface ThrProductsExportLogService {
boolean deleteById(String id);
boolean deleteByTime();
}

@ -18,6 +18,8 @@ public interface ThrProductsImportDetailService {
boolean deleteById(String id);
boolean deleteByTime();
boolean deleteByGenkey(String genKey);
}

@ -15,5 +15,7 @@ public interface ThrProductsImportLogService {
boolean deleteById(String id);
boolean deleteByTime();
ThrProductsImportLogEntity selectByGenKey(String genKey);
}

@ -54,4 +54,10 @@ public class ThrCorpExportLogServiceImpl implements ThrCorpExportLogService {
public boolean deleteById(String id) {
return thrCorpExportLogDao.deleteById(id);
}
@Override
public boolean deleteByTime() {
return thrCorpExportLogDao.deleteByTime();
}
}

@ -54,4 +54,9 @@ public class ThrCorpImportDetailServiceImpl implements ThrCorpImportDetailServic
public boolean deleteByGenkey(String genKey) {
return thrCorpImportDetailDao.deleteByGenkey(genKey);
}
@Override
public boolean deleteByTime() {
return thrCorpImportDetailDao.deleteByTime();
}
}

@ -55,4 +55,10 @@ public class ThrCorpImportLogServiceImpl implements ThrCorpImportLogService {
public boolean deleteById(String id) {
return thrCorpImportLogDao.deleteById(id);
}
@Override
public boolean deleteByTime() {
return thrCorpImportLogDao.deleteByTime();
}
}

@ -47,6 +47,11 @@ public class ThrImportLogServiceImpl implements ThrImportLogService {
return thrImportLogDao.deleteById(id);
}
@Override
public boolean deleteByTime() {
return thrImportLogDao.deleteByTime();
}
@Override
public ThrImportLogEntity selectByGenKey(String genKey) {
FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest();

@ -59,4 +59,9 @@ public class ThrOrderDetailServiceImpl implements ThrOrderDetailService {
public boolean deleteAll() {
return thrOrderDetailDao.deleteAll();
}
@Override
public boolean deleteByTime() {
return thrOrderDetailDao.deleteByTime();
}
}

@ -55,4 +55,10 @@ public class ThrOrderExportLogServiceImpl implements ThrOrderExportLogService {
public boolean deleteById(String id) {
return thrOrderExportLogDao.deleteById(id);
}
@Override
public boolean deleteByTime() {
return thrOrderExportLogDao.deleteByTime();
}
}

@ -50,6 +50,10 @@ public class ThrOrderImportDetailServiceImpl implements ThrOrderImportDetailServ
return thrOrderImportDetailDao.deleteById(id);
}
@Override
public boolean deleteByTime() {
return thrOrderImportDetailDao.deleteByTime();
}
@Override
public boolean deleteByGenkey(String genKey) {
return thrOrderImportDetailDao.deleteByGenkey(genKey);

@ -56,4 +56,10 @@ public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService {
public boolean deleteById(String id) {
return thrOrderImportLogDao.deleteById(id);
}
@Override
public boolean deleteByTime() {
return thrOrderImportLogDao.deleteByTime();
}
}

@ -54,4 +54,9 @@ public class ThrProductsExportLogServiceImpl implements ThrProductsExportLogServ
public boolean deleteById(String id) {
return thrProductsExportLogDao.deleteById(id);
}
@Override
public boolean deleteByTime() {
return thrProductsExportLogDao.deleteByTime();
}
}

@ -50,6 +50,10 @@ public class ThrProductsImportDetailServiceImpl implements ThrProductsImportDeta
return thrProductsImportDetailDao.deleteById(id);
}
public boolean deleteByTime() {
return thrProductsImportDetailDao.deleteByTime();
}
@Override
public boolean deleteByGenkey(String genKey) {
return thrProductsImportDetailDao.deleteByGenkey(genKey);

@ -44,6 +44,10 @@ public class ThrProductsImportLogServiceImpl implements ThrProductsImportLogServ
return thrProductsImportLogDao.deleteById(id);
}
@Override
public boolean deleteByTime() {
return thrProductsImportLogDao.deleteByTime();
}
@Override
public ThrProductsImportLogEntity selectByGenKey(String genKey) {
FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest();

@ -0,0 +1,96 @@
package com.glxp.sale.admin.thread;
import com.glxp.sale.admin.dao.info.ScheduledDao;
import com.glxp.sale.admin.entity.info.ScheduledEntity;
import com.glxp.sale.admin.req.udid.ScheduledRequest;
import com.glxp.sale.admin.service.basic.BasicDownloadService;
import com.glxp.sale.admin.service.basic.BasicExportService;
import com.glxp.sale.admin.service.thrsys.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.SchedulingConfigurer;
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
import org.springframework.scheduling.support.CronTrigger;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
/**
*
*/
@Slf4j
@Component
@EnableScheduling
public class CleanDataTask implements SchedulingConfigurer {
@Resource
private ScheduledDao scheduledDao;
@Resource
private BasicExportService basicExportService;
@Resource
private BasicDownloadService basicDownloadService;
@Resource
private ThrCorpExportLogService thrCorpExportLogService;
@Resource
private ThrCorpImportDetailService thrCorpImportDetailService;
@Resource
private ThrCorpImportLogService thrCorpImportLogService;
@Resource
private ThrImportLogService thrImportLogService;
@Resource
private ThrOrderDetailService thrOrderDetailService;
@Resource
private ThrOrderExportLogService thrOrderExportLogService;
@Resource
private ThrOrderImportDetailService thrOrderImportDetailService;
@Resource
private ThrOrderImportLogService thrOrderImportLogService;
@Resource
private ThrProductsImportLogService thrProductsImportLogService;
@Resource
private ThrProductsExportLogService thrProductsExportLogService;
@Resource
private ThrProductsImportDetailService thrProductsImportDetailService;
@Override
public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
taskRegistrar.addTriggerTask(() -> process(),
triggerContext -> {
ScheduledRequest scheduledRequest = new ScheduledRequest();
scheduledRequest.setCronName("ScheduledDeletion");
ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
String cron = scheduledEntity.getCron();
if (cron.isEmpty()) {
log.error("cron is null");
}
return new CronTrigger(cron).nextExecutionTime(triggerContext);
});
}
private void process() {
log.info("开始清理 30 天前的历史数据");
//删除同步任务
log.info("开始删除同步任务历史记录");
basicExportService.deleteByTime();
//删除下载记录
log.info("开始删除下载记录");
basicDownloadService.deleteByTime();
//删除第三方数据
log.info("开始删除第三方数据");
thrCorpExportLogService.deleteByTime();
thrCorpImportDetailService.deleteByTime();
thrCorpImportLogService.deleteByTime();
thrImportLogService.deleteByTime();
thrOrderDetailService.deleteByTime();
thrOrderExportLogService.deleteByTime();
thrOrderImportDetailService.deleteByTime();
thrOrderImportLogService.deleteByTime();
thrProductsImportLogService.deleteByTime();
thrProductsExportLogService.deleteByTime();
thrProductsImportDetailService.deleteByTime();
log.info("历史数据清理完成");
}
}

@ -68,4 +68,9 @@
WHERE id = #{id}
</delete>
<delete id="deleteByTime">
Delete From basic_download_status
where date(startTime) &lt;= date(DATE_SUB(NOW(),INTERVAL 30 day))
</delete>
</mapper>

@ -74,4 +74,9 @@
WHERE id = #{id}
</delete>
<delete id="deleteByTime" >
Delete From basic_export_status
where date(startTime) &lt;= date(DATE_SUB(NOW(),INTERVAL 30 day))
</delete>
</mapper>

@ -49,5 +49,9 @@
</set>
WHERE genKey = #{genKey}
</update>
<delete id="deleteByTime">
Delete From thr_corp_export_log
where date(updateTime) &lt;= date(DATE_SUB(NOW(),INTERVAL 30 day))
</delete>
</mapper>

@ -89,4 +89,9 @@
WHERE id = #{id}
</update>
<delete id="deleteByTime">
Delete From thr_corp_import_detail
where date(updateTime) &lt;= date(DATE_SUB(NOW(),INTERVAL 30 day))
</delete>
</mapper>

@ -54,4 +54,9 @@
WHERE genKey = #{genKey}
</update>
<delete id="deleteByTime">
Delete From thr_corp_import_log
where date(updateTime) &lt;= date(DATE_SUB(NOW(),INTERVAL 30 day))
</delete>
</mapper>

@ -59,4 +59,10 @@
WHERE genKey = #{genKey}
</update>
<delete id="deleteByTime">
Delete From thr_import_log
where date(updateTime) &lt;= date(DATE_SUB(NOW(),INTERVAL 30 day))
</delete>
</mapper>

@ -127,4 +127,9 @@
FROM thr_order_detail
</delete>
<delete id="deleteByTime">
Delete From thr_order_detail
where date(updateTime) &lt;= date(DATE_SUB(NOW(),INTERVAL 30 day))
</delete>
</mapper>

@ -50,4 +50,11 @@
WHERE genKey = #{genKey}
</update>
<delete id="deleteByTime">
Delete From thr_order_export_log
where date(updateTime) &lt;= date(DATE_SUB(NOW(),INTERVAL 30 day))
</delete>
</mapper>

@ -91,4 +91,9 @@
WHERE id = #{id}
</update>
<delete id="deleteByTime">
Delete From thr_order_import_detail
where date(updateTime) &lt;= date(DATE_SUB(NOW(),INTERVAL 30 day))
</delete>
</mapper>

@ -54,4 +54,9 @@
WHERE genKey = #{genKey}
</update>
<delete id="deleteByTime">
Delete From thr_order_import_log
where date(updateTime) &lt;= date(DATE_SUB(NOW(),INTERVAL 30 day))
</delete>
</mapper>

@ -50,4 +50,9 @@
WHERE genKey = #{genKey}
</update>
<delete id="deleteByTime">
Delete From thr_products_export_log
where date(updateTime) &lt;= date(DATE_SUB(NOW(),INTERVAL 30 day))
</delete>
</mapper>

@ -100,4 +100,9 @@
WHERE id = #{id}
</update>
<delete id="deleteByTime">
Delete From thr_products_import_detail
where date(updateTime) &lt;= date(DATE_SUB(NOW(),INTERVAL 30 day))
</delete>
</mapper>

@ -54,4 +54,9 @@
WHERE genKey = #{genKey}
</update>
<delete id="deleteByTime">
Delete From thr_porducts_import_log
where date(updateTime) &lt;= date(DATE_SUB(NOW(),INTERVAL 30 day))
</delete>
</mapper>

@ -5,5 +5,12 @@ CALL Pro_Temp_ColumnWork ('io_order','wzUploadStatus','varchar(255) ', 1);
CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1);
INSERT ignore INTO scheduled(id, cronName, cron, customerId, remark)
VALUES
(16, 'ScheduledDeletion', '0 0 2 1/1 * ? ', NULL, '删除30天数据');
INSERT ignore INTO system_param_config ( id, parentId, paramName, paramKey, paramValue, paramStatus, paramType, paramExplain )
VALUES
( 20009, 0, '删除30天数据', 'ScheduledDeletion', '1', 1, 0, '1:是0' );
-- 创建表时必须 create table if not exists 表名
Loading…
Cancel
Save