diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java index fa1ee677..3bb0b8f6 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java @@ -540,11 +540,14 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl 0){ - lawsDomesticStandardService.updateById(lawsDomesticStandard); - }else { + if (count > 0 && Objects.isNull(domesticStandard)){ + // 物理删除 + lawsDomesticStandardService.delById(lawsAsmsDomestic.getId()); lawsDomesticStandardService.save(lawsDomesticStandard); + }else { + lawsDomesticStandardService.updateById(lawsDomesticStandard); } // 同步es数据库 lawsHomeSearchService.updateEsData(LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD, lawsDomesticStandard.getId(), LawsHomeSearchCommon.LAWS_ES_ADD); diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java index 85845232..a17edfb8 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java @@ -140,17 +140,11 @@ public class SynchronizationAsmsService { } else { dupCodeList = new ArrayList<>(); } - // TODO:过滤数据测试用 - mapList = mapList.stream().filter(v -> v.get("createTime").substring(0, 10).equals("2024-02-22")).collect(Collectors.toList()); List lawsAsmsDomesticList = new ArrayList(); mapList.forEach(eMap -> { String createTimeString = eMap.get("createTime"); Date createTime = DateUtil.getDateSecond(createTimeString); -// Date yesterday = DateUtil.getDateAddDays(new Date(), -1); - Calendar instance = Calendar.getInstance(); - // TODO:过滤数据测试用 - instance.set(2024,1,23); - Date yesterday = DateUtil.getDateAddDays(instance.getTime(), -1); + Date yesterday = DateUtil.getDateAddDays(new Date(), -1); // 创建时间为昨天的数据 if (createTime.after(DateUtil.getDayStart(yesterday)) && createTime.before(DateUtil.getDayEnd(yesterday))) { if (!dupCodeList.contains((String) eMap.get("code"))) { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsDomesticStandardMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsDomesticStandardMapper.java index a3ee95ef..b6bc358c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsDomesticStandardMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsDomesticStandardMapper.java @@ -26,4 +26,6 @@ public interface LawsDomesticStandardMapper extends BaseMapper + + DELETE FROM laws_domestic_standard WHERE id = #{id} + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsDomesticStandardService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsDomesticStandardService.java index 5759286d..720de4ae 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsDomesticStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsDomesticStandardService.java @@ -86,4 +86,10 @@ public interface ILawsDomesticStandardService extends IService