From e73b025e95ad7c53534954b9f8dcf581faa2a8eb Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Wed, 24 May 2023 15:40:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=A2=E5=BC=83=E7=9A=84?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/rtask/condiFindHandle.go | 286 -------------------------------
 1 file changed, 286 deletions(-)
 delete mode 100644 modules/rtask/condiFindHandle.go

diff --git a/modules/rtask/condiFindHandle.go b/modules/rtask/condiFindHandle.go
deleted file mode 100644
index 3930ee896..000000000
--- a/modules/rtask/condiFindHandle.go
+++ /dev/null
@@ -1,286 +0,0 @@
-package rtask
-
-import (
-	cfg "go_dreamfactory/sys/configure/structs"
-
-	"github.com/pkg/errors"
-)
-
-func (this *ModelRtaskRecord) equalFirstParam(cfg *cfg.GameRdtaskCondiData, vals ...int32) (condiId int32, err error) {
-	//只查询参数于配置相等的情况下设置condiId，否则返回0
-	if ok, err1 := soEqual(vals[0], cfg.Data1); !ok {
-		err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-		return
-	}
-	condiId = cfg.Id
-	return
-}
-
-func (this *ModelRtaskRecord) greatEqualFirstParam(cfg *cfg.GameRdtaskCondiData, vals ...int32) (condiId int32, err error) {
-	if ok, err1 := soGreatEqual(vals[0], cfg.Data1); !ok {
-		err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-		return
-	}
-	condiId = cfg.Id
-	return
-}
-
-// 传递参数小于等于配置参数
-// 适合只比较首个参数（一个参数）
-func (this *ModelRtaskRecord) lessEqualFirstParam(cfg *cfg.GameRdtaskCondiData, vals ...int32) (condiId int32, err error) {
-	if ok, err1 := soLessEqual(vals[0], cfg.Data1); !ok {
-		err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-		return
-	}
-	condiId = cfg.Id
-	return
-}
-
-// 与每个参数比较
-func (this *ModelRtaskRecord) equalParams(cfg *cfg.GameRdtaskCondiData, vals ...int32) (condiId int32, err error) {
-	var (
-		paramLen int
-	)
-	if paramLen, err = lenParam(cfg, vals...); err != nil {
-		return
-	}
-
-	switch paramLen {
-	case 1:
-		if ok, err1 := soEqual(vals[0], cfg.Data1); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-	case 2:
-		if ok, err1 := soEqual(vals[0], cfg.Data1); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soEqual(vals[1], cfg.Data2); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-	case 3:
-		if ok, err1 := soEqual(vals[0], cfg.Data1); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soEqual(vals[1], cfg.Data2); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soEqual(vals[2], cfg.Data3); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-	case 4:
-		if ok, err1 := soEqual(vals[0], cfg.Data1); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soEqual(vals[1], cfg.Data2); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soEqual(vals[2], cfg.Data3); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soEqual(vals[3], cfg.Data4); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-	case 5:
-		if ok, err1 := soEqual(vals[0], cfg.Data1); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soEqual(vals[1], cfg.Data2); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soEqual(vals[2], cfg.Data3); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soEqual(vals[3], cfg.Data4); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soEqual(vals[4], cfg.Data5); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-	default:
-		return
-	}
-
-	condiId = cfg.Id
-
-	return
-}
-
-func (this *ModelRtaskRecord) greatThanParams(cfg *cfg.GameRdtaskCondiData, vals ...int32) (condiId int32, err error) {
-	var (
-		paramLen int
-	)
-	if paramLen, err = lenParam(cfg, vals...); err != nil {
-		return
-	}
-
-	switch paramLen {
-	case 1:
-		if ok, err1 := soGreatEqual(vals[0], cfg.Data1); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-	case 2:
-		if ok, err1 := soGreatEqual(vals[0], cfg.Data1); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-	case 3:
-		if ok, err1 := soGreatEqual(vals[0], cfg.Data1); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-	case 4:
-		if ok, err1 := soGreatEqual(vals[0], cfg.Data1); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[3], cfg.Data4); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-	case 5:
-		if ok, err1 := soGreatEqual(vals[0], cfg.Data1); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[3], cfg.Data4); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[4], cfg.Data5); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-	default:
-		return
-	}
-
-	condiId = cfg.Id
-	return
-}
-
-// 需要累加更新的查询
-func (this *ModelRtaskRecord) lessThanParams(cfg *cfg.GameRdtaskCondiData, vals ...int32) (condiId int32, err error) {
-	var (
-		paramLen int
-	)
-	if paramLen, err = lenParam(cfg, vals...); err != nil {
-		return
-	}
-
-	switch paramLen {
-	case 1:
-		if ok, err1 := soLessEqual(vals[0], cfg.Data1); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-	case 2:
-		if ok, err1 := soLessEqual(vals[0], cfg.Data1); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-	case 3:
-		if ok, err1 := soLessEqual(vals[0], cfg.Data1); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-	case 4:
-		if ok, err1 := soLessEqual(vals[0], cfg.Data1); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[3], cfg.Data4); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-	case 5:
-		if ok, err1 := soLessEqual(vals[0], cfg.Data1); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[3], cfg.Data4); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-		if ok, err1 := soGreatEqual(vals[4], cfg.Data5); !ok {
-			err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals)
-			return
-		}
-	default:
-		return
-	}
-
-	condiId = cfg.Id
-	return
-}