From d7879c8945ecb0102978ac2fcb97ee7423dfd30a Mon Sep 17 00:00:00 2001 From: yangduo Date: Thu, 1 Aug 2024 10:47:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/adminserver/config/confdb.mysql.json | 9 +++++++ bin/adminserver/config/permission.json | 2 +- .../adminserver/api/v1/system/announcement.go | 24 ++++++++++++++----- server/adminserver/api/v1/system/audit.go | 23 +++++++++++++----- 4 files changed, 45 insertions(+), 13 deletions(-) create mode 100644 bin/adminserver/config/confdb.mysql.json diff --git a/bin/adminserver/config/confdb.mysql.json b/bin/adminserver/config/confdb.mysql.json new file mode 100644 index 00000000..c3477c54 --- /dev/null +++ b/bin/adminserver/config/confdb.mysql.json @@ -0,0 +1,9 @@ +{ + "host": "mysql-test.kingsome.cn", + "port": 3306, + "user": "root", + "passwd": "keji178", + "database": "confdb_dev_1", + "max_open_conns": 1, + "max_idle_conns": 1 +} diff --git a/bin/adminserver/config/permission.json b/bin/adminserver/config/permission.json index 6c30eb14..65924dcf 100644 --- a/bin/adminserver/config/permission.json +++ b/bin/adminserver/config/permission.json @@ -36,7 +36,7 @@ ], "special": { "api": [], - "ui": ["-addannouncement", "-editannouncement", "-addaudit", "-editaudit"] + "ui": ["addannouncement", "editannouncement", "addaudit", "editaudit"] } } } diff --git a/server/adminserver/api/v1/system/announcement.go b/server/adminserver/api/v1/system/announcement.go index 131634aa..a26f6026 100644 --- a/server/adminserver/api/v1/system/announcement.go +++ b/server/adminserver/api/v1/system/announcement.go @@ -40,7 +40,8 @@ func (this *AnncApi) AddAnnc(c *gin.Context) { return } var count int64 - f5.GetApp().GetOrmDb(constant.CONF_DB).Table(annc.TableName()).Where("model = ?", annc.Model).Where("type = ?", annc.Type).Count(&count) + db := f5.GetApp().GetOrmDb(constant.CONF_DB) + db.Table(annc.TableName()).Where("model = ?", annc.Model).Where("type = ?", annc.Type).Count(&count) if count > 0 { c.JSON(http.StatusOK, gin.H{ "code": 1, @@ -49,7 +50,7 @@ func (this *AnncApi) AddAnnc(c *gin.Context) { return } - err := f5.GetApp().GetOrmDb(constant.CONF_DB).Create(&annc).Error + err := db.Create(&annc).Error if err != nil { c.JSON(http.StatusOK, gin.H{ "code": 1, @@ -67,7 +68,16 @@ func (this *AnncApi) UpdateAnnc(c *gin.Context) { idx, _ := strconv.ParseUint(c.Param("idx"), 10, 64) var count int64 annc := system.Annc{} - f5.GetApp().GetOrmDb(constant.CONF_DB).Table(annc.TableName()).Where("idx = ?", idx).Count(&count) + if err := c.ShouldBindJSON(&annc); err != nil { + c.JSON(http.StatusOK, gin.H{ + "code": 1, + "message": err.Error(), + }) + return + } + + db := f5.GetApp().GetOrmDb(constant.CONF_DB) + db.Table(annc.TableName()).Where("idx = ?", idx).Count(&count) if count < 1 { c.JSON(http.StatusOK, gin.H{ "code": 1, @@ -76,14 +86,16 @@ func (this *AnncApi) UpdateAnnc(c *gin.Context) { return } - if err := c.ShouldBindJSON(&annc); err != nil { + db.Table(annc.TableName()).Where("idx != ?", idx).Where("model = ?", annc.Model).Where("type = ?", annc.Type).Count(&count) + if count > 0 { c.JSON(http.StatusOK, gin.H{ "code": 1, - "message": err.Error(), + "message": "已有同类型的公告", }) return } - err := f5.GetApp().GetOrmDb(constant.CONF_DB).Select("*").Omit("idx").Where("idx = ?", idx).Updates(&annc).Error + + err := db.Select("*").Omit("idx").Where("idx = ?", idx).Updates(&annc).Error if err != nil { c.JSON(http.StatusOK, gin.H{ "code": 1, diff --git a/server/adminserver/api/v1/system/audit.go b/server/adminserver/api/v1/system/audit.go index fde56c8e..2e1053b8 100644 --- a/server/adminserver/api/v1/system/audit.go +++ b/server/adminserver/api/v1/system/audit.go @@ -40,7 +40,8 @@ func (this *AuditApi) AddAudit(c *gin.Context) { return } var count int64 - f5.GetApp().GetOrmDb(constant.CONF_DB).Table(audit.TableName()).Where("model = ?", audit.Model).Count(&count) + db := f5.GetApp().GetOrmDb(constant.CONF_DB) + db.Table(audit.TableName()).Where("model = ?", audit.Model).Count(&count) if count > 0 { c.JSON(http.StatusOK, gin.H{ "code": 1, @@ -49,7 +50,7 @@ func (this *AuditApi) AddAudit(c *gin.Context) { return } - err := f5.GetApp().GetOrmDb(constant.CONF_DB).Create(&audit).Error + err := db.Create(&audit).Error if err != nil { c.JSON(http.StatusOK, gin.H{ "code": 1, @@ -66,8 +67,16 @@ func (this *AuditApi) AddAudit(c *gin.Context) { func (this *AuditApi) UpdateAudit(c *gin.Context) { idx, _ := strconv.ParseUint(c.Param("idx"), 10, 64) audit := system.Audit{} + if err := c.ShouldBindJSON(&audit); err != nil { + c.JSON(http.StatusOK, gin.H{ + "code": 1, + "message": err.Error(), + }) + return + } var count int64 - f5.GetApp().GetOrmDb(constant.CONF_DB).Table(audit.TableName()).Where("idx = ?", idx).Count(&count) + db := f5.GetApp().GetOrmDb(constant.CONF_DB) + db.Table(audit.TableName()).Where("idx = ?", idx).Count(&count) if count < 1 { c.JSON(http.StatusOK, gin.H{ "code": 1, @@ -76,14 +85,16 @@ func (this *AuditApi) UpdateAudit(c *gin.Context) { return } - if err := c.ShouldBindJSON(&audit); err != nil { + db.Table(audit.TableName()).Where("idx != ?", idx).Where("model = ?", audit.Model).Count(&count) + if count > 0 { c.JSON(http.StatusOK, gin.H{ "code": 1, - "message": err.Error(), + "message": "已有同类型审核", }) return } - err := f5.GetApp().GetOrmDb(constant.CONF_DB).Select("*").Omit("idx").Where("idx = ?", idx).Updates(&audit).Error + + err := db.Select("*").Omit("idx").Where("idx = ?", idx).Updates(&audit).Error if err != nil { c.JSON(http.StatusOK, gin.H{ "code": 1,