提交

陆恒
1 parent a2520e5b
Showing 3 changed files with 71 additions and 13 deletions Show diff stats
src/HttpServer/logic/datadef.go
src/HttpServer/logic/function.go
src/HttpServer/logic/logic.go
@@ -127,9 +127,14 @@ type InviteWorkDesc struct {
 }
+type InviteWorkOffDesc struct {
+	Uuid int		`json:"uuid"` //打工者ID
+
+}
 type InviteWorksDesc struct {
 	Invite_data []InviteWorkDesc `json:"invite_data"`
+	Offlinelist []InviteWorkOffDesc `json:"offlinelist"`
 }
 type InviteWorkResult struct {
@@ -779,32 +779,67 @@ func (wl *WorkList) IsInWork(uuid int) bool {
 	return isIn
 }
-func GetdagongList(uuid int) (*WorkList,error) {
+//此接口为处理返回所有的打工列表
+func GetRealDagonglist(uuid int) (*WorkList,*WorkList,error) {
+	vv,err := redishandler.GetRedisClient().HGet(redis.USER_INVITEWORK_RELATION,strconv.Itoa(uuid))
+
+	if err != nil {
+		//logger.Error("GetdagongList err=%v",err)
+		return nil,nil,nil
+	}
+
+	var reallist WorkList
+	var list WorkList
+	err = json.Unmarshal([]byte(vv),&list)
+	if err != nil {
+		logger.Error("GetRealDagonglist err=%v",err)
+		return nil,nil,err
+	}
+
+	//此处时间改为600s
+	nowtime := int(time.Now().Unix())
+	for i:=0;i<len(list);i++ {
+		if nowtime  > 600 + list[i].InviteTime {
+			//list = append(list[:i],list[i+1:]...)
+			//i--
+		}else {
+			reallist = append(reallist,list[i])
+		}
+	}
+
+	return &list,&reallist,nil
+}
+
+func GetdagongList(uuid int) (*WorkList,[]int,error) {
 	//需要判断 超过时间  四小时的删除
 	vv,err := redishandler.GetRedisClient().HGet(redis.USER_INVITEWORK_RELATION,strconv.Itoa(uuid))
 	if err != nil {
 		//logger.Error("GetdagongList err=%v",err)
-		return nil,nil
+		return nil,nil,nil
 	}
 	var list WorkList
 	err = json.Unmarshal([]byte(vv),&list)
 	if err != nil {
 		logger.Error("GetdagongList err=%v",err)
-		return nil,err
+		return nil,nil,err
 	}
+	var offlist []int
 	//此处时间改为600s
 	nowtime := int(time.Now().Unix())
 	for i:=0;i<len(list);i++ {
 		if nowtime  > 600 + list[i].InviteTime {
 			list = append(list[:i],list[i+1:]...)
 			i--
+			offlist = append(offlist,list[i].Uuid)
 		}
 	}
-	return &list,nil
+
+
+	return &list,offlist,nil
 }
 //加入打工列表
@@ -320,7 +320,7 @@ func HandleQueryInviteWork(w http.ResponseWriter, data string) {
 			break
 		}
-		dalist,_ := GetdagongList(rdata.Uuid)
+		dalist,offlist,_ := GetdagongList(rdata.Uuid)
 		if dalist == nil {
 			resp.Result.Code = ERROR_OK
 			break
@@ -330,6 +330,12 @@ func HandleQueryInviteWork(w http.ResponseWriter, data string) {
 			resp.Result.Data.Invite_data = append(resp.Result.Data.Invite_data,val)
 		}
+		for _,val := range offlist {
+			var tmp InviteWorkOffDesc
+			tmp.Uuid = val
+			resp.Result.Data.Offlinelist = append(resp.Result.Data.Offlinelist,tmp)
+		}
+
 		resp.Result.Code = ERROR_OK
 		break
 	}
@@ -384,7 +390,8 @@ func HandleEnterInvite(w http.ResponseWriter, data string) {
 			redishandler.GetRedisClient().HSet(rkey,strconv.Itoa(rdata.Selfuuid),"0")
 		}else {
 			//邀请打工
-			invitelist,err := GetdagongList(rdata.Inviteuuid)
+			//invitelist,err := GetdagongList(rdata.Inviteuuid)
+			invitelist,reallist,err :=GetRealDagonglist(rdata.Inviteuuid)
 			if err != nil {
 				/*logger.Error("HandleEnterInvite GetdagongList failed")
 				resp.Result.Code = ERROR_SRVDB_FAILED
@@ -392,8 +399,8 @@ func HandleEnterInvite(w http.ResponseWriter, data string) {
 				break*/
 			}
-			if invitelist != nil {
-				if len(*invitelist)  > 2 {
+			if reallist != nil {
+				if len(*reallist)  > 2 {
 					logger.Error("HandleEnterInvite dagong num is full")
 					resp.Result.Code = ERROR_DAGONG_FULL
 					//resp.Message = "dagong full"
@@ -401,20 +408,31 @@ func HandleEnterInvite(w http.ResponseWriter, data string) {
 				}
 				//需要判断是否已经处于打工中
-				if invitelist.IsInWork(rdata.Selfuuid) {
+				if reallist.IsInWork(rdata.Selfuuid) {
 					logger.Error("HandleEnterInvite IsInWork")
 					resp.Result.Code = ERROR_DAGONG_FULL
 					//resp.Message = "ERROR_ALREADY_INWORK"
 					break
 				}
-				err = AddDagongList(rdata.Selfuuid,rdata.Inviteuuid,*invitelist)
+				if invitelist != nil {
+					err = AddDagongList(rdata.Selfuuid,rdata.Inviteuuid,*invitelist)
+				}else {
+					//此时列表为空 新建一个
+					var newlist WorkList
+					err = AddDagongList(rdata.Selfuuid,rdata.Inviteuuid,newlist)
+				}
+
 			}else {
 				//此时列表为空 新建一个
-				var newlist WorkList
-				err = AddDagongList(rdata.Selfuuid,rdata.Inviteuuid,newlist)
-
+				if invitelist != nil {
+					err = AddDagongList(rdata.Selfuuid,rdata.Inviteuuid,*invitelist)
+				}else {
+					//此时列表为空 新建一个
+					var newlist WorkList
+					err = AddDagongList(rdata.Selfuuid,rdata.Inviteuuid,newlist)
+				}
 			}
	@@ -779,32 +779,67 @@ func (wl *WorkList) IsInWork(uuid int) bool {		@@ -779,32 +779,67 @@ func (wl *WorkList) IsInWork(uuid int) bool {
779	return isIn	779	return isIn
780	}	780	}
781		781
782	-func GetdagongList(uuid int) (*WorkList,error) {	782	+//此接口为处理返回所有的打工列表
		783	+func GetRealDagonglist(uuid int) (WorkList,WorkList,error) {
		784	+ vv,err := redishandler.GetRedisClient().HGet(redis.USER_INVITEWORK_RELATION,strconv.Itoa(uuid))
		785	+
		786	+ if err != nil {
		787	+ //logger.Error("GetdagongList err=%v",err)
		788	+ return nil,nil,nil
		789	+ }
		790	+
		791	+ var reallist WorkList
		792	+ var list WorkList
		793	+ err = json.Unmarshal([]byte(vv),&list)
		794	+ if err != nil {
		795	+ logger.Error("GetRealDagonglist err=%v",err)
		796	+ return nil,nil,err
		797	+ }
		798	+
		799	+ //此处时间改为600s
		800	+ nowtime := int(time.Now().Unix())
		801	+ for i:=0;i<len(list);i++ {
		802	+ if nowtime > 600 + list[i].InviteTime {
		803	+ //list = append(list[:i],list[i+1:]...)
		804	+ //i--
		805	+ }else {
		806	+ reallist = append(reallist,list[i])
		807	+ }
		808	+ }
		809	+
		810	+ return &list,&reallist,nil
		811	+}
		812	+
		813	+func GetdagongList(uuid int) (*WorkList,[]int,error) {
783	//需要判断超过时间四小时的删除	814	//需要判断超过时间四小时的删除
784	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))
785		816
786	if err != nil {	817	if err != nil {
787	//logger.Error("GetdagongList err=%v",err)	818	//logger.Error("GetdagongList err=%v",err)
788	- return nil,nil	819	+ return nil,nil,nil
789	}	820	}
790		821
791	var list WorkList	822	var list WorkList
792	err = json.Unmarshal([]byte(vv),&list)	823	err = json.Unmarshal([]byte(vv),&list)
793	if err != nil {	824	if err != nil {
794	logger.Error("GetdagongList err=%v",err)	825	logger.Error("GetdagongList err=%v",err)
795	- return nil,err	826	+ return nil,nil,err
796	}	827	}
797		828
		829	+ var offlist []int
798	//此处时间改为600s	830	//此处时间改为600s
799	nowtime := int(time.Now().Unix())	831	nowtime := int(time.Now().Unix())
800	for i:=0;i<len(list);i++ {	832	for i:=0;i<len(list);i++ {
801	if nowtime > 600 + list[i].InviteTime {	833	if nowtime > 600 + list[i].InviteTime {
802	list = append(list[:i],list[i+1:]...)	834	list = append(list[:i],list[i+1:]...)
803	i--	835	i--
		836	+ offlist = append(offlist,list[i].Uuid)
804	}	837	}
805	}	838	}
806		839
807	- return &list,nil	840	+
		841	+
		842	+ return &list,offlist,nil
808	}	843	}
809		844
810	//加入打工列表	845	//加入打工列表