From bfd7201c84e250e88b9a83ba55317b16f08c7a38 Mon Sep 17 00:00:00 2001 From: feige <feige@qq.com> Date: 星期五, 15 九月 2023 12:00:24 +0800 Subject: [PATCH] 定义了EsModel作为报错到es的数据模型,每个表要存储的是每个表的表明 表对应的主键,以及要被检索的字段 --- zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java index b536e66..a6f5504 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java @@ -17,8 +17,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -37,6 +39,9 @@ @Autowired ZYearInfoServiceImpl zYearInfoService; + + @Resource + ZYearInfoMapper zYearInfoMapper; private LambdaQueryWrapper<ZYearInfo> uniqueCondition(ZYearInfo zYearInfo) { LambdaQueryWrapper<ZYearInfo> lqw = new LambdaQueryWrapper<>(); @@ -57,6 +62,7 @@ .like(StringUtils.isNotEmpty(zYearInfo.getHospital()), ZYearInfo::getHospital, zYearInfo.getHospital()) .like(StringUtils.isNotEmpty(zYearInfo.getTitle()), ZYearInfo::getTitle, zYearInfo.getTitle()) .like(StringUtils.isNotEmpty(zYearInfo.getNotice()),ZYearInfo::getNotice,zYearInfo.getNotice()) + .like(StringUtils.isNotEmpty(zYearInfo.getRemark()),ZYearInfo::getRemark,zYearInfo.getRemark()) .between(zYearInfo.getHappenStartTime() != null && zYearInfo.getHappenEndTime() != null, ZYearInfo::getCheckTime, zYearInfo.getHappenStartTime(), zYearInfo.getHappenEndTime()) .orderByDesc(ZYearInfo::getCreateTime); return lqw; @@ -114,6 +120,12 @@ } @Override + public AjaxResult listType() { + List<String> result = zYearInfoMapper.listType(); + return AjaxResult.success(result); + } + + @Override @Transactional public AjaxResult importExcel(MultipartFile file) { -- Gitblit v1.9.1