diff --git a/src/controller/account.controller.js b/src/controller/account.controller.js index 016c9ad..aad0e02 100644 --- a/src/controller/account.controller.js +++ b/src/controller/account.controller.js @@ -47,6 +47,10 @@ class AccountController { const res = await getAllPerson(); ctx.body = Response(0, "获取所有用户信息成功", res); } + + async isAdmin(ctx, next) { + ctx.body = Response(0, "欢迎您, 尊敬的管理员"); + } } module.exports = new AccountController(); diff --git a/src/controller/coop.controller.js b/src/controller/coop.controller.js index 9551644..744c15e 100644 --- a/src/controller/coop.controller.js +++ b/src/controller/coop.controller.js @@ -49,7 +49,11 @@ class CoopController { async deleteById(ctx, next) { const { id } = ctx.request.body; const res = await deleteCoop(id); - ctx.body = Response(0, "删除鸡舍成功", res); + if (res) { + ctx.body = Response(0, "删除鸡舍成功", res); + } else { + ctx.body = Response(500, "该鸡舍已有进鸡记录,不可删除"); + } } } diff --git a/src/router/account.route.js b/src/router/account.route.js index 1975d9c..7b11942 100644 --- a/src/router/account.route.js +++ b/src/router/account.route.js @@ -6,6 +6,7 @@ const { register, login, allAccount, + isAdmin, } = require("../controller/account.controller"); const { auth, hasAdminPermission } = require("../middleware/auth.middleware"); const { @@ -31,4 +32,6 @@ router.post("/login", accountValidator, verifyLogin, login); router.get("/all", auth, hasAdminPermission, allAccount); +router.get("/isAdmin", auth, hasAdminPermission, isAdmin); + module.exports = router; diff --git a/src/service/coop.service.js b/src/service/coop.service.js index d9f5934..7518c4c 100644 --- a/src/service/coop.service.js +++ b/src/service/coop.service.js @@ -1,4 +1,5 @@ const { Op } = require("sequelize"); +const Chicken = require("../model/chicken.model.js"); const Coop = require("../model/coop.model"); const { getHouseById } = require("./house.service"); class CoopService { @@ -77,6 +78,16 @@ class CoopService { } async deleteCoop(id) { + const chickenInfo = await Chicken.findAll({ + where: { + coop_id: id, + }, + }); + console.log(chickenInfo); + if (chickenInfo && chickenInfo.length > 0) { + // 已有进鸡记录的鸡舍不可删除 + return null; + } const res = await Coop.destroy({ where: { id,