diff --git a/src/controller/coop.controller.js b/src/controller/coop.controller.js index 5644626..9551644 100644 --- a/src/controller/coop.controller.js +++ b/src/controller/coop.controller.js @@ -3,6 +3,7 @@ const { createCoop, updateCoop, getCoopById, + deleteCoop, } = require("../service/coop.service"); const Response = require("../utils/response"); @@ -44,6 +45,12 @@ class CoopController { ); ctx.body = Response(0, "更新鸡舍信息成功", res); } + + async deleteById(ctx, next) { + const { id } = ctx.request.body; + const res = await deleteCoop(id); + ctx.body = Response(0, "删除鸡舍成功", res); + } } module.exports = new CoopController(); diff --git a/src/controller/house.controller.js b/src/controller/house.controller.js index 1a795f0..0603a21 100644 --- a/src/controller/house.controller.js +++ b/src/controller/house.controller.js @@ -2,6 +2,7 @@ const { getHouseListById, createHouse, updateHouse, + getHouseById, } = require("../service/house.service"); const Response = require("../utils/response"); @@ -23,6 +24,12 @@ class HouseController { const res = await updateHouse(belong, house_name, area, id); ctx.body = Response(0, "更新鸡厂信息成功", res); } + + async info(ctx, next) { + const { id } = ctx.request.query; + const res = await getHouseById(id); + ctx.body = Response(0, "查询单个鸡厂成功", res); + } } module.exports = new HouseController(); diff --git a/src/router/coop.route.js b/src/router/coop.route.js index 8cb13c3..47efab9 100644 --- a/src/router/coop.route.js +++ b/src/router/coop.route.js @@ -4,7 +4,13 @@ const router = new Router({ prefix: "/coop" }); const { auth, hasAdminPermission } = require("../middleware/auth.middleware"); const { verifyCoopExisted } = require("../middleware/coop.middleware"); -const { list, create, update, info } = require("../controller/coop.controller"); +const { + list, + create, + update, + info, + deleteById, +} = require("../controller/coop.controller"); router.get("/list", auth, list); @@ -14,4 +20,6 @@ router.post("/update", auth, update); router.get("/info", auth, info); +router.post("/delete", auth, deleteById); + module.exports = router; diff --git a/src/router/house.route.js b/src/router/house.route.js index e534585..7e184ae 100644 --- a/src/router/house.route.js +++ b/src/router/house.route.js @@ -4,7 +4,12 @@ const router = new Router({ prefix: "/house" }); const { auth, hasAdminPermission } = require("../middleware/auth.middleware"); const { verifyHouseExisted } = require("../middleware/house.middleware"); -const { list, create, update } = require("../controller/house.controller"); +const { + list, + create, + update, + info, +} = require("../controller/house.controller"); // 查询某厂主的鸡场信息 router.get("/list", auth, list); @@ -13,4 +18,6 @@ router.post("/create", auth, hasAdminPermission, verifyHouseExisted, create); router.post("/update", auth, hasAdminPermission, update); +router.get("/info", auth, hasAdminPermission, info); + module.exports = router; diff --git a/src/service/coop.service.js b/src/service/coop.service.js index 1f1167f..e8e2758 100644 --- a/src/service/coop.service.js +++ b/src/service/coop.service.js @@ -62,6 +62,15 @@ class CoopService { ); return res; } + + async deleteCoop(id) { + const res = await Coop.destroy({ + where: { + id, + }, + }); + return res; + } } module.exports = new CoopService(); diff --git a/src/service/house.service.js b/src/service/house.service.js index 25d20eb..a5a41e7 100644 --- a/src/service/house.service.js +++ b/src/service/house.service.js @@ -72,6 +72,23 @@ class HouseService { ); return res; } + + async getHouseById(id) { + const whereOpt = {}; + id && Object.assign(whereOpt, { id }); + const res = await House.findOne({ + where: whereOpt, + }); + if (res) { + const belong_id = res.dataValues.belong; + const accountInfo = await getAccountInfo({ id: belong_id }); + res.dataValues.username = accountInfo.name; + res.dataValues.userid = accountInfo.id; + res.dataValues.phonenumber = accountInfo.username; + return res.dataValues; + } + return null; + } } module.exports = new HouseService();