diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go index 87e5009..b0e0f98 100644 --- a/src/HttpServer/logic/datadef.go +++ b/src/HttpServer/logic/datadef.go @@ -129,6 +129,7 @@ type InviteWorkDesc struct { type InviteWorkOffDesc struct { Uuid int `json:"uuid"` //打工者ID + InviteTime int `json:"invitetime"` //打工者ID } @@ -155,8 +156,8 @@ type SaveDataBackupReq struct{ type SaveDataBackupResp struct { - Code int `json:"code"` - Message string `json:"message"` + Status string `json:"status"` + Result CommonResult `json:"result"` } diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go index 7c4f727..bfd99cd 100644 --- a/src/HttpServer/logic/function.go +++ b/src/HttpServer/logic/function.go @@ -810,7 +810,7 @@ func GetRealDagonglist(uuid int) (*WorkList,*WorkList,error) { return &list,&reallist,nil } -func GetdagongList(uuid int) (*WorkList,[]int,error) { +func GetdagongList(uuid int) (*WorkList,[]InviteWorkOffDesc,error) { //需要判断 超过时间 四小时的删除 vv,err := redishandler.GetRedisClient().HGet(redis.USER_INVITEWORK_RELATION,strconv.Itoa(uuid)) @@ -826,12 +826,15 @@ func GetdagongList(uuid int) (*WorkList,[]int,error) { return nil,nil,err } - var offlist []int + var offlist []InviteWorkOffDesc //此处时间改为600s nowtime := int(time.Now().Unix()) for i:=0;i 600 + list[i].InviteTime { - offlist = append(offlist,list[i].Uuid) + var tmp InviteWorkOffDesc + tmp.Uuid = list[i].Uuid + tmp.InviteTime = list[i].InviteTime + offlist = append(offlist,tmp) list = append(list[:i],list[i+1:]...) i-- diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index caad08e..8dfea3e 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -277,26 +277,26 @@ func HandleQueryInvite(w http.ResponseWriter, data string) { func HandleSaveDataBackup(w http.ResponseWriter, data string) { SetHeader(w) var resp SaveDataBackupResp - resp.Code = 0 + resp.Status = "true" var rdata SaveDataBackupReq err := json.Unmarshal([]byte(data), &rdata) for { if err != nil { logger.Error("HandleQueryInviteWork json unmarshal failed=%v", err) - resp.Code = ERROR_JSONUNMASHFAILED - resp.Message = "json unmarshal failed" + resp.Result.Code = ERROR_JSONUNMASHFAILED + resp.Result.Data = "json unmarshal failed" break } err = redishandler.GetRedisClient().HSet(redis.USER_BACKUP_DATA,strconv.Itoa(rdata.Uuid),rdata.Value) if err != nil { logger.Error("HandleQueryInviteWork save failed=%v", err) - resp.Code = ERROR_SRVDB_FAILED - resp.Message = "ERROR_SRVDB_FAILED" + resp.Result.Code = ERROR_SRVDB_FAILED + resp.Result.Data = "ERROR_SRVDB_FAILED" break } - resp.Code = ERROR_OK + resp.Result.Code = ERROR_OK break } @@ -331,9 +331,7 @@ func HandleQueryInviteWork(w http.ResponseWriter, data string) { } for _,val := range offlist { - var tmp InviteWorkOffDesc - tmp.Uuid = val - resp.Result.Data.Offlinelist = append(resp.Result.Data.Offlinelist,tmp) + resp.Result.Data.Offlinelist = append(resp.Result.Data.Offlinelist,val) } resp.Result.Code = ERROR_OK -- libgit2 0.21.0