zhangdeman/wrapper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: fix pkg tool

Browse Source
This commit is contained in:
白茶清欢
2025-10-13 17:41:28 +08:00
parent e162029506
commit d57d32b103
2 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tool/diff.go
View File

@ -8,7 +8,7 @@
package tool package tool
import ( import (
"git.zhangdeman.cn/zhangdeman/wrapper" "git.zhangdeman.cn/zhangdeman/wrapper/op_map"
"git.zhangdeman.cn/zhangdeman/wrapper/tool/define" "git.zhangdeman.cn/zhangdeman/wrapper/tool/define"
) )
@ -20,11 +20,7 @@ type diff struct {
} }
// Compare 比较两个数据源的指定字段 // Compare 比较两个数据源的指定字段
// func (d *diff) Compare(fieldList []string, input op_map.Map, storage op_map.Map, option *define.DiffOption) map[string]*define.DiffResult {
// Author : go_developer@163.com<白茶清欢>
//
// Date : 15:53 2024/3/8
func (d *diff) Compare(fieldList []string, input wrapper.Map, storage wrapper.Map, option *define.DiffOption) map[string]*define.DiffResult {
if nil == option { if nil == option {
option = define.NewDiffOption() option = define.NewDiffOption()
} }
@ -36,11 +32,7 @@ func (d *diff) Compare(fieldList []string, input wrapper.Map, storage wrapper.Ma
} }
// CompareSingle 比较一个字段 // CompareSingle 比较一个字段
// func (d *diff) CompareSingle(field string, input op_map.Map, storage op_map.Map, option *define.DiffOption) *define.DiffResult {
// Author : go_developer@163.com<白茶清欢>
//
// Date : 15:57 2024/3/8
func (d *diff) CompareSingle(field string, input wrapper.Map, storage wrapper.Map, option *define.DiffOption) *define.DiffResult {
if nil == option { if nil == option {
option = define.NewDiffOption() option = define.NewDiffOption()
} }
@ -52,11 +44,7 @@ func (d *diff) CompareSingle(field string, input wrapper.Map, storage wrapper.Ma
} }
// IsSame 判断连个数据是否一致 // IsSame 判断连个数据是否一致
// func (d *diff) IsSame(fieldList []string, input op_map.Map, storage op_map.Map, option *define.DiffOption) bool {
// Author : go_developer@163.com<白茶清欢>
//
// Date : 11:16 2024/3/11
func (d *diff) IsSame(fieldList []string, input wrapper.Map, storage wrapper.Map, option *define.DiffOption) bool {
res := d.Compare(fieldList, input, storage, option) res := d.Compare(fieldList, input, storage, option)
for _, item := range res { for _, item := range res {
if item.IsSame { if item.IsSame {

29
tool/version.go
View File

@ -8,7 +8,8 @@
package tool package tool
import ( import (
"git.zhangdeman.cn/zhangdeman/wrapper" "git.zhangdeman.cn/zhangdeman/wrapper/op_string"
"git.zhangdeman.cn/zhangdeman/wrapper/op_ternary"
"git.zhangdeman.cn/zhangdeman/wrapper/tool/define" "git.zhangdeman.cn/zhangdeman/wrapper/tool/define"
) )
@ -20,13 +21,9 @@ type version struct {
} }
// getVersionArr 解析版本号 // getVersionArr 解析版本号
//
// Author : go_developer@163.com<白茶清欢>
//
// Date : 17:42 2023/12/27
func (v *version) getVersionArr(versionOne string, versionTwo string) ([]int64, []int64, error) { func (v *version) getVersionArr(versionOne string, versionTwo string) ([]int64, []int64, error) {
oneWrapper := wrapper.String(versionOne).ToInt64Slice(".") oneWrapper := op_string.ToBaseTypeSlice[int64](versionOne, ".")
twoWrapper := wrapper.String(versionTwo).ToInt64Slice(".") twoWrapper := op_string.ToBaseTypeSlice[int64](versionTwo, ".")
if oneWrapper.Err != nil { if oneWrapper.Err != nil {
return nil, nil, oneWrapper.Err return nil, nil, oneWrapper.Err
} }
@ -38,11 +35,7 @@ func (v *version) getVersionArr(versionOne string, versionTwo string) ([]int64,
// Compare 比较版本号的大小， 版本号格式必须是 x.y.z 的形式，几个 . 不限制, x、y、z 必须是是数字 // Compare 比较版本号的大小， 版本号格式必须是 x.y.z 的形式，几个 . 不限制, x、y、z 必须是是数字
// //
// strictMode 严格模式, 非严格模式下, 2.4 == 2.4.0 , 开启严格模式, 则认为 2.4 < 2.4.0 , 因为 2.4 没有小版本号 // - strictMode 严格模式, 非严格模式下, 2.4 == 2.4.0 , 开启严格模式, 则认为 2.4 < 2.4.0 , 因为 2.4 没有小版本号
//
// Author : go_developer@163.com<白茶清欢>
//
// Date : 17:07 2023/12/27
func (v *version) Compare(versionOne string, versionTwo string, strictMode bool) (int, error) { func (v *version) Compare(versionOne string, versionTwo string, strictMode bool) (int, error) {
oneVersionArr, twoVersionArr, err := v.getVersionArr(versionOne, versionTwo) oneVersionArr, twoVersionArr, err := v.getVersionArr(versionOne, versionTwo)
if nil != err { if nil != err {
@ -80,18 +73,14 @@ func (v *version) Compare(versionOne string, versionTwo string, strictMode bool)
if !strictMode || oneVersionLength == twoVersionLength { if !strictMode || oneVersionLength == twoVersionLength {
return define.VersionEqual, nil return define.VersionEqual, nil
} }
return wrapper.TernaryOperator.Int( return op_ternary.BaseType[int](
oneVersionLength > twoVersionLength, oneVersionLength > twoVersionLength,
wrapper.Int(define.VersionOneMax), define.VersionOneMax,
wrapper.Int(define.VersionTwoMax), define.VersionTwoMax,
).ToInt().Value, nil ), nil
} }
// CompareIgnoreError 忽略error // CompareIgnoreError 忽略error
//
// Author : go_developer@163.com<白茶清欢>
//
// Date : 18:20 2023/12/27
func (v *version) CompareIgnoreError(versionOne string, versionTwo string, strictMode bool) int { func (v *version) CompareIgnoreError(versionOne string, versionTwo string, strictMode bool) int {
res, _ := v.Compare(versionOne, versionTwo, strictMode) res, _ := v.Compare(versionOne, versionTwo, strictMode)
return res return res