Merge branch 'dwl0112' of wangbin/log-server into master

api/v1/task/game_task.go

@@ -6,6 +6,7 @@ import (
 	"log-server/global"
 	"log-server/model/common/response"
 	"log-server/model/task/request"
+	taskResponse "log-server/model/task/response"
 	"log-server/utils"
 )
 
@@ -51,12 +52,13 @@ func (s *GameTaskApi) GetGameTaskList(c *gin.Context) {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	if list, total, err := taskService.GetGameTaskInfoList(paramsInfo.GameTask, paramsInfo.PageInfo, paramsInfo.OrderKey, paramsInfo.Desc); err != nil {
+	if list, option, total, err := taskService.GetGameTaskInfoList(paramsInfo.GameTask, paramsInfo.PageInfo, paramsInfo.OrderKey, paramsInfo.Desc); err != nil {
 		global.GVA_LOG.Error("获取失败!", zap.Error(err))
 		response.FailWithMessage("获取失败", c)
 	} else {
-		response.OkWithDetailed(response.PageResult{
+		response.OkWithDetailed(taskResponse.GameTaskPageResult{
 			List:     list,
+			OptionList: option,
 			Total:    total,
 			Page:     paramsInfo.Page,
 			PageSize: paramsInfo.PageSize,

config.yaml

@@ -93,7 +93,7 @@ mysql:
   config: charset=utf8mb4&parseTime=True&loc=Local
   db-name: backend-server
   username: backend-server
-  password: 123456
+  password: 2f88080966
   max-idle-conns: 10
   max-open-conns: 100
   log-mode: info
@@ -119,8 +119,8 @@ qiniu:
   use-cdn-domains: false
 redis:
   db: 8
-  addr: 120.92.140.137:6379
-  password: "rootredis!fu>6Wy2"
+  addr: 127.0.0.1:6379
+  password: ""
 system:
   env: public
   addr: 8888
@@ -159,3 +159,5 @@ zap:
   log-in-console: true
 send-url:
   computer-send-url: "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=7d095d5b-8240-45fd-a68c-baff3628d83b111"
+#extranet-domain:
+#  control: "http://192.168.50.35:8099"

model/task/option.go

@@ -0,0 +1,29 @@
+package task
+
+type GamePortOption struct {
+	Id int
+	ChannelName string
+}
+
+type LoginTypeOption struct {
+	Id int
+	LoginName string
+}
+
+type AccountTypeOption struct {
+	Id int
+	TypeName string
+}
+
+type GameListOption struct {
+	Id int	`json:"game_id"`
+	GameName string	`json:"game_name"`
+}
+
+
+type Option struct {
+	GamePortOptions []GamePortOption `json:"game_port"`
+	LoginTypeOptions []LoginTypeOption `json:"login_type"`
+	AccountTypeOptions []AccountTypeOption `json:"account_type"`
+	GameListOptions []GameListOption `json:"game_list"`
+}

model/task/response/game_task_page_result.go

@@ -0,0 +1,9 @@
+package response
+
+type GameTaskPageResult struct {
+	List       interface{} `json:"list"`
+	OptionList interface{} `json:"option"`
+	Total      int64       `json:"total"`
+	Page       int         `json:"page"`
+	PageSize   int         `json:"pageSize"`
+}

service/task/game_task.go

@@ -210,7 +210,7 @@ func (s *GameTask) GetControlTaskId(gameId int) (d *ControlTaskId, err error) {
 //@description: 分页获取数据,
 //@param: card card.Card, info request.PageInfo, order string, desc bool
 //@return: list interface{}, total int64, err error
-func (apiService *GameTask) GetGameTaskInfoList(api task.GameTask, info request.PageInfo, order string, desc bool) (list interface{}, total int64, err error) {
+func (apiService *GameTask) GetGameTaskInfoList(api task.GameTask, info request.PageInfo, order string, desc bool) (list interface{}, options interface{}, total int64, err error) {
 	limit := info.PageSize
 	offset := info.PageSize * (info.Page - 1)
 	db := global.GVA_DB.Model(&task.GameTask{})
@@ -230,8 +230,20 @@ func (apiService *GameTask) GetGameTaskInfoList(api task.GameTask, info request.
 
 	err = db.Count(&total).Error
 
+
+
+	//查找厂商名称，登录类型名称、账号类型名称
+	option := task.Option{}
+	global.GVA_DB.Table("game_channel").Select("id","channel_name").Find(&option.GamePortOptions)
+	global.GVA_DB.Table("login_type").Select("id", "login_name").Find(&option.LoginTypeOptions)
+	global.GVA_DB.Table("account_type").Select("id", "type_name").Find(&option.AccountTypeOptions)
+	global.GVA_DB.Table("game_list").Select("id", "game_name").Find(&option.GameListOptions)
+	//fmt.Println(option)
+
+
+
 	if err != nil {
-		return apiList, total, err
+		return apiList, option , total, err
 	} else {
 		db = db.Limit(limit).Offset(offset)
 		if order != "" {
@@ -250,7 +262,7 @@ func (apiService *GameTask) GetGameTaskInfoList(api task.GameTask, info request.
 				}
 			} else { // didn't matched any order key in `orderMap`
 				err = fmt.Errorf("非法的排序字段: %v", order)
-				return apiList, total, err
+				return apiList, option, total, err
 			}
 
 			err = db.Order(OrderStr).Find(&apiList).Error
@@ -285,7 +297,7 @@ func (apiService *GameTask) GetGameTaskInfoList(api task.GameTask, info request.
 		}
 
 	}
-	return apisReply, total, err
+	return apisReply, option,  total, err
 }
 
 //@author: [piexlmax](https://github.com/piexlmax)

service/typeManage/tm_gameList.go

@@ -83,7 +83,7 @@ func (g *GameListService) GetGameList(game typeManage.SearchGameListParams, info
 	global.GVA_DB.Table("login_type").Select("login_name").Find(&option.LoginTypeOptions)
 
 
-	fmt.Println(option)
+	//fmt.Println(option)
 
 
 

service/typeManage/tm_responsiblePerson.go

@@ -33,7 +33,7 @@ func (r *ResponsiblePersonService) CreateResponsiblePerson(person typeManage.Res
 	}
 	//不存在同名员工
 	//根据image是否为空来判断是否需要图片处理
-	fmt.Println(person.Img)
+	//fmt.Println(person.Img)
 	//if person.Img != "" {
 	//	var (
 	//		enc  = base64.StdEncoding