feat: pg引入

2023-04-18 22:35:55 +08:00
parent a540ee944a
commit 9e951fbc15
17 changed files with 260 additions and 150 deletions
--- a/src/pages/api/model/data/delModelDataById.ts
+++ b/src/pages/api/model/data/delModelDataById.ts
@@ -1,7 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { authToken } from '@/service/utils/tools';
-import { connectRedis } from '@/service/redis';
+import { connectPg } from '@/service/pg';

 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
  try {
@@ -21,15 +21,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
    // 凭证校验
    const userId = await authToken(authorization);

-    const redis = await connectRedis();
+    const pg = await connectPg();
+    await pg.query(`DELETE FROM modelData WHERE user_id = '${userId}' AND id = '${dataId}'`);

-    // 校验是否为该用户的数据
-    const dataItemUserId = await redis.hGet(dataId, 'userId');
-    if (dataItemUserId !== userId) {
-      throw new Error('无权操作');
-    }
-    // 删除
-    await redis.del(dataId);
    jsonRes(res);
  } catch (err) {
    console.log(err);
--- a/src/pages/api/model/data/getModelData.ts
+++ b/src/pages/api/model/data/getModelData.ts
@@ -2,8 +2,8 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase } from '@/service/mongo';
 import { authToken } from '@/service/utils/tools';
-import { connectRedis } from '@/service/redis';
-import { VecModelDataIdx } from '@/constants/redis';
+import { connectPg } from '@/service/pg';
+import type { PgModelDataItemType } from '@/types/pg';

 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
  try {
@@ -35,34 +35,20 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
    const userId = await authToken(authorization);

    await connectToDatabase();
-    const redis = await connectRedis();
+    const pg = await connectPg();

-    // 从 redis 中获取数据
-    const searchRes = await redis.ft.search(
-      VecModelDataIdx,
-      `@modelId:{${modelId}} @userId:{${userId}} ${searchText ? `*${searchText}*` : ''}`,
-      {
-        RETURN: ['q', 'text', 'status'],
-        LIMIT: {
-          from: (pageNum - 1) * pageSize,
-          size: pageSize
-        },
-        SORTBY: {
-          BY: 'modelId',
-          DIRECTION: 'DESC'
-        }
-      }
-    );
+    const searchRes = await pg.query<PgModelDataItemType>(`SELECT id, q, a, status
+              FROM modelData
+              WHERE user_id='${userId}' AND model_id='${modelId}'
+              LIMIT ${pageSize} OFFSET ${pageSize * (pageNum - 1)}
+            `);

    jsonRes(res, {
      data: {
        pageNum,
        pageSize,
-        data: searchRes.documents.map((item) => ({
-          id: item.id,
-          ...item.value
-        })),
-        total: searchRes.total
+        data: searchRes.rows,
+        total: searchRes.rowCount
      }
    });
  } catch (err) {
--- a/src/pages/api/model/data/pushModelDataInput.ts
+++ b/src/pages/api/model/data/pushModelDataInput.ts
@@ -4,14 +4,13 @@ import { connectToDatabase, Model } from '@/service/mongo';
 import { authToken } from '@/service/utils/tools';
 import { ModelDataSchema } from '@/types/mongoSchema';
 import { generateVector } from '@/service/events/generateVector';
-import { connectRedis } from '@/service/redis';
-import { VecModelDataPrefix, ModelDataStatusEnum } from '@/constants/redis';
+import { connectPg } from '@/service/pg';

 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
  try {
    const { modelId, data } = req.body as {
      modelId: string;
-      data: { text: ModelDataSchema['text']; q: ModelDataSchema['q'] }[];
+      data: { a: ModelDataSchema['a']; q: ModelDataSchema['q'] }[];
    };
    const { authorization } = req.headers;

@@ -27,7 +26,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
    const userId = await authToken(authorization);

    await connectToDatabase();
-    const redis = await connectRedis();
+    const pg = await connectPg();

    // 验证是否是该用户的 model
    const model = await Model.findOne({
@@ -39,29 +38,23 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
      throw new Error('无权操作该模型');
    }

-    const insertRes = await Promise.allSettled(
-      data.map((item) => {
-        return redis.sendCommand([
-          'HMSET',
-          `${VecModelDataPrefix}:${item.q.id}`,
-          'userId',
-          userId,
-          'modelId',
-          modelId,
-          'q',
-          item.q.text,
-          'text',
-          item.text,
-          'status',
-          ModelDataStatusEnum.waiting
-        ]);
-      })
+    // 插入记录
+    await pg.query(
+      `INSERT INTO modelData (user_id, model_id, q, a, status) VALUES ${data
+        .map(
+          (item) =>
+            `('${userId}', '${modelId}', '${item.q.replace(/\'/g, '"')}', '${item.a.replace(
+              /\'/g,
+              '"'
+            )}', 'waiting')`
+        )
+        .join(',')}`
    );

    generateVector();

    jsonRes(res, {
-      data: insertRes.filter((item) => item.status === 'rejected').length
+      data: 0
    });
  } catch (err) {
    jsonRes(res, {
--- a/src/pages/model/detail/components/InputDataModal.tsx
+++ b/src/pages/model/detail/components/InputDataModal.tsx
@@ -16,14 +16,14 @@ import { useToast } from '@/hooks/useToast';
 import { customAlphabet } from 'nanoid';
 const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz1234567890', 12);

-export type FormData = { dataId?: string; text: string; q: string };
+export type FormData = { dataId?: string; a: string; q: string };

 const InputDataModal = ({
  onClose,
  onSuccess,
  modelId,
  defaultValues = {
-    text: '',
+    a: '',
    q: ''
  }
 }: {
@@ -51,11 +51,8 @@ const InputDataModal = ({
          modelId: modelId,
          data: [
            {
-              text: e.text,
-              q: {
-                id: nanoid(),
-                text: e.q
-              }
+              a: e.a,
+              q: e.q
            }
          ]
        });
@@ -65,7 +62,7 @@ const InputDataModal = ({
          status: res === 0 ? 'success' : 'warning'
        });
        reset({
-          text: '',
+          a: '',
          q: ''
        });
        onSuccess();
@@ -81,10 +78,10 @@ const InputDataModal = ({
    async (e: FormData) => {
      if (!e.dataId) return;

-      if (e.text !== defaultValues.text || e.q !== defaultValues.q) {
+      if (e.a !== defaultValues.a || e.q !== defaultValues.q) {
        await putModelDataById({
          dataId: e.dataId,
-          text: e.text,
+          a: e.a,
          q: e.q === defaultValues.q ? '' : e.q
        });
        onSuccess();
@@ -144,7 +141,7 @@ const InputDataModal = ({
              maxLength={1000}
              resize={'none'}
              h={'calc(100% - 30px)'}
-              {...register(`text`, {
+              {...register(`a`, {
                required: '知识点'
              })}
            />
--- a/src/pages/model/detail/components/ModelDataCard.tsx
+++ b/src/pages/model/detail/components/ModelDataCard.tsx
@@ -19,7 +19,7 @@ import {
  Input
 } from '@chakra-ui/react';
 import type { ModelSchema } from '@/types/mongoSchema';
-import type { RedisModelDataItemType } from '@/types/redis';
+import type { ModelDataItemType } from '@/types/model';
 import { ModelDataStatusMap } from '@/constants/model';
 import { usePagination } from '@/hooks/usePagination';
 import {
@@ -53,9 +53,9 @@ const ModelDataCard = ({ model }: { model: ModelSchema }) => {
    total,
    getData,
    pageNum
-  } = usePagination<RedisModelDataItemType>({
+  } = usePagination<ModelDataItemType>({
    api: getModelDataList,
-    pageSize: 8,
+    pageSize: 10,
    params: {
      modelId: model._id,
      searchText
@@ -149,7 +149,7 @@ const ModelDataCard = ({ model }: { model: ModelSchema }) => {
            <MenuItem
              onClick={() =>
                setEditInputData({
-                  text: '',
+                  a: '',
                  q: ''
                })
              }
@@ -216,7 +216,7 @@ const ModelDataCard = ({ model }: { model: ModelSchema }) => {
                      maxH={'250px'}
                      overflowY={'auto'}
                    >
-                      {item.text}
+                      {item.a}
                    </Box>
                  </Td>
                  <Td>{ModelDataStatusMap[item.status]}</Td>
@@ -231,7 +231,7 @@ const ModelDataCard = ({ model }: { model: ModelSchema }) => {
                        setEditInputData({
                          dataId: item.id,
                          q: item.q,
-                          text: item.text
+                          a: item.a
                        })
                      }
                    />