1

controller/resourceController.js

@@ -9,6 +9,12 @@ const _ = require('lodash')
 async function createResource(req, res, next) {
     try {
         const body = req.body;
+        if (req.body.key) {
+            let rt = await DB.Resources.findOne({ where: { key: req.body.key, del: 0 } });
+            if (rt) {
+                return res.sendError(errorMessage.roesourceDuplicate);
+            }
+        }
         let ret = await DB.Resources.create(body);
         ret = ret.toJSON();
         if (body.resourceInfos && body.resourceInfos.length && ret.id) {
@@ -105,9 +111,10 @@ async function listResource(req, res, next) {
                 del: 0,
             }
         }
-        if(req.body.type) {
+        if (req.body.type) {
             search.where.type = req.body.type;
         }
+        search.order = [['id', 'DESC']];
         search.limit = limit;
         search.offset = offset;
         //指定显示字段，空数组会报错
@@ -124,17 +131,17 @@ async function getResource(req, res, next) {
             return res.sendError(errorMessage.resourceNotFound)
 
         }
-        let ress = await DB.Resources.findOne({ where: { id: req.body.id } , raw: true});
+        let ress = await DB.Resources.findOne({ where: { id: req.body.id }, raw: true });
         if (!(ress && ress.id)) {
             return res.sendError(errorMessage.resourceNotFound)
         }
         if (ress.type == 1) {
-            let ressinfos = await DB.ResourcesInfo.findAll({where: {resourceId: ress.id}, raw: true});
+            let ressinfos = await DB.ResourcesInfo.findAll({ where: { resourceId: ress.id }, raw: true });
             ress.resourceInfos = ressinfos;
         } else if (ress.type == 2) {
-            let ressinfos = await DB.ResourcesInfo.findAll({where: {resourceId: ress.id}, raw: true});
+            let ressinfos = await DB.ResourcesInfo.findAll({ where: { resourceId: ress.id }, raw: true });
             console.log(ressinfos.length, ressinfos)
-            let tree = await utils.buildTree2(ressinfos, {keyName: 'key', parentKeyName: 'parentKey'})
+            let tree = await utils.buildTree2(ressinfos, { keyName: 'key', parentKeyName: 'parentKey' })
             ress.resourceInfos = tree;
         }
         return res.sendData(ress);
@@ -311,7 +318,7 @@ module.exports = {
     updateResource,
     deleteResource,
     listResource,
-getResource,
+    getResource,
 
     createResourceInfo,
     updateResourceInfo,

db/model/jt/resources.js

@@ -11,7 +11,8 @@ const Resources = sequelize.define('Resources', {
     },
     key: { 
         type: DataTypes.STRING,
-        comment: "资源库key"
+        comment: "资源库key",
+        // unique: true,
     },
     name: {
         type: DataTypes.STRING,
@@ -59,7 +60,7 @@ const Resources = sequelize.define('Resources', {
 
 // 同步模型到数据库（创建表）
 Resources.sync({
-    force: false, 
+    // force: false, 
     // force: true ,//会删除已存在表并重新创建
     // alter: true
 })

utils/errorMessage.js

@@ -30,6 +30,10 @@ module.exports = {
         code: 40007,
         message: "角色标识重复"
     },
+    roesourceDuplicate : {
+        code: 40008,
+        message: "资源库标识重复"
+    },