backend api

.gitignore

@@ -1,3 +1,5 @@
 sws_xcx.exe
 sws_xcx.exe~
 sws_xcx
+.idea/
+.vscode/

conf/app.conf

@@ -4,6 +4,7 @@ runmode = test
 autorender = false
 copyrequestbody = true
 EnableDocs = true
+sessionon = true
 
 
 enablexsrf = false

controllers/admin/admin_api_base_controller.go

@@ -0,0 +1,31 @@
+package admin
+
+import (
+	"net/http"
+	"sws_xcx/controllers"
+	"sws_xcx/enums"
+	"sws_xcx/models"
+
+	"github.com/astaxie/beego"
+)
+
+func ApiControllersRegisterRouters() {
+	beego.Router("xcx/api/admin/login", &LoginApiController{}, "post:Login")
+	beego.Router("xcx/api/admin/getdevicelist", &DeviceApiController{}, "get:GetDeviceList")
+	beego.Router("xcx/api/admin/getdevicedetail", &DeviceApiController{}, "get:GetDeviceDetail")
+
+}
+
+type BaseAdminApiController struct {
+	controllers.BaseApiAuthController
+	Admin models.SysAdminVO
+}
+
+func (c *BaseAdminApiController) Prepare() {
+	admin := c.GetSession("admin_info")
+	if admin == nil {
+		c.ServeFailJsonSendAndStop(http.StatusUnauthorized, enums.ErrorCodeNotLogin, "用户未登录")
+		return
+	}
+	c.Admin = admin.(models.SysAdminVO)
+}

controllers/admin/device_api_controller.go

@@ -0,0 +1,56 @@
+package admin
+
+import "sws_xcx/service"
+
+type DeviceApiController struct {
+	BaseAdminApiController
+}
+
+// @Title GetDeviceList
+// @Description 获取设备列表
+// @Param   pageNum query int true "当前页(从1开始)"
+// @Param   pageSize query int true "分页大小"
+// @Param   deviceType query string false "设备类型"
+// @Success 200 {array} models.Device success
+// @Failure 500 error
+// @router /getdevicelist [get]
+func (c *DeviceApiController) GetDeviceList() {
+
+	pageNum, _ := c.GetInt("pageNum", 1)
+	pageSize, _ := c.GetInt("pageSize", 30)
+	deviceType := c.GetString("keyword")
+
+	devices, total, err := service.NewDeviceService().GetDeviceList1(pageNum, pageSize, deviceType)
+	if err != nil {
+		c.ServeDynamicFailJsonSend(err.Error())
+		return
+	}
+
+	c.ServeSuccessPageJSON(devices, total)
+
+}
+
+// @Title GetDeviceDetail
+// @Description 根据设备ID获取设备详细信息
+// @Param   deviceid query int true "设备ID"
+// @Success 200 {object} models.Device success
+// @Failure 500 error
+// @Security token
+// @router /getdevicedetail [get]
+func (c *DeviceApiController) GetDeviceDetail() {
+	id, err := c.GetInt("deviceid")
+	if err != nil {
+		c.ServeDynamicFailJsonSend(err.Error())
+		return
+	}
+	device, err := service.NewDeviceService().GetDeviceInfo1(id)
+	if err != nil {
+		c.ServeDynamicFailJsonSend(err.Error())
+		return
+	}
+	c.ServeSuccessJSON(device)
+}
+
+func (c *DeviceApiController) DeviceBindList() {
+
+}

controllers/admin/login_api_controllor.go

@@ -0,0 +1,47 @@
+package admin
+
+import (
+	"encoding/json"
+	"sws_xcx/controllers"
+	"sws_xcx/enums"
+	"sws_xcx/models"
+	"sws_xcx/service"
+	"sws_xcx/utils"
+)
+
+type LoginApiController struct {
+	controllers.BaseApiController
+}
+
+// @Title Admin Login
+// @Description 管理员登录
+// @Param	body	body 	models.AdminLoginReq	true  "用户登录参数"
+// @Success	200	{object}	models.SysAdmin
+// @Failure 500 error
+// @router /login [post]
+func (c *LoginApiController) Login() {
+	dataBody := models.AdminLoginReq{}
+	json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if dataBody.UserName == "" || dataBody.Password == "" {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAccountOrPasswordWrong)
+		return
+	}
+
+	admin, err := service.NewSysAdminService().GetByUserName(dataBody.UserName)
+	if err != nil {
+		c.ServeDynamicFailJsonSend(err.Error())
+		return
+	}
+	if admin.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdminUserNotExist)
+		return
+	}
+	//hash, _ := utils.PasswordHash(dataBody.Password)
+	if !utils.PasswordVerify(dataBody.Password, admin.Password) {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAccountOrPasswordWrong)
+		return
+	}
+	sysAdmin := models.SysAdminVO{ID: admin.ID, UserName: admin.UserName, NickName: admin.NickName, UserType: admin.UserType, DeptID: admin.DeptID}
+	c.SetSession("admin_info", sysAdmin)
+	c.ServeSuccessJSON(sysAdmin)
+}

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/jinzhu/gorm v1.9.16
 	github.com/medivhzhan/weapp/v3 v3.8.1
+	golang.org/x/crypto v0.18.0
 )
 
 require (
@@ -35,7 +36,6 @@ require (
 	github.com/rogpeppe/go-internal v1.10.0 // indirect
 	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
 	github.com/stretchr/testify v1.8.1 // indirect
-	golang.org/x/crypto v0.18.0 // indirect
 	golang.org/x/net v0.20.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect
 	golang.org/x/text v0.14.0 // indirect

models/dbmodels.go

@@ -382,3 +382,29 @@ type CheckItemNews struct {
 func (CheckItemNews) TableName() string {
 	return "check_item_news"
 }
+
+// SysAdmin 管理员信息表
+type SysAdmin struct {
+	ID          int       `gorm:"column:id;primaryKey;autoIncrement" json:"id" description:"用户ID"`             // 用户ID
+	DeptID      int       `gorm:"column:dept_id" json:"dept_id" description:"部门ID"`                            // 部门ID
+	UserName    string    `gorm:"column:user_name;not null" json:"user_name" description:"用户账号"`               // 用户账号
+	NickName    string    `gorm:"column:nick_name;not null" json:"nick_name" description:"用户昵称"`               // 用户昵称
+	UserType    string    `gorm:"column:user_type;default:'00'" json:"user_type" description:"用户类型（00系统用户）"`   // 用户类型（00系统用户）
+	Email       string    `gorm:"column:email;default:''" json:"email" description:"用户邮箱"`                     // 用户邮箱
+	Phonenumber string    `gorm:"column:phonenumber;default:''" json:"phonenumber" description:"手机号码"`         // 手机号码
+	Sex         string    `gorm:"column:sex;default:'0'" json:"sex" description:"用户性别（0男 1女 2未知）"`             // 用户性别（0男 1女 2未知）
+	Avatar      string    `gorm:"column:avatar;default:''" json:"avatar" description:"头像地址"`                   // 头像地址
+	Password    string    `gorm:"column:password;default:''" json:"password" description:"密码"`                 // 密码
+	Status      string    `gorm:"column:status;default:'0'" json:"status" description:"帐号状态（0正常 1停用）"`         // 帐号状态（0正常 1停用）
+	DelFlag     string    `gorm:"column:del_flag;default:'0'" json:"del_flag" description:"删除标志（0代表存在 2代表删除）"` // 删除标志（0代表存在 2代表删除）
+	LoginIP     string    `gorm:"column:login_ip;default:''" json:"login_ip" description:"最后登录IP"`             // 最后登录IP
+	LoginDate   time.Time `gorm:"column:login_date" json:"login_date" description:"最后登录时间"`                    // 最后登录时间
+	Ctime       time.Time `gorm:"column:ctime" json:"ctime" description:"创建时间"`                                // 创建时间
+	Mtime       time.Time `gorm:"column:mtime" json:"mtime" description:"更新时间"`                                // 更新时间
+	Remark      string    `gorm:"column:remark" json:"remark" description:"备注"`                                // 备注
+}
+
+// TableName 设置表名
+func (SysAdmin) TableName() string {
+	return "sys_admin"
+}

models/httpmodels.go

@@ -42,6 +42,13 @@ type WxXcxLoginResp struct {
 	UserOrgId int64  ` json:"user_org_id"`
 }
 
+type AdminLoginReq struct {
+	UserName string `json:"user_name"`
+	Password string `json:"password"`
+	Code     string `json:"code"`
+	Uuid     string `json:"uuid"`
+}
+
 type SaveUserInfoReq struct {
 	Phone string `json:"phone" description:"手机号码"`
 	Email string `json:"email" description:"邮件"`
@@ -295,3 +302,50 @@ type CheckItemNewsVO struct {
 	UpdateTime      Time   `gorm:"column:update_time;default:CURRENT_TIMESTAMP;on_update:CURRENT_TIMESTAMP" json:"update_time" description:"记录最后更新的时间，自动更新"`
 	CreateTime      Time   `gorm:"column:create_time;default:CURRENT_TIMESTAMP" json:"create_time" description:"创建时间"`
 }
+
+type SysAdminVO struct {
+	ID       int    `gorm:"column:id;primaryKey;autoIncrement" json:"id" description:"用户ID"`           // 用户ID
+	DeptID   int    `gorm:"column:dept_id" json:"dept_id" description:"部门ID"`                          // 部门ID
+	UserName string `gorm:"column:user_name;not null" json:"user_name" description:"用户账号"`             // 用户账号
+	NickName string `gorm:"column:nick_name;not null" json:"nick_name" description:"用户昵称"`             // 用户昵称
+	UserType string `gorm:"column:user_type;default:'00'" json:"user_type" description:"用户类型（00系统用户）"` // 用户类型（00系统用户）
+}
+
+//设备表
+type DeviceVO struct {
+	Id         uint64 `json:"id" gorm:"type:bigint(20) unsigned auto_increment; NOT NULL; primary_key; COMMENT:'设备ID'" description:"设备ID"`
+	Name       string `json:"name" gorm:"type:varchar(255); COMMENT:'设备名称'" description:"设备名称"`
+	Serialno   string `json:"serialno" gorm:"type:varchar(64); COMMENT:'设备编号'" description:"设备编号"`
+	DeviceName string `json:"device_name" gorm:"type:varchar(255); COMMENT:'设备名称'" description:"设备名称"`
+	DeviceType string `json:"device_type" gorm:"type:varchar(11); COMMENT:'设备类型'" description:"设备类型"`
+	InformType int    `json:"inform_type" gorm:"type:int(1); COMMENT:'通知类型：0跳转小程序、1跳转网页 、默认跳转小程序'" description:"通知类型：0跳转小程序、1跳转网页 、默认跳转小程序"`
+	Mac        string `json:"mac" gorm:"type:varchar(255)"`
+	Mcu        string `json:"mcu" gorm:"type:varchar(255)"`
+
+	Number      int    `json:"number" gorm:"type:int(10); COMMENT:'序号'" description:"序号"`
+	QrCode      string `json:"qr_code" gorm:"type:varchar(255)"`
+	EmqPassword string `json:"emq_password" gorm:"type:varchar(255); COMMENT:'emq密码'" description:"emq密码"`
+	Status      int    `json:"status" gorm:"type:int(2); DEFAULT:'0'; COMMENT:'状态(0:未分配 1：已分配 2：包装中 3:待出厂 6：废弃 99：已出厂 100：销售中 101：已售出）'" description:"状态(0:未分配 1：已分配 2：包装中 3:待出厂 6：废弃 99：已出厂 100：销售中 101：已售出）"`
+	Ver         string `json:"ver" gorm:"type:varchar(255); COMMENT:'软件版本'" description:"软件版本"`
+	McuType     string `json:"mcu_type" gorm:"type:varchar(32); COMMENT:'MCU芯片类型'" description:"MCU芯片类型"`
+	SensorMode  string `json:"sensor_mode" gorm:"type:varchar(32); COMMENT:'传感放大倍数'" description:"传感放大倍数"`
+	Language    string `json:"language" gorm:"type:varchar(32); COMMENT:'语言'" description:"语言"`
+	PaperCheck  int    `json:"paper_check" gorm:"type:int(11); COMMENT:'试纸检查状态'" description:"试纸检查状态"`
+	WifiVer     string `json:"wifi_ver" gorm:"type:varchar(32); COMMENT:'WIFI版本'" description:"WIFI版本"`
+	Ctime       Time   `json:"ctime" gorm:"type:datetime; DEFAULT: CURRENT_TIMESTAMP; COMMENT:'创建时间'" description:"创建时间"`
+	Mtime       Time   `json:"mtime" gorm:"type:datetime; DEFAULT: CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP; COMMENT:'更新时间 '" description:"更新时间 "`
+	DeleteFlag  int    `json:"delete_flag" gorm:"type:int(11); DEFAULT:'0'; COMMENT:'删除标志'" description:"删除标志"`
+	OrgID       int64  `json:"org_id" gorm:"type:bigint(20); NOT NULL; default:0; COMMENT:'所属机构'" description:"所属机构"`
+
+	BatchNumber    string    `json:"batch_num" gorm:"column:batch_num; COMMENT:'批号'" description:"批号"`
+	ProductionDate string    `json:"production_date" gorm:"column:production_date; COMMENT:'生产日期'" description:"生产日期"`
+	ExpireDate     time.Time `gorm:"column:expire_date;type:date;not null" json:"expire_date" description:"到期日期"`
+	RegisterNum    string    `gorm:"column:register_num;type:varchar(128);not null" json:"register_num" description:"医疗器械注册证编号"`
+
+	VendorName          string `gorm:"column:vendor_name;type:varchar(128)" json:"vendor_name" description:"公司名称"`
+	Address             string `gorm:"column:address;type:varchar(511)" json:"address" description:"地址"`
+	Contact             string `gorm:"column:contact;type:varchar(128)" json:"contact" description:"联系方式"`
+	ProductionLicense   string `gorm:"column:production_license;type:varchar(128)" json:"production_license" description:"生产许可证编号"`
+	ProductionCorporate string `gorm:"column:production_corporate;type:varchar(128)" json:"production_corporate" description:"生产企业"`
+	ProductionAddress   string `gorm:"column:production_address;type:varchar(100)" json:"production_address" description:"生产地址"`
+}

routers/router.go

@@ -7,6 +7,7 @@ package routers
 
 import (
 	"sws_xcx/controllers"
+	"sws_xcx/controllers/admin"
 
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/plugins/cors"
@@ -47,7 +48,13 @@ func init() {
 				beego.NSInclude(
 					&controllers.ArticleApiController{},
 				)),
+			beego.NSNamespace("/api/admin",
+				beego.NSInclude(
+					&admin.LoginApiController{},
+					&admin.DeviceApiController{},
+				)),
 		)
 	beego.AddNamespace(ns)
 	controllers.ApiControllersRegisterRouters()
+	admin.ApiControllersRegisterRouters()
 }

service/deviceservice.go

@@ -19,6 +19,49 @@ func NewDeviceService() *DeviceService {
 	}
 }
 
+func (s *DeviceService) GetDeviceList(pageNum int, pageSize int, deviceType string) (devices []*models.Device, total int, err error) {
+
+	offset := (pageNum - 1) * pageSize
+	db := s.rdb.Model(&models.Device{}).Where("1=1")
+
+	if deviceType != "" {
+		db = db.Where("device_type = ?", deviceType)
+	}
+	err = db.Count(&total).Offset(offset).Limit(pageSize).Find(&devices).Error
+	return
+}
+
+func (s *DeviceService) GetDeviceList1(pageNum int, pageSize int, deviceType string) (devices []*models.DeviceVO, total int, err error) {
+	offset := (pageNum - 1) * pageSize
+	sql := "select a.*,b.batch_num ,b.production_date ,b.expire_date ,b.register_num ,v.name  as vendor_name,v.address ,v.contact ,v.production_license ,v.production_corporate ,v.production_address  from device as a inner join device_batch as b on a.batch_number =b.id inner join  vendor v on b.vendor_id =v.id where 1=1"
+	dbc := s.rdb.Model(&models.Device{})
+	if deviceType != "" {
+		dbc = dbc.Where("device_type = ?", deviceType)
+		sql = sql + " and a.device_type = ?"
+	}
+	err = dbc.Count(&total).Error
+	if err != nil {
+		return
+	}
+	db := s.rdb.Raw(sql)
+	if deviceType != "" {
+		db = s.rdb.Raw(sql, deviceType)
+	}
+	err = db.Offset(offset).Limit(pageSize).Find(&devices).Error
+	return
+}
+
+func (s *DeviceService) GetDeviceInfo1(id int) (models.DeviceVO, error) {
+	var device models.DeviceVO
+	sql := "select a.*,b.batch_num ,b.production_date ,b.expire_date ,b.register_num ,v.name  as vendor_name,v.address ,v.contact ,v.production_license ,v.production_corporate ,v.production_address  from device as a inner join device_batch as b on a.batch_number =b.id inner join  vendor v on b.vendor_id =v.id where a.id=? "
+
+	err := s.rdb.Raw(sql, id).First(&device).Error
+	if err == gorm.ErrRecordNotFound {
+		err = nil
+	}
+	return device, err
+}
+
 func (s *DeviceService) GetDeviceInfo(id int) (models.Device, error) {
 	var device models.Device
 	err := s.rdb.Model(&device).First(&device, id).Error

service/sysadminservice.go

@@ -0,0 +1,29 @@
+package service
+
+import (
+	"sws_xcx/models"
+
+	"github.com/jinzhu/gorm"
+)
+
+type SysAdminService struct {
+	rdb *gorm.DB
+	wdb *gorm.DB
+}
+
+func NewSysAdminService() *SysAdminService {
+	admin := &models.SysAdmin{}
+	return &SysAdminService{
+		rdb: readDb.Model(admin),
+		wdb: writeDb.Model(admin),
+	}
+}
+
+func (s *SysAdminService) GetByUserName(userName string) (*models.SysAdmin, error) {
+	var admin models.SysAdmin
+	err := s.rdb.Where("user_name = ?", userName).First(&admin).Error
+	if err == gorm.ErrRecordNotFound {
+		return &admin, nil
+	}
+	return &admin, err
+}

service/userservice.go

@@ -20,7 +20,7 @@ func NewXcxUserService() *XcxUserService {
 func (s *XcxUserService) GetUser(id uint64) (*models.XcxUser, error) {
 
 	user := &models.XcxUser{}
-	db := readDb.Where("id=?", id).First(user)
+	db := s.rdb.Where("id=?", id).First(user)
 
 	return user, db.Error
 
@@ -29,7 +29,7 @@ func (s *XcxUserService) GetUser(id uint64) (*models.XcxUser, error) {
 func (s *XcxUserService) GetOrCreate(openId string, unionId string) (*models.XcxUser, error) {
 
 	user := &models.XcxUser{OpenId: openId, UnionId: unionId}
-	db := writeDb.Where("open_id = ?", openId)
+	db := s.wdb.Where("open_id = ?", openId)
 	if unionId != "" {
 		db = db.Or("union_id = ?", unionId)
 	}
@@ -42,7 +42,7 @@ func (s *XcxUserService) GetOrCreate(openId string, unionId string) (*models.Xcx
 func (s *XcxUserService) GetByOpenId(openId string) (*models.XcxUser, error) {
 
 	user := &models.XcxUser{}
-	db := writeDb.Where("open_id = ?", openId)
+	db := s.wdb.Where("open_id = ?", openId)
 	db.First(user)
 	return user, db.Error
 

swagger/swagger.json

@@ -11,6 +11,119 @@
     },
     "basePath": "/xcx",
     "paths": {
+        "/api/admin/getdevicedetail": {
+            "get": {
+                "tags": [
+                    "api/admin"
+                ],
+                "description": "根据设备ID获取设备详细信息\n\u003cbr\u003e",
+                "operationId": "DeviceApiController.GetDeviceDetail",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "deviceid",
+                        "description": "设备ID",
+                        "required": true,
+                        "type": "integer",
+                        "format": "int64"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "success",
+                        "schema": {
+                            "$ref": "#/definitions/models.Device"
+                        }
+                    },
+                    "500": {
+                        "description": "error"
+                    }
+                },
+                "security": [
+                    {
+                        "token": []
+                    }
+                ]
+            }
+        },
+        "/api/admin/getdevicelist": {
+            "get": {
+                "tags": [
+                    "api/admin"
+                ],
+                "description": "获取设备列表\n\u003cbr\u003e",
+                "operationId": "DeviceApiController.GetDeviceList",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "pageNum",
+                        "description": "当前页(从1开始)",
+                        "required": true,
+                        "type": "integer",
+                        "format": "int64"
+                    },
+                    {
+                        "in": "query",
+                        "name": "pageSize",
+                        "description": "分页大小",
+                        "required": true,
+                        "type": "integer",
+                        "format": "int64"
+                    },
+                    {
+                        "in": "query",
+                        "name": "deviceType",
+                        "description": "设备类型",
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "success",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.Device"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "error"
+                    }
+                }
+            }
+        },
+        "/api/admin/login": {
+            "post": {
+                "tags": [
+                    "api/admin"
+                ],
+                "description": "管理员登录\n\u003cbr\u003e",
+                "operationId": "LoginApiController.Admin Login",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "description": "用户登录参数",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/models.AdminLoginReq"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "",
+                        "schema": {
+                            "$ref": "#/definitions/models.SysAdmin"
+                        }
+                    },
+                    "500": {
+                        "description": "error"
+                    }
+                }
+            }
+        },
         "/api/article/getarticlebyid": {
             "get": {
                 "tags": [
@@ -811,6 +924,24 @@
         }
     },
     "definitions": {
+        "models.AdminLoginReq": {
+            "title": "AdminLoginReq",
+            "type": "object",
+            "properties": {
+                "code": {
+                    "type": "string"
+                },
+                "password": {
+                    "type": "string"
+                },
+                "user_name": {
+                    "type": "string"
+                },
+                "uuid": {
+                    "type": "string"
+                }
+            }
+        },
         "models.AppCheckRecordItemDetailsVO": {
             "title": "AppCheckRecordItemDetailsVO",
             "type": "object",
@@ -1668,6 +1799,85 @@
                 }
             }
         },
+        "models.SysAdmin": {
+            "title": "SysAdmin",
+            "type": "object",
+            "properties": {
+                "avatar": {
+                    "description": "头像地址",
+                    "type": "string"
+                },
+                "ctime": {
+                    "description": "创建时间",
+                    "type": "string",
+                    "format": "datetime"
+                },
+                "del_flag": {
+                    "description": "删除标志（0代表存在 2代表删除）",
+                    "type": "string"
+                },
+                "dept_id": {
+                    "description": "部门ID",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "email": {
+                    "description": "用户邮箱",
+                    "type": "string"
+                },
+                "id": {
+                    "description": "用户ID",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "login_date": {
+                    "description": "最后登录时间",
+                    "type": "string",
+                    "format": "datetime"
+                },
+                "login_ip": {
+                    "description": "最后登录IP",
+                    "type": "string"
+                },
+                "mtime": {
+                    "description": "更新时间",
+                    "type": "string",
+                    "format": "datetime"
+                },
+                "nick_name": {
+                    "description": "用户昵称",
+                    "type": "string"
+                },
+                "password": {
+                    "description": "密码",
+                    "type": "string"
+                },
+                "phonenumber": {
+                    "description": "手机号码",
+                    "type": "string"
+                },
+                "remark": {
+                    "description": "备注",
+                    "type": "string"
+                },
+                "sex": {
+                    "description": "用户性别（0男 1女 2未知）",
+                    "type": "string"
+                },
+                "status": {
+                    "description": "帐号状态（0正常 1停用）",
+                    "type": "string"
+                },
+                "user_name": {
+                    "description": "用户账号",
+                    "type": "string"
+                },
+                "user_type": {
+                    "description": "用户类型（00系统用户）",
+                    "type": "string"
+                }
+            }
+        },
         "models.Time": {
             "title": "Time",
             "type": "object"

swagger/swagger.yml

@@ -8,6 +8,86 @@ info:
     name: 领透科技
 basePath: /xcx
 paths:
+  /api/admin/getdevicedetail:
+    get:
+      tags:
+      - api/admin
+      description: |-
+        根据设备ID获取设备详细信息
+        <br>
+      operationId: DeviceApiController.GetDeviceDetail
+      parameters:
+      - in: query
+        name: deviceid
+        description: 设备ID
+        required: true
+        type: integer
+        format: int64
+      responses:
+        "200":
+          description: success
+          schema:
+            $ref: '#/definitions/models.Device'
+        "500":
+          description: error
+      security:
+      - token: []
+  /api/admin/getdevicelist:
+    get:
+      tags:
+      - api/admin
+      description: |-
+        获取设备列表
+        <br>
+      operationId: DeviceApiController.GetDeviceList
+      parameters:
+      - in: query
+        name: pageNum
+        description: 当前页(从1开始)
+        required: true
+        type: integer
+        format: int64
+      - in: query
+        name: pageSize
+        description: 分页大小
+        required: true
+        type: integer
+        format: int64
+      - in: query
+        name: deviceType
+        description: 设备类型
+        type: string
+      responses:
+        "200":
+          description: success
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/models.Device'
+        "500":
+          description: error
+  /api/admin/login:
+    post:
+      tags:
+      - api/admin
+      description: |-
+        管理员登录
+        <br>
+      operationId: LoginApiController.Admin Login
+      parameters:
+      - in: body
+        name: body
+        description: 用户登录参数
+        required: true
+        schema:
+          $ref: '#/definitions/models.AdminLoginReq'
+      responses:
+        "200":
+          description: ""
+          schema:
+            $ref: '#/definitions/models.SysAdmin'
+        "500":
+          description: error
   /api/article/getarticlebyid:
     get:
       tags:
@@ -568,6 +648,18 @@ paths:
       security:
       - token: []
 definitions:
+  models.AdminLoginReq:
+    title: AdminLoginReq
+    type: object
+    properties:
+      code:
+        type: string
+      password:
+        type: string
+      user_name:
+        type: string
+      uuid:
+        type: string
   models.AppCheckRecordItemDetailsVO:
     title: AppCheckRecordItemDetailsVO
     type: object
@@ -1220,6 +1312,66 @@ definitions:
         description: 类型'0系统1医生2机构
         type: integer
         format: int32
+  models.SysAdmin:
+    title: SysAdmin
+    type: object
+    properties:
+      avatar:
+        description: 头像地址
+        type: string
+      ctime:
+        description: 创建时间
+        type: string
+        format: datetime
+      del_flag:
+        description: 删除标志（0代表存在 2代表删除）
+        type: string
+      dept_id:
+        description: 部门ID
+        type: integer
+        format: int64
+      email:
+        description: 用户邮箱
+        type: string
+      id:
+        description: 用户ID
+        type: integer
+        format: int64
+      login_date:
+        description: 最后登录时间
+        type: string
+        format: datetime
+      login_ip:
+        description: 最后登录IP
+        type: string
+      mtime:
+        description: 更新时间
+        type: string
+        format: datetime
+      nick_name:
+        description: 用户昵称
+        type: string
+      password:
+        description: 密码
+        type: string
+      phonenumber:
+        description: 手机号码
+        type: string
+      remark:
+        description: 备注
+        type: string
+      sex:
+        description: 用户性别（0男 1女 2未知）
+        type: string
+      status:
+        description: 帐号状态（0正常 1停用）
+        type: string
+      user_name:
+        description: 用户账号
+        type: string
+      user_type:
+        description: 用户类型（00系统用户）
+        type: string
   models.Time:
     title: Time
     type: object

tests/default_test.go

@@ -546,3 +546,21 @@ func findItem(items []*models.CheckItem, itemNumber int) *models.CheckItem {
 	}
 	return nil
 }
+
+func TestHashPassword(t *testing.T) {
+	password := "sAGi7="
+	hash, err := utils.PasswordHash(password)
+	if err != nil {
+		t.Error(err)
+		t.Fail()
+
+	}
+	t.Log(hash)
+}
+
+func TestCompareHashPassword(t *testing.T) {
+	hash := "$2a$10$5EqckbPqLlsDlGmzCG9AHOoJheFdKzazKpIpInoYNVe9llwM4Etqi"
+	password := "sAGi7="
+	ok := utils.PasswordVerify(password, hash)
+	t.Log(ok)
+}

tests/gendb_test.go

@@ -137,3 +137,17 @@ func TestCheckRecordService_GetCheckRecordList(t *testing.T) {
 	t.Logf("%+v", vos)
 
 }
+
+func TestGetDeviceList1(t *testing.T) {
+	pageNum := 1
+	pageSize := 30
+	deviceType := "1"
+	devices, total, err := service.NewDeviceService().GetDeviceList1(pageNum, pageSize, deviceType)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	ds, _ := json.Marshal(devices)
+	t.Logf("devices:%s", ds)
+	t.Logf("total:%v", total)
+}

utils/stringtool.go

@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/astaxie/beego"
+	"golang.org/x/crypto/bcrypt"
 )
 
 // 将字符串加密成 md5
@@ -113,3 +114,14 @@ func _aesDecrypt(crypted, key []byte) ([]byte, error) {
 	origData = _PKCS5UnPadding(origData)
 	return origData, nil
 }
+
+func PasswordHash(password string) (string, error) {
+	bytes, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
+	return string(bytes), err
+}
+
+// PasswordVerify php的函数password_verify
+func PasswordVerify(password, hash string) bool {
+	err := bcrypt.CompareHashAndPassword([]byte(hash), []byte(password))
+	return err == nil
+}