From c6040452078da86c797142d559056599d0bc35f3 Mon Sep 17 00:00:00 2001 From: kylinhao Date: Sun, 23 Jan 2022 20:50:21 +0800 Subject: [PATCH] batchcreate --- config/index.js | 11 ++- pkg/app/server/controller/machinemanager.go | 1 + pkg/app/server/model/machinemanager.go | 1 + pkg/app/server/router/router.go | 4 ++ pkg/cmd/cmd.go | 7 ++ pkg/controller/batchmanager.go | 74 +++++++++++++++++++++ pkg/dao/batchmanagerdao.go | 36 ++++++++++ pkg/model/batch.go | 24 +++++++ 8 files changed, 155 insertions(+), 3 deletions(-) create mode 100644 pkg/controller/batchmanager.go create mode 100644 pkg/dao/batchmanagerdao.go create mode 100644 pkg/model/batch.go diff --git a/config/index.js b/config/index.js index bfe6ad49..9d8bb757 100644 --- a/config/index.js +++ b/config/index.js @@ -29,21 +29,21 @@ module.exports = { // } }, '/overview': { - target: 'https://172.17.6.163:8888', + target: 'https://localhost:8888', changeOrigin: true, //改变源 // pathRewrite: { // '^/api': '' //路径重写 // } }, '/plugin': { - target: 'https://172.17.6.163:8888', + target: 'https://localhost:8888', changeOrigin: true, //改变源 // pathRewrite: { // '^/api': '' //路径重写 // } }, '/cockpit': { - target: 'https://172.17.6.163:8081', + target: 'https://lcoalhost:8081', changeOrigin: true, //改变源 // pathRewrite: { // '^/api': '' //路径重写 @@ -60,8 +60,13 @@ module.exports = { // Various Dev Server settings // host: '172.17.6.167', // can be overwritten by process.env.HOST +<<<<<<< Updated upstream host: '192.168.160.128', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined +======= + host: '192.168.217.22', // can be overwritten by process.env.HOST + port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined +>>>>>>> Stashed changes autoOpenBrowser: false, errorOverlay: true, notifyOnErrors: true, diff --git a/pkg/app/server/controller/machinemanager.go b/pkg/app/server/controller/machinemanager.go index 0dc212a0..d790a993 100644 --- a/pkg/app/server/controller/machinemanager.go +++ b/pkg/app/server/controller/machinemanager.go @@ -114,6 +114,7 @@ func AddMachine(c *gin.Context) { machinenode := model.MachineNode{ DepartId: tmp, MachineUUID: machineuuid, + BatchInfo: "0", } mysqlmanager.DB.Create(&machinenode) response.Success(c, nil, "机器入库成功") diff --git a/pkg/app/server/model/machinemanager.go b/pkg/app/server/model/machinemanager.go index 13ba1ff2..4bf0d1a0 100644 --- a/pkg/app/server/model/machinemanager.go +++ b/pkg/app/server/model/machinemanager.go @@ -17,6 +17,7 @@ type DepartNode struct { type MachineNode struct { DepartId int `"gorm:type:int(100);not null" json:"departid"` MachineUUID string `gorm:"type:varchar(100);not null" json:"machineuuid"` + BatchInfo string `gorm:"type:varchar(100);` } // kylin/serve/opensource/ops/wanghao/dfsagdasgs type MachineTreeNode struct { diff --git a/pkg/app/server/router/router.go b/pkg/app/server/router/router.go index b60fb1eb..6de54c8a 100644 --- a/pkg/app/server/router/router.go +++ b/pkg/app/server/router/router.go @@ -52,6 +52,10 @@ func SetupRouter() *gin.Engine { machinemanager.POST("/deletedepartdata", controller.Deletedepartdata) machinemanager.POST("/deletemachinedata", controller.Deletemachinedata) } + batchmanager := router.Group("batchmanager") + { + batchmanager.POST("/createbatch", controller.CreateBatch) + } // TODO: 此处绑定前端静态资源handler router.Static("/static", "./dist/static") router.StaticFile("/", "./dist/index.html") diff --git a/pkg/cmd/cmd.go b/pkg/cmd/cmd.go index f788de08..0a71e72e 100644 --- a/pkg/cmd/cmd.go +++ b/pkg/cmd/cmd.go @@ -90,9 +90,16 @@ func Start(conf *config.Configure) (err error) { // }) // } +<<<<<<< Updated upstream // mysqlmanager.DB.AutoMigrate(&model.User{}) // mysqlmanager.DB.AutoMigrate(&model.DepartNode{}) // mysqlmanager.DB.AutoMigrate(&model.MachineNode{}) +======= + mysqlmanager.DB.AutoMigrate(&model.User{}) + mysqlmanager.DB.AutoMigrate(&model.DepartNode{}) + mysqlmanager.DB.AutoMigrate(&model.MachineNode{}) + mysqlmanager.DB.AutoMigrate(&model.Batch{}) +>>>>>>> Stashed changes defer mysqlmanager.DB.Close() r := router.SetupRouter() diff --git a/pkg/controller/batchmanager.go b/pkg/controller/batchmanager.go new file mode 100644 index 00000000..3fd28e91 --- /dev/null +++ b/pkg/controller/batchmanager.go @@ -0,0 +1,74 @@ +package controller + +import ( + "net/http" + "strconv" + "strings" + + "github.com/gin-gonic/gin" + "openeluer.org/PilotGo/PilotGo/pkg/common/response" + "openeluer.org/PilotGo/PilotGo/pkg/dao" + "openeluer.org/PilotGo/PilotGo/pkg/model" + "openeluer.org/PilotGo/PilotGo/pkg/mysqlmanager" +) + +func CreateBatch(c *gin.Context) { + name := c.Query("Name") + descrip := c.PostForm("Description") + manager := c.PostForm("Manager") + depart := c.QueryArray("Depart") + machine := c.QueryArray("Machine") + if len(name) == 0 { + response.Response(c, http.StatusUnprocessableEntity, + 422, + nil, + "批次名未输入") + return + } + if len(manager) == 0 { + response.Response(c, http.StatusUnprocessableEntity, + 422, + nil, + "创建人未输入") + return + } + if len(depart) == 0 { + response.Response(c, http.StatusUnprocessableEntity, + 422, + nil, + "归属部门未输入") + return + } + if len(machine) == 0 { + response.Response(c, http.StatusUnprocessableEntity, + 422, + nil, + "归属部门未输入") + return + } + if dao.IsExistName(name) { + response.Response(c, http.StatusUnprocessableEntity, + 422, + nil, + "已存在该名称批次") + return + } + Batch := model.Batch{ + Name: name, + Description: descrip, + Manager: manager, + Depart: strings.Join(depart, ","), + } + mysqlmanager.DB.Create(&Batch) + response.Success(c, nil, "批次入库成功") + for _, value := range machine { + batchid := dao.GetBatchID(name) + tmp := strconv.Itoa(int(batchid)) + x := dao.GetmachineBatch(value) + if dao.GetmachineBatch(value) != "" { + x += "," + } + dao.UpdatemachineBatch(value, x+tmp) + } + response.Success(c, nil, "机器已绑定批次") +} diff --git a/pkg/dao/batchmanagerdao.go b/pkg/dao/batchmanagerdao.go new file mode 100644 index 00000000..47a152ae --- /dev/null +++ b/pkg/dao/batchmanagerdao.go @@ -0,0 +1,36 @@ +package dao + +import ( + "openeluer.org/PilotGo/PilotGo/pkg/logger" + "openeluer.org/PilotGo/PilotGo/pkg/model" + "openeluer.org/PilotGo/PilotGo/pkg/mysqlmanager" +) + +func IsExistName(name string) bool { + var batch model.Batch + mysqlmanager.DB.Where("name=?", name).Find(&batch) + return batch.ID != 0 +} +func GetBatchID(name string) uint { + var machine model.Batch + mysqlmanager.DB.Where("name=?", name).Find(&machine) + logger.Info("%d", machine.ID) + return machine.ID +} +func GetmachineBatch(uuid string) string { + var machine model.MachineNode + mysqlmanager.DB.Where("machine_uuid=?", uuid).Find(&machine) + logger.Info("%s", machine.BatchInfo) + return machine.BatchInfo +} + +func UpdatemachineBatch(s string, b string) { + var machine model.MachineNode + mysqlmanager.DB.Find(&machine) + mysqlmanager.DB.Model(&machine).Where("machine_uuid=?", s).Update("batch_info", b) + logger.Info("%+v", machine) +} + +// func UpdatemachineBatch(m model.MachineNode) { + +// } diff --git a/pkg/model/batch.go b/pkg/model/batch.go new file mode 100644 index 00000000..94c6ff4e --- /dev/null +++ b/pkg/model/batch.go @@ -0,0 +1,24 @@ +package model + +import "github.com/jinzhu/gorm" + +/** + * @Author: wang hao + * @Date: 2021/12/23 17:00 + * @Description:批次属性列表 + */ + +type Batch struct { + gorm.Model + Name string `gorm:"type:varchar(100);not null" json:"name"` + Description string `gorm:"type:varchar(100)" json:"description"` + Manager string `gorm:"type:varchar(100)" json:"manager"` + Depart string `gorm:"type:varchar(100)"` +} + +// type GetBatch struct { +// Name string +// Description string +// manager string +// Depart []string +// } -- Gitee