From 88324f3d47dab99da5b4bd9422e50b63b97c242c Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 30 八月 2023 19:51:00 +0800
Subject: [PATCH] fix
---
api/v1/test/industry.go | 47 +++++++++++++++++++++++++++++------------------
1 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/api/v1/test/industry.go b/api/v1/test/industry.go
index 8e97898..47caef3 100644
--- a/api/v1/test/industry.go
+++ b/api/v1/test/industry.go
@@ -1,14 +1,14 @@
package test
import (
- "github.com/flipped-aurora/gin-vue-admin/server/global"
- "github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
- "github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
- "github.com/flipped-aurora/gin-vue-admin/server/model/test"
- testReq "github.com/flipped-aurora/gin-vue-admin/server/model/test/request"
- "github.com/flipped-aurora/gin-vue-admin/server/service"
"github.com/gin-gonic/gin"
"go.uber.org/zap"
+ "srm/global"
+ "srm/model/common/request"
+ "srm/model/common/response"
+ "srm/model/test"
+ testReq "srm/model/test/request"
+ "srm/service"
)
type IndustryApi struct {
@@ -24,7 +24,7 @@
// @Produce application/json
// @Param data body test.Industry true "鍒涘缓Industry"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"鑾峰彇鎴愬姛"}"
-// @Router /api/i/createIndustry [post]
+// @Router /i/createIndustry [post]
func (iApi *IndustryApi) CreateIndustry(c *gin.Context) {
var i test.Industry
err := c.ShouldBindJSON(&i)
@@ -48,7 +48,7 @@
// @Produce application/json
// @Param data body test.Industry true "鍒犻櫎Industry"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"鍒犻櫎鎴愬姛"}"
-// @Router /api/i/deleteIndustry [delete]
+// @Router /i/deleteIndustry [delete]
func (iApi *IndustryApi) DeleteIndustry(c *gin.Context) {
var i test.Industry
err := c.ShouldBindJSON(&i)
@@ -72,7 +72,7 @@
// @Produce application/json
// @Param data body request.IdsReq true "鎵归噺鍒犻櫎Industry"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"鎵归噺鍒犻櫎鎴愬姛"}"
-// @Router /api/i/deleteIndustryByIds [delete]
+// @Router /i/deleteIndustryByIds [delete]
func (iApi *IndustryApi) DeleteIndustryByIds(c *gin.Context) {
var IDS request.IdsReq
err := c.ShouldBindJSON(&IDS)
@@ -94,22 +94,33 @@
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
-// @Param data body test.Industry true "鏇存柊Industry"
+// @Param data body request.IndustryList true "鏇存柊Industry"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"鏇存柊鎴愬姛"}"
-// @Router /api/i/updateIndustry [put]
+// @Router /i/updateIndustry [put]
func (iApi *IndustryApi) UpdateIndustry(c *gin.Context) {
- var i test.Industry
+ var i testReq.IndustryList
err := c.ShouldBindJSON(&i)
if err != nil {
response.FailWithMessage(err.Error(), c)
return
}
- if err := iService.UpdateIndustry(i); err != nil {
+
+ // 鍒犻櫎鎵�鏈夌浉鍏崇殑琛屼笟
+ if err := iService.DeleteAll(); err != nil {
global.GVA_LOG.Error("鏇存柊澶辫触!", zap.Error(err))
- response.FailWithMessage("鏇存柊澶辫触", c)
- } else {
- response.OkWithMessage("鏇存柊鎴愬姛", c)
+ response.FailWithMessage("淇濆瓨澶辫触", c)
+ return
}
+
+ for _, industry := range i.Industries {
+ if err := iService.CreateIndustry(&industry); err != nil {
+ global.GVA_LOG.Error("鏇存柊澶辫触!", zap.Error(err))
+ response.FailWithMessage("淇濆瓨澶辫触", c)
+ return
+ }
+ }
+
+ response.OkWithMessage("鏇存柊鎴愬姛", c)
}
// FindIndustry 鐢╥d鏌ヨIndustry
@@ -120,7 +131,7 @@
// @Produce application/json
// @Param data query test.Industry true "鐢╥d鏌ヨIndustry"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"鏌ヨ鎴愬姛"}"
-// @Router /api/i/findIndustry [get]
+// @Router /i/findIndustry [get]
func (iApi *IndustryApi) FindIndustry(c *gin.Context) {
var i test.Industry
err := c.ShouldBindQuery(&i)
@@ -144,7 +155,7 @@
// @Produce application/json
// @Param data query testReq.IndustrySearch true "鍒嗛〉鑾峰彇Industry鍒楄〃"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"鑾峰彇鎴愬姛"}"
-// @Router /api/i/getIndustryList [get]
+// @Router /i/getIndustryList [get]
func (iApi *IndustryApi) GetIndustryList(c *gin.Context) {
var pageInfo testReq.IndustrySearch
err := c.ShouldBindQuery(&pageInfo)
--
Gitblit v1.8.0