From 6931562b0f0f154548fed5cf0287c7c028091075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Wed, 15 Nov 2023 20:51:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/mapper/xml/SysDictMapper.xml | 4 +- .../impl/LawsHomeSearchServiceImpl.java | 41 ++++++++++++++----- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml index 038dd453..cccc062d 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml +++ b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml @@ -37,8 +37,8 @@ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java index b7fa8694..0627c1d1 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java @@ -22,6 +22,10 @@ import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.laws.standard.service.ILawsNewsFeedService; import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; +import com.jero.modules.system.entity.SysDepart; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysDepartService; +import com.jero.modules.system.service.ISysUserService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; @@ -31,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; +import java.util.stream.Collectors; /** * @author lqt @@ -54,6 +59,10 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { private ILawsNewsFeedService lawsNewsFeedService; @Resource private ISysBaseAPI sysBaseAPI; + @Resource + private ISysUserService sysUserService; + @Resource + private ISysDepartService sysDepartService; @Override @Transactional(rollbackFor = JeroBootException.class) @@ -127,8 +136,9 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { List finalListLawsOverseasStandard = listLawsOverseasStandard; List finalListLawsEnterpriseStandard = listLawsEnterpriseStandard; List finalListLawsNewsFeed = listLawsNewsFeed; -// Map = sysBaseAPI.getDictItems(""); + Map mapSysUser = sysUserService.list().stream().collect(Collectors.toMap(SysUser::getId,SysUser::getRealname)); + Map mapSysDepart = sysDepartService.list().stream().collect(Collectors.toMap(SysDepart::getId,SysDepart::getDepartName)); list.parallelStream().forEach(p->{ switch (p.getResourceType()){ @@ -139,10 +149,11 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { LawsDomesticStandard obj = op.get(); p.setTitle(obj.getStandardNumber().replace(searchContent,searchContentSpan) + " " + obj.getStandardName().replace(searchContent,searchContentSpan)); p.setReleaseDate(obj.getReleaseDate()); - // todo 生成正文 + // 生成正文 StringBuilder content = new StringBuilder(); - content.append("标准性质：").append(obj.getStandardProperty()).append(" "); - content.append("标准类别：").append(obj.getStandardClass()).append(" "); + // 标准类别 + content.append("标准性质：").append(sysBaseAPI.translateDict("standard_property",obj.getStandardProperty())).append(""); + content.append("标准类别：").append(sysBaseAPI.translateDict("standard_type",obj.getStandardClass())).append(""); content.append("年代号：").append(obj.getYearNumber()).append(" "); content.append("标准编号：").append(obj.getStandardNumber()).append(" "); content.append("标准名称：").append(obj.getStandardName()).append(" "); @@ -155,14 +166,22 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { content.append("废止日期：").append(obj.getAnnulmentDate()).append(" "); content.append("标准状态：").append(obj.getStandardState()).append(" "); content.append("归口管理部门：").append(obj.getCentralizedManagementDepartments()).append(" "); - content.append("分标委：").append(obj.getBiddingCommittee()).append(" "); - content.append("责任部门：").append(obj.getResponsibleDepartment()).append(" "); - content.append("责任部门负责人：").append(obj.getResponsibleDepartmentUser()).append(" "); + content.append("分标委：").append(sysBaseAPI.translateDict("bidding_committee",obj.getBiddingCommittee())).append(" "); + content.append("责任部门：").append(mapSysDepart.get(obj.getResponsibleDepartment())).append(" "); + content.append("责任部门负责人：").append(mapSysUser.get(obj.getResponsibleDepartmentUser())).append(" "); + content.append("企业参与情况：").append(sysBaseAPI.translateDict("enterprise_participation",obj.getEnterpriseParticipation())).append(" "); content.append("零部件名称：").append(obj.getPartName()).append(" "); - content.append("适用认证：").append(obj.getApplicableCertification()).append(" "); - content.append("适用车型：").append(obj.getApplicableVehicle()).append(" "); - content.append("动力类型：").append(obj.getDynamicType()); - + content.append("适用认证：").append(sysBaseAPI.translateDict("applicable_certification",obj.getApplicableCertification())).append(" "); + content.append("适用车型：").append(sysBaseAPI.translateDict("APPLICATIONS_DOMESTIC",obj.getApplicableVehicle())).append(" "); + content.append("动力类型：").append(sysBaseAPI.translateDict("POWER_TYPE_DOMESTIC",obj.getDynamicType())); + content.append("代替标准号：").append(obj.getSubstituteStandardNumber()).append(" "); + content.append("被代替标准号：").append(obj.getReplacedByStandardNumber()).append(" "); + content.append("引用标准：").append(obj.getReferenceStandard()).append(" "); + content.append("被引用标准：").append(obj.getReferencedStandard()).append(" "); + content.append("采标程度：").append(sysBaseAPI.translateDict("degree_bid_acquisition",obj.getDegreeOfBidAcquisition())).append(" "); + content.append("采用国际标准号：").append(obj.getAdoptTheInternationalStandardNumber()).append(" "); + content.append("关联国外标准：").append(obj.getAssociatedForeignStandards()).append(" "); + p.setContent(content.toString()); } } break;