From 51a9c5267092d0e377dbb3d80d78d0555e6e94f9 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 28 九月 2019 17:20:38 +0800
Subject: [PATCH] area add alias
---
controllers/syssetcont.go | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/controllers/syssetcont.go b/controllers/syssetcont.go
index 3d3b3be..977aeb5 100644
--- a/controllers/syssetcont.go
+++ b/controllers/syssetcont.go
@@ -3,8 +3,8 @@
import (
"basic.com/dbapi.git"
"github.com/gin-gonic/gin"
- "time"
"webserver/extend/code"
+ "webserver/extend/config"
"webserver/extend/util"
)
@@ -16,6 +16,8 @@
Id string `json:"id"`
AlarmIp string `json:"alarm_ip,omitempty" example:"192.168.1.182"`
AlarmPort int `json:"alarm_port,omitempty" example:"22122"`
+ AlarmThresholdType int `json:"alarm_threshold_type"`//鎶ヨ闃堝�肩被鍨嬭缃細1:鎸夋渶楂樺垎,2:鎸夐槇鍊间互涓�
+ AlarmThreshold int `json:"alarm_threshold"`//鎶ヨ闃堝��
WebPicIp string `json:"web_pic_ip,omitempty" example:""`
WebPicPort int `json:"web_pic_port,omitempty" example:"22122"`
EsPicIp string `json:"es_pic_ip,omitempty" example:""`
@@ -30,13 +32,14 @@
}
type Gb28181ConfigVo struct {
- ID string `json:"ID,omitempty" gorm:"primary_key" `
- ServerIp string `json:"ServerIp,omitempty" example:"SIP鏈嶅姟鍣↖P" gorm:"column:ServerIp"`
- ServerPort int `json:"ServerPort,omitempty" example:"21231" gorm:"column:ServerPort"`
- ServerId string `json:"ServerId,omitempty" example:"SIP鏈嶅姟鍣↖d" gorm:"column:ServerId"`
- UserAuthId string `json:"UserAuthId,omitempty" example:"SIP鐢ㄦ埛璁よ瘉ID" gorm:"column:UserAuthId"`
- Password string `json:"Password,omitempty" example:"瀵嗙爜" gorm:"column:Password"`
- UpdateTime time.Time `json:"-" gorm:"column:UpdateTime"`
+ Id string `json:"Id"`
+ ServerIp string `json:"ServerIp" example:"鍥芥爣鏈嶅姟鍣↖P"`
+ ServerPort int `json:"ServerPort" example:"骞冲彴鏈嶅姟绔彛:7060"`
+ PublicId string `json:"PublicId" example:"骞冲彴鏈嶅姟Id"`
+ GbServerPort int `json:"GbServerPort" example:"鍥芥爣鏈嶅姟绔彛:8060"`
+ IsAuth bool `json:"IsAuth" example:"鏄惁寮�鍚壌鏉�:true"`
+ Password string `json:"Password" example:"瀵嗙爜"`
+ UpdateTime string `json:"UpdateTime"`
}
// @Summary 瀛樺偍淇℃伅鏌ヨ
@@ -145,9 +148,22 @@
if !b { // 鏌ヨ鏄惁瀛樺湪
util.ResponseFormat(c, code.ServiceInsideError,"鏌ヨ澶辫触")
}else {
- resData["dev_id"] = sysconf.GetServerId()
- resData["dev_name"] = sysconf.GetServerName()
- // 瀛樺湪
+ resData["server_id"] = sysconf.GetServerId()
+ resData["server_name"] = sysconf.GetServerName()
+ ipv4, mask, _ := util.GetLocalIP(config.Server.NetworkAdapter)
+ gateway, _ := util.GetDefaultRoute(config.Server.NetworkAdapter)
+ resData["ip"] = ipv4
+ resData["subMask"] = mask
+ resData["gateway"] = gateway
+
+ resData["deviceNum"] = config.Server.DeviceNum
+ resData["deviceType"] = config.Server.DeviceType
+ resData["deviceSerialNum"] = config.Server.DeviceSerialNum
+ resData["masterVersion"] = config.Server.MasterVersion
+ resData["webVersion"] = config.Server.WebVersion
+ resData["channelCount"] = config.Server.ChannelCount
+ resData["diskCount"] = config.Server.DiskCount
+
util.ResponseFormat(c, code.Success, resData)
}
}
@@ -164,7 +180,7 @@
// @Router /data/api-v/sysset/saveDevInfo [POST]
func (sset SysSetController) SaveDevInfo(c *gin.Context){
- dev_name := c.Request.FormValue("dev_name")
+ dev_name := c.PostForm("server_name")
var api dbapi.SysSetApi
paramBody :=make(map[string]interface{},0)
paramBody["serverName"] = dev_name
@@ -205,7 +221,7 @@
// @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}"
// @Router /data/api-v/sysset/gb28181ConfigEdit [POST]
func (sset SysSetController) Gb28181ConfigEdit(c *gin.Context) {
- var args LocalConfigVo
+ var args Gb28181ConfigVo
err := c.BindJSON(&args)
if err !=nil {
util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
--
Gitblit v1.8.0