添加游戏任务配置模拟器类型

api/v1/task/task_conf.go

@@ -67,7 +67,7 @@ func (b *TaskConfApi) DownloadFile(c *gin.Context) {
 //获取所有游戏脚本列表
 func (b *TaskConfApi) GetScriptList(c *gin.Context)  {
 	//获取前端传值并校验
-	var pageInfo task.SearchAccountTypeParams
+	var pageInfo task.SearchGameScriptParams
 	_ = c.ShouldBindJSON(&pageInfo)
 	//页面信息校验
 	if err := utils.Verify(pageInfo.PageInfo, utils.PageInfoVerify); err != nil{

model/task/game_task.go

@@ -34,13 +34,14 @@ type GameTask struct {
 	StopTime        time.Time `json:"stop_time"`
 }
 
-//添加加付费提醒字段
+//添加加付费提醒字段和模拟器类型字段
 type GameTaskUnion struct {
 	Id              uint      `json:"id"`
 	TaskId          int       `json:"task_id"`
 	TaskName        string    `json:"task_name"`
 	User            string    `json:"user"`
 	AddFeeNotice    int       `json:"add_fee_notice"`
+	SimulatorType   int       `json:"simulator_type"`
 	NewRetained     string    `json:"new_retained"`
 	GameName        string    `json:"game_name"`
 	GameId          int       `json:"game_id"`

model/task/response/game_task.go

@@ -25,7 +25,7 @@ type GetGameTaskListReply struct {
 	StopTime        string `json:"stop_time"`
 }
 
-//增加加付费提醒字段
+//增加加付费提醒字段和模拟器类型字段
 type GetGameTaskListUnionReply struct {
 	TaskId          int    `json:"task_id"`
 	TaskName        string `json:"task_name"`
@@ -33,6 +33,7 @@ type GetGameTaskListUnionReply struct {
 	GameName        string `json:"game_name"`
 	Date            string `json:"date"`
 	AddFeeNotice    int    `json:"add_fee_notice"`
+	SimulatorType   int    `json:"simulator_type"`
 	GamePort        string `json:"game_port"`
 	AccountType     string `json:"account_type"`
 	LoginMethod     string `json:"login_method"`
@@ -134,8 +135,8 @@ type XmyGameDataReply struct {
 
 //小绵羊数据列表
 type XmyGameList struct {
-	StartDay string          `json:"start_day"`
-	EndDay   string          `json:"end_day"`
+	StartDay string            `json:"start_day"`
+	EndDay   string            `json:"end_day"`
 	List     []XmyGameResponse `json:"list"`
 }
 

model/task/search_script_params.go

@@ -3,7 +3,7 @@ package task
 import "log-server/model/common/request"
 
 // script分页条件查询及排序结构体
-type SearchAccountTypeParams struct {
+type SearchGameScriptParams struct {
 	GameScriptResponse
 	request.PageInfo
 	OrderKey string `json:"orderKey"` // 排序

model/task/task_conf.go

@@ -5,10 +5,11 @@ import (
 )
 
 type TaskConf struct {
-	Id           int    `json:"id"`
-	TaskId       int    `json:"task_id"`
-	User         string `json:"user"`
-	AddFeeNotice int    `json:"add_fee_notice"`
+	Id            int    `json:"id"`
+	TaskId        int    `json:"task_id"`
+	User          string `json:"user"`
+	AddFeeNotice  int    `json:"add_fee_notice"`
+	SimulatorType int    `json:"simulator_type"`
 }
 
 func (TaskConf) TableName() string {

service/task/game_task.go

@@ -350,7 +350,7 @@ func (apiService *GameTask) GetUsedGameTaskInfoList(api task.GameTask, info requ
 	offset := info.PageSize * (info.Page - 1)
 	db := global.GVA_DB.Model(&task.GameTask{})
 	var apiList []task.GameTaskUnion
-	db = db.Select("game_task.*, task_conf.add_fee_notice")
+	db = db.Select("game_task.*, task_conf.add_fee_notice, task_conf.simulator_type")
 	db = db.Joins("left join task_conf on task_conf.task_id = game_task.task_id")
 	db = db.Where("is_del = ?", -1)
 	if api.TaskName != "" {
@@ -415,6 +415,7 @@ func (apiService *GameTask) GetUsedGameTaskInfoList(api task.GameTask, info requ
 			var apiReply = new(response.GetGameTaskListUnionReply)
 			apiReply.Status = apiInfo.Status
 			apiReply.TaskId = apiInfo.TaskId
+			apiReply.SimulatorType = apiInfo.SimulatorType
 			apiReply.TaskName = apiInfo.TaskName
 			apiReply.AddFeeNotice = apiInfo.AddFeeNotice
 			apiReply.GamePort = gamePortMp[apiInfo.GamePortId].ChannelName
@@ -1160,15 +1161,15 @@ func (s *GameTask) GetFeeAccountList(taskId int) (fa []FeeAccount, err error) {
 }
 
 //从小绵羊后台获取数据并返回
-func (apiService *GameTask) GetXmyTaskList(startDay  string, endDay string) (list interface{}, err error) {
+func (apiService *GameTask) GetXmyTaskList(startDay string, endDay string) (list interface{}, err error) {
 	var apisReply *response.XmyGameDataReply
 	client := &http.Client{}
 	url := "http://api.sheepsdk.17xmy.com/foreign/api/get_youhua_data.php?start_day=" + startDay + "&end_day=" + endDay
-	req, err := http.NewRequest("GET", url, nil)//GET大写
+	req, err := http.NewRequest("GET", url, nil) //GET大写
 	if err != nil {
 		return
 	}
-	rep, err := client.Do(req)//发起请求
+	rep, err := client.Do(req) //发起请求
 	if err != nil {
 		return
 	}
@@ -1179,10 +1180,9 @@ func (apiService *GameTask) GetXmyTaskList(startDay  string, endDay string) (lis
 		return
 	}
 	//fmt.Printf("%s", apisReply)
-	return apisReply.Data , err
+	return apisReply.Data, err
 }
 
-
 func (exa *GameTask) TaskStatisticsList2Excel(infoList []response.GetGameTargetComplete, filePath string) error {
 	excel := excelize.NewFile()
 	excel.SetSheetRow("Sheet1", "A1", &[]string{

service/task/task_conf.go

@@ -291,5 +291,5 @@ func (e *TaskConfService) JudgeOperate(taskConf task.TaskConf) (err error) {
 		return global.GVA_DB.Model(&task.TaskConf{}).Create(&taskConf).Error
 	}
 	//如果有，更新
-	return global.GVA_DB.Model(&task.TaskConf{}).Where("task_id = ?", taskConf.TaskId).Omit("task_id", "user").Updates(&taskConf).Error
+	return global.GVA_DB.Model(&task.TaskConf{}).Where("task_id = ?", taskConf.TaskId).Omit("task_id", "user").Updates(map[string]interface{}{"add_fee_notice": taskConf.AddFeeNotice, "simulator_type": taskConf.SimulatorType}).Error
 }