Commit 7d5a437f249d03a8b153213c01957a583bf99f98
1 parent
43d121e8
Exists in
master
提交
Showing
3 changed files
with
16 additions
and
14 deletions
Show diff stats
src/HttpServer/logic/datadef.go
| @@ -129,6 +129,7 @@ type InviteWorkDesc struct { | @@ -129,6 +129,7 @@ type InviteWorkDesc struct { | ||
| 129 | 129 | ||
| 130 | type InviteWorkOffDesc struct { | 130 | type InviteWorkOffDesc struct { |
| 131 | Uuid int `json:"uuid"` //打工者ID | 131 | Uuid int `json:"uuid"` //打工者ID |
| 132 | + InviteTime int `json:"invitetime"` //打工者ID | ||
| 132 | 133 | ||
| 133 | } | 134 | } |
| 134 | 135 | ||
| @@ -155,8 +156,8 @@ type SaveDataBackupReq struct{ | @@ -155,8 +156,8 @@ type SaveDataBackupReq struct{ | ||
| 155 | 156 | ||
| 156 | 157 | ||
| 157 | type SaveDataBackupResp struct { | 158 | type SaveDataBackupResp struct { |
| 158 | - Code int `json:"code"` | ||
| 159 | - Message string `json:"message"` | 159 | + Status string `json:"status"` |
| 160 | + Result CommonResult `json:"result"` | ||
| 160 | } | 161 | } |
| 161 | 162 | ||
| 162 | 163 |
src/HttpServer/logic/function.go
| @@ -810,7 +810,7 @@ func GetRealDagonglist(uuid int) (*WorkList,*WorkList,error) { | @@ -810,7 +810,7 @@ func GetRealDagonglist(uuid int) (*WorkList,*WorkList,error) { | ||
| 810 | return &list,&reallist,nil | 810 | return &list,&reallist,nil |
| 811 | } | 811 | } |
| 812 | 812 | ||
| 813 | -func GetdagongList(uuid int) (*WorkList,[]int,error) { | 813 | +func GetdagongList(uuid int) (*WorkList,[]InviteWorkOffDesc,error) { |
| 814 | //需要判断 超过时间 四小时的删除 | 814 | //需要判断 超过时间 四小时的删除 |
| 815 | vv,err := redishandler.GetRedisClient().HGet(redis.USER_INVITEWORK_RELATION,strconv.Itoa(uuid)) | 815 | vv,err := redishandler.GetRedisClient().HGet(redis.USER_INVITEWORK_RELATION,strconv.Itoa(uuid)) |
| 816 | 816 | ||
| @@ -826,12 +826,15 @@ func GetdagongList(uuid int) (*WorkList,[]int,error) { | @@ -826,12 +826,15 @@ func GetdagongList(uuid int) (*WorkList,[]int,error) { | ||
| 826 | return nil,nil,err | 826 | return nil,nil,err |
| 827 | } | 827 | } |
| 828 | 828 | ||
| 829 | - var offlist []int | 829 | + var offlist []InviteWorkOffDesc |
| 830 | //此处时间改为600s | 830 | //此处时间改为600s |
| 831 | nowtime := int(time.Now().Unix()) | 831 | nowtime := int(time.Now().Unix()) |
| 832 | for i:=0;i<len(list);i++ { | 832 | for i:=0;i<len(list);i++ { |
| 833 | if nowtime > 600 + list[i].InviteTime { | 833 | if nowtime > 600 + list[i].InviteTime { |
| 834 | - offlist = append(offlist,list[i].Uuid) | 834 | + var tmp InviteWorkOffDesc |
| 835 | + tmp.Uuid = list[i].Uuid | ||
| 836 | + tmp.InviteTime = list[i].InviteTime | ||
| 837 | + offlist = append(offlist,tmp) | ||
| 835 | list = append(list[:i],list[i+1:]...) | 838 | list = append(list[:i],list[i+1:]...) |
| 836 | 839 | ||
| 837 | i-- | 840 | i-- |
src/HttpServer/logic/logic.go
| @@ -277,26 +277,26 @@ func HandleQueryInvite(w http.ResponseWriter, data string) { | @@ -277,26 +277,26 @@ func HandleQueryInvite(w http.ResponseWriter, data string) { | ||
| 277 | func HandleSaveDataBackup(w http.ResponseWriter, data string) { | 277 | func HandleSaveDataBackup(w http.ResponseWriter, data string) { |
| 278 | SetHeader(w) | 278 | SetHeader(w) |
| 279 | var resp SaveDataBackupResp | 279 | var resp SaveDataBackupResp |
| 280 | - resp.Code = 0 | 280 | + resp.Status = "true" |
| 281 | var rdata SaveDataBackupReq | 281 | var rdata SaveDataBackupReq |
| 282 | err := json.Unmarshal([]byte(data), &rdata) | 282 | err := json.Unmarshal([]byte(data), &rdata) |
| 283 | for { | 283 | for { |
| 284 | if err != nil { | 284 | if err != nil { |
| 285 | logger.Error("HandleQueryInviteWork json unmarshal failed=%v", err) | 285 | logger.Error("HandleQueryInviteWork json unmarshal failed=%v", err) |
| 286 | - resp.Code = ERROR_JSONUNMASHFAILED | ||
| 287 | - resp.Message = "json unmarshal failed" | 286 | + resp.Result.Code = ERROR_JSONUNMASHFAILED |
| 287 | + resp.Result.Data = "json unmarshal failed" | ||
| 288 | break | 288 | break |
| 289 | } | 289 | } |
| 290 | 290 | ||
| 291 | err = redishandler.GetRedisClient().HSet(redis.USER_BACKUP_DATA,strconv.Itoa(rdata.Uuid),rdata.Value) | 291 | err = redishandler.GetRedisClient().HSet(redis.USER_BACKUP_DATA,strconv.Itoa(rdata.Uuid),rdata.Value) |
| 292 | if err != nil { | 292 | if err != nil { |
| 293 | logger.Error("HandleQueryInviteWork save failed=%v", err) | 293 | logger.Error("HandleQueryInviteWork save failed=%v", err) |
| 294 | - resp.Code = ERROR_SRVDB_FAILED | ||
| 295 | - resp.Message = "ERROR_SRVDB_FAILED" | 294 | + resp.Result.Code = ERROR_SRVDB_FAILED |
| 295 | + resp.Result.Data = "ERROR_SRVDB_FAILED" | ||
| 296 | break | 296 | break |
| 297 | } | 297 | } |
| 298 | 298 | ||
| 299 | - resp.Code = ERROR_OK | 299 | + resp.Result.Code = ERROR_OK |
| 300 | break | 300 | break |
| 301 | } | 301 | } |
| 302 | 302 | ||
| @@ -331,9 +331,7 @@ func HandleQueryInviteWork(w http.ResponseWriter, data string) { | @@ -331,9 +331,7 @@ func HandleQueryInviteWork(w http.ResponseWriter, data string) { | ||
| 331 | } | 331 | } |
| 332 | 332 | ||
| 333 | for _,val := range offlist { | 333 | for _,val := range offlist { |
| 334 | - var tmp InviteWorkOffDesc | ||
| 335 | - tmp.Uuid = val | ||
| 336 | - resp.Result.Data.Offlinelist = append(resp.Result.Data.Offlinelist,tmp) | 334 | + resp.Result.Data.Offlinelist = append(resp.Result.Data.Offlinelist,val) |
| 337 | } | 335 | } |
| 338 | 336 | ||
| 339 | resp.Result.Code = ERROR_OK | 337 | resp.Result.Code = ERROR_OK |