From 8deffdc2e673c8adcb6e0edc7f17137b25e3cf8d Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Wed, 6 Mar 2024 15:09:29 +0800
Subject: [PATCH] =?UTF-8?q?fix(asms):=20=E5=9B=BD=E6=A0=87=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../asms/service/impl/LawsAsmsOpenApiServiceImpl.java    | 9 ++++++---
 .../asms/service/impl/SynchronizationAsmsService.java    | 8 +-------
 .../laws/standard/mapper/LawsDomesticStandardMapper.java | 2 ++
 .../standard/mapper/xml/LawsDomesticStandardMapper.xml   | 4 ++++
 .../standard/service/ILawsDomesticStandardService.java   | 6 ++++++
 .../service/impl/LawsDomesticStandardServiceImpl.java    | 5 +++++
 6 files changed, 24 insertions(+), 10 deletions(-)

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<LawsAsmsOpenApiMappe
 					lawsDomesticStandard.setCreateTime(getSimpleDate2(lawsAsmsDomestic.getCreateTimeString()));
 					// 更新时间
 					lawsDomesticStandard.setUpdateTime(getSimpleDate2(lawsAsmsDomestic.getUpdateTimeString()));
+					LawsDomesticStandard domesticStandard = lawsDomesticStandardService.getById(lawsAsmsDomestic.getId());
 					int count = lawsDomesticStandardService.queryCountById(lawsAsmsDomestic.getId());
-					if (count > 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<LawsAsmsDomestic> 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<LawsDomesticStand
     void cleanAnnulmentDate();
 
     int queryCountById(@Param("id") String id);
+
+    int delById(@Param("id") String id);
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsDomesticStandardMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsDomesticStandardMapper.xml
index 380d8174..2b42ae0c 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsDomesticStandardMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsDomesticStandardMapper.xml
@@ -46,6 +46,10 @@
         <result column="draft" property="draft" />
     </resultMap>
 
+    <delete id="delById">
+        DELETE FROM laws_domestic_standard WHERE id = #{id}
+    </delete>
+
     <select id="queryCountById" resultType="java.lang.Integer">
         SELECT count(*) FROM laws_domestic_standard WHERE id = #{id}
     </select>
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<LawsDomesticStand
 	 * @return
 	 */
 	int queryCountById(String id);
+
+	/**
+	 * 物理删除
+	 * @param id
+	 */
+	void delById(String id);
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsDomesticStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsDomesticStandardServiceImpl.java
index fb2d9256..16a9a649 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsDomesticStandardServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsDomesticStandardServiceImpl.java
@@ -147,4 +147,9 @@ public class LawsDomesticStandardServiceImpl extends ServiceImpl<LawsDomesticSta
 	public int queryCountById(String id) {
 		return lawsDomesticStandardMapper.queryCountById(id);
 	}
+
+	@Override
+	public void delById(String id) {
+		lawsDomesticStandardMapper.delById(id);
+	}
 }