luziqi
/
autogo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 设备管理v2

Browse Source
master
luziqi 3 years ago
parent d4f2fbd5e1
commit 3866baabaa
9 changed files with 778 additions and 295 deletions
Show Stats Download Patch File Download Diff File

9
dbsql/db.go
Unescape Escape View File

@ -2,6 +2,7 @@ package dbsql
import (
"fmt"
"strings"
"gorm.io/driver/mysql"
"gorm.io/gorm"
@ -35,5 +36,11 @@ func SetPageQuery(db *gorm.DB, pageIndex int, pageSize int) *gorm.DB {
}
func SetDSN(pwd string) {
DSN_local = "root:" + pwd + "@tcp(mysql.flatincbr.work:3306)/qa?charset=utf8&parseTime=true"
DSN_local = "root:" + pwd + "@tcp(qa.flatincbr.work:3306)/qa?charset=utf8&parseTime=true"
}
func DSN_qaoms() string {
str1 := strings.Split(DSN, ")/")[0] + ")/"
str2 := "?" + strings.Split(DSN, "?")[1]
return str1 + "qaoms" + str2
}

0
device/devices.go → device/device.go
Unescape Escape View File

108
device/device_v2.go
Unescape Escape View File

@ -0,0 +1,108 @@
package device
import (
"autogo/controllers"
"autogo/dbsql"
"autogo/models"
"net/http"
"github.com/gin-gonic/gin"
)
// @Tags 设备相关 /api/device/v2/
// @Summary 新建设备
// @Description 新建设备,UDID唯一
// @accept application/json
// @Param body body models.DeviceV2 true "设备信息"
// @Success 200 {object} models.Response "返回结果"
// @Router /api/device/v2/create [post]
func CreateDeviceV2(c *gin.Context) {
rsp := controllers.NewResponse()
var dv models.DeviceV2
c.ShouldBind(&dv)
if dv.Udid == "" {
c.JSON(http.StatusOK, rsp.Error("udid不能为空"))
return
}
if dv.Platform == "" {
c.JSON(http.StatusOK, rsp.Error("platform不能为空"))
return
}
if dv.Platform != "adr" && dv.Platform != "ios" {
c.JSON(http.StatusOK, rsp.Error("参数platform异常, 只允许值=adr/ios: "+dv.Platform))
return
}
db, err := dbsql.GetConn(dbsql.DSN_qaoms())
if err != nil {
c.JSON(http.StatusOK, rsp.Error(err.Error()))
return
}
defer dbsql.Close(db)
db.Model(models.DeviceV2{}).Create(&dv)
if db.Error != nil {
c.JSON(http.StatusOK, rsp.Error(db.Error.Error()))
return
}
if dv.ID < 1 {
c.JSON(http.StatusOK, rsp.Error("新建失败"))
return
}
rsp.Success()
rsp.Data = dv
c.JSON(http.StatusOK, rsp)
}
// @Tags 设备相关 /api/device/v2/
// @Summary 更新设备状态
// @Description 更新设备状态，错误的状态会被拒绝
// @accept x-www-form-urlencoded
// @Param udid formData string true "设备udid"
// @Param status formData string true "要更新的设备状态，online-在线空闲，busy-占用中，offline-离线"
// @Param status_details formData string false "状态详细，接收文本"
// @Success 200 {object} models.Response "返回更新的状态"
// @Router /api/device/v2/update_status [post]
func UpdateDeviceStatusV2(c *gin.Context) {
rsp := controllers.NewResponse()
udid := c.PostForm("udid")
status := c.PostForm("status")
status_details := c.PostForm("status_details")
if udid == "" {
c.JSON(http.StatusOK, rsp.Error("参数udid错误："+udid))
return
}
if c.PostForm("status") != "offline" && c.PostForm("status") != "online" && c.PostForm("status") != "busy" {
c.JSON(http.StatusOK, rsp.Error("参数status错误: "+status))
return
}
db, err := dbsql.GetConn(dbsql.DSN_qaoms())
if err != nil {
rsp.Error(err.Error())
c.JSON(http.StatusOK, rsp)
return
}
defer dbsql.Close(db)
var dv models.DeviceV2
db.Model(models.DeviceV2{}).Where("udid = ?", udid).Last(&dv)
if dv.ID < 1 {
c.JSON(http.StatusOK, rsp.Error("设备不存在: "+udid))
return
}
dv.Status = status
dv.StatusDetails = status_details
db.Save(&dv)
rsp.Success()
rsp.Data = dv
c.JSON(http.StatusOK, rsp)
}

123
docs/docs.go
Unescape Escape View File

@ -315,6 +315,79 @@ const docTemplate = `{
}
}
},
"/api/device/v2/create": {
"post": {
"description": "新建设备,UDID唯一",
"consumes": [
"application/json"
],
"tags": [
"设备相关 /api/device/v2/"
],
"summary": "新建设备",
"parameters": [
{
"description": "设备信息",
"name": "body",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/models.DeviceV2"
}
}
],
"responses": {
"200": {
"description": "返回结果",
"schema": {
"$ref": "#/definitions/models.Response"
}
}
}
}
},
"/api/device/v2/update_status": {
"post": {
"description": "更新设备状态，错误的状态会被拒绝",
"consumes": [
"application/x-www-form-urlencoded"
],
"tags": [
"设备相关 /api/device/v2/"
],
"summary": "更新设备状态",
"parameters": [
{
"type": "string",
"description": "设备udid",
"name": "udid",
"in": "formData",
"required": true
},
{
"type": "string",
"description": "要更新的设备状态，online-在线空闲，busy-占用中，offline-离线",
"name": "status",
"in": "formData",
"required": true
},
{
"type": "string",
"description": "状态详细，接收文本",
"name": "status_details",
"in": "formData"
}
],
"responses": {
"200": {
"description": "返回更新的状态",
"schema": {
"$ref": "#/definitions/models.Response"
}
}
}
}
},
"/api/monkey/v1/create_task": {
"post": {
"description": "新建Monkey任务，创建成功后将会发送指令到monkey服务，初始status为WAITTING-等待中",
@ -1213,6 +1286,56 @@ const docTemplate = `{
}
},
"definitions": {
"models.DeviceV2": {
"type": "object",
"properties": {
"app_did": {
"type": "string"
},
"brand": {
"type": "string"
},
"create_time": {
"description": "创建时间",
"type": "string"
},
"device_name": {
"type": "string"
},
"id": {
"description": "主键ID",
"type": "integer"
},
"is_enabled": {
"type": "integer"
},
"lan_ip": {
"type": "string"
},
"os_version": {
"type": "string"
},
"platform": {
"type": "string"
},
"product_id": {
"type": "integer"
},
"status": {
"type": "string"
},
"status_details": {
"type": "string"
},
"udid": {
"type": "string"
},
"update_time": {
"description": "更新时间",
"type": "string"
}
}
},
"models.Response": {
"type": "object",
"properties": {

123
docs/swagger.json
Unescape Escape View File

@ -303,6 +303,79 @@
}
}
},
"/api/device/v2/create": {
"post": {
"description": "新建设备,UDID唯一",
"consumes": [
"application/json"
],
"tags": [
"设备相关 /api/device/v2/"
],
"summary": "新建设备",
"parameters": [
{
"description": "设备信息",
"name": "body",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/models.DeviceV2"
}
}
],
"responses": {
"200": {
"description": "返回结果",
"schema": {
"$ref": "#/definitions/models.Response"
}
}
}
}
},
"/api/device/v2/update_status": {
"post": {
"description": "更新设备状态，错误的状态会被拒绝",
"consumes": [
"application/x-www-form-urlencoded"
],
"tags": [
"设备相关 /api/device/v2/"
],
"summary": "更新设备状态",
"parameters": [
{
"type": "string",
"description": "设备udid",
"name": "udid",
"in": "formData",
"required": true
},
{
"type": "string",
"description": "要更新的设备状态，online-在线空闲，busy-占用中，offline-离线",
"name": "status",
"in": "formData",
"required": true
},
{
"type": "string",
"description": "状态详细，接收文本",
"name": "status_details",
"in": "formData"
}
],
"responses": {
"200": {
"description": "返回更新的状态",
"schema": {
"$ref": "#/definitions/models.Response"
}
}
}
}
},
"/api/monkey/v1/create_task": {
"post": {
"description": "新建Monkey任务，创建成功后将会发送指令到monkey服务，初始status为WAITTING-等待中",
@ -1201,6 +1274,56 @@
}
},
"definitions": {
"models.DeviceV2": {
"type": "object",
"properties": {
"app_did": {
"type": "string"
},
"brand": {
"type": "string"
},
"create_time": {
"description": "创建时间",
"type": "string"
},
"device_name": {
"type": "string"
},
"id": {
"description": "主键ID",
"type": "integer"
},
"is_enabled": {
"type": "integer"
},
"lan_ip": {
"type": "string"
},
"os_version": {
"type": "string"
},
"platform": {
"type": "string"
},
"product_id": {
"type": "integer"
},
"status": {
"type": "string"
},
"status_details": {
"type": "string"
},
"udid": {
"type": "string"
},
"update_time": {
"description": "更新时间",
"type": "string"
}
}
},
"models.Response": {
"type": "object",
"properties": {

82
docs/swagger.yaml
Unescape Escape View File

@ -1,4 +1,38 @@
definitions:
models.DeviceV2:
properties:
app_did:
type: string
brand:
type: string
create_time:
description: 创建时间
type: string
device_name:
type: string
id:
description: 主键ID
type: integer
is_enabled:
type: integer
lan_ip:
type: string
os_version:
type: string
platform:
type: string
product_id:
type: integer
status:
type: string
status_details:
type: string
udid:
type: string
update_time:
description: 更新时间
type: string
type: object
models.Response:
properties:
code:
@ -209,6 +243,54 @@ paths:
summary: 更新设备状态
tags:
- 设备相关 /api/device/v1/
/api/device/v2/create:
post:
consumes:
- application/json
description: 新建设备,UDID唯一
parameters:
- description: 设备信息
in: body
name: body
required: true
schema:
$ref: '#/definitions/models.DeviceV2'
responses:
"200":
description: 返回结果
schema:
$ref: '#/definitions/models.Response'
summary: 新建设备
tags:
- 设备相关 /api/device/v2/
/api/device/v2/update_status:
post:
consumes:
- application/x-www-form-urlencoded
description: 更新设备状态，错误的状态会被拒绝
parameters:
- description: 设备udid
in: formData
name: udid
required: true
type: string
- description: 要更新的设备状态，online-在线空闲，busy-占用中，offline-离线
in: formData
name: status
required: true
type: string
- description: 状态详细，接收文本
in: formData
name: status_details
type: string
responses:
"200":
description: 返回更新的状态
schema:
$ref: '#/definitions/models.Response'
summary: 更新设备状态
tags:
- 设备相关 /api/device/v2/
/api/monkey/v1/create_task:
post:
consumes:

31
models/oms_devices.go
Unescape Escape View File

@ -0,0 +1,31 @@
package models
import (
"time"
"gorm.io/gorm"
)
// Device 结构体
type DeviceV2 struct {
ID uint `gorm:"primarykey"` // 主键ID
ProductId *int `json:"product_id" form:"product_id" gorm:"column:product_id;comment:产品表主键id;"`
DeviceName string `json:"device_name" form:"device_name" gorm:"column:device_name;comment:;"`
Brand string `json:"brand" form:"brand" gorm:"column:brand;comment:设备品牌;"`
Udid string `json:"udid" form:"udid" gorm:"column:udid;comment:;"`
AppDid string `json:"app_did" form:"app_did" gorm:"column:app_did;comment:;"`
Platform string `json:"platform" form:"platform" gorm:"column:platform;comment:支持两项ios/adr;"`
OsVersion string `json:"os_version" form:"os_version" gorm:"column:os_version;comment:;"`
LanIp string `json:"lan_ip" form:"lan_ip" gorm:"column:lan_ip;comment:局域网ip地址;"`
Status string `json:"status" form:"status" gorm:"column:status;comment:描述设备的状态;"`
StatusDetails string `json:"status_details" form:"status_details" gorm:"column:status_details;comment:设备详细状态;"`
IsEnabled *int `json:"is_enabled" form:"is_enabled" gorm:"column:is_enabled;comment:;"`
CreatedAt time.Time `json:"create_time" gorm:"column:created_at;autoCreate"` // 创建时间
UpdatedAt time.Time `json:"update_time" gorm:"column:updated_at;autoUpdate"` // 更新时间
DeletedAt gorm.DeletedAt `gorm:"index" json:"-"` // 删除时间
}
// TableName Device 表名
func (DeviceV2) TableName() string {
return "qa_devices"
}

7
router/router.go
Unescape Escape View File

@ -5,6 +5,8 @@ import (
"net/http"
"github.com/gin-gonic/gin"
swaggerFiles "github.com/swaggo/files"
ginSwagger "github.com/swaggo/gin-swagger"
)
func InitRoute() *gin.Engine {
@ -14,6 +16,9 @@ func InitRoute() *gin.Engine {
c.String(http.StatusOK, "hello World!")
})
r.GET("/swagger", ginSwagger.WrapHandler(swaggerFiles.Handler))
r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
setRoute(r)
setRouteV2(r)
@ -29,7 +34,7 @@ func Cors() gin.HandlerFunc {
//接收客户端发送的origin （重要！）
c.Writer.Header().Set("Access-Control-Allow-Origin", origin)
//服务器支持的所有跨域请求的方法
c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE,UPDATE")
c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE, UPDATE")
//允许跨域设置可以返回其他子段，可以自定义字段
c.Header("Access-Control-Allow-Headers", "Authorization, Content-Length, X-CSRF-Token, Token,session, Origin, X-Requested-With, Content-Type, Accept")
//允许浏览器（客户端）可以解析的头部 （重要）

4
router/v2.go
Unescape Escape View File

@ -2,6 +2,7 @@ package router
import (
"autogo/controllers"
"autogo/device"
"autogo/monkey"
"github.com/gin-gonic/gin"
@ -16,4 +17,7 @@ func setRouteV2(r *gin.Engine) {
r.GET("/api/setting/v2/get_bugly_token", controllers.GetBuglyToken)
r.POST("/api/setting/v2/update_bugly_token", controllers.UpdateBuglyToken)
r.POST("/api/device/v2/create", device.CreateDeviceV2)
r.POST("/api/device/v2/update_status", device.UpdateDeviceStatusV2)
}

Write Preview
Loading…
Cancel
Save