添加外部对接标准法规信息/文本接口

2024-10-15 16:30:12 +08:00
parent 8679dfa3b7
commit 1ad70febd5
6 changed files with 101 additions and 17 deletions
@@ -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<IPage<Map<String,Object>>> getStandardData(@RequestBody Map<String,Object> parameterMap) {
-        return lawsSysApiInfoService.getStandardData(parameterMap);
+    @PostMapping("/getStandardDataPage")
+    public Result<IPage<StandardData>> 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<List<StandardData>> getStandardDataList(@RequestBody StandardData standardData) {
+        return lawsSysApiInfoService.getStandardDataList(standardData);
    }


@@ -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<LawsSysApiInfo> {
+
+    IPage<StandardData> getStandardData(Page<StandardData> page,
+                                            @Param(Constants.WRAPPER) QueryWrapper<StandardData> queryWrapper);
+
+    List<StandardData> getStandardData(@Param(Constants.WRAPPER) QueryWrapper<StandardData> queryWrapper);
 }


@@ -4,7 +4,7 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jero.modules.docking.api.mapper.LawsSysApiInfoMapper">

-    <select id="pageList" resultType="com.jero.modules.docking.api.entity.LawsSysApiInfo">
+    <select id="getStandardData" resultType="com.jero.modules.docking.api.vo.StandardData">
        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
@@ -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<LawsSysApiInfo> {

-    Result<IPage<Map<String,Object>>> getStandardData(Map<String,Object> parameterMap);
+    Result<IPage<StandardData>> getStandardDataPage(StandardData standardData,Integer pageNo,Integer pageSize);
+
+    Result<List<StandardData>> getStandardDataList(StandardData standardData);
+
 }
@@ -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<LawsSysApiInfoMapper,
    implements ILawsSysApiInfoService {

    @Resource
-    private ILawsCommonService lawsCommonService;
-    @Resource
-    private LawsHomeSearchMapper lawsHomeSearchMapper;
-    @Resource
-    private ISysDictService sysDictService;
+    private LawsSysApiInfoMapper lawsSysApiInfoMapper;

    @Override
-    public Result<IPage<Map<String, Object>>> getStandardData(Map<String, Object> parameterMap) {
-        return Result.OK();
+    public Result<IPage<StandardData>> getStandardDataPage(StandardData standardData,Integer pageNo,Integer pageSize) {
+        // todo  未变更url
+        QueryWrapper<StandardData> 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<StandardData> page = new Page<>(pageNo, pageSize);
+        return Result.OK(lawsSysApiInfoMapper.getStandardData(page,queryWrapper));
+    }
+
+    @Override
+    public Result<List<StandardData>> getStandardDataList(StandardData standardData) {
+        QueryWrapper<StandardData> 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));
    }
 }

@@ -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;
+}