From 1ad70febd5c87121ca492e94797f0173323f83e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 15 Oct 2024 16:30:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=96=E9=83=A8=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?/=E6=96=87=E6=9C=AC=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LawsSysApiInfoController.java | 22 +++++++++-- .../api/mapper/LawsSysApiInfoMapper.java | 14 +++++++ .../api/mapper/xml/LawsSysApiInfoMapper.xml | 2 +- .../api/service/ILawsSysApiInfoService.java | 7 +++- .../impl/LawsSysApiInfoServiceImpl.java | 38 +++++++++++++------ .../modules/docking/api/vo/StandardData.java | 35 +++++++++++++++++ 6 files changed, 101 insertions(+), 17 deletions(-) create mode 100644 laws-modules-docking/src/main/java/com/jero/modules/docking/api/vo/StandardData.java diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/controller/LawsSysApiInfoController.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/controller/LawsSysApiInfoController.java index 12b76b92..d576893c 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/controller/LawsSysApiInfoController.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/controller/LawsSysApiInfoController.java @@ -3,11 +3,13 @@ package com.jero.modules.docking.api.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.modules.docking.api.service.ILawsSysApiInfoService; +import com.jero.modules.docking.api.vo.StandardData; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; import java.util.Map; @@ -21,12 +23,24 @@ public class LawsSysApiInfoController { private ILawsSysApiInfoService lawsSysApiInfoService; /** - * 获取token + * 分页列表 * @return */ - @PostMapping("/getStandardData") - public Result>> getStandardData(@RequestBody Map parameterMap) { - return lawsSysApiInfoService.getStandardData(parameterMap); + @PostMapping("/getStandardDataPage") + public Result> getStandardDataPage(@RequestBody StandardData standardData, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + return lawsSysApiInfoService.getStandardDataPage(standardData,pageNo,pageSize); + } + + + /** + * 列表 + * @return + */ + @PostMapping("/getStandardDataList") + public Result> getStandardDataList(@RequestBody StandardData standardData) { + return lawsSysApiInfoService.getStandardDataList(standardData); } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/LawsSysApiInfoMapper.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/LawsSysApiInfoMapper.java index 7b7db490..840b58ce 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/LawsSysApiInfoMapper.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/LawsSysApiInfoMapper.java @@ -1,10 +1,24 @@ package com.jero.modules.docking.api.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.modules.docking.api.entity.LawsSysApiInfo; +import com.jero.modules.docking.api.vo.StandardData; +import com.jero.modules.laws.part.entity.LawsPartType; +import org.apache.ibatis.annotations.Param; + +import java.util.List; public interface LawsSysApiInfoMapper extends BaseMapper { + + IPage getStandardData(Page page, + @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List getStandardData(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/xml/LawsSysApiInfoMapper.xml b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/xml/LawsSysApiInfoMapper.xml index 9f1798f8..949507ca 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/xml/LawsSysApiInfoMapper.xml +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/xml/LawsSysApiInfoMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - select * from ( select standard_number, standard_name, '1' as resource_type,GROUP_CONCAT(o.url) as url from laws_domestic_standard l left join oss_file o on o.standard_id = l.id diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/ILawsSysApiInfoService.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/ILawsSysApiInfoService.java index bcc7e246..db9092fe 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/ILawsSysApiInfoService.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/ILawsSysApiInfoService.java @@ -4,10 +4,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.api.vo.Result; import com.jero.modules.docking.api.entity.LawsSysApiInfo; +import com.jero.modules.docking.api.vo.StandardData; +import java.util.List; import java.util.Map; public interface ILawsSysApiInfoService extends IService { - Result>> getStandardData(Map parameterMap); + Result> getStandardDataPage(StandardData standardData,Integer pageNo,Integer pageSize); + + Result> getStandardDataList(StandardData standardData); + } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/impl/LawsSysApiInfoServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/impl/LawsSysApiInfoServiceImpl.java index e31b45cb..f4cbeff6 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/impl/LawsSysApiInfoServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/impl/LawsSysApiInfoServiceImpl.java @@ -1,27 +1,30 @@ package com.jero.modules.docking.api.service.impl; +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.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; import com.jero.modules.docking.api.entity.LawsSysApiInfo; import com.jero.modules.docking.api.mapper.LawsSysApiInfoMapper; import com.jero.modules.docking.api.service.ILawsSysApiInfoService; +import com.jero.modules.docking.api.vo.StandardData; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.service.ILawsCommonService; import com.jero.modules.laws.home.common.LawsHomeSearchCommon; import com.jero.modules.laws.home.mapper.LawsHomeSearchMapper; +import com.jero.modules.laws.part.entity.LawsPartType; import com.jero.modules.system.service.ISysDictService; import com.jero.modules.tag.enums.TableNameEnum; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; +import java.util.*; @Service @@ -30,15 +33,28 @@ public class LawsSysApiInfoServiceImpl extends ServiceImpl>> getStandardData(Map parameterMap) { - return Result.OK(); + public Result> getStandardDataPage(StandardData standardData,Integer pageNo,Integer pageSize) { + // todo 未变更url + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(!StringUtils.isEmpty(standardData.getStandardNumber()),"standard_number",standardData.getStandardNumber()); + queryWrapper.like(!StringUtils.isEmpty(standardData.getStandardName()),"standard_name",standardData.getStandardName()); + queryWrapper.eq(!StringUtils.isEmpty(standardData.getResourceType()),"resource_type",standardData.getResourceType()); + queryWrapper.orderByDesc("create_time"); + Page page = new Page<>(pageNo, pageSize); + return Result.OK(lawsSysApiInfoMapper.getStandardData(page,queryWrapper)); + } + + @Override + public Result> getStandardDataList(StandardData standardData) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(!StringUtils.isEmpty(standardData.getStandardNumber()),"standard_number",standardData.getStandardNumber()); + queryWrapper.like(!StringUtils.isEmpty(standardData.getStandardName()),"standard_name",standardData.getStandardName()); + queryWrapper.eq(!StringUtils.isEmpty(standardData.getResourceType()),"resource_type",standardData.getResourceType()); + queryWrapper.orderByDesc("create_time"); + return Result.OK(lawsSysApiInfoMapper.getStandardData(queryWrapper)); } } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/vo/StandardData.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/vo/StandardData.java new file mode 100644 index 00000000..82b3126c --- /dev/null +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/vo/StandardData.java @@ -0,0 +1,35 @@ +package com.jero.modules.docking.api.vo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author lqt + * @version 1.0 + * @date 2024/10/15 16:15 + */ +@Data +public class StandardData implements Serializable { + + /** + * 标准编号 + */ + private String standardNumber; + /** + * 标准名称 + */ + private String standardName; + /** + * 标准类型1：外标 2：企标 + */ + private String resourceType; + /** + * url + */ + private String url; + /** + * + */ + private String id; +}