增加资源库路由

controller/resourceController.js

 const errorMessage = require("../utils/errorMessage");
-const userModule = require('../module/userModule');
+const { Op } = require('sequelize');
 
-async function createRole(req, res, next) {
-    try {
-        ////
-    } catch (error) {
-        next(error);
+
+/**
+ * 资源库controller
+ */
+async function createResource(req, res, next) {
+  try {
+    const body = req.body;
+    const ret = await DB.Resources.create(body);
+    return res.sendData(ret);
+  } catch (error) {
+    next(error);
+  }
+};
+
+async function updateResource(req, res, next) {
+  try {
+    const body = req.body;
+    if (!body.id) { 
+      return res.sendError(errorMessage.resourceNotFound)
     }
+    const ret = await DB.Resources.update(body, { where: { id: body.id } });
+    return res.sendData(ret);
+  } catch (error) {
+      next(error);
+  }
+}
 
+async function deleteResource(req, res, next) {
+  try {
+    if (!req.body.id) {
+        return res.sendError(errorMessage.resourceNotFound);
+    }
+    const ret = await DB.Resources.update({ del: 1 }, { where: { id: req.body.id } });
+    return res.sendData(ret);
+  } catch (error) {
+      next(error);
+  }
 }
 
+async function listResource(req, res, next) {
+  try {
+    let search = { where: { del: 0 } };
+    let page = req.body.page || 1;
+    let limit = req.body.pageSize || 10;
+    //翻页
+    let offset = (page - 1) * limit;
+    if (req.body.name) {
+        search.where = {
+          [Op.or]: [
+            //根据名字模糊搜索
+              { name: { [Op.like]: `%${req.body.name}%` } }
+            ],
+          del: 0,
+        }
+    }
+    search.limit = limit;
+    search.offset = offset;
+    //指定显示字段，空数组会报错
+    search.attributes = req.body.attributes || null;
+    let ret = await DB.Resources.findAndCountAll(search);
+    return res.sendData(ret);
+  } catch (error) {
+    next(error);
+  }
+};
+
+/**
+ * 资源库字段controller
+ */
+async function createResourceInfo(req, res, next) {
+  try {
+    const body = req.body;
+    if (!body.resourceId) {
+      return res.sendError(errorMessage.resourceNotFound)
+    } 
+    const resource = await DB.Resources.findOne({ where: { id: body.resourceId } });
+    if (!resource) {
+      return res.sendError(errorMessage.resourceNotFound)
+    } 
+    const ret = await DB.ResourcesInfo.create(body);
+    return res.sendData(ret);
+  } catch (error) {
+    next(error);
+  }
+};
+
+async function updateResourceInfo(req, res, next) {
+  try {
+    const body = req.body;
+    if (!body.id) { 
+      return res.sendError(errorMessage.resourceNotFound)
+    }
+    const ret = await DB.ResourcesInfo.update(body, { where: { id: body.id } });
+    return res.sendData(ret);
+  } catch (error) {
+      next(error);
+  }
+}
+
+async function deleteResourceInfo(req, res, next) {
+  try {
+    if (!req.body.id) {
+        return res.sendError(errorMessage.resourceNotFound);
+    }
+    const ret = await DB.ResourcesInfo.update({ del: 1 }, { where: { id: req.body.id } });
+    return res.sendData(ret);
+  } catch (error) {
+      next(error);
+  }
+}
+
+async function listResourceInfo(req, res, next) {
+  try {
+    let search = { where: { del: 0 } };
+    let page = req.body.page || 1;
+    let limit = req.body.pageSize || 10;
+    //翻页
+    let offset = (page - 1) * limit;
+    if (req.body.name) {
+        search.where = {
+          [Op.or]: [
+            //根据value值模糊搜索
+              { value: { [Op.like]: `%${req.body.name}%` } }
+            ],
+          del: 0,
+        }
+    }
+    search.limit = limit;
+    search.offset = offset;
+    //指定显示字段，空数组会报错
+    search.attributes = req.body.attributes || null;
+    let ret = await DB.ResourcesInfo.findAndCountAll(search);
+    return res.sendData(ret);
+  } catch (error) {
+    next(error);
+  }
+};
 
 module.exports = {
-    
+  createResource,
+  updateResource,
+  deleteResource,
+  listResource,
+
+  createResourceInfo,
+  updateResourceInfo,
+  deleteResourceInfo,
+  listResourceInfo
 }
\ No newline at end of file

controller/userController.js

@@ -31,28 +31,29 @@ async function login(req, res, next) {
         const { mobile, password } = req.body;
         let user = await DB.User.findOne({
             where: { mobile, del: 0, enable: 0 },
-            include: [{
-                model: DB.Role,
-                as: 'roles',
-                where: { del: 0 },
-                attributes: ["id", "name"],
-                through: { attributes: [] },
-                include: [{
-                    model: DB.Menu,
-                    as: 'menus',
-                    // where: { del: 0 },
-                    // attributes: ['id', 'name', 'parentId'],
-                    through: { attributes: [] },
-                }]
-            }, {
-                model: DB.Depart,
-                as: 'departs',
-                where: { del: 0 },
-                attributes: ["id", "name"],
-                through: { attributes: [] },
-            }
-            ]
+            // include: [{
+            //     model: DB.Role,
+            //     as: 'roles',
+            //     where: { del: 0 },
+            //     attributes: ["id", "name"],
+            //     through: { attributes: [] },
+            //     include: [{
+            //         model: DB.Menu,
+            //         as: 'menus',
+            //         // where: { del: 0 },
+            //         // attributes: ['id', 'name', 'parentId'],
+            //         through: { attributes: [] },
+            //     }]
+            // }, {
+            //     model: DB.Depart,
+            //     as: 'departs',
+            //     where: { del: 0 },
+            //     attributes: ["id", "name"],
+            //     through: { attributes: [] },
+            // }
+            // ]
         });
+        // console.log('this is user login', user)
         user = user.toJSON();
         if (!user) {
             return res.sendError(errorMessage.loginError);

middleware/request.js

@@ -13,7 +13,7 @@ module.exports = async (req, res, next) => {
         }
         req.headers.authorization = req.headers.authorization || req.headers.Authorization;
         const userStr = await ioRedis.get(`token:${req.headers.authorization}`);
-        // console.log(userStr)
+        console.log(userStr)
         if (userStr) {
             try {
                 req.user = JSON.parse(userStr);

router/resourceRouter.js

-
 const express = require('express');
 const router = express.Router();
 
-
 const resourceController = require('../controller/resourceController');
 
 /**
@@ -10,9 +8,18 @@ const resourceController = require('../controller/resourceController');
  */
 // router.post('/resource', resourceController.createResource);
 
+router.post('/createResource', resourceController.createResource);
+router.post('/deleteResource', resourceController.deleteResource);
+router.post('/updateResource', resourceController.updateResource);
+router.post('/listResource', resourceController.listResource);
+// router.post('/getProjectFields', projectController.getProjectFields);
 /**
  * 资源库字段详情
  */
 // router.post('/resourceInfo', resourceController.createResourceInfo);
+router.post('/createResourceInfo', resourceController.createResourceInfo);
+router.post('/deleteResourceInfo', resourceController.deleteResourceInfo);
+router.post('/updateResourceInfo', resourceController.updateResourceInfo);
+router.post('/listResourceInfo', resourceController.listResourceInfo);
 
 module.exports = router;
\ No newline at end of file