fix bugs

.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+    "testing.coverageBarThresholds": {
+        "red": 0,
+        "yellow": 60,
+        "green": 90
+    },
+    "testing.showAllMessages": true,  
+    "terminal.integrated.defaultProfile.windows": "Command Prompt",
+    "go.testFlags": ["-v" ]
+    
+}

controllers/message_api_controllor.go

@@ -13,3 +13,7 @@ func (c *MessageApiControllor) PutEmqxMessage() {
 	utils.InfoLog("Revice EMQX message: %s", c.Ctx.Input.RequestBody)
 	c.ServeSuccessJSON(map[string]interface{}{})
 }
+
+func HandleMsg(req []byte) {
+
+}

controllers/sysdic_api_controller.go

@@ -61,7 +61,7 @@ func (c *SysDicApiController) GetDeviceTypes() {
 // @router /getcheckitems [get]
 func (c *SysDicApiController) GetCheckItems() {
 	s := service.NewCheckItemService()
-	dics, err := s.GetCheckItems("cn")
+	dics, err := s.GetCheckItems("cn", "")
 	if err != nil {
 		c.ServeDynamicFailJsonSend(err.Error())
 		return

controllers/user_api_controller.go

@@ -32,8 +32,19 @@ func (c *UserApiController) GetUserInfo() {
 		OpenId:                  c.CurrentUser.OpenId,
 		Status:                  c.CurrentUser.Status,
 		Source:                  c.CurrentUser.Source,
-		Ctime:                   c.CurrentUser.Ctime,
-		Mtime:                   c.CurrentUser.Mtime,
+		Ctime:                   models.Time(c.CurrentUser.Ctime),
+		Mtime:                   models.Time(c.CurrentUser.Mtime),
+	}
+
+	p, err := service.NewUserHealthProfileService().GetUserHealthProfileByUserId(c.CurrentUser.Id)
+	if err != nil {
+		c.ServeDynamicFailJsonSend(err.Error())
+	}
+	if p != nil {
+
+		resp.RealName = p.RealName
+		resp.IdCard = p.IdCard
+		resp.InpatientRegPhone = p.InpatientRegPhone
 	}
 
 	c.ServeSuccessJSON(resp)
@@ -160,24 +171,24 @@ func (c *UserApiController) GetHealthProfile() {
 	resp := models.HealthProfileResp{}
 	if p != nil {
 
-		resp.Birthday = p.Birthday
+		resp.Birthday = models.Time(p.Birthday)
 		resp.BloodType = p.BloodType
-		resp.CreatineTime = p.CreatineTime
+		resp.CreatineTime = models.Time(p.CreatineTime)
 		resp.Creatinine = p.Creatinine
 		resp.CreatinineUnit = p.CreatinineUnit
-		resp.Ctime = p.Ctime
+		resp.Ctime = models.Time(p.Ctime)
 		resp.Gender = p.Gender
 		resp.Height = p.Height
 		resp.Id = p.Id
 		resp.IllnessState = p.IllnessState
-		resp.Mtime = p.Mtime
+		resp.Mtime = models.Time(p.Mtime)
 		resp.RenalFunctionStatus = p.RenalFunctionStatus
 		resp.Status = p.Status
 		resp.UrineProtein = p.UrineProtein
-		resp.UrineProteinTime = p.UrineProteinTime
+		resp.UrineProteinTime = models.Time(p.UrineProteinTime)
 		resp.UrineProteinUnit = p.UrineProteinUnit
 		resp.UrineProtein24h = p.UrineProtein24h
-		resp.UrineProtein24hTime = p.UrineProtein24hTime
+		resp.UrineProtein24hTime = models.Time(p.UrineProtein24hTime)
 		resp.UrineProtein24hUnit = p.UrineProtein24hUnit
 
 		resp.Weight = p.Weight

models/dbmodels.go

@@ -157,12 +157,12 @@ type UserHealthProfile struct {
 	Creatinine          int       `json:"creatinine" gorm:"type:int(11); NOT NULL; DEFAULT:'0'; COMMENT:'血肌酐'" description:"血肌酐"`
 	CreatinineUnit      string    `json:"creatinine_unit" gorm:"type:varchar(32); COMMENT:'肌酐单位(umol/L,mg/dl)'" description:"肌酐单位(umol/L,mg/dl)"`
 	CreatineTime        time.Time `json:"creatine_time" gorm:"type:datetime; COMMENT:'肌酐检测时间'" description:"肌酐检测时间"`
-	UrineProtein24hUnit string    `json:"urine_protein_24h_unit" gorm:"type:varchar(32); COMMENT:'24小时尿蛋白单位(g/24h,mg/24h)'" description:"24小时尿蛋白单位(g/24h,mg/24h)"`
-	UrineProtein24h     int       `json:"urine_protein_24h" gorm:"type:int(11); NOT NULL; DEFAULT:'0'; COMMENT:'24小时尿蛋白'" description:"24小时尿蛋白"`
-	UrineProtein24hTime time.Time `json:"urine_protein_24h_time" gorm:"type:datetime; COMMENT:'24小时尿蛋白检测时间'" description:"24小时尿蛋白检测时间"`
+	UrineProtein24hUnit string    `json:"urine_protein_24h_unit" gorm:"column:urine_protein_24h_unit; type:varchar(32); COMMENT:'24小时尿蛋白单位(g/24h,mg/24h)'" description:"24小时尿蛋白单位(g/24h,mg/24h)"`
+	UrineProtein24h     int       `json:"urine_protein_24h" gorm:"column:urine_protein_24h;type:int(11); NOT NULL; DEFAULT:'0'; COMMENT:'24小时尿蛋白'" description:"24小时尿蛋白"`
+	UrineProtein24hTime time.Time `json:"urine_protein_24h_time" gorm:"column:urine_protein_24h_time;type:datetime; COMMENT:'24小时尿蛋白检测时间'" description:"24小时尿蛋白检测时间"`
 	UrineProtein        int       `json:"urine_protein" gorm:"type:int(11); NOT NULL; DEFAULT:'0'; COMMENT:'尿蛋白'" description:"尿蛋白"`
-	UrineProteinUnit    string    `json:"urine_protein_unit" gorm:"type:varchar(32); COMMENT:'尿蛋白单位(g,mg)'" description:"尿蛋白单位(g,mg)"`
-	UrineProteinTime    time.Time `json:"urine_protein_time" gorm:"type:datetime; COMMENT:'尿蛋白检测时间'" description:"尿蛋白检测时间"`
+	UrineProteinUnit    string    `json:"urine_protein_unit" gorm:"column:urine_protein_unit; type:varchar(32); COMMENT:'尿蛋白单位(g,mg)'" description:"尿蛋白单位(g,mg)"`
+	UrineProteinTime    time.Time `json:"urine_protein_time" gorm:"column:urine_protein_time;type:datetime; COMMENT:'尿蛋白检测时间'" description:"尿蛋白检测时间"`
 	Status              int       `json:"status" gorm:"type:int(11); DEFAULT:'1'; COMMENT:'状态（１：有效　０：无效 ）'" description:"状态（１：有效　０：无效 ）"`
 	Ctime               time.Time `json:"ctime" gorm:"type:datetime; DEFAULT: CURRENT_TIMESTAMP; COMMENT:'创建时间'" description:"创建时间"`
 	Mtime               time.Time `json:"mtime" gorm:"type:datetime; DEFAULT: CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP; COMMENT:'更新时间 '" description:"更新时间 "`

models/httpmodels.go

@@ -2,6 +2,29 @@ package models
 
 import "time"
 
+type Time time.Time
+
+const (
+	timeFormart = "2006-01-02 15:04:05"
+)
+
+func (t *Time) UnmarshalJSON(data []byte) (err error) {
+	now, err := time.ParseInLocation(`"`+timeFormart+`"`, string(data), time.Local)
+	*t = Time(now)
+	return
+}
+
+func (t Time) MarshalJSON() ([]byte, error) {
+	b := make([]byte, 0, len(timeFormart)+2)
+	b = append(b, '"')
+	b = time.Time(t).AppendFormat(b, timeFormart)
+	b = append(b, '"')
+	return b, nil
+}
+func (t Time) String() string {
+	return time.Time(t).Format(timeFormart)
+}
+
 type WxXcxLoginReq struct {
 	Code string `json:"code"`
 }
@@ -40,27 +63,27 @@ type UserInfoResp struct {
 	IdCard            string `json:"id_card" description:"身份证号"`
 	InpatientRegPhone string `json:"inpatient_reg_phone" description:"住院登记手机号"`
 
-	Ctime time.Time `json:"ctime" description:"创建时间"`
-	Mtime time.Time `json:"mtime" description:"更新时间 "`
+	Ctime Time `json:"ctime" description:"创建时间"`
+	Mtime Time `json:"mtime" description:"更新时间 "`
 }
 
 type SaveHealthProfileReq struct {
-	Gender              int       `json:"gender" description:"性别(0:未知 1:男 2:女)"`
-	Height              int       `json:"height" description:"身高"`
-	Weight              int       `json:"weight" description:"体重"`
-	BloodType           string    `json:"blood_type" description:"血型"`
-	Birthday            time.Time `json:"birthday" description:"生日"`
-	IllnessState        string    `json:"illness_state" description:"病情"`
-	RenalFunctionStatus int       `json:"renal_function_status" description:"肾功能情况(0:未透析,1: 血液透析,2:腹膜透析,3:肾脏移植)"`
-	Creatinine          int       `json:"creatinine" description:"血肌酐"`
-	CreatinineUnit      string    `json:"creatinine_unit" description:"肌酐单位(umol/L,mg/dl)"`
-	CreatineTime        time.Time `json:"creatine_time" description:"肌酐检测时间"`
-	UrineProtein24hUnit string    `json:"urine_protein_24h_unit" description:"24小时尿蛋白单位(g/24h,mg/24h)"`
-	UrineProtein24h     int       `json:"urine_protein_24h" description:"24小时尿蛋白"`
-	UrineProtein24hTime time.Time `json:"urine_protein_24h_time" description:"24小时尿蛋白检测时间"`
-	UrineProtein        int       `json:"urine_protein" description:"尿蛋白"`
-	UrineProteinUnit    string    `json:"urine_protein_unit" description:"尿蛋白单位(g,mg)"`
-	UrineProteinTime    time.Time `json:"urine_protein_time" description:"尿蛋白检测时间"`
+	Gender              int    `json:"gender" description:"性别(0:未知 1:男 2:女)"`
+	Height              int    `json:"height" description:"身高"`
+	Weight              int    `json:"weight" description:"体重"`
+	BloodType           string `json:"blood_type" description:"血型"`
+	Birthday            Time   `json:"birthday" description:"生日"`
+	IllnessState        string `json:"illness_state" description:"病情"`
+	RenalFunctionStatus int    `json:"renal_function_status" description:"肾功能情况(0:未透析,1: 血液透析,2:腹膜透析,3:肾脏移植)"`
+	Creatinine          int    `json:"creatinine" description:"血肌酐"`
+	CreatinineUnit      string `json:"creatinine_unit" description:"肌酐单位(umol/L,mg/dl)"`
+	CreatineTime        Time   `json:"creatine_time" description:"肌酐检测时间"`
+	UrineProtein24hUnit string `json:"urine_protein_24h_unit" description:"24小时尿蛋白单位(g/24h,mg/24h)"`
+	UrineProtein24h     int    `json:"urine_protein_24h" description:"24小时尿蛋白"`
+	UrineProtein24hTime Time   `json:"urine_protein_24h_time" description:"24小时尿蛋白检测时间"`
+	UrineProtein        int    `json:"urine_protein" description:"尿蛋白"`
+	UrineProteinUnit    string `json:"urine_protein_unit" description:"尿蛋白单位(g,mg)"`
+	UrineProteinTime    Time   `json:"urine_protein_time" description:"尿蛋白检测时间"`
 }
 
 type HealthProfileResp struct {
@@ -69,25 +92,25 @@ type HealthProfileResp struct {
 	//RealName            string    `json:"real_name" description:"真实姓名"`
 	//IdCard              string    `json:"id_card" description:"身份证号"`
 	//InpatientRegPhone   string    `json:"inpatient_reg_phone" description:"住院登记手机号"`
-	Gender              int       `json:"gender" description:"性别(0:未知 1:男 2:女)"`
-	Height              int       `json:"height" description:"身高"`
-	Weight              int       `json:"weight" description:"体重"`
-	BloodType           string    `json:"blood_type" description:"血型"`
-	Birthday            time.Time `json:"birthday" description:"生日"`
-	IllnessState        string    `json:"illness_state" description:"病情"`
-	RenalFunctionStatus int       `json:"renal_function_status" description:"肾功能情况(0:未透析,1: 血液透析,2:腹膜透析,3:肾脏移植)"`
-	Creatinine          int       `json:"creatinine" description:"血肌酐"`
-	CreatinineUnit      string    `json:"creatinine_unit" description:"肌酐单位(umol/L,mg/dl)"`
-	CreatineTime        time.Time `json:"creatine_time" description:"肌酐检测时间"`
-	UrineProtein24hUnit string    `json:"urine_protein_24h_unit" description:"24小时尿蛋白单位(g/24h,mg/24h)"`
-	UrineProtein24h     int       `json:"urine_protein_24h" description:"24小时尿蛋白"`
-	UrineProtein24hTime time.Time `json:"urine_protein_24h_time" description:"24小时尿蛋白检测时间"`
-	UrineProtein        int       `json:"urine_protein" description:"尿蛋白"`
-	UrineProteinUnit    string    `json:"urine_protein_unit" description:"尿蛋白单位(g,mg)"`
-	UrineProteinTime    time.Time `json:"urine_protein_time" description:"尿蛋白检测时间"`
-	Status              int       `json:"status" description:"状态(1:有效 0:无效 )"`
-	Ctime               time.Time `json:"ctime" description:"创建时间"`
-	Mtime               time.Time `json:"mtime" description:"更新时间 "`
+	Gender              int    `json:"gender" description:"性别(0:未知 1:男 2:女)"`
+	Height              int    `json:"height" description:"身高"`
+	Weight              int    `json:"weight" description:"体重"`
+	BloodType           string `json:"blood_type" description:"血型"`
+	Birthday            Time   `json:"birthday" description:"生日"`
+	IllnessState        string `json:"illness_state" description:"病情"`
+	RenalFunctionStatus int    `json:"renal_function_status" description:"肾功能情况(0:未透析,1: 血液透析,2:腹膜透析,3:肾脏移植)"`
+	Creatinine          int    `json:"creatinine" description:"血肌酐"`
+	CreatinineUnit      string `json:"creatinine_unit" description:"肌酐单位(umol/L,mg/dl)"`
+	CreatineTime        Time   `json:"creatine_time" description:"肌酐检测时间"`
+	UrineProtein24hUnit string `json:"urine_protein_24h_unit" description:"24小时尿蛋白单位(g/24h,mg/24h)"`
+	UrineProtein24h     int    `json:"urine_protein_24h" description:"24小时尿蛋白"`
+	UrineProtein24hTime Time   `json:"urine_protein_24h_time" description:"24小时尿蛋白检测时间"`
+	UrineProtein        int    `json:"urine_protein" description:"尿蛋白"`
+	UrineProteinUnit    string `json:"urine_protein_unit" description:"尿蛋白单位(g,mg)"`
+	UrineProteinTime    Time   `json:"urine_protein_time" description:"尿蛋白检测时间"`
+	Status              int    `json:"status" description:"状态(1:有效 0:无效 )"`
+	Ctime               Time   `json:"ctime" description:"创建时间"`
+	Mtime               Time   `json:"mtime" description:"更新时间 "`
 }
 
 type DicResp struct {
@@ -95,3 +118,40 @@ type DicResp struct {
 	Name  string `json:"name" description:"字典名称"`
 	Value int    `json:"value" description:"字典值"`
 }
+
+type OpenEmqMsgReqV0 struct {
+	UserName   string `json:"username" description:"用户名"`
+	Topic      string `json:"topic" description:"主题"`
+	PeerHost   string `json:"peerhost" description:"主机"`
+	Payload    string `json:"payload" description:"负载"`
+	Id         string `json:"id"`
+	ProductKey string `json:"productKey" description:"产品key"`
+	DeviceName string `json:"deviceName" description:"设备名称"`
+	Acc        int    `json:"acc"`
+	Type       int    `json:"type"`
+	Count      int    `json:"count"`
+	DataType   int    `json:"datatype"`
+	VerifyCode string `json:"verifycode"`
+	Data       string `json:"data"`
+	Origin     string `json:"origin"`
+	Len        int    `json:"len"`
+}
+
+type OpenEmqPayloadReqVO struct {
+	ProductKey string `json:"productKey"` // 产品密钥
+	DeviceName string `json:"deviceName"` // 设备名称
+	Acc        int    `json:"acc"`        // 准确度
+	Type       int    `json:"type"`       // 类型
+	Count      int    `json:"count"`      // 计数
+	Datatype   int    `json:"datatype"`   // 数据类型
+	Verifycode int    `json:"verifycode"` // 验证码
+	Data       string `json:"data"`       // 数据
+	Origin     string `json:"origin"`     // 来源
+	Len        int    `json:"len"`        // 长度
+}
+type CheckItemScopeVO struct {
+	Index int     `json:"index"`
+	Type  int     `json:"type"`
+	Value string  `json:"value"`
+	Num   float64 `json:"num"`
+}

service/checkitemservice.go

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

service/checkrecordservice.go

@@ -21,3 +21,7 @@ func NewCheckRecordService() *CheckRecordService {
 func (s *CheckRecordService) GetCheckRecordList(pageNum, pageSize int, search string) ([]*models.CheckRecord, int, error) {
 	return nil, 0, nil
 }
+
+func (s *CheckRecordService) CreateCheckRecord(checkRecord *models.CheckRecord) error {
+	return s.wdb.Model(checkRecord).Create(checkRecord).Error
+}

service/deviceservice.go

@@ -20,12 +20,21 @@ 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
-	if err != nil {
-		return nil, err
+	var device *models.Device
+	err := s.rdb.Model(device).First(device, id).Error
+	if err == nil || err == gorm.ErrRecordNotFound {
+		err = nil
 	}
-	return &device, 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
+	if err == nil || err == gorm.ErrRecordNotFound {
+		err = nil
+	}
+	return device, err
 }
 
 func (s *DeviceService) GetMyDevices(userId uint64) ([]*models.Device, error) {
@@ -66,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).Update("delete_flag", 0, "user_id", userId).Error
+			return s.wdb.Model(dr).Where("id=?", dr.Id).Update("delete_flag", 0, "user_id", userId).Error
 		}
 	} else if dr.DeleteFlag == 1 { //直接解绑了该设备 重新绑定
 
-		return s.wdb.Model(dr).Update("delete_flag", 0).Error
+		return s.wdb.Model(dr).Where("id=?", dr.Id).Update("delete_flag", 0).Error
 
 	} else {
 		return errors.New("设备已绑定")
@@ -93,5 +102,18 @@ func (s *DeviceService) UnbindDevice(userId uint64, deviceId uint64) error {
 	if err != nil {
 		return err
 	}
-	return s.wdb.Model(dr).Update("delete_flag", 1).Error
+	return s.wdb.Model(dr).Where("id=?", dr.Id).Update("delete_flag", 1).Error
+}
+
+func (s *DeviceService) CreateDeviceMessageLog(log models.DeviceMessageLog) error {
+	return s.wdb.Model(&log).Create(&log).Error
+}
+
+func (s *DeviceService) GetDeviceRelateByDeviceId(deviceId uint64) (*models.DeviceRelate, error) {
+	dr := &models.DeviceRelate{}
+	err := s.rdb.Model(dr).Where("device_id = ?", deviceId).First(dr).Error
+	if err != nil && err != gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	return dr, nil
 }

service/userhealthprofileservice.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"sws_xcx/models"
+	"time"
 
 	"github.com/jinzhu/gorm"
 )
@@ -23,12 +24,18 @@ func NewUserHealthProfileService() *HealthProfileService {
 func (s *HealthProfileService) GetUserHealthProfileByUserId(userId uint64) (*models.UserHealthProfile, error) {
 	p := &models.UserHealthProfile{}
 	err := s.rdb.Find(p, "user_id = ?", userId).Error
+	if err == nil || err == gorm.ErrRecordNotFound {
+		err = nil
+	}
 	return p, err
 }
 
 func (s *HealthProfileService) Get(id uint64) (models.UserHealthProfile, error) {
 	p := &models.UserHealthProfile{}
 	err := s.rdb.First(p, id).Error
+	if err == nil || err == gorm.ErrRecordNotFound {
+		err = nil
+	}
 	return *p, err
 }
 
@@ -45,7 +52,12 @@ func (s *HealthProfileService) SavePatientInfo(userId uint64, realName string, i
 	p.UserId = userId
 	p.RealName = realName
 	p.InpatientRegPhone = regPhone
-	return s.wdb.Save(p).Error
+	p.IdCard = idCard
+
+	if p.Id == 0 {
+		return s.wdb.Create(p).Error
+	}
+	return s.wdb.Model(p).Update(p).Error
 }
 
 func (s *HealthProfileService) SaveHealthProfile(userId uint64, req models.SaveHealthProfileReq) error {
@@ -59,9 +71,9 @@ func (s *HealthProfileService) SaveHealthProfile(userId uint64, req models.SaveH
 	}
 
 	p.UserId = userId
-	p.Birthday = req.Birthday
+	p.Birthday = time.Time(req.Birthday)
 	p.BloodType = req.BloodType
-	p.CreatineTime = req.CreatineTime
+	p.CreatineTime = time.Time(req.CreatineTime)
 	p.Creatinine = req.Creatinine
 	p.CreatinineUnit = req.CreatinineUnit
 	p.Gender = req.Gender
@@ -70,13 +82,16 @@ func (s *HealthProfileService) SaveHealthProfile(userId uint64, req models.SaveH
 	p.RenalFunctionStatus = req.RenalFunctionStatus
 	p.UrineProtein = req.UrineProtein
 	p.UrineProtein24h = req.UrineProtein24h
-	p.UrineProtein24hTime = req.UrineProtein24hTime
+	p.UrineProtein24hTime = time.Time(req.UrineProtein24hTime)
 	p.UrineProtein24hUnit = req.UrineProtein24hUnit
-	p.UrineProteinTime = req.UrineProteinTime
+	p.UrineProteinTime = time.Time(req.UrineProteinTime)
 	p.UrineProteinUnit = req.UrineProteinUnit
 	p.Weight = req.Weight
 
-	return s.wdb.Save(p).Error
+	if p.Id == 0 {
+		return s.wdb.Create(p).Error
+	}
+	return s.wdb.Model(p).Update(p).Error
 }
 
 func (s *HealthProfileService) Save(p *models.UserHealthProfile) error {

service/userservice.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"sws_xcx/models"
+	"time"
 
 	"github.com/jinzhu/gorm"
 )
@@ -40,7 +41,8 @@ func (s *XcxUserService) GetOrCreate(openId string, unionId string) (*models.Xcx
 
 func (s *XcxUserService) UpdateUser(user *models.XcxUser) error {
 
-	db := writeDb.Where("id = ?", user.Id).Update(user)
+	user.Mtime = time.Now()
+	db := writeDb.Model(user).Update(user)
 
 	return db.Error
 

tests/default_test.go

@@ -1,15 +1,23 @@
 package test
 
 import (
+	"encoding/json"
+	"errors"
+	"fmt"
 	"path/filepath"
 	"runtime"
+	"strconv"
+	"strings"
+	"sws_xcx/models"
 	_ "sws_xcx/routers"
 	"sws_xcx/service"
+	"sws_xcx/utils"
 	"testing"
 
 	//beego "github.com/beego/beego/v2/server/web"
 	//"github.com/beego/beego/v2/core/logs"
 	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
 	"github.com/medivhzhan/weapp/v3/auth"
 	// "github.com/smartystreets/goconvey/convey"
 )
@@ -36,6 +44,7 @@ func TestGet(t *testing.T) {
 	//                 So(w.Body.Len(), ShouldBeGreaterThan, 0)
 	//         })
 	// })
+	t.Log("TestGet")
 }
 
 func TestWxappSessionCode(t *testing.T) {
@@ -57,3 +66,175 @@ func TestWxappSessionCode(t *testing.T) {
 	t.Logf("resp: %+v", *resp)
 
 }
+func TestJson(t *testing.T) {
+	req := `{"id":1,"nick_name":"zhangsan","ctime":"2019-11-20 16:49:08"}`
+	u := models.UserInfoResp{}
+	err := json.Unmarshal([]byte(req), &u)
+	if err != nil {
+		t.Error(err)
+	}
+	t.Logf("u:%+v", u)
+
+}
+
+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{}
+	err := json.Unmarshal(req, msg)
+	if err != nil {
+		t.Error(err)
+	}
+
+	ds := service.NewDeviceService()
+
+	device, err := ds.GetDeviceByNo(msg.DeviceName)
+	if err != nil && err != gorm.ErrRecordNotFound {
+		utils.ErrorLog("GetDeviceByNo %v:", err)
+		t.Error(err)
+	}
+	if device == nil {
+		utils.WarningLog("非本系统设备，数据废弃")
+		return
+	}
+	err = ds.CreateDeviceMessageLog(models.DeviceMessageLog{
+		DeviceName: msg.DeviceName,
+		Content:    string(req),
+		EventType:  EventType,
+		MessageId:  msg.Id,
+		Topic:      msg.Topic,
+	})
+
+	if err != nil {
+		utils.ErrorLog("CreateDeviceMessageLog %v:", err)
+		t.Error(err)
+	}
+	payload := &models.OpenEmqPayloadReqVO{}
+	err = json.Unmarshal([]byte(msg.Payload), payload)
+	if err != nil {
+		utils.ErrorLog("json.Unmarshal %v:", err)
+		t.Error(err)
+	}
+	if payload.Len != 23 {
+		utils.WarningLog("非标准数据，数据废弃:%v", msg.Payload)
+	}
+
+	dr, err := ds.GetDeviceRelateByDeviceId(device.Id)
+	if err != nil {
+		utils.ErrorLog("GetDeviceRelateByDeviceId %v:", err)
+		t.Error(err)
+	}
+
+	checkRecord := &models.CheckRecord{
+
+		Acc:          payload.Acc,
+		PutSources:   EventType,
+		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)
+			t.Error(err)
+		}
+		checkRecord.UserHealthProfileId = int64(hp.Id)
+	}
+	crs := service.NewCheckRecordService()
+	err = crs.CreateCheckRecord(checkRecord)
+	if err != nil {
+		utils.ErrorLog("CreateCheckRecord %v:", err)
+		t.Error(err)
+	}
+	t.Log(checkRecord.Id)
+	t.Log(payload.Data)
+
+	da := strings.Split(payload.Data, ",")
+	count := payload.Count
+	if len(da) != count {
+		t.Logf("数据长度不匹配,截取存储 %+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)
+		t.Error(err)
+	}
+
+	if len(checkItems) < count {
+		t.Error("接收的数据于检查项目配置不一致")
+	}
+
+	alerts := make([]string, 0)
+	for i := 0; i < count; i++ {
+		vi, _ := strconv.Atoi(da[i])
+		err = createCheckRecordItem(checkItems, checkRecord.Id, alerts, vi, i+1)
+		if err != nil {
+			utils.ErrorLog("createCheckRecordItem valule:%v, err:%v:", vi, err)
+		}
+	}
+
+	if len(alerts) > 0 {
+		//save alerts
+	}
+
+}
+
+func createCheckRecordItem(items []*models.CheckItem, crId int64, alerts []string, vi, n int) 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))
+	}
+	//create cri
+	return nil
+}
+
+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
+}

tests/gendb_test.go

@@ -1,8 +1,11 @@
 package test
 
 import (
+	"sws_xcx/models"
 	"sws_xcx/service"
 	"testing"
+
+	"github.com/jinzhu/gorm"
 )
 
 func init() {
@@ -16,3 +19,44 @@ func TestGenDb(t *testing.T) {
 		t.Error(err)
 	}
 }
+
+func TestUpdate(t *testing.T) {
+
+	s := service.NewXcxUserService()
+
+	u := &models.XcxUser{Id: 1, UnionId: "123"}
+
+	err := s.UpdateUser(u)
+	if err != nil {
+		t.Error(err)
+	}
+
+}
+
+func TestDBGet(t *testing.T) {
+	wdb := service.WriteDB()
+	p := &models.UserHealthProfile{}
+	err := wdb.Model(p).First(p, "user_id = ?", 2).Error
+	if err != nil && err != gorm.ErrRecordNotFound {
+		t.Error(err)
+	}
+
+	t.Log(p)
+}
+
+func TestHealthProfileService_SavePatientInfo(t *testing.T) {
+
+	userId := uint64(1)
+	realName := "John Doe"
+	idCard := "1234567890"
+	regPhone := "123-456-7890"
+
+	s := service.NewUserHealthProfileService()
+
+	// 调用待测试的函数
+	err := s.SavePatientInfo(userId, realName, idCard, regPhone)
+
+	if err != nil {
+		t.Error(err)
+	}
+}