device api

controllers/api_base_controller.go

@@ -42,6 +42,11 @@ func ApiControllersRegisterRouters() {
 
 	beego.Router("/xcx/api/sysdic/getdevicetypes", &SysDicApiController{}, "Get:GetDeviceTypes")
 
+	beego.Router("xcx/api/device/binddevice", &DeviceApiController{}, "Post:BindDevice")
+	beego.Router("/xcx/api/device/getdevicedetail", &DeviceApiController{}, "Get:GetDeviceDetail")
+	beego.Router("/xcx/api/device/getmydevices", &DeviceApiController{}, "Get:GetMyDevices")
+	beego.Router("/xcx/api/device/unbinddevice", &DeviceApiController{}, "Post:UnbindDevice")
+
 }
 
 type BaseApiController struct {
@@ -140,6 +145,12 @@ func (c *BaseApiController) ServeSuccessJSON(data interface{}) {
 	c.ServeJSON()
 }
 
+func (c *BaseApiController) ServeSuccessPageJSON(list interface{}, total int) {
+
+	c.Data["json"] = enums.MakeSuccessPageResponseJSON(list, total)
+	c.ServeJSON()
+}
+
 func (c *BaseApiController) ServeFailJSONWithSGJErrorCode(code int) {
 	c.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(code)
 	c.ServeJSON()

controllers/check_record_api_controller.go

@@ -3,3 +3,19 @@ package controllers
 type CheckRecordApiController struct {
 	BaseApiAuthController
 }
+
+func (c *CheckRecordApiController) GetCheckRecordList() {
+
+}
+
+func (c *CheckRecordApiController) GetCheckRecordItemReport() {
+
+}
+
+func (c *CheckRecordApiController) GetCheckRecordItemById() {
+
+}
+
+func (c *CheckRecordApiController) QrCodeCheckRecord() {
+
+}

controllers/device_api_controllor.go

@@ -1,6 +1,9 @@
 package controllers
 
-import "sws_xcx/service"
+import (
+	"sws_xcx/service"
+	"sws_xcx/utils"
+)
 
 type DeviceApiController struct {
 	BaseApiAuthController
@@ -17,7 +20,7 @@ func (c *DeviceApiController) GetMyDevices() {
 	devices, err := service.NewDeviceService().GetMyDevices(c.CurrentUser.Id)
 	if err != nil {
 		c.ServeDynamicFailJsonSend(err.Error())
-
+		return
 	}
 	c.ServeSuccessJSON(devices)
 
@@ -25,45 +28,46 @@ func (c *DeviceApiController) GetMyDevices() {
 
 // @Title GetDeviceDetail
 // @Description 根据设备ID获取设备详细信息
-// @Param   id path int true "设备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("id")
+	utils.TraceLog(c.GetString("deviceid"))
+	id, err := c.GetInt("deviceid")
 	if err != nil {
 		c.ServeDynamicFailJsonSend(err.Error())
+		return
 	}
 	device, err := service.NewDeviceService().GetDeviceInfo(id)
 	if err != nil {
 		c.ServeDynamicFailJsonSend(err.Error())
+		return
 	}
 	c.ServeSuccessJSON(device)
 }
 
 // @Title BindDevice
 // @Description 绑定设备
-// @Param   deviceid path int true "设备ID"
+// @Param   qrcode query string true "设备二维码"
 // @Success 200  success
 // @Failure 500 error
 // @Security token
 // @router /binddevice [post]
 func (c *DeviceApiController) BindDevice() {
-	id, err := c.GetInt("deviceid")
-	if err != nil {
-		c.ServeDynamicFailJsonSend(err.Error())
-	}
-	if err := service.NewDeviceService().BindDevice(c.CurrentUser.Id, uint64(id)); err != nil {
+	qrcode := c.GetString("qrcode")
+	if err := service.NewDeviceService().BindDevice(c.CurrentUser.Id, qrcode); err != nil {
 		c.ServeDynamicFailJsonSend(err.Error())
+		return
 	}
 	c.ServeSuccessJSON(new(interface{}))
 }
 
 // @Title UnBindDevice
 // @Description 解绑设备
-// @Param   deviceid path int true "设备ID"
+// @Param   deviceid query int true "设备ID"
 // @Success 200  success
 // @Failure 500 error
 // @Security token
@@ -72,9 +76,11 @@ func (c *DeviceApiController) UnbindDevice() {
 	id, err := c.GetInt("deviceid")
 	if err != nil {
 		c.ServeDynamicFailJsonSend(err.Error())
+		return
 	}
 	if err := service.NewDeviceService().UnbindDevice(c.CurrentUser.Id, uint64(id)); err != nil {
 		c.ServeDynamicFailJsonSend(err.Error())
+		return
 	}
 	c.ServeSuccessJSON(new(interface{}))
 }

controllers/message_api_controllor.go

@@ -1,6 +1,14 @@
 package controllers
 
 import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"strconv"
+	"strings"
+	"sws_xcx/enums"
+	"sws_xcx/models"
+	"sws_xcx/service"
 	"sws_xcx/utils"
 )
 
@@ -10,10 +18,174 @@ type MessageApiControllor struct {
 
 func (c *MessageApiControllor) PutEmqxMessage() {
 
-	utils.InfoLog("Revice EMQX message: %s", c.Ctx.Input.RequestBody)
-	c.ServeSuccessJSON(map[string]interface{}{})
+	msg := &models.OpenEmqMsgReqVO{}
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, msg)
+	if err != nil {
+		c.ServeDynamicFailJsonSend(err.Error())
+		return
+	}
+
+	ds := service.NewDeviceService()
+
+	device, err := ds.GetDeviceByNo(msg.UserName)
+	if err != nil {
+		utils.ErrorLog("GetDeviceByNo %v:", err)
+		c.ServeDynamicFailJsonSend(err.Error())
+		return
+	}
+	if device.Id == 0 {
+		msg := "非本系统设备，数据废弃"
+		utils.WarningLog(msg)
+		c.ServeDynamicFailJsonSend(msg)
+		return
+	}
+	err = ds.CreateDeviceMessageLog(models.DeviceMessageLog{
+		DeviceName: msg.DeviceName,
+		Content:    string(c.Ctx.Input.RequestBody),
+		EventType:  enums.EventTypeEmqx,
+		MessageId:  msg.Id,
+		Topic:      msg.Topic,
+	})
+
+	if err != nil {
+		utils.ErrorLog("CreateDeviceMessageLog %v:", err)
+		c.ServeDynamicFailJsonSend(err.Error())
+		return
+	}
+	payload := &models.OpenEmqPayloadReqVO{}
+	err = json.Unmarshal([]byte(msg.Payload), payload)
+	if err != nil {
+		utils.ErrorLog("json.Unmarshal %v:", err)
+		c.ServeDynamicFailJsonSend(err.Error())
+		return
+	}
+	if payload.Len != 23 {
+		utils.WarningLog("非标准数据，数据废弃:%v", msg.Payload)
+	}
+
+	dr, err := ds.GetDeviceRelateByDeviceId(device.Id)
+	if err != nil {
+		utils.ErrorLog("GetDeviceRelateByDeviceId %v:", err)
+		c.ServeDynamicFailJsonSend(err.Error())
+		return
+	}
+
+	checkRecord := &models.CheckRecord{
+
+		Acc:          payload.Acc,
+		PutSources:   enums.EventTypeEmqx,
+		MessageId:    msg.Id,
+		DeviceId:     device.Id,
+		UserId:       dr.UserId,
+		DeviceStatus: device.Status,
+	}
+
+	if dr.UserId > 0 {
+
+		hp, err := service.NewUserHealthProfileService().GetUserHealthProfileByUserId(dr.UserId)
+		if err != nil {
+			utils.ErrorLog("GetUserHealthProfileByUserId %v:", err)
+			c.ServeDynamicFailJsonSend(err.Error())
+			return
+		}
+		checkRecord.UserHealthProfileId = int64(hp.Id)
+	}
+	crs := service.NewCheckRecordService()
+	err = crs.CreateCheckRecord(checkRecord)
+	if err != nil {
+		utils.ErrorLog("CreateCheckRecord %v:", err)
+		c.ServeDynamicFailJsonSend(err.Error())
+		return
+	}
+
+	da := strings.Split(payload.Data, ",")
+	count := payload.Count
+	if len(da) != count {
+		utils.WarningLog("数据长度不匹配,截取存储 %+v", payload)
+		if len(da) < count {
+			count = len(da)
+		}
+	}
+
+	checkItems, err := service.NewCheckItemService().GetCheckItems("cn", device.DeviceType)
+
+	if err != nil {
+		utils.ErrorLog("GetCheckItems %v:", err)
+		c.ServeDynamicFailJsonSend(err.Error())
+		return
+	}
+
+	if len(checkItems) < count {
+		c.ServeDynamicFailJsonSend("接收的数据于检查项目配置不一致")
+		return
+	}
+
+	alerts := make([]string, 0)
+	for i := 0; i < count; i++ {
+		vi, _ := strconv.Atoi(da[i])
+		err = createCheckRecordItem(checkItems, checkRecord.Id, &alerts, vi, i+1, crs)
+		if err != nil {
+			utils.ErrorLog("createCheckRecordItem valule:%v, err:%v:", vi, err)
+		}
+	}
+
+	if len(alerts) > 0 {
+		alertItemIds := strings.Join(alerts, ",")
+		err = crs.UpdateCheckRecordAlertItems(checkRecord.Id, alertItemIds)
+		if err != nil {
+			utils.ErrorLog("UpdateCheckRecordAlertItems %v:", err)
+			c.ServeDynamicFailJsonSend(err.Error())
+			return
+		}
+
+	}
+
 }
 
-func HandleMsg(req []byte) {
+func createCheckRecordItem(items []*models.CheckItem, crId int64, alerts *[]string, vi, n int, crs *service.CheckRecordService) error {
+	item := findItem(items, n)
+	if item == nil {
+		return fmt.Errorf("检测项目不匹配，需要检查基础数据！序号：%v", n)
+	}
+
+	cri := models.CheckRecordItem{
+		CheckId:         crId,
+		CheckItemId:     n,
+		CheckValueIndex: vi,
+	}
+
+	scopes := []*models.CheckItemScopeVO{}
+	err := json.Unmarshal([]byte(item.ScopeList), &scopes)
+	if err != nil {
+		return fmt.Errorf("检测项目数值范围定义不正确 err:%v", err)
+	}
+	scope := findScope(scopes, vi)
+	if scope == nil {
+		return errors.New("检测结果不匹配")
+	}
+
+	cri.CheckValue = scope.Value
+	if scope.Type == 1 {
+		*alerts = append(*alerts, strconv.Itoa(n))
+	}
+	return crs.CreateCheckRecordItem(&cri)
+}
+
+func findScope(scopes []*models.CheckItemScopeVO, vi int) *models.CheckItemScopeVO {
+	for _, scope := range scopes {
+		if scope.Index == vi {
+			return scope
+		}
+	}
+	return nil
+}
 
+func findItem(items []*models.CheckItem, itemNumber int) *models.CheckItem {
+	//循环items
+	for _, item := range items {
+		if item.CheckItemNumber == itemNumber {
+			return item
+		}
+	}
+	return nil
 }

controllers/user_api_controller.go

@@ -35,6 +35,8 @@ func (c *UserApiController) GetUserInfo() {
 		Source:                  c.CurrentUser.Source,
 		Ctime:                   models.Time(c.CurrentUser.Ctime),
 		Mtime:                   models.Time(c.CurrentUser.Mtime),
+		UserOrgId:               c.CurrentUser.UserOrgId,
+		PatientId:               c.CurrentUser.PatientId,
 	}
 
 	p, err := service.NewUserHealthProfileService().GetUserHealthProfileByUserId(c.CurrentUser.Id)

enums/enums.go

@@ -0,0 +1,6 @@
+package enums
+
+const (
+	EventTypeEmqx   = "emq"
+	EventTypeQrCode = "device_qr_code"
+)

enums/error_code.go

@@ -490,6 +490,12 @@ func MakeSuccessResponseJSON(data interface{}) CommonResp {
 	return resp
 }
 
+func MakeSuccessPageResponseJSON(data interface{}, total int) CommonResp {
+	resp := CommonResp{Code: 0, State: 1, Msg: "success"}
+	resp.Data = map[string]interface{}{"total": total, "list": data}
+	return resp
+}
+
 func MakeFailResponseJSON(errMsg string, errCode int) CommonResp {
 	resp := CommonResp{Code: errCode, Msg: errMsg, State: 0}
 	return resp

models/dbmodels.go

@@ -77,7 +77,7 @@ type Device struct {
 	BatchNumber          int       `json:"batch_number" gorm:"type:int(10); COMMENT:'批号'" description:"批号"`
 	ProductionDateNumber int       `json:"production_date_number" gorm:"type:int(10); COMMENT:'生产日期'" description:"生产日期"`
 	Number               int       `json:"number" gorm:"type:int(10); COMMENT:'序号'" description:"序号"`
-	QrCodeId             int64     `json:"qr_code_id" gorm:"type:bigint(20)"`
+	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:"软件版本"`

models/httpmodels.go

@@ -71,6 +71,9 @@ type UserInfoResp struct {
 	IdCard            string `json:"id_card" description:"身份证号"`
 	InpatientRegPhone string `json:"inpatient_reg_phone" description:"住院登记手机号"`
 
+	PatientId int64 ` json:"patient_id"`
+	UserOrgId int64 ` json:"user_org_id"`
+
 	Ctime Time `json:"ctime" description:"创建时间"`
 	Mtime Time `json:"mtime" description:"更新时间 "`
 }
@@ -127,7 +130,7 @@ type DicResp struct {
 	Value int    `json:"value" description:"字典值"`
 }
 
-type OpenEmqMsgReqV0 struct {
+type OpenEmqMsgReqVO struct {
 	UserName   string `json:"username" description:"用户名"`
 	Topic      string `json:"topic" description:"主题"`
 	PeerHost   string `json:"peerhost" description:"主机"`
@@ -158,8 +161,32 @@ type OpenEmqPayloadReqVO struct {
 	Len        int    `json:"len"`        // 长度
 }
 type CheckItemScopeVO struct {
-	Index int     `json:"index"`
-	Type  int     `json:"type"`
-	Value string  `json:"value"`
-	Num   float64 `json:"num"`
+	Index int    `json:"index"`
+	Type  int    `json:"type"`
+	Value string `json:"value"`
+	Num   string `json:"num"`
+}
+
+type AppCheckRecordVO struct {
+
+	// AlertCount is the number of alerts.
+	AlertCount int `json:"alert_count" description:"异常数量"`
+	// NormalCount is the number of normal items.
+	NormalCount int `json:"normal_count" description:"正常数量"`
+	// Describe is the description of the record.
+	Describe string `json:"describe" description:"描述"`
+	// CheckDate is the date when the check was performed.
+	CheckDate Time `json:"check_date" description:"检测日期"`
+	// CheckRecordID is the ID of the check record.
+	CheckRecordId int64 `json:"check_record_id" description:"检测记录id"`
+	// UserID is the user ID, defaulting to the user's own ID.
+	UserId uint64 `json:"user_id" description:"绑定用户id 默认自己"`
+	// AlertGrade is the risk level: 1 for low, 2 for medium, 3 for high.
+	//AlertGrade int `json:"alert_grade" description:"风险等级 1 低  2 中 3 高"`
+	// View indicates whether the record has been viewed.
+	View int `json:"view" description:"是否查看 1 已查看 0 未查看"`
+	// Bind indicates whether the user is bound.
+	Bind int `json:"bind" description:"0 未绑定用户 1 绑定"`
+	// AlertItems is a list of alert items.
+	AlertItems []string `json:"alert_items" description:"异常项"`
 }

routers/router.go

@@ -33,7 +33,7 @@ func init() {
 			),
 			beego.NSNamespace("/api/device",
 				beego.NSInclude(
-					&controllers.MessageApiControllor{},
+					&controllers.DeviceApiController{},
 				)),
 			beego.NSNamespace("/api/sysdic",
 				beego.NSInclude(

service/checkitemservice.go

@@ -18,9 +18,12 @@ func NewCheckItemService() *CheckItemService {
 
 func (s *CheckItemService) GetCheckItems(lang, t string) ([]*models.CheckItem, error) {
 	var items []*models.CheckItem
-	db := s.rdb.Where("language = ? and delete_flag = ?", lang, 0)
+	db := s.rdb.Where(" delete_flag = ?", 0)
 	if t != "" {
-		db = db.Where("check_type = ?", t)
+		db = db.Where("device_type = ?", t)
+	}
+	if lang != "" {
+		db = db.Where("language = ? ", lang)
 	}
 	err := db.Order("check_item_number").Find(&items).Error
 	return items, err

service/checkrecordservice.go

@@ -1,7 +1,10 @@
 package service
 
 import (
+	"strconv"
+	"strings"
 	"sws_xcx/models"
+	"sws_xcx/utils"
 
 	"github.com/jinzhu/gorm"
 )
@@ -18,10 +21,66 @@ func NewCheckRecordService() *CheckRecordService {
 	}
 }
 
-func (s *CheckRecordService) GetCheckRecordList(pageNum, pageSize int, search string) ([]*models.CheckRecord, int, error) {
-	return nil, 0, nil
+func (s *CheckRecordService) GetCheckRecordList(pageNum, pageSize int, userid uint64) (vos []models.AppCheckRecordVO, total int, err error) {
+	offset := (pageNum - 1) * pageSize
+	records := make([]*models.CheckRecord, pageSize)
+	err = s.rdb.Model(&models.CheckRecord{}).Where("user_id= ? and delete_flag = ?", 0).Count(&total).Order("id desc").Offset(offset).Limit(pageSize).Find(&records).Error
+	if len(records) > 0 {
+		is := NewCheckItemService()
+		cnItems, err1 := is.GetCheckItems("cn", "1")
+		if err1 != nil {
+			utils.ErrorLog("GetCheckItems err：%v ", err1)
+		}
+		mcn := make(map[int]models.CheckItem, len(cnItems))
+		for _, item := range cnItems {
+			mcn[item.Id] = *item
+		}
+
+		vos = make([]models.AppCheckRecordVO, len(records))
+		for i, r := range records {
+			vo := models.AppCheckRecordVO{}
+			vo.CheckRecordId = r.Id
+			vo.UserId = r.UserId
+			if r.UserId > 0 {
+				vo.Bind = 1
+			}
+			vo.CheckDate = models.Time(r.Ctime)
+			vo.View = r.View
+			vo.AlertCount = 0
+			//vo.AlertGrade = 0
+
+			if r.AlertItemIds != "" {
+				ids := strings.Split(r.AlertItemIds, ",")
+				names := make([]string, len(ids))
+				for j, id := range ids {
+
+					ii, _ := strconv.Atoi(id)
+					if item, ok := mcn[ii]; ok {
+						names[j] = item.NameCn
+					}
+
+				}
+				vo.AlertItems = names
+				vo.AlertCount = len(ids)
+			}
+			vo.NormalCount = len(cnItems) - vo.AlertCount
+
+			vos[i] = vo
+		}
+
+	}
+
+	return
 }
 
 func (s *CheckRecordService) CreateCheckRecord(checkRecord *models.CheckRecord) error {
 	return s.wdb.Model(checkRecord).Create(checkRecord).Error
 }
+
+func (s *CheckRecordService) CreateCheckRecordItem(checkRecordItem *models.CheckRecordItem) error {
+	return s.wdb.Model(checkRecordItem).Create(checkRecordItem).Error
+}
+
+func (s *CheckRecordService) UpdateCheckRecordAlertItems(id int64, alertItemIds string) error {
+	return s.wdb.Model(&models.CheckRecord{}).Where("id = ?", id).Update("alert_item_ids", alertItemIds).Error
+}

service/deviceservice.go

@@ -19,18 +19,18 @@ func NewDeviceService() *DeviceService {
 	}
 }
 
-func (s *DeviceService) GetDeviceInfo(id int) (*models.Device, error) {
-	var device *models.Device
-	err := s.rdb.Model(device).First(device, id).Error
+func (s *DeviceService) GetDeviceInfo(id int) (models.Device, error) {
+	var device models.Device
+	err := s.rdb.Model(&device).First(&device, id).Error
 	if err == nil || err == gorm.ErrRecordNotFound {
 		err = nil
 	}
 	return device, err
 }
 
-func (s *DeviceService) GetDeviceByNo(serialno string) (*models.Device, error) {
-	var device *models.Device
-	err := s.rdb.Model(device).Where("serialno = ?", serialno).First(device).Error
+func (s *DeviceService) GetDeviceByNo(serialno string) (models.Device, error) {
+	var device models.Device
+	err := s.rdb.Model(&device).Where("serialno = ?", serialno).First(&device).Error
 	if err == nil || err == gorm.ErrRecordNotFound {
 		err = nil
 	}
@@ -40,16 +40,16 @@ func (s *DeviceService) GetDeviceByNo(serialno string) (*models.Device, error) {
 func (s *DeviceService) GetMyDevices(userId uint64) ([]*models.Device, error) {
 	var devices []*models.Device
 	sql := "select d.* from device as d inner join device_relate as dr on d.id = dr.device_id where dr.user_id = ? and dr.delete_flag = 0"
-	err := s.rdb.Raw(sql).Scan(&devices).Error
+	err := s.rdb.Raw(sql, userId).Scan(&devices).Error
 	if err != nil {
 		return nil, err
 	}
 	return devices, nil
 }
 
-func (s *DeviceService) BindDevice(userId uint64, deviceId uint64) error {
+func (s *DeviceService) BindDevice(userId uint64, qrcode string) error {
 	var device models.Device
-	err := s.rdb.Model(&device).Where("id = ?  and delete_flag =0", deviceId).First(&device).Error
+	err := s.rdb.Model(&device).Where("qr_code = ?  and delete_flag =0", qrcode).First(&device).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return errors.New("设备不存在")
@@ -57,12 +57,12 @@ func (s *DeviceService) BindDevice(userId uint64, deviceId uint64) error {
 		return err
 	}
 	dr := &models.DeviceRelate{}
-	err = s.rdb.Model(dr).Where("device_id = ?", deviceId).First(dr).Error
+	err = s.rdb.Model(dr).Where("device_id = ?", device.Id).First(dr).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			dr = &models.DeviceRelate{
 				UserId:   userId,
-				DeviceId: deviceId,
+				DeviceId: device.Id,
 				Name:     device.DeviceName,
 			}
 
@@ -75,11 +75,11 @@ func (s *DeviceService) BindDevice(userId uint64, deviceId uint64) error {
 		if dr.DeleteFlag == 0 {
 			return errors.New("该设备已绑定其他用户")
 		} else { //其他用户解绑了设备
-			return s.wdb.Model(dr).Where("id=?", dr.Id).Update("delete_flag", 0, "user_id", userId).Error
+			return s.wdb.Model(dr).Update("delete_flag", 0, "user_id", userId).Error
 		}
 	} else if dr.DeleteFlag == 1 { //直接解绑了该设备 重新绑定
 
-		return s.wdb.Model(dr).Where("id=?", dr.Id).Update("delete_flag", 0).Error
+		return s.wdb.Model(dr).Update("delete_flag", 0).Error
 
 	} else {
 		return errors.New("设备已绑定")

swagger/swagger.json

@@ -11,6 +11,132 @@
     },
     "basePath": "/xcx",
     "paths": {
+        "/api/device/binddevice": {
+            "post": {
+                "tags": [
+                    "api/device"
+                ],
+                "description": "绑定设备\n\u003cbr\u003e",
+                "operationId": "DeviceApiController.BindDevice",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "qrcode",
+                        "description": "设备二维码",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "success"
+                    },
+                    "500": {
+                        "description": "error"
+                    }
+                },
+                "security": [
+                    {
+                        "token": []
+                    }
+                ]
+            }
+        },
+        "/api/device/getdevicedetail": {
+            "get": {
+                "tags": [
+                    "api/device"
+                ],
+                "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/device/getmydevices": {
+            "get": {
+                "tags": [
+                    "api/device"
+                ],
+                "description": "获取绑定的设备列表\n\u003cbr\u003e",
+                "operationId": "DeviceApiController.GetMyDevices",
+                "responses": {
+                    "200": {
+                        "description": "success",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.Device"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "error"
+                    }
+                },
+                "security": [
+                    {
+                        "token": []
+                    }
+                ]
+            }
+        },
+        "/api/device/unbinddevice": {
+            "post": {
+                "tags": [
+                    "api/device"
+                ],
+                "description": "解绑设备\n\u003cbr\u003e",
+                "operationId": "DeviceApiController.UnBindDevice",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "deviceid",
+                        "description": "设备ID",
+                        "required": true,
+                        "type": "integer",
+                        "format": "int64"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "success"
+                    },
+                    "500": {
+                        "description": "error"
+                    }
+                },
+                "security": [
+                    {
+                        "token": []
+                    }
+                ]
+            }
+        },
         "/api/sysdic/getcheckitems": {
             "get": {
                 "tags": [
@@ -447,9 +573,8 @@
                     "type": "integer",
                     "format": "int64"
                 },
-                "qr_code_id": {
-                    "type": "integer",
-                    "format": "int64"
+                "qr_code": {
+                    "type": "string"
                 },
                 "sensor_mode": {
                     "description": "传感放大倍数",
@@ -497,18 +622,16 @@
             "type": "object",
             "properties": {
                 "birthday": {
-                    "description": "生日",
-                    "type": "string",
-                    "format": "datetime"
+                    "$ref": "#/definitions/models.Time",
+                    "description": "生日"
                 },
                 "blood_type": {
                     "description": "血型",
                     "type": "string"
                 },
                 "creatine_time": {
-                    "description": "肌酐检测时间",
-                    "type": "string",
-                    "format": "datetime"
+                    "$ref": "#/definitions/models.Time",
+                    "description": "肌酐检测时间"
                 },
                 "creatinine": {
                     "description": "血肌酐",
@@ -520,9 +643,8 @@
                     "type": "string"
                 },
                 "ctime": {
-                    "description": "创建时间",
-                    "type": "string",
-                    "format": "datetime"
+                    "$ref": "#/definitions/models.Time",
+                    "description": "创建时间"
                 },
                 "gender": {
                     "description": "性别(0:未知 1:男 2:女)",
@@ -544,9 +666,8 @@
                     "type": "string"
                 },
                 "mtime": {
-                    "description": "更新时间 ",
-                    "type": "string",
-                    "format": "datetime"
+                    "$ref": "#/definitions/models.Time",
+                    "description": "更新时间 "
                 },
                 "renal_function_status": {
                     "description": "肾功能情况(0:未透析,1: 血液透析,2:腹膜透析,3:肾脏移植)",
@@ -569,18 +690,16 @@
                     "format": "int64"
                 },
                 "urine_protein_24h_time": {
-                    "description": "24小时尿蛋白检测时间",
-                    "type": "string",
-                    "format": "datetime"
+                    "$ref": "#/definitions/models.Time",
+                    "description": "24小时尿蛋白检测时间"
                 },
                 "urine_protein_24h_unit": {
                     "description": "24小时尿蛋白单位(g/24h,mg/24h)",
                     "type": "string"
                 },
                 "urine_protein_time": {
-                    "description": "尿蛋白检测时间",
-                    "type": "string",
-                    "format": "datetime"
+                    "$ref": "#/definitions/models.Time",
+                    "description": "尿蛋白检测时间"
                 },
                 "urine_protein_unit": {
                     "description": "尿蛋白单位(g,mg)",
@@ -598,18 +717,16 @@
             "type": "object",
             "properties": {
                 "birthday": {
-                    "description": "生日",
-                    "type": "string",
-                    "format": "datetime"
+                    "description": "生日 yyyy-MM-dd HH:mm:ss",
+                    "type": "string"
                 },
                 "blood_type": {
                     "description": "血型",
                     "type": "string"
                 },
                 "creatine_time": {
-                    "description": "肌酐检测时间",
-                    "type": "string",
-                    "format": "datetime"
+                    "description": "肌酐检测时间 yyyy-MM-dd HH:mm:ss",
+                    "type": "string"
                 },
                 "creatinine": {
                     "description": "血肌酐",
@@ -650,18 +767,16 @@
                     "format": "int64"
                 },
                 "urine_protein_24h_time": {
-                    "description": "24小时尿蛋白检测时间",
-                    "type": "string",
-                    "format": "datetime"
+                    "description": "24小时尿蛋白检测时间 yyyy-MM-dd HH:mm:ss",
+                    "type": "string"
                 },
                 "urine_protein_24h_unit": {
                     "description": "24小时尿蛋白单位(g/24h,mg/24h)",
                     "type": "string"
                 },
                 "urine_protein_time": {
-                    "description": "尿蛋白检测时间",
-                    "type": "string",
-                    "format": "datetime"
+                    "description": "尿蛋白检测时间 yyyy-MM-dd HH:mm:ss",
+                    "type": "string"
                 },
                 "urine_protein_unit": {
                     "description": "尿蛋白单位(g,mg)",
@@ -708,6 +823,10 @@
                 }
             }
         },
+        "models.Time": {
+            "title": "Time",
+            "type": "object"
+        },
         "models.UserInfoResp": {
             "title": "UserInfoResp",
             "type": "object",
@@ -717,9 +836,8 @@
                     "type": "string"
                 },
                 "ctime": {
-                    "description": "创建时间",
-                    "type": "string",
-                    "format": "datetime"
+                    "$ref": "#/definitions/models.Time",
+                    "description": "创建时间"
                 },
                 "email": {
                     "description": "邮件",
@@ -739,9 +857,8 @@
                     "type": "string"
                 },
                 "mtime": {
-                    "description": "更新时间 ",
-                    "type": "string",
-                    "format": "datetime"
+                    "$ref": "#/definitions/models.Time",
+                    "description": "更新时间 "
                 },
                 "nick_name": {
                     "description": "昵称",
@@ -751,6 +868,10 @@
                     "description": "OpenID",
                     "type": "string"
                 },
+                "patient_id": {
+                    "type": "integer",
+                    "format": "int64"
+                },
                 "phone": {
                     "description": "手机号码",
                     "type": "string"
@@ -776,6 +897,10 @@
                 "union_id": {
                     "description": "unionid",
                     "type": "string"
+                },
+                "user_org_id": {
+                    "type": "integer",
+                    "format": "int64"
                 }
             }
         },
@@ -795,8 +920,16 @@
                 "openid": {
                     "type": "string"
                 },
+                "patient_id": {
+                    "type": "integer",
+                    "format": "int64"
+                },
                 "token": {
                     "type": "string"
+                },
+                "user_org_id": {
+                    "type": "integer",
+                    "format": "int64"
                 }
             }
         },
@@ -835,6 +968,10 @@
                     "description": "OpenID",
                     "type": "string"
                 },
+                "patient_id": {
+                    "type": "integer",
+                    "format": "int64"
+                },
                 "phone": {
                     "description": "手机号码",
                     "type": "string"
@@ -864,6 +1001,10 @@
                 "union_id": {
                     "description": "unionid",
                     "type": "string"
+                },
+                "user_org_id": {
+                    "type": "integer",
+                    "format": "int64"
                 }
             }
         }

swagger/swagger.yml

@@ -8,6 +8,92 @@ info:
     name: 领透科技
 basePath: /xcx
 paths:
+  /api/device/binddevice:
+    post:
+      tags:
+      - api/device
+      description: |-
+        绑定设备
+        <br>
+      operationId: DeviceApiController.BindDevice
+      parameters:
+      - in: query
+        name: qrcode
+        description: 设备二维码
+        required: true
+        type: string
+      responses:
+        "200":
+          description: success
+        "500":
+          description: error
+      security:
+      - token: []
+  /api/device/getdevicedetail:
+    get:
+      tags:
+      - api/device
+      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/device/getmydevices:
+    get:
+      tags:
+      - api/device
+      description: |-
+        获取绑定的设备列表
+        <br>
+      operationId: DeviceApiController.GetMyDevices
+      responses:
+        "200":
+          description: success
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/models.Device'
+        "500":
+          description: error
+      security:
+      - token: []
+  /api/device/unbinddevice:
+    post:
+      tags:
+      - api/device
+      description: |-
+        解绑设备
+        <br>
+      operationId: DeviceApiController.UnBindDevice
+      parameters:
+      - in: query
+        name: deviceid
+        description: 设备ID
+        required: true
+        type: integer
+        format: int64
+      responses:
+        "200":
+          description: success
+        "500":
+          description: error
+      security:
+      - token: []
   /api/sysdic/getcheckitems:
     get:
       tags:
@@ -324,9 +410,8 @@ definitions:
         description: 生产日期
         type: integer
         format: int64
-      qr_code_id:
-        type: integer
-        format: int64
+      qr_code:
+        type: string
       sensor_mode:
         description: 传感放大倍数
         type: string
@@ -361,16 +446,14 @@ definitions:
     type: object
     properties:
       birthday:
+        $ref: '#/definitions/models.Time'
         description: 生日
-        type: string
-        format: datetime
       blood_type:
         description: 血型
         type: string
       creatine_time:
+        $ref: '#/definitions/models.Time'
         description: 肌酐检测时间
-        type: string
-        format: datetime
       creatinine:
         description: 血肌酐
         type: integer
@@ -379,9 +462,8 @@ definitions:
         description: 肌酐单位(umol/L,mg/dl)
         type: string
       ctime:
+        $ref: '#/definitions/models.Time'
         description: 创建时间
-        type: string
-        format: datetime
       gender:
         description: 性别(0:未知 1:男 2:女)
         type: integer
@@ -398,9 +480,8 @@ definitions:
         description: 病情
         type: string
       mtime:
+        $ref: '#/definitions/models.Time'
         description: '更新时间 '
-        type: string
-        format: datetime
       renal_function_status:
         description: '肾功能情况(0:未透析,1: 血液透析,2:腹膜透析,3:肾脏移植)'
         type: integer
@@ -418,16 +499,14 @@ definitions:
         type: integer
         format: int64
       urine_protein_24h_time:
+        $ref: '#/definitions/models.Time'
         description: 24小时尿蛋白检测时间
-        type: string
-        format: datetime
       urine_protein_24h_unit:
         description: 24小时尿蛋白单位(g/24h,mg/24h)
         type: string
       urine_protein_time:
+        $ref: '#/definitions/models.Time'
         description: 尿蛋白检测时间
-        type: string
-        format: datetime
       urine_protein_unit:
         description: 尿蛋白单位(g,mg)
         type: string
@@ -440,16 +519,14 @@ definitions:
     type: object
     properties:
       birthday:
-        description: 生日
+        description: 生日 yyyy-MM-dd HH:mm:ss
         type: string
-        format: datetime
       blood_type:
         description: 血型
         type: string
       creatine_time:
-        description: 肌酐检测时间
+        description: 肌酐检测时间 yyyy-MM-dd HH:mm:ss
         type: string
-        format: datetime
       creatinine:
         description: 血肌酐
         type: integer
@@ -481,16 +558,14 @@ definitions:
         type: integer
         format: int64
       urine_protein_24h_time:
-        description: 24小时尿蛋白检测时间
+        description: 24小时尿蛋白检测时间 yyyy-MM-dd HH:mm:ss
         type: string
-        format: datetime
       urine_protein_24h_unit:
         description: 24小时尿蛋白单位(g/24h,mg/24h)
         type: string
       urine_protein_time:
-        description: 尿蛋白检测时间
+        description: 尿蛋白检测时间 yyyy-MM-dd HH:mm:ss
         type: string
-        format: datetime
       urine_protein_unit:
         description: 尿蛋白单位(g,mg)
         type: string
@@ -523,6 +598,9 @@ definitions:
       real_name:
         description: 真实姓名
         type: string
+  models.Time:
+    title: Time
+    type: object
   models.UserInfoResp:
     title: UserInfoResp
     type: object
@@ -531,9 +609,8 @@ definitions:
         description: 头像
         type: string
       ctime:
+        $ref: '#/definitions/models.Time'
         description: 创建时间
-        type: string
-        format: datetime
       email:
         description: 邮件
         type: string
@@ -548,15 +625,17 @@ definitions:
         description: 住院登记手机号
         type: string
       mtime:
+        $ref: '#/definitions/models.Time'
         description: '更新时间 '
-        type: string
-        format: datetime
       nick_name:
         description: 昵称
         type: string
       open_id:
         description: OpenID
         type: string
+      patient_id:
+        type: integer
+        format: int64
       phone:
         description: 手机号码
         type: string
@@ -577,6 +656,9 @@ definitions:
       union_id:
         description: unionid
         type: string
+      user_org_id:
+        type: integer
+        format: int64
   models.WxXcxLoginReq:
     title: WxXcxLoginReq
     type: object
@@ -589,8 +671,14 @@ definitions:
     properties:
       openid:
         type: string
+      patient_id:
+        type: integer
+        format: int64
       token:
         type: string
+      user_org_id:
+        type: integer
+        format: int64
   models.XcxUser:
     title: XcxUser
     type: object
@@ -619,6 +707,9 @@ definitions:
       open_id:
         description: OpenID
         type: string
+      patient_id:
+        type: integer
+        format: int64
       phone:
         description: 手机号码
         type: string
@@ -642,6 +733,9 @@ definitions:
       union_id:
         description: unionid
         type: string
+      user_org_id:
+        type: integer
+        format: int64
 securityDefinitions:
   token:
     type: apiKey

tests/default_test.go

@@ -8,6 +8,7 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
+	"sws_xcx/enums"
 	"sws_xcx/models"
 	_ "sws_xcx/routers"
 	"sws_xcx/service"
@@ -81,28 +82,29 @@ func TestHandleMsg(t *testing.T) {
 
 	req := []byte(`{"publish_received_at":1722839054218,"pub_props":{"User-Property":{}},"peerhost":"124.133.43.122","qos":0,"topic":"/CH-U100/09012201100010104/user/checkresult","clientid":"42915152F3F1","payload":"{\"productKey\":\"CH-U100\",\"deviceName\":\"09012201100010104\",\"acc\":12378,\"type\":0,\"count\":14,\"datatype\":0,\"verifycode\":212,\"data\":\"0,0,0,2,2,0,0,0,0,0,4,3,0,1\",\"origin\":\"4243305A0000010E0000000202000000000004030001D4\",\"len\":23}","username":"09012201100010104","event":"message.publish","metadata":{"rule_id":"checkresult"},"timestamp":1722839054218,"node":"emqx@127.0.0.1","id":"00061EE9B9D4F6AFF445000924860003","flags":{"retain":false,"dup":false}}`)
 
-	const EventType string = "emq"
-	msg := &models.OpenEmqMsgReqV0{}
+	msg := &models.OpenEmqMsgReqVO{}
 	err := json.Unmarshal(req, msg)
 	if err != nil {
 		t.Error(err)
+		return
 	}
 
 	ds := service.NewDeviceService()
 
-	device, err := ds.GetDeviceByNo(msg.DeviceName)
+	device, err := ds.GetDeviceByNo(msg.UserName)
 	if err != nil && err != gorm.ErrRecordNotFound {
 		utils.ErrorLog("GetDeviceByNo %v:", err)
 		t.Error(err)
+		return
 	}
-	if device == nil {
+	if device.Id == 0 {
 		utils.WarningLog("非本系统设备，数据废弃")
 		return
 	}
 	err = ds.CreateDeviceMessageLog(models.DeviceMessageLog{
 		DeviceName: msg.DeviceName,
 		Content:    string(req),
-		EventType:  EventType,
+		EventType:  enums.EventTypeEmqx,
 		MessageId:  msg.Id,
 		Topic:      msg.Topic,
 	})
@@ -110,12 +112,14 @@ func TestHandleMsg(t *testing.T) {
 	if err != nil {
 		utils.ErrorLog("CreateDeviceMessageLog %v:", err)
 		t.Error(err)
+		return
 	}
 	payload := &models.OpenEmqPayloadReqVO{}
 	err = json.Unmarshal([]byte(msg.Payload), payload)
 	if err != nil {
 		utils.ErrorLog("json.Unmarshal %v:", err)
 		t.Error(err)
+		return
 	}
 	if payload.Len != 23 {
 		utils.WarningLog("非标准数据，数据废弃:%v", msg.Payload)
@@ -125,12 +129,13 @@ func TestHandleMsg(t *testing.T) {
 	if err != nil {
 		utils.ErrorLog("GetDeviceRelateByDeviceId %v:", err)
 		t.Error(err)
+		return
 	}
 
 	checkRecord := &models.CheckRecord{
 
 		Acc:          payload.Acc,
-		PutSources:   EventType,
+		PutSources:   enums.EventTypeEmqx,
 		MessageId:    msg.Id,
 		DeviceId:     device.Id,
 		UserId:       dr.UserId,
@@ -143,6 +148,7 @@ func TestHandleMsg(t *testing.T) {
 		if err != nil {
 			utils.ErrorLog("GetUserHealthProfileByUserId %v:", err)
 			t.Error(err)
+			return
 		}
 		checkRecord.UserHealthProfileId = int64(hp.Id)
 	}
@@ -151,6 +157,7 @@ func TestHandleMsg(t *testing.T) {
 	if err != nil {
 		utils.ErrorLog("CreateCheckRecord %v:", err)
 		t.Error(err)
+		return
 	}
 	t.Log(checkRecord.Id)
 	t.Log(payload.Data)
@@ -169,28 +176,39 @@ func TestHandleMsg(t *testing.T) {
 	if err != nil {
 		utils.ErrorLog("GetCheckItems %v:", err)
 		t.Error(err)
+		return
 	}
 
 	if len(checkItems) < count {
 		t.Error("接收的数据于检查项目配置不一致")
+		return
 	}
 
 	alerts := make([]string, 0)
 	for i := 0; i < count; i++ {
 		vi, _ := strconv.Atoi(da[i])
-		err = createCheckRecordItem(checkItems, checkRecord.Id, alerts, vi, i+1)
+		err = createCheckRecordItem(checkItems, checkRecord.Id, &alerts, vi, i+1, crs)
 		if err != nil {
 			utils.ErrorLog("createCheckRecordItem valule:%v, err:%v:", vi, err)
 		}
 	}
 
 	if len(alerts) > 0 {
-		//save alerts
+		alertItemIds := strings.Join(alerts, ",")
+		err = crs.UpdateCheckRecordAlertItems(checkRecord.Id, alertItemIds)
+		if err != nil {
+			utils.ErrorLog("UpdateCheckRecordAlertItems %v:", err)
+			t.Error(err)
+			return
+		}
+
+	} else {
+		utils.TraceLog("无异常数据")
 	}
 
 }
 
-func createCheckRecordItem(items []*models.CheckItem, crId int64, alerts []string, vi, n int) error {
+func createCheckRecordItem(items []*models.CheckItem, crId int64, alerts *[]string, vi, n int, crs *service.CheckRecordService) error {
 	item := findItem(items, n)
 	if item == nil {
 		return fmt.Errorf("检测项目不匹配，需要检查基础数据！序号：%v", n)
@@ -214,10 +232,9 @@ func createCheckRecordItem(items []*models.CheckItem, crId int64, alerts []strin
 
 	cri.CheckValue = scope.Value
 	if scope.Type == 1 {
-		alerts = append(alerts, strconv.Itoa(n))
+		*alerts = append(*alerts, strconv.Itoa(n))
 	}
-	//create cri
-	return nil
+	return crs.CreateCheckRecordItem(&cri)
 }
 
 func findScope(scopes []*models.CheckItemScopeVO, vi int) *models.CheckItemScopeVO {

tests/gendb_test.go

@@ -86,14 +86,14 @@ func TestHealthProfileService_SaveHealthProfile(t *testing.T) {
 func TestGetMobilePatientInfo(t *testing.T) {
 
 	s := service.NewXcxUserService()
-	mobile := "13058102387"
-	name := "李搜"
-	idcard := "111222900901222"
+	mobile := "13414858017"
+	name := "邹土贵"
+	idcard := "440804195502141115"
 
 	p, err := s.GetMobilePatientInfo(mobile, name, idcard)
 	if err != nil {
 		t.Error(err)
 		return
 	}
-	t.Logf("%+v", p)
+	t.Logf("id: %d orgid: %d", p.ID, p.UserOrgId)
 }