Rick.Lan 1 month ago
parent
commit
028f145629

BIN
asserts/devicetype/1.png View File


+ 9 - 3
controllers/sysdic_api_controller.go View File

1
 package controllers
1
 package controllers
2
 
2
 
3
-import "sws_xcx/service"
3
+import (
4
+	"fmt"
5
+	"sws_xcx/service"
6
+)
4
 
7
 
5
 type SysDicApiController struct {
8
 type SysDicApiController struct {
6
 	BaseApiController
9
 	BaseApiController
50
 		c.ServeDynamicFailJsonSend(err.Error())
53
 		c.ServeDynamicFailJsonSend(err.Error())
51
 		return
54
 		return
52
 	}
55
 	}
53
-
54
-	c.ServeSuccessJSON(s.Transform(dics))
56
+	types := s.Transform(dics)
57
+	for _, item := range types {
58
+		item.ValueStr = fmt.Sprintf("/asserts/devicetype/%v.png", item.Value)
59
+	}
60
+	c.ServeSuccessJSON(types)
55
 }
61
 }
56
 
62
 
57
 // @Title GetCheckItems
63
 // @Title GetCheckItems

+ 2 - 1
main.go View File

9
 
9
 
10
 func main() {
10
 func main() {
11
 	service.ConnectDB()
11
 	service.ConnectDB()
12
+	beego.BConfig.WebConfig.DirectoryIndex = true
12
 	if beego.BConfig.RunMode == "dev" || beego.BConfig.RunMode == "test" {
13
 	if beego.BConfig.RunMode == "dev" || beego.BConfig.RunMode == "test" {
13
-		beego.BConfig.WebConfig.DirectoryIndex = true
14
 		beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
14
 		beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
15
 	}
15
 	}
16
+	beego.BConfig.WebConfig.StaticDir["/asserts"] = "asserts"
16
 	beego.Run()
17
 	beego.Run()
17
 }
18
 }

+ 4 - 3
models/httpmodels.go View File

128
 }
128
 }
129
 
129
 
130
 type DicResp struct {
130
 type DicResp struct {
131
-	Type  string `json:"type"`
132
-	Name  string `json:"name" description:"字典名称"`
133
-	Value int    `json:"value" description:"字典值"`
131
+	Type     string `json:"type"`
132
+	Name     string `json:"name" description:"字典名称"`
133
+	Value    int    `json:"value" description:"字典值"`
134
+	ValueStr string `json:"value_str" description:"字典字符串值"`
134
 }
135
 }
135
 
136
 
136
 type OpenEmqMsgReqVO struct {
137
 type OpenEmqMsgReqVO struct {

+ 1 - 1
service/sysdicservice.go View File

23
 
23
 
24
 func (s *SysDicService) GetDicsByType(t string) ([]*models.SysDictionary, error) {
24
 func (s *SysDicService) GetDicsByType(t string) ([]*models.SysDictionary, error) {
25
 	var dics []*models.SysDictionary
25
 	var dics []*models.SysDictionary
26
-	err := s.rdb.Where("name_en = ? and parent_id>0", t).Find(&dics).Error
26
+	err := s.rdb.Where("name_en = ? and parent_id>0 and delete_flag=0", t).Find(&dics).Error
27
 	return dics, err
27
 	return dics, err
28
 }
28
 }
29
 
29
 

+ 6 - 3
swagger/swagger.json View File

708
                     "type": "boolean"
708
                     "type": "boolean"
709
                 },
709
                 },
710
                 "check_date": {
710
                 "check_date": {
711
-                    "description": "检测日期",
712
-                    "type": "string",
713
-                    "format": "datetime"
711
+                    "$ref": "#/definitions/models.Time",
712
+                    "description": "检测日期"
714
                 },
713
                 },
715
                 "check_record_id": {
714
                 "check_record_id": {
716
                     "description": "检测记录id",
715
                     "description": "检测记录id",
1016
                     "description": "字典值",
1015
                     "description": "字典值",
1017
                     "type": "integer",
1016
                     "type": "integer",
1018
                     "format": "int64"
1017
                     "format": "int64"
1018
+                },
1019
+                "value_str": {
1020
+                    "description": "字典字符串值",
1021
+                    "type": "string"
1019
                 }
1022
                 }
1020
             }
1023
             }
1021
         },
1024
         },

+ 4 - 2
swagger/swagger.yml View File

497
         description: false 未绑定用户 true 绑定
497
         description: false 未绑定用户 true 绑定
498
         type: boolean
498
         type: boolean
499
       check_date:
499
       check_date:
500
+        $ref: '#/definitions/models.Time'
500
         description: 检测日期
501
         description: 检测日期
501
-        type: string
502
-        format: datetime
503
       check_record_id:
502
       check_record_id:
504
         description: 检测记录id
503
         description: 检测记录id
505
         type: integer
504
         type: integer
731
         description: 字典值
730
         description: 字典值
732
         type: integer
731
         type: integer
733
         format: int64
732
         format: int64
733
+      value_str:
734
+        description: 字典字符串值
735
+        type: string
734
   models.HealthProfileResp:
736
   models.HealthProfileResp:
735
     title: HealthProfileResp
737
     title: HealthProfileResp
736
     type: object
738
     type: object