From 1992d9a83c453960190a6e5be8fff751556f177c Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Wed, 6 Mar 2024 13:50:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(asms):=20=E6=A0=87=E5=87=86=E6=80=A7?=
 =?UTF-8?q?=E8=B4=A8=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsAsmsOpenApiServiceImpl.java      |  7 +++++-
 .../mapper/LawsDomesticStandardMapper.java    |  3 +++
 .../mapper/xml/LawsDomesticStandardMapper.xml |  4 ++++
 .../service/ILawsDomesticStandardService.java | 14 ++++++++---
 .../impl/LawsDomesticStandardServiceImpl.java | 23 +++++++++++++------
 5 files changed, 40 insertions(+), 11 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 a70ac1cc..fa1ee677 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,7 +540,12 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
 					lawsDomesticStandard.setCreateTime(getSimpleDate2(lawsAsmsDomestic.getCreateTimeString()));
 					// 更新时间
 					lawsDomesticStandard.setUpdateTime(getSimpleDate2(lawsAsmsDomestic.getUpdateTimeString()));
-					lawsDomesticStandardService.saveOrUpdate(lawsDomesticStandard);
+					int count = lawsDomesticStandardService.queryCountById(lawsAsmsDomestic.getId());
+					if (count > 0){
+						lawsDomesticStandardService.updateById(lawsDomesticStandard);
+					}else {
+						lawsDomesticStandardService.save(lawsDomesticStandard);
+					}
 					// 同步es数据库
 					lawsHomeSearchService.updateEsData(LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD, lawsDomesticStandard.getId(), LawsHomeSearchCommon.LAWS_ES_ADD);
 				});
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 269b61f7..a3ee95ef 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
@@ -2,6 +2,7 @@ package com.jero.modules.laws.standard.mapper;
 
 import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
@@ -23,4 +24,6 @@ public interface LawsDomesticStandardMapper extends BaseMapper<LawsDomesticStand
 
     @Select("UPDATE laws_domestic_standard SET annulment_date = null WHERE annulment_date = '0000-00-00'")
     void cleanAnnulmentDate();
+
+    int queryCountById(@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 a218d5c0..380d8174 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
@@ -45,4 +45,8 @@
         <result column="draft_for_comment" property="draftForComment" />
         <result column="draft" property="draft" />
     </resultMap>
+
+    <select id="queryCountById" resultType="java.lang.Integer">
+        SELECT count(*) FROM laws_domestic_standard WHERE id = #{id}
+    </select>
 </mapper>
\ No newline at end of file
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 1bf561d6..5759286d 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
@@ -1,9 +1,10 @@
 package com.jero.modules.laws.standard.service;
 
-import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
-import com.baomidou.mybatisplus.extension.service.IService;
-import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
+
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -78,4 +79,11 @@ public interface ILawsDomesticStandardService extends IService<LawsDomesticStand
 	 * 通过编号查查询
 	 */
 	LawsDomesticStandard queryByStandardNumber(String standardNumber);
+
+	/**
+	 * 查询数量
+	 * @param id
+	 * @return
+	 */
+	int queryCountById(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 bd479b3e..fb2d9256 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
@@ -2,7 +2,12 @@ package com.jero.modules.laws.standard.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.CommonConstant;
+import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
 import com.jero.modules.laws.standard.mapper.LawsDomesticStandardMapper;
 import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
@@ -11,14 +16,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.jero.common.exception.JeroBootException;
-import java.util.List;
-import java.util.Date;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.common.system.query.QueryGenerator;
+
 import javax.servlet.http.HttpServletRequest;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -33,6 +34,9 @@ public class LawsDomesticStandardServiceImpl extends ServiceImpl<LawsDomesticSta
 
 	@Autowired
 	private ILawsStandardCollectionService lawsStandardCollectionService;
+	@Autowired
+	private LawsDomesticStandardMapper lawsDomesticStandardMapper;
+
 
     /**
      * 分页查询
@@ -138,4 +142,9 @@ public class LawsDomesticStandardServiceImpl extends ServiceImpl<LawsDomesticSta
 		wrapper.last("limit 1");
 		return getOne(wrapper);
 	}
+
+	@Override
+	public int queryCountById(String id) {
+		return lawsDomesticStandardMapper.queryCountById(id);
+	}
 }