库表、文件、接口元数据查询接口修改

api/app/lib/controllers/latestMetadata/index.js

@@ -114,9 +114,11 @@ async function getMetadataDatabases(ctx) {
         const { catalog, limit, offset, keywords, orderBy = 'createAt', orderDirection = 'desc' } = ctx.query;
         const where = { catalog: catalog };
         if (keywords) {
-            where[$or] = [{ name: { $like: keywords } }, { code: { $like: keywords } }, { type: { $like: keywords } }]
+            where['$or'] = [{ name: { $iLike: `%${keywords}%` } },
+            { code: { $iLike: `%${keywords}%` } },
+            { type: { $iLike: `%${keywords}%` } }]
         }
-        const rslt = await models.MetadataDatabase.findAll({
+        const findObj = {
             include: [
                 {
                     model: models.User,
@@ -130,10 +132,13 @@ async function getMetadataDatabases(ctx) {
                 }],
             where: where,
             order: [[orderBy, orderDirection]],
-            offset: Number(offset) * Number(limit),
-            limit: Number(limit),
             distinct: true
-        });
+        }
+        if (Number(limit) > 0 && Number(offset) >= 0) {
+            findObj.offset = Number(offset) * Number(limit);
+            findObj.limit = Number(limit);
+        }
+        const rslt = await models.MetadataDatabase.findAndCountAll(findObj);
         ctx.status = 200;
         ctx.body = rslt;
     } catch (error) {
@@ -151,13 +156,13 @@ async function getMetadataFiles(ctx) {
         const { catalog, limit, offset, keywords, orderBy = 'createAt', orderDirection = 'desc' } = ctx.query;
         const where = { catalog: catalog };
         if (keywords) {
-            where[$or] = [{ name: { $like: keywords } }, { type: { $like: keywords } }]
+            where['$or'] = [{ name: { $iLike: `%${keywords}%` } }, { type: { $iLike: `%${keywords}%` } }]
         }
-        const rslt = await models.MetadataFile.findAll({
+        const findObj = {
             include: [
                 {
                     model: models.User,
-                    attributes: ['id', 'name'],
+                    attributes: ['id', 'name', 'username'],
                 },
                 {
                     model: models.TagFile,
@@ -167,10 +172,13 @@ async function getMetadataFiles(ctx) {
                 }],
             where: where,
             order: [[orderBy, orderDirection]],
-            offset: Number(offset) * Number(limit),
-            limit: Number(limit),
             distinct: true
-        });
+        };
+        if (Number(limit) > 0 && Number(offset) >= 0) {
+            findObj.offset = Number(offset) * Number(limit);
+            findObj.limit = Number(limit);
+        }
+        const rslt = await models.MetadataFile.findAndCountAll(findObj);
         ctx.status = 200;
         ctx.body = rslt;
     } catch (error) {
@@ -188,9 +196,9 @@ async function getMetadataRestapis(ctx) {
         const { catalog, limit, offset, keywords, orderBy = 'createAt', orderDirection = 'desc' } = ctx.query;
         const where = { catalog: catalog };
         if (keywords) {
-            where.name = { $like: keywords };
+            where.name = { $iLike: `%${keywords}%` };
         }
-        const rslt = await models.MetadataRestapi.findAll({
+        const findObj = {
             include: [
                 {
                     model: models.User,
@@ -204,10 +212,13 @@ async function getMetadataRestapis(ctx) {
                 }],
             where: where,
             order: [[orderBy, orderDirection]],
-            offset: Number(offset) * Number(limit),
-            limit: Number(limit),
             distinct: true
-        });
+        };
+        if (Number(limit) > 0 && Number(offset) >= 0) {
+            findObj.offset = Number(offset) * Number(limit);
+            findObj.limit = Number(limit);
+        }
+        const rslt = await models.MetadataRestapi.findAndCountAll(findObj);
         ctx.status = 200;
         ctx.body = rslt;
     } catch (error) {