|
|
@@ -80,12 +80,92 @@ func (s *ServiceIpLog) GetIpLogList(api log.IpLogRequest, info request.PageInfo,
|
|
|
return apiList, total, err
|
|
|
}
|
|
|
|
|
|
+//获取异常租机ip列表
|
|
|
+func (s *ServiceIpLog) GetAbnormalIpLogList(api log.AbnormalIpLogRequest, info request.PageInfo, order string, desc bool) (list interface{}, total int64, err error) {
|
|
|
+ limit := info.PageSize
|
|
|
+ offset := info.PageSize * (info.Page - 1)
|
|
|
+ db := global.GVA_DB.Model(&log.AbnormalMachineIp{})
|
|
|
+ var apiList []log.AbnormalMachineIp
|
|
|
+ startDate := time.Now().Format("2006-01-02")
|
|
|
+ endDate := time.Now().Format("2006-01-02")
|
|
|
+ if len(api.Date) == 2 {
|
|
|
+ startDate = api.Date[0]
|
|
|
+ endDate = api.Date[1]
|
|
|
+ }
|
|
|
+ db = db.Where("create_date >= ? and create_date <= ?", startDate, endDate)
|
|
|
+ if api.GameId != 0 {
|
|
|
+ db = db.Where("game_id = ?", api.GameId)
|
|
|
+ }
|
|
|
+ if api.PcCode != "" {
|
|
|
+ db = db.Where("pc_code = ?", api.PcCode)
|
|
|
+ }
|
|
|
+ if api.Ip != "" {
|
|
|
+ db = db.Where("ip = ?", api.Ip)
|
|
|
+ }
|
|
|
+
|
|
|
+ err = db.Count(&total).Error
|
|
|
+ if err != nil {
|
|
|
+ return apiList, total, err
|
|
|
+ } else {
|
|
|
+ db = db.Limit(limit).Offset(offset)
|
|
|
+ if order != "" {
|
|
|
+ var OrderStr string
|
|
|
+ // 设置有效排序key 防止sql注入
|
|
|
+ // 感谢 Tom4t0 提交漏洞信息
|
|
|
+ orderMap := make(map[string]bool, 3)
|
|
|
+ orderMap["game_id"] = true
|
|
|
+ orderMap["count"] = true
|
|
|
+ orderMap["create_date"] = true
|
|
|
+ if orderMap[order] {
|
|
|
+ if desc {
|
|
|
+ OrderStr = order + " desc"
|
|
|
+ } else {
|
|
|
+ OrderStr = order
|
|
|
+ }
|
|
|
+ } else { // didn't matched any order key in `orderMap`
|
|
|
+ global.GVA_LOG.Error("获取失败!", zap.Error(err))
|
|
|
+ return apiList, total, err
|
|
|
+ }
|
|
|
+
|
|
|
+ err = db.Order(OrderStr).Find(&apiList).Error
|
|
|
+ } else {
|
|
|
+ err = db.Order("id desc").Find(&apiList).Error
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //遍历更改日期格式
|
|
|
+ for i, _ := range apiList {
|
|
|
+ apiList[i].CreateDate = apiList[i].CreateDate[:10]
|
|
|
+ }
|
|
|
+ return apiList, total, err
|
|
|
+}
|
|
|
+
|
|
|
+//获取今日异常租机ip（ip播报使用）
|
|
|
+func (s *ServiceIpLog) GetTodayAbnormalIpLogList() (list []log.TodayAbnormalMachineIp, err error){
|
|
|
+ var total int64
|
|
|
+ var apiList []log.TodayAbnormalMachineIp
|
|
|
+ date := time.Now().Format("2006-01-02")
|
|
|
+ db := global.GVA_DB.Table("abnormal_machine_ip as ami")
|
|
|
+ db = db.Select("ami.*, gt.task_name, gt.user")
|
|
|
+ db = db.Joins("left join game_task as gt on gt.task_id = ami.game_id")
|
|
|
+ db = db.Where("create_date", date)
|
|
|
+ err = db.Count(&total).Error
|
|
|
+ if err != nil {
|
|
|
+ return apiList, err
|
|
|
+ } else {
|
|
|
+ err = db.Order("id").Find(&apiList).Error
|
|
|
+ }
|
|
|
+ //遍历更改日期格式
|
|
|
+ for i, _ := range apiList {
|
|
|
+ apiList[i].CreateDate = apiList[i].CreateDate[:10]
|
|
|
+ }
|
|
|
+ return apiList , err
|
|
|
+}
|
|
|
+
|
|
|
//根据gameId获取ip
|
|
|
func (s *ServiceIpLog) GetGameIpList(api log.GameIpRequest, info request.PageInfo, order string, desc bool) (apiList []log.GameIpResponse, total int64, err error) {
|
|
|
limit := info.PageSize
|
|
|
offset := info.PageSize * (info.Page - 1)
|
|
|
db := global.GVA_DB.Model(&log.IpLog{})
|
|
|
-
|
|
|
startDate := time.Now().Format("2006-01-02")
|
|
|
endDate := time.Now().Format("2006-01-02")
|
|
|
if len(api.Date) == 2 {
|
|
|
@@ -168,7 +248,6 @@ func (s *ServiceIpLog) GetGameIpList(api log.GameIpRequest, info request.PageInf
|
|
|
return apiList, total, err
|
|
|
}
|
|
|
|
|
|
-
|
|
|
//展示ip
|
|
|
func (s *ServiceIpLog) GetIp(iplog log.IpLogResponse) (list interface{}, total int64, err error) {
|
|
|
var ipList []log.QueryIpList
|
|
|
@@ -226,7 +305,6 @@ func (s *ServiceIpLog) GameIpListExcel(infoList []log.GameIpResponse, filePath s
|
|
|
|
|
|
//获取异常ip数据
|
|
|
func (s *ServiceIpLog) GetAbnormalIp() (list map[string]string, err error) {
|
|
|
-
|
|
|
db := global.GVA_DB.Model(&log.IpLog{})
|
|
|
startDate := time.Now().Format("2006-01-02")
|
|
|
endDate := time.Now().Format("2006-01-02")
|
|
|
@@ -280,23 +358,87 @@ func (s *ServiceIpLog) UpdateAbnormalMachineIp() (err error) {
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
-
|
|
|
//将异常ip存储至abnormal_machine_ip数据库中
|
|
|
- for k,_ := range abnormalIpList {
|
|
|
+ for i,_ := range abnormalIpList {
|
|
|
var entity log.AbnormalMachineIp
|
|
|
- ip := abnormalIpList[k].Ip
|
|
|
- gameId := abnormalIpList[k].GameId
|
|
|
- pcCode := abnormalIpList[k].PcCode
|
|
|
- createDate := abnormalIpList[k].CreateDate
|
|
|
- if !errors.Is(global.GVA_DB.Model(&log.AbnormalMachineIp{}).Where("ip, game_id, pc_code, create_date",ip, gameId, pcCode, createDate).First(&entity).Error, gorm.ErrRecordNotFound) {
|
|
|
- return nil
|
|
|
+ ip := abnormalIpList[i].Ip
|
|
|
+ gameId := abnormalIpList[i].GameId
|
|
|
+ pcCode := abnormalIpList[i].PcCode
|
|
|
+ createDate := abnormalIpList[i].CreateDate[:10]
|
|
|
+ count := abnormalIpList[i].Count
|
|
|
+
|
|
|
+ //根据count判断，如果count < 9, continue继续做下一条记录的处理
|
|
|
+ if count < 10 {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+
|
|
|
+ if !errors.Is(global.GVA_DB.Model(&log.AbnormalMachineIp{}).Where("ip = ? and game_id = ? and pc_code = ? and create_date = ?",ip, gameId, pcCode, createDate).First(&entity).Error, gorm.ErrRecordNotFound) {
|
|
|
+ //存在相同的ip、租机、gameid、创建日期记录，那么更新数量即可
|
|
|
+ err = global.GVA_DB.Model(&log.AbnormalMachineIp{}).Where("ip = ? and game_id = ? and pc_code = ? and create_date = ?", ip, gameId, pcCode, createDate).Update("count", count).Error
|
|
|
+ if err != nil {
|
|
|
+ return errors.New("更新ip数量失败")
|
|
|
+ }
|
|
|
+ continue
|
|
|
}
|
|
|
//如果数据库中没有相同的记录，则创建相对应的记录
|
|
|
- err = global.GVA_DB.Model(&log.AbnormalMachineIp{}).Create(abnormalIpList[k]).Error
|
|
|
+ err = global.GVA_DB.Model(&log.AbnormalMachineIp{}).Create(&abnormalIpList[i]).Error
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
}
|
|
|
- return
|
|
|
+ return err
|
|
|
+}
|
|
|
|
|
|
+//定时更新ip列表数据
|
|
|
+func (s *ServiceIpLog) UpdateGameIpList() (err error) {
|
|
|
+ var total int64
|
|
|
+ var apiList []log.GameIpResponse
|
|
|
+ db := global.GVA_DB.Model(&log.IpLog{})
|
|
|
+ date := time.Now().Format("2006-01-02")
|
|
|
+ //筛选日期
|
|
|
+ db = db.Where("ip_log.create_date = ?", date)
|
|
|
+ //查找总ip上报次数
|
|
|
+ db = db.Joins("left join" + "(select count(*) as count, game_id, create_date from ip_log where create_date = ? group by game_id, create_date)" + " as late on late.game_id = ip_log.game_id and late.create_date = ip_log.create_date", date)
|
|
|
+ db = db.Where("ip_log.status = 2")
|
|
|
+ db = db.Select("ip_log.create_date,ip_log.game_id,late.count as count_total, task_name, user, count(*) as success_ip , retained_complete as task_count, count(distinct(ip)) as count_distinct_ip")
|
|
|
+ //拼接任务完成表
|
|
|
+ db = db.Joins("left join game_target_complete as gtc on gtc.task_id = ip_log.game_id and gtc.create_date = ip_log.create_date")
|
|
|
+ //拼接game_task表获取任务名称和负责人名称
|
|
|
+ db = db.Joins("left join game_task as gt on gt.task_id = ip_log.game_id")
|
|
|
+ db = db.Group("ip_log.game_id, ip_log.create_date")
|
|
|
+ err = db.Count(&total).Error
|
|
|
+ if err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
+ err = db.Order("ip_log.id").Find(&apiList).Error
|
|
|
+ //遍历更改日期格式
|
|
|
+ for i, _ := range apiList {
|
|
|
+ var entity log.GameIpResponse
|
|
|
+ apiList[i].CreateDate = apiList[i].CreateDate[:10]
|
|
|
+ err = global.GVA_DB.Model(&log.IpLog{}).Select("COUNT(1) as max_count").Where("game_id = ? and create_date = ? and status = 2", apiList[i].GameId, apiList[i].CreateDate).Group("ip").Order("max_count desc").Limit(1).Find(&apiList[i]).Error
|
|
|
+ global.GVA_DB.Model(&log.IpLog{}).Select("id,ip,count(*) ").Where("game_id = ? and create_date = ? and status = 2", apiList[i].GameId, apiList[i].CreateDate).Group("ip").Having("count(*) > 4").Count(&apiList[i].ExceedThree)
|
|
|
+ //获取平均重复率和ip重复率 并保留小数点后两位
|
|
|
+ countDistinctIp := float64(apiList[i].CountDistinctIp)
|
|
|
+ successIp := float64(apiList[i].SuccessIp)
|
|
|
+ taskCount := float64(apiList[i].TaskCount)
|
|
|
+ apiList[i].IpRepetitionRate, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", (countDistinctIp/ successIp) *100), 64)
|
|
|
+ if taskCount != 0 {
|
|
|
+ apiList[i].AverageIpRepetitionRate, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", (countDistinctIp / taskCount) *100), 64)
|
|
|
+ }
|
|
|
+ //查找数据库中是否有这条记录（game_id, create_date）
|
|
|
+ if !errors.Is(global.GVA_DB.Model(&log.GameIpResponse{}).Where("game_id = ? and create_date = ?",apiList[i].GameId, apiList[i].CreateDate).First(&entity).Error, gorm.ErrRecordNotFound) {
|
|
|
+ //如果有，更新
|
|
|
+ err = global.GVA_DB.Model(&log.GameIpResponse{}).Where("game_id = ? and create_date = ?",apiList[i].GameId, apiList[i].CreateDate).Updates(&apiList[i]).Error
|
|
|
+ if err != nil {
|
|
|
+ return errors.New("更新ip列表失败")
|
|
|
+ }
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ //如果数据库中没有相同的记录，则创建相对应的记录
|
|
|
+ err = global.GVA_DB.Model(&log.GameIpResponse{}).Create(&apiList[i]).Error
|
|
|
+ if err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return err
|
|
|
}
|
maker