提交

陆恒
1 parent 43d121e8
Showing 3 changed files with 16 additions and 14 deletions Show diff stats
src/HttpServer/logic/datadef.go
src/HttpServer/logic/function.go
src/HttpServer/logic/logic.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"`
 }
  
  
@@ -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<len(list);i++ {
 		if nowtime  > 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--
@@ -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
...	...	@@ -129,6 +129,7 @@ type InviteWorkDesc struct {
129	129
130	130	type InviteWorkOffDesc struct {
131	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	156
156	157
157	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
...	...
...	...	@@ -810,7 +810,7 @@ func GetRealDagonglist(uuid int) (WorkList,WorkList,error) {
810	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	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	826	return nil,nil,err
827	827	}
828	828
829		- var offlist []int
	829	+ var offlist []InviteWorkOffDesc
830	830	//此处时间改为600s
831	831	nowtime := int(time.Now().Unix())
832	832	for i:=0;i<len(list);i++ {
833	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	838	list = append(list[:i],list[i+1:]...)
836	839
837	840	i--
...	...
...	...	@@ -277,26 +277,26 @@ func HandleQueryInvite(w http.ResponseWriter, data string) {
277	277	func HandleSaveDataBackup(w http.ResponseWriter, data string) {
278	278	SetHeader(w)
279	279	var resp SaveDataBackupResp
280		- resp.Code = 0
	280	+ resp.Status = "true"
281	281	var rdata SaveDataBackupReq
282	282	err := json.Unmarshal([]byte(data), &rdata)
283	283	for {
284	284	if err != nil {
285	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	288	break
289	289	}
290	290
291	291	err = redishandler.GetRedisClient().HSet(redis.USER_BACKUP_DATA,strconv.Itoa(rdata.Uuid),rdata.Value)
292	292	if err != nil {
293	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	296	break
297	297	}
298	298
299		- resp.Code = ERROR_OK
	299	+ resp.Result.Code = ERROR_OK
300	300	break
301	301	}
302	302
...	...	@@ -331,9 +331,7 @@ func HandleQueryInviteWork(w http.ResponseWriter, data string) {
331	331	}
332	332
333	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	337	resp.Result.Code = ERROR_OK
...	...