修改关联表查询

spider-flow-web/src/main/java/com/zq/spiderflow/controller/MetaDataMappingController.java

@@ -33,7 +33,7 @@ public class MetaDataMappingController {
      */
     @ApiOperation("获取元数据映射分页列表")
     @PostMapping("/page")
-    public ResultVo<PageVo<MetaDataMapping>> getPageList(@RequestBody MetaDataMappingReq req) {
+    public ResultVo<PageVo<MetaDataReq>> getPageList(@RequestBody MetaDataReq req) {
         return ResultVo.success(metaDataMappingService.getPageList(req));
     }
 

spider-flow-web/src/main/java/com/zq/spiderflow/dao/MetaDataMappingDao.java

 package com.zq.spiderflow.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zq.spiderflow.vo.MetaDataMappingReq;
 import com.zq.spiderflow.vo.MetaDataReq;
 import org.springframework.stereotype.Repository;
 import com.zq.spiderflow.entity.MetaDataMapping;
@@ -21,4 +22,6 @@ public interface MetaDataMappingDao extends BaseMapper<MetaDataMapping> {
     List<MetaDataReq> getMetaByTable(String tableSqlName);
 
     int selectByMetadataId(Long id);
+
+    List<MetaDataReq> getPageList(MetaDataReq req);
 }

spider-flow-web/src/main/java/com/zq/spiderflow/service/MetaDataMappingService.java

@@ -24,15 +24,23 @@ public class MetaDataMappingService extends ServiceImpl<MetaDataMappingDao, Meta
     @Resource
     private MetaDataMappingDao metaDataMappingDao;
 
-    public PageVo<MetaDataMapping> getPageList(MetaDataMappingReq req) {
-        LambdaQueryWrapper<MetaDataMapping> wrapper = new LambdaQueryWrapper<>();
-        if (StringUtils.isNotBlank(req.getTableSqlname())) {
-            wrapper.like(MetaDataMapping::getTableSqlname, req.getTableSqlname());
+    public PageVo<MetaDataReq> getPageList(MetaDataReq req) {
+        List<MetaDataReq> pageList = metaDataMappingDao.getPageList(req);
+        int start = 0;
+        PageVo<MetaDataReq> pageVo = new PageVo<>();
+        if (req.getPage() - 1 == 0) {
+            pageVo.setStart(0);
+            start = 0;
+        } else {
+            pageVo.setStart((req.getPage() - 1) * req.getSize());
+            start = (req.getPage() - 1) * req.getSize();
         }
-        if (StringUtils.isNotBlank(req.getFieldName())) {
-            wrapper.like(MetaDataMapping::getFieldName, req.getFieldName());
-        }
-        return PagingUtils.paging(req, metaDataMappingDao, wrapper.orderByDesc(MetaDataMapping::getCreateTime), MetaDataMapping.class);
+        pageVo.setPage(req.getPage());
+        pageVo.setSize(req.getSize());
+        pageVo.setRows(pageList);
+        pageVo.setTotal(pageList.size());
+        return pageVo;
+
     }
 
     public MetaDataMapping getByMetaDataId(Long metaDataId) {

spider-flow-web/src/main/java/com/zq/spiderflow/vo/MetaDataReq.java

@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import com.zq.common.vo.PageReqVo;
 
+import java.util.Date;
+
 @Data
 @Builder
 @NoArgsConstructor
@@ -79,4 +81,11 @@ public class MetaDataReq extends PageReqVo {
     private String tableSqlName;
 
     private String tableName;
+
+    private String categoryName;
+
+    private String fieldName;
+
+    private Date createTime;
+
 }

spider-flow-web/src/main/resources/mapper/MetaDataMappingMapper.xml

@@ -56,4 +56,26 @@
     <select id="selectByMetadataId" resultType="java.lang.Integer">
 
     </select>
+    <select id="getPageList" resultType="com.zq.spiderflow.vo.MetaDataReq">
+        SELECT
+            t.table_sqlname,
+            t.field_name,
+            t.create_time,
+            a.english_name,
+            s.category_name
+        FROM
+            meta_data_mapping t
+                LEFT JOIN meta_data a ON t.metadata_id = a.id
+                LEFT JOIN meta_data_category s ON a.category_id = s.id
+        <where>
+            <if test="englishName != null and englishName !=''">
+                 a.english_name = #{englishName}
+            </if>
+            <if test="categoryName != null and categoryName !=''">
+                AND s.category_name = #{categoryName}
+            </if>
+        </where>
+        ORDER BY t.create_time DESC
+        LIMIT #{page},#{size}
+    </select>
 </mapper>