server_common/f5
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
azw 2023-08-20 13:14:56 +08:00
parent 3ac5b2b0c3
commit 9d1eeef81c
4 changed files with 31 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app.go
View File

@ -64,8 +64,8 @@ func (this *app) init(userApp UserApp) {
_sysLog.init()
_tgLog = new(TGLog_)
_tgLog.init()
_pageQuery = new (pageQuery)
_pageQuery.init()
_dbFilter = new (dbFilter)
_dbFilter.init()
_httpCliMgr = new(HttpCliMgr)
_httpCliMgr.init()
{
@ -92,7 +92,7 @@ func (this *app) init(userApp UserApp) {
func (this *app) unInit() {
this.chGoLoopTimerExit <- 1
_httpCliMgr.unInit()
_pageQuery.unInit()
_dbFilter.unInit()
_timer.unInit()
_timer = nil
this.userApp.UnInit()

3
dbpool.go
View File

@ -107,7 +107,8 @@ func (this *dbPool) PageQuery(
page int32,
sql string,
params []string,
queryParam *PageQueryParam,
filter DbQueryFilter,
orderBy string,
cb PageQueryCb) {
var pagination Pagination
pagination.PerPage = q5.Max(1, perPage)

6
export.go
View File

@ -5,7 +5,7 @@ var _timer *Timer
var _sysLog *SysLog_
var _tgLog *TGLog_
var _httpCliMgr *HttpCliMgr
var _pageQuery *pageQuery
var _dbFilter *dbFilter
var _goStyleDb *dbPool
var _jsStyleDb *dbPool
@ -29,8 +29,8 @@ func GetHttpCliMgr() *HttpCliMgr {
return _httpCliMgr
}
func GetPageQuery() *pageQuery {
return _pageQuery
func GetDbFilter() *dbFilter {
return _dbFilter
}
func GetGoStyleDb() *dbPool {

60
pagequery.go
View File

@ -23,13 +23,13 @@ const (
QC_CUSTOM
)
type pageQuery struct {
type dbFilter struct {
}
type PageQueryFilter interface {
And() PageQueryFilter
Or() PageQueryFilter
Not() PageQueryFilter
type DbQueryFilter interface {
And() DbQueryFilter
Or() DbQueryFilter
Not() DbQueryFilter
GetLinkOp() LinkOp
GenSql() string
}
@ -46,30 +46,16 @@ type PageQueryOne struct {
type PageQueryComp struct {
linkOp LinkOp
not bool
subFilters []PageQueryFilter
subFilters []DbQueryFilter
}
type PageQueryParam struct {
Filter *PageQueryComp
OrderBy string
func (this *dbFilter) init() {
}
func (this *PageQueryParam) genSql() string {
sql := " "
/*
for _, field := range this.Filter {
}*/
sql += " " + this.OrderBy + " "
return sql
func (this *dbFilter) unInit() {
}
func (this *pageQuery) init() {
}
func (this *pageQuery) unInit() {
}
func (this *pageQuery) Like(fieldName string, val string) PageQueryFilter {
func (this *dbFilter) Like(fieldName string, val string) DbQueryFilter {
f := &PageQueryOne{
cond: QC_LIKE,
fieldName: fieldName,
@ -77,7 +63,7 @@ func (this *pageQuery) Like(fieldName string, val string) PageQueryFilter {
return f
}
func (this *pageQuery) EQ(fieldName string, val string) PageQueryFilter {
func (this *dbFilter) EQ(fieldName string, val string) DbQueryFilter {
f := &PageQueryOne{
cond: QC_EQ,
fieldName: fieldName,
@ -85,7 +71,7 @@ func (this *pageQuery) EQ(fieldName string, val string) PageQueryFilter {
return f
}
func (this *pageQuery) LT(fieldName string, val string) PageQueryFilter {
func (this *dbFilter) LT(fieldName string, val string) DbQueryFilter {
f := &PageQueryOne{
cond: QC_LT,
fieldName: fieldName,
@ -93,7 +79,7 @@ func (this *pageQuery) LT(fieldName string, val string) PageQueryFilter {
return f
}
func (this *pageQuery) LE(fieldName string, val string) PageQueryFilter {
func (this *dbFilter) LE(fieldName string, val string) DbQueryFilter {
f := &PageQueryOne{
cond: QC_LE,
fieldName: fieldName,
@ -101,7 +87,7 @@ func (this *pageQuery) LE(fieldName string, val string) PageQueryFilter {
return f
}
func (this *pageQuery) GT(fieldName string, val string) PageQueryFilter {
func (this *dbFilter) GT(fieldName string, val string) DbQueryFilter {
f := &PageQueryOne{
cond: QC_GT,
fieldName: fieldName,
@ -109,7 +95,7 @@ func (this *pageQuery) GT(fieldName string, val string) PageQueryFilter {
return f
}
func (this *pageQuery) GE(fieldName string, val string) PageQueryFilter {
func (this *dbFilter) GE(fieldName string, val string) DbQueryFilter {
f := &PageQueryOne{
cond: QC_GE,
fieldName: fieldName,
@ -117,7 +103,7 @@ func (this *pageQuery) GE(fieldName string, val string) PageQueryFilter {
return f
}
func (this *pageQuery) Custom(fieldName string, val string) PageQueryFilter {
func (this *dbFilter) Custom(fieldName string, val string) DbQueryFilter {
f := &PageQueryOne{
cond: QC_CUSTOM,
fieldName: fieldName,
@ -125,29 +111,29 @@ func (this *pageQuery) Custom(fieldName string, val string) PageQueryFilter {
return f
}
func (this *pageQuery) Comp(subFilters ...PageQueryFilter) PageQueryFilter {
func (this *dbFilter) Comp(subFilters ...DbQueryFilter) DbQueryFilter {
f := &PageQueryComp{
subFilters: subFilters}
return f
}
func (this *PageQueryOne) IgnoreEmpy() PageQueryFilter {
func (this *PageQueryOne) IgnoreEmpy() DbQueryFilter {
this.ignoreEmpty = true
return this
}
func (this *PageQueryOne) And() PageQueryFilter {
func (this *PageQueryOne) And() DbQueryFilter {
this.linkOp = LK_AND
return this
}
func (this *PageQueryOne) Or() PageQueryFilter {
func (this *PageQueryOne) Or() DbQueryFilter {
this.linkOp = LK_OR
return this
}
func (this *PageQueryOne) Not() PageQueryFilter {
func (this *PageQueryOne) Not() DbQueryFilter {
this.not = true
return this
}
@ -193,17 +179,17 @@ func (this *PageQueryOne) GenSql() string {
return sql
}
func (this *PageQueryComp) And() PageQueryFilter {
func (this *PageQueryComp) And() DbQueryFilter {
this.linkOp = LK_AND
return this
}
func (this *PageQueryComp) Or() PageQueryFilter {
func (this *PageQueryComp) Or() DbQueryFilter {
this.linkOp = LK_OR
return this
}
func (this *PageQueryComp) Not() PageQueryFilter {
func (this *PageQueryComp) Not() DbQueryFilter {
this.not = true
return this
}