From bcfc7757e02487680d7c5132119d9f396211b1df Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期四, 04 七月 2019 20:33:25 +0800 Subject: [PATCH] rm db --- controllers/syssetcont.go | 203 +++++++++++++++++---------------- models/task.go | 7 - models/db.go | 50 ++++---- main.go | 2 models/vssLocalSettingTbl.go | 37 ------ models/localconfig.go | 43 ------- router/router.go | 4 7 files changed, 131 insertions(+), 215 deletions(-) diff --git a/controllers/syssetcont.go b/controllers/syssetcont.go index 1a08f8e..edeefbd 100644 --- a/controllers/syssetcont.go +++ b/controllers/syssetcont.go @@ -1,16 +1,42 @@ package controllers import ( + "basic.com/dbapi.git" "github.com/gin-gonic/gin" + "time" "webserver/extend/code" "webserver/extend/util" - "webserver/models" - "github.com/satori/go.uuid" - "strconv" ) type SysSetController struct { +} + +type LocalConfigVo struct { + Id string `json:"id"` + AlarmIp string `json:"alarm_ip,omitempty" example:"192.168.1.182"` + AlarmPort int `json:"alarm_port,omitempty" example:"22122"` + 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:""` + EsPicPort int `json:"es_pic_port,omitempty" example:"22122"` + CutMaxDuration int `json:"cut_max_duration,omitempty" example:"20"` + CutMinDuration int `json:"cut_min_duration,omitempty" example:"5"` + ServerId string `json:"server_id,omitempty" example:"鍒嗘瀽璁惧id"` + ServerName string `json:"server_name,omitempty" example:"鍒嗘瀽璁惧鍚嶇О"` + ServerType int `json:"server_type,omitempty" example:"1"` + Reserved string `json:"reserved,omitempty" example:"1"` + RealMax int `json:"real_max"`//瀹炴椂澶勭悊鐨勬渶澶ц矾鏁� +} + +type Gb28181ConfigVo struct { + ID int `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"` } // @Summary 瀛樺偍淇℃伅鏌ヨ @@ -22,11 +48,12 @@ // @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}" // @Router /data/api-v/sysset/alarmServerShow [GET] func (sset SysSetController) AlarmServerShow(c *gin.Context){ - config := new(models.LocalConfig) - if err := config.Select(); err != nil { - util.ResponseFormat(c, code.ServiceInsideError, config) + var api dbapi.SysSetApi + b, sysconf := api.GetServerInfo() + if b{ + util.ResponseFormat(c,code.Success,sysconf) } else { - util.ResponseFormat(c, code.Success, config) + util.ResponseFormat(c,code.ComError,"鏌ヨ澶辫触") } } @@ -35,36 +62,25 @@ // @Accept json // @Produce json // @Tags sysset -// @Param config body models.LocalConfig true "鎶ヨ鍜屽瓨鍌ㄤ俊鎭暟鎹�" +// @Param config body controllers.LocalConfigVo true "鎶ヨ鍜屽瓨鍌ㄤ俊鎭暟鎹�" // @Success 200 {string} json "{"code":200, msg:"鐩綍缁撴瀯鏁版嵁", success:true}" // @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}" // @Router /data/api-v/sysset/alarmEdit [POST] func (sset SysSetController) AlarmEdit(c *gin.Context) { - config := new(models.LocalConfig) // 鏌ヨ缁戝畾 - reqCon := new(models.LocalConfig) // 鍓嶅彴鏁版嵁缁戝畾 - c.BindJSON(reqCon) - if err := config.Select(); err != nil { // 鏌ヨ鏄惁瀛樺湪 - util.ResponseFormat(c, code.ServiceInsideError, config) - } else { - copyColumnValueForAlarm(reqCon ,config) // 涓嶅嵃璞″叾浠栧�� - reqCon.ID = config.ID // 淇敼蹇呴』鏈� id - if e := reqCon.Update(); e != nil { - util.ResponseFormat(c, code.ServiceInsideError, e.Error()) - } else { - util.ResponseFormat(c, code.Success,reqCon) - } + var args LocalConfigVo + err := c.BindJSON(&args) + if err !=nil { + util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎") + return } -} - - -// 鏈湴 閰嶇疆淇℃伅 澶嶅埗 -func copyColumnValueForAlarm(reqCon *models.LocalConfig,config *models.LocalConfig) { - reqCon.Dev_id = config.Dev_id - reqCon.Dev_name = config.Dev_name - reqCon.Cut_min_duration = config.Cut_min_duration - reqCon.Cut_max_duration = config.Cut_max_duration - reqCon.Dev_type = config.Dev_type - reqCon.Reserved = config.Reserved + var api dbapi.SysSetApi + paramBody := util.Struct2Map(args) + b,data := api.AlarmEdit(paramBody) + if b { + util.ResponseFormat(c,code.Success,data) + }else { + util.ResponseFormat(c,code.ComError,"淇濆瓨澶辫触") + } } // @Summary 瀛樺偍淇℃伅淇敼 @@ -76,15 +92,16 @@ // @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}" // @Router /data/api-v/sysset/videoLenShow [GET] func (sset SysSetController) VideoLenShow(c *gin.Context){ - config := new(models.LocalConfig) // 鍓嶅彴鏁版嵁缁戝畾 - if err := config.Select(); err != nil { // 鏌ヨ鏄惁瀛樺湪 - util.ResponseFormat(c, code.ServiceInsideError, config) + var api dbapi.SysSetApi + b, sysconf := api.GetServerInfo() + if b { + resData := make(map[string]int32, 0) + resData["max_video_len"] = sysconf.CutMaxDuration + resData["min_video_len"] = sysconf.CutMinDuration + // 瀛樺湪鍒欎慨鏀� + util.ResponseFormat(c, code.Success, resData) } else { - resData := make(map[string]int, 0) - resData["max_video_len"] = config.Cut_max_duration - resData["min_video_len"] = config.Cut_min_duration - // 瀛樺湪鍒欎慨鏀� - util.ResponseFormat(c, code.Success, resData) + util.ResponseFormat(c,code.ComError,"鏌ヨ澶辫触") } } @@ -99,25 +116,17 @@ // @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}" // @Router /data/api-v/sysset/videoLenEdit [POST] func (sset SysSetController) VideoLenEdit(c *gin.Context) { - config := new(models.LocalConfig) // 鍓嶅彴鏁版嵁缁戝畾 - /*min_video_len := c.Query("min_video_len") //鏌ヨ璇锋眰URL鍚庨潰鐨勫弬鏁� max_video_len := c.PostForm("max_video_len") //浠庤〃鍗曚腑鏌ヨ鍙傛暟*/ //POST鍜孭UT涓讳綋鍙傛暟浼樺厛浜嶶RL鏌ヨ瀛楃涓插�笺�� max_video_len := c.Request.FormValue("max_video_len") min_video_len := c.Request.FormValue("min_video_len") - if err := config.Select(); err != nil { // 鏌ヨ鏄惁瀛樺湪 - util.ResponseFormat(c, code.ServiceInsideError, config) + var api dbapi.SysSetApi + b,data := api.VideoLenEdit(max_video_len,min_video_len) + if b{ + util.ResponseFormat(c,code.UpdateSuccess,data) } else { - max, _ := strconv.Atoi(max_video_len) // 鏁版嵁 string 杞� int8 - min, _ := strconv.Atoi(min_video_len) - config.Cut_max_duration = max - config.Cut_min_duration = min - if e := config.Update(); e != nil { - util.ResponseFormat(c, code.ServiceInsideError, e.Error()) - } else { - util.ResponseFormat(c, code.Success, config) - } + util.ResponseFormat(c,code.ComError,"淇濆瓨澶辫触") } } @@ -130,15 +139,16 @@ // @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}" // @Router /data/api-v/sysset/getDevInfo [GET] func (sset SysSetController) GetDevInfo(c *gin.Context) { - config := new(models.LocalConfig) // 鍓嶅彴鏁版嵁缁戝畾 - resData := make(map[string]string, 0) - if err := config.Select(); err != nil { // 鏌ヨ鏄惁瀛樺湪 - util.ResponseFormat(c, code.ServiceInsideError,err.Error()) + var api dbapi.SysSetApi + b, sysconf := api.GetServerInfo() + resData := make(map[string]string, 0) + if !b { // 鏌ヨ鏄惁瀛樺湪 + util.ResponseFormat(c, code.ServiceInsideError,"鏌ヨ澶辫触") }else { - resData["dev_id"] = config.Dev_id - resData["dev_name"] = config.Dev_name - // 瀛樺湪 - util.ResponseFormat(c, code.Success, resData) + resData["dev_id"] = sysconf.GetServerId() + resData["dev_name"] = sysconf.GetServerName() + // 瀛樺湪 + util.ResponseFormat(c, code.Success, resData) } } @@ -153,21 +163,16 @@ // @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}" // @Router /data/api-v/sysset/saveDevInfo [POST] func (sset SysSetController) SaveDevInfo(c *gin.Context){ - config := new(models.LocalConfig) // 鍓嶅彴鏁版嵁缁戝畾 - dev_name := c.Request.FormValue("dev_name") - if err := config.Select(); err != nil { // 鏌ヨ鏄惁瀛樺湪 - util.ResponseFormat(c, code.ServiceInsideError,err.Error()) - } else { // 瀛樺湪鍙婁慨鏀� 涓嶅瓨鍦� 鍗虫坊鍔� - config.Dev_name = dev_name - if config.Dev_id == "" { - config.Dev_id = uuid.NewV4().String() - } - if e := config.Update(); e != nil { - util.ResponseFormat(c, code.ServiceInsideError, e.Error()) - } else { - util.ResponseFormat(c, code.Success, config) - } + dev_name := c.Request.FormValue("dev_name") + var api dbapi.SysSetApi + paramBody :=make(map[string]interface{},0) + paramBody["serverName"] = dev_name + b,data := api.SaveServerInfo(paramBody) + if b { // 鏌ヨ鏄惁瀛樺湪 + util.ResponseFormat(c,code.Success,data) + } else { // 瀛樺湪鍙婁慨鏀� 涓嶅瓨鍦� 鍗虫坊鍔� + util.ResponseFormat(c,code.ComError,"淇濆瓨澶辫触") } } @@ -179,17 +184,14 @@ // @Tags sysset // @Success 200 {string} json "{"code":200, msg:"鐩綍缁撴瀯鏁版嵁", success:true}" // @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}" -// @Router /data/api-v/sysset/vSSLocalSettingShow [GET] -func (sset SysSetController) VSSLocalSettingShow(c *gin.Context) { - config := new(models.VSSLocalSettingTbl) - if err := config.Select(); err != nil { - util.ResponseFormat(c, code.ServiceInsideError, config) +// @Router /data/api-v/sysset/gb28181ConfigShow [GET] +func (sset SysSetController) Gb28181ConfigShow(c *gin.Context) { + var api dbapi.SysSetApi + b, data := api.Gb28181ConfigShow() + if b { + util.ResponseFormat(c,code.Success,data) } else { - if config == nil { - util.ResponseFormat(c, code.DdSelectNotFindError, config) - } else { - util.ResponseFormat(c, code.Success, config) - } + util.ResponseFormat(c,code.ComError,"鏌ヨ澶辫触") } } @@ -198,24 +200,23 @@ // @Accept json // @Produce json // @Tags sysset -// @Param config body models.VSSLocalSettingTbl true "GB28181璁剧疆鏁版嵁" +// @Param config body controllers.Gb28181ConfigVo true "GB28181璁剧疆鏁版嵁" // @Success 200 {string} json "{"code":200, msg:"鐩綍缁撴瀯鏁版嵁", success:true}" // @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}" -// @Router /data/api-v/sysset/vSSLocalSettingEdit [POST] -func (sset SysSetController) VSSLocalSettingEdit(c *gin.Context) { - config := new(models.VSSLocalSettingTbl) // 鏌ヨ缁戝畾 - reqCon := new(models.VSSLocalSettingTbl) // 鍓嶅彴鏁版嵁缁戝畾 - c.BindJSON(reqCon) - if err := config.Select(); err != nil { // 鏌ヨ鏄惁瀛樺湪 - util.ResponseFormat(c, code.ServiceInsideError, config) +// @Router /data/api-v/sysset/gb28181ConfigEdit [POST] +func (sset SysSetController) Gb28181ConfigEdit(c *gin.Context) { + var args LocalConfigVo + err := c.BindJSON(&args) + if err !=nil { + util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎") + return + } + var api dbapi.SysSetApi + paramBody := util.Struct2Map(args) + b, data := api.Gb28181ConfigEdit(paramBody) + if b { + util.ResponseFormat(c,code.UpdateSuccess,data) } else { - { // 瀛樺湪鍒欎慨鏀� - reqCon.ID = config.ID - if e := reqCon.Update(); e != nil { - util.ResponseFormat(c, code.ServiceInsideError, e.Error()) - } else { - util.ResponseFormat(c, code.Success, reqCon) - } - } + util.ResponseFormat(c,code.ComError,"鏇存柊澶辫触") } } diff --git a/main.go b/main.go index dbcf601..18705f6 100644 --- a/main.go +++ b/main.go @@ -30,7 +30,7 @@ flag.Lookup("alsologtostderr").Value.Set("true") flag.Lookup("log_dir").Value.Set("./log") config.Init(*envirment) - models.Init() + //models.Init() r := router.NewRouter() r.Run("0.0.0.0:8000") diff --git a/models/db.go b/models/db.go index 02b72e6..71124a1 100644 --- a/models/db.go +++ b/models/db.go @@ -1,33 +1,31 @@ package models -import ( - "github.com/golang/glog" - "github.com/jinzhu/gorm" - _ "github.com/jinzhu/gorm/dialects/sqlite" - "webserver/extend/config" -) - -var db *gorm.DB -var err error +//import ( +// "github.com/jinzhu/gorm" +// _ "github.com/jinzhu/gorm/dialects/sqlite" +//) +// +//var db *gorm.DB +//var err error // Init creates a connection to mysql database and // migrates any new models -func Init() { - // dbname, file path - db, err = gorm.Open(config.DBconf.Name, config.DBconf.FilePath) - db.LogMode(true) - db.Exec("PRAGMA foreign_keys = ON") - if err != nil { - glog.Error("db open error ", err) - } - db.AutoMigrate(&Area{}, &Camera{}, &LocalConfig{}, &VSSLocalSettingTbl{}, &Task{}, &CameraTask{}, &TaskSdk{}, &Sdk{}) -} +//func Init() { +// // dbname, file path +// db, err = gorm.Open(config.DBconf.Name, config.DBconf.FilePath) +// db.LogMode(true) +// db.Exec("PRAGMA foreign_keys = ON") +// if err != nil { +// glog.Error("db open error ", err) +// } +// //db.AutoMigrate(&Area{}, &Camera{}, &LocalConfig{}, &VSSLocalSettingTbl{}, &Task{}, &CameraTask{}, &TaskSdk{}, &Sdk{}) +//} //GetDB ... -func GetDB() *gorm.DB { - return db -} - -func CloseDB() { - db.Close() -} +//func GetDB() *gorm.DB { +// return db +//} +// +//func CloseDB() { +// db.Close() +//} diff --git a/models/localconfig.go b/models/localconfig.go index 09e9197..b4cca23 100644 --- a/models/localconfig.go +++ b/models/localconfig.go @@ -14,45 +14,4 @@ Dev_name string `json:"dev_name,omitempty" example:"鍒嗘瀽璁惧鍚嶇О"` Dev_type int `json:"dev_type,omitempty" example:"1"` Reserved string `json:"dev_type,omitempty" example:"1"` -} - -// 璁剧疆User鐨勮〃鍚嶄负`profiles` -func (LocalConfig) TableName() string { - return "local_configs" -} - -func (loCon *LocalConfig) FindAreaSliece() (config []LocalConfig, err error) { - if err := db.Table(loCon.TableName()).Find(&config).Error; err != nil { - return nil, err - } - return config, nil -} - -/*func (loCon *LocalConfig) Create() (err error){ - tx := db.Table(loCon.TableName()).Begin() - if tx.Error != nil { - return err - } - fmt.Println(loCon) - if err := tx.Create(&loCon).Error; err != nil { - tx.Rollback() - return err - } - return tx.Commit().Error -}*/ - -func (loCon *LocalConfig) Select()(err error) { - if err = db.Table(loCon.TableName()).First(&loCon).Error; err != nil{ - if err.Error() == "record not found"{ loCon = nil; return nil } - return err - } - return nil -} - -func (loCon *LocalConfig) Update() error{ - if err := db.Save(&loCon).Error; err != nil { - return err - } - return nil -} - +} \ No newline at end of file diff --git a/models/task.go b/models/task.go index 6153253..2640e7f 100644 --- a/models/task.go +++ b/models/task.go @@ -1,8 +1 @@ package models - -// 鍏宠仈鏌ヨ鍏ㄩ儴鎽勫儚鏈� -//func (camera *Camera) FindAllCamTask() (cams []Camera) { -// var cameras []Camera -// db.Preload("CamTask").Find(&cameras) //鏌ヨ鎵�鏈塪evice璁板綍 // .Preload("CamTask") -// return cameras -//} diff --git a/models/vssLocalSettingTbl.go b/models/vssLocalSettingTbl.go index 57456b8..de36b96 100644 --- a/models/vssLocalSettingTbl.go +++ b/models/vssLocalSettingTbl.go @@ -12,39 +12,4 @@ 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"` -} - -func (VSSLocalSettingTbl)TableName() string { - return "VSSLocalSettingTbl" -} - - -func (vst *VSSLocalSettingTbl) Select() (err error) { - if err = db.Table("VSSLocalSettingTbl").First(&vst).Error; err != nil { - if err.Error() == "record not found"{ vst = nil; return nil } - return err - } - return nil -} - -/*func (vst *VSSLocalSettingTbl) Insert() (err error) { - tx := db.Table("VSSLocalSettingTbl").Begin() - if tx.Error != nil { - return err - } - fmt.Println(vst) - if err := tx.Create(&vst).Error; err != nil { - tx.Rollback() - return err - } - return tx.Commit().Error -}*/ - -func (vst *VSSLocalSettingTbl) Update() error { // cid int - // find record by id - vst.UpdateTime = time.Now() - if err := db.Save(&vst).Error; err != nil { - return err - } - return nil -} +} \ No newline at end of file diff --git a/router/router.go b/router/router.go index 75c1a0f..b4574e3 100644 --- a/router/router.go +++ b/router/router.go @@ -167,8 +167,8 @@ vsset.POST("/videoLenEdit", ssController.VideoLenEdit) vsset.GET("/getDevInfo", ssController.GetDevInfo) vsset.POST("/saveDevInfo", ssController.SaveDevInfo) - vsset.GET("/vSSLocalSettingShow", ssController.VSSLocalSettingShow) - vsset.POST("/vSSLocalSettingEdit", ssController.VSSLocalSettingEdit) + vsset.GET("/gb28181ConfigShow", ssController.Gb28181ConfigShow) + vsset.POST("/gb28181ConfigEdit", ssController.Gb28181ConfigEdit) } //绠楁硶搴撴搷浣� -- Gitblit v1.8.0