From d254f51644006b08bca41a61ccda3fd45173ff4e Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 3 Nov 2023 18:07:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):=20?= =?UTF-8?q?=E4=BA=91=E5=B9=B3=E5=8F=B0=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asms/service/impl/SynchronizationAsmsService.java | 10 +++++++++- .../documenttool/mapper/xml/DocumentSplitMapper.xml | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) 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 b84ee8b0..69e5d1d8 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 @@ -13,6 +13,7 @@ import com.jero.modules.docking.asms.util.AsmsPostUtil; import com.jero.modules.laws.common.util.DateUtil; import com.jero.modules.laws.documenttool.entity.LawsDocumentSplit; import com.jero.modules.laws.documenttool.mapper.LawsDocumentSplitMapper; +import com.jero.modules.laws.documenttool.service.IDocumentSplitService; import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standard.service.ILawsReplacedStandardService; @@ -40,7 +41,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.io.InputStream; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -85,6 +85,8 @@ public class SynchronizationAsmsService { private ILawsReplacedStandardService lawsReplacedStandardService; @Autowired private IOSSFileService ossFileService; + @Autowired + private IDocumentSplitService documentSplitService; private final static String filePath = "asms/"; private static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); @@ -317,6 +319,7 @@ public class SynchronizationAsmsService { sarFileSplitInfoEO.setCreateTime(getSimpleDate2(eMap.get("createTime"))); sarFileSplitInfoEO.setUpdateTime(getSimpleDate2(eMap.get("updateTime"))); sarFileSplitInfoEO.setIsAsmsImport("1"); + sarFileSplitInfoEO.setAuthor("云平台"); sarFileSplitInfoEO.setId(UUIDUtils.randomUUID20()); @@ -481,6 +484,11 @@ public class SynchronizationAsmsService { }); }); + for (SarFileSplitInfoEO sarFileSplitInfoEO : insertSplitList) { + HashMap parameter = new HashMap<>(); + parameter.put("id", sarFileSplitInfoEO.getId()); + documentSplitService.publish(parameter); + } long time4 = System.currentTimeMillis(); log.info("=====================生成条文详情耗时：{}毫秒=====================", time4 - time3); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml index d237908d..b667cd57 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml @@ -109,7 +109,7 @@ file_type, file_name, split_status, - concat(u.realname, '(', u.username, ')') as author, + (IF(i.is_asms_import = '1', i.author, concat(u.realname, '(', u.username, ')'))) as author, i.create_time, i.split_result, u2.id createBy,