From dc9fe5e0a7655d3a4245884c9a4e3c58e59d305c Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 22 十二月 2023 14:25:55 +0800
Subject: [PATCH] 系统设置保存修改
---
api/v1/system_set.go | 2
docs/swagger.yaml | 26 ++++++++++---
model/system_set.go | 10 ----
docs/docs.go | 38 +++++++++++++++----
docs/swagger.json | 38 +++++++++++++++----
model/request/system_set_request.go | 3 -
6 files changed, 83 insertions(+), 34 deletions(-)
diff --git a/api/v1/system_set.go b/api/v1/system_set.go
index 4625727..aca1708 100644
--- a/api/v1/system_set.go
+++ b/api/v1/system_set.go
@@ -49,7 +49,7 @@
return
}
err := model.WithTransaction(func(db *gorm.DB) error {
- err := model.NewSystemSetSearch().SetOrm(db).SetTypes(params.SystemTypes).DeleteAll()
+ err := model.NewSystemSetSearch().SetOrm(db).DeleteAll()
if err != nil {
return err
}
diff --git a/docs/docs.go b/docs/docs.go
index abad8f3..8070cac 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -9851,6 +9851,34 @@
}
}
},
+ "/api/system/useSystemSet/{modeType}": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绯荤粺璁剧疆"
+ ],
+ "summary": "浣跨敤绯荤粺璁剧疆",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "鏌ヨ鍙傛暟",
+ "name": "modeType",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/response.ListResponse"
+ }
+ }
+ }
+ }
+ },
"/api/timeSpent/add": {
"post": {
"produces": [
@@ -13415,10 +13443,10 @@
"id": {
"type": "integer"
},
- "name": {
+ "modeType": {
"type": "string"
},
- "systemType": {
+ "name": {
"type": "string"
},
"value": {
@@ -16385,12 +16413,6 @@
"type": "array",
"items": {
"$ref": "#/definitions/model.SystemSet"
- }
- },
- "systemTypes": {
- "type": "array",
- "items": {
- "type": "string"
}
}
}
diff --git a/docs/swagger.json b/docs/swagger.json
index de60416..f6a48a0 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -9839,6 +9839,34 @@
}
}
},
+ "/api/system/useSystemSet/{modeType}": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绯荤粺璁剧疆"
+ ],
+ "summary": "浣跨敤绯荤粺璁剧疆",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "鏌ヨ鍙傛暟",
+ "name": "modeType",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/response.ListResponse"
+ }
+ }
+ }
+ }
+ },
"/api/timeSpent/add": {
"post": {
"produces": [
@@ -13403,10 +13431,10 @@
"id": {
"type": "integer"
},
- "name": {
+ "modeType": {
"type": "string"
},
- "systemType": {
+ "name": {
"type": "string"
},
"value": {
@@ -16373,12 +16401,6 @@
"type": "array",
"items": {
"$ref": "#/definitions/model.SystemSet"
- }
- },
- "systemTypes": {
- "type": "array",
- "items": {
- "type": "string"
}
}
}
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 626e44f..d1eba5a 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -2121,9 +2121,9 @@
properties:
id:
type: integer
- name:
+ modeType:
type: string
- systemType:
+ name:
type: string
value:
type: string
@@ -4160,10 +4160,6 @@
sets:
items:
$ref: '#/definitions/model.SystemSet'
- type: array
- systemTypes:
- items:
- type: string
type: array
type: object
request.SetAuthorityMenu:
@@ -12486,6 +12482,24 @@
summary: 淇濆瓨绯荤粺璁剧疆
tags:
- 绯荤粺璁剧疆
+ /api/system/useSystemSet/{modeType}:
+ get:
+ parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: path
+ name: modeType
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: OK
+ schema:
+ $ref: '#/definitions/response.ListResponse'
+ summary: 浣跨敤绯荤粺璁剧疆
+ tags:
+ - 绯荤粺璁剧疆
/api/timeSpent/add:
post:
parameters:
diff --git a/model/request/system_set_request.go b/model/request/system_set_request.go
index 93e6be3..326aa7e 100644
--- a/model/request/system_set_request.go
+++ b/model/request/system_set_request.go
@@ -3,6 +3,5 @@
import "aps_crm/model"
type SaveSystemSet struct {
- SystemTypes []string `json:"systemTypes"`
- Sets []*model.SystemSet `json:"sets"`
+ Sets []*model.SystemSet `json:"sets"`
}
diff --git a/model/system_set.go b/model/system_set.go
index 40a20da..f44370a 100644
--- a/model/system_set.go
+++ b/model/system_set.go
@@ -15,8 +15,7 @@
}
SystemSetSearch struct {
SystemSet
- Types []string
- Orm *gorm.DB
+ Orm *gorm.DB
}
)
@@ -32,10 +31,6 @@
slf.Orm = tx
return slf
}
-func (slf *SystemSetSearch) SetTypes(types []string) *SystemSetSearch {
- slf.Types = types
- return slf
-}
func (slf *SystemSetSearch) SetName(name string) *SystemSetSearch {
slf.Name = name
return slf
@@ -48,9 +43,6 @@
func (slf *SystemSetSearch) build() *gorm.DB {
var db = slf.Orm.Table(slf.TableName())
- if len(slf.Types) > 0 {
- db = db.Where("system_type in (?)", slf.Types)
- }
if slf.Name != "" {
db = db.Where("name = ?", slf.Name)
}
--
Gitblit v1.8.0