add pic

controllers/sysdic_api_controller.go

@@ -1,6 +1,9 @@
 package controllers
 
-import "sws_xcx/service"
+import (
+	"fmt"
+	"sws_xcx/service"
+)
 
 type SysDicApiController struct {
 	BaseApiController
@@ -50,8 +53,11 @@ func (c *SysDicApiController) GetDeviceTypes() {
 		c.ServeDynamicFailJsonSend(err.Error())
 		return
 	}
-
-	c.ServeSuccessJSON(s.Transform(dics))
+	types := s.Transform(dics)
+	for _, item := range types {
+		item.ValueStr = fmt.Sprintf("/asserts/devicetype/%v.png", item.Value)
+	}
+	c.ServeSuccessJSON(types)
 }
 
 // @Title GetCheckItems

main.go

@@ -9,9 +9,10 @@ import (
 
 func main() {
 	service.ConnectDB()
+	beego.BConfig.WebConfig.DirectoryIndex = true
 	if beego.BConfig.RunMode == "dev" || beego.BConfig.RunMode == "test" {
-		beego.BConfig.WebConfig.DirectoryIndex = true
 		beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
 	}
+	beego.BConfig.WebConfig.StaticDir["/asserts"] = "asserts"
 	beego.Run()
 }

models/httpmodels.go

@@ -128,9 +128,10 @@ type HealthProfileResp struct {
 }
 
 type DicResp struct {
-	Type  string `json:"type"`
-	Name  string `json:"name" description:"字典名称"`
-	Value int    `json:"value" description:"字典值"`
+	Type     string `json:"type"`
+	Name     string `json:"name" description:"字典名称"`
+	Value    int    `json:"value" description:"字典值"`
+	ValueStr string `json:"value_str" description:"字典字符串值"`
 }
 
 type OpenEmqMsgReqVO struct {

service/sysdicservice.go

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

swagger/swagger.json

@@ -708,9 +708,8 @@
                     "type": "boolean"
                 },
                 "check_date": {
-                    "description": "检测日期",
-                    "type": "string",
-                    "format": "datetime"
+                    "$ref": "#/definitions/models.Time",
+                    "description": "检测日期"
                 },
                 "check_record_id": {
                     "description": "检测记录id",
@@ -1016,6 +1015,10 @@
                     "description": "字典值",
                     "type": "integer",
                     "format": "int64"
+                },
+                "value_str": {
+                    "description": "字典字符串值",
+                    "type": "string"
                 }
             }
         },

swagger/swagger.yml

@@ -497,9 +497,8 @@ definitions:
         description: false 未绑定用户 true 绑定
         type: boolean
       check_date:
+        $ref: '#/definitions/models.Time'
         description: 检测日期
-        type: string
-        format: datetime
       check_record_id:
         description: 检测记录id
         type: integer
@@ -731,6 +730,9 @@ definitions:
         description: 字典值
         type: integer
         format: int64
+      value_str:
+        description: 字典字符串值
+        type: string
   models.HealthProfileResp:
     title: HealthProfileResp
     type: object