Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
b41f6f88
Commit
b41f6f88
authored
May 08, 2019
by
zw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
e887cf2c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
Square.php
application/api_broker/controller/Square.php
+2
-2
SquareSortService.php
application/api_broker/service/SquareSortService.php
+6
-6
No files found.
application/api_broker/controller/Square.php
View file @
b41f6f88
...
@@ -69,10 +69,10 @@ class Square extends Basic
...
@@ -69,10 +69,10 @@ class Square extends Basic
public
function
getSquareSortList
()
public
function
getSquareSortList
()
{
{
$params
=
$this
->
params
;
$params
=
$this
->
params
;
/*
$params = array(
/*
$params = array(
"page_no" => 1,
"page_no" => 1,
"page_size" => 15,
"page_size" => 15,
"site_id" => 1,
"site_id" => 1
0001
,
);*/
);*/
$pageNo
=
empty
(
$params
[
'page_no'
])
?
1
:
$params
[
'page_no'
];
$pageNo
=
empty
(
$params
[
'page_no'
])
?
1
:
$params
[
'page_no'
];
$pageSize
=
empty
(
$params
[
'page_size'
])
?
15
:
$params
[
'page_size'
];
$pageSize
=
empty
(
$params
[
'page_size'
])
?
15
:
$params
[
'page_size'
];
...
...
application/api_broker/service/SquareSortService.php
View file @
b41f6f88
...
@@ -135,20 +135,20 @@ class SquareSortService
...
@@ -135,20 +135,20 @@ class SquareSortService
$index_max
=
$page_no
*
$page_size
;
$index_max
=
$page_no
*
$page_size
;
$result
=
[];
$result
=
[];
if
(
$total
<=
$page_size
)
{
if
(
$total
<=
$page_size
)
{
$cream_list
=
$this
->
redis
->
zRange
(
self
::
SORT_KEY_CREAM
.
$site_id
,
0
,
-
1
,
true
);
$cream_list
=
$this
->
redis
->
zR
evR
ange
(
self
::
SORT_KEY_CREAM
.
$site_id
,
0
,
-
1
,
true
);
$list
=
$this
->
redis
->
zRange
(
self
::
SORT_KEY
.
$site_id
,
0
,
-
1
,
true
);
$list
=
$this
->
redis
->
zR
evR
ange
(
self
::
SORT_KEY
.
$site_id
,
0
,
-
1
,
true
);
$result
=
$cream_list
+
$list
;
$result
=
$cream_list
+
$list
;
}
elseif
(
$index_min
<=
$cream_num
&&
$index_max
<=
$cream_num
)
{
}
elseif
(
$index_min
<=
$cream_num
&&
$index_max
<=
$cream_num
)
{
$cream_list
=
$this
->
redis
->
zRange
(
self
::
SORT_KEY_CREAM
.
$site_id
,
$index_min
,
$page_size
,
true
);
$cream_list
=
$this
->
redis
->
zR
evR
ange
(
self
::
SORT_KEY_CREAM
.
$site_id
,
$index_min
,
$page_size
,
true
);
$result
=
$cream_list
;
$result
=
$cream_list
;
}
elseif
(
$index_min
<=
$cream_num
&&
$index_max
>
$cream_num
)
{
}
elseif
(
$index_min
<=
$cream_num
&&
$index_max
>
$cream_num
)
{
$residue
=
$index_max
-
$cream_num
;
$residue
=
$index_max
-
$cream_num
;
$cream_list
=
$this
->
redis
->
zRange
(
self
::
SORT_KEY_CREAM
.
$site_id
,
$index_min
,
-
1
,
true
);
$cream_list
=
$this
->
redis
->
zR
evR
ange
(
self
::
SORT_KEY_CREAM
.
$site_id
,
$index_min
,
-
1
,
true
);
$list
=
$this
->
redis
->
zRange
(
self
::
SORT_KEY
.
$site_id
,
0
,
$residue
,
true
);
$list
=
$this
->
redis
->
zR
evR
ange
(
self
::
SORT_KEY
.
$site_id
,
0
,
$residue
,
true
);
$result
=
$cream_list
+
$list
;
$result
=
$cream_list
+
$list
;
}
elseif
(
$index_min
>
$cream_num
)
{
}
elseif
(
$index_min
>
$cream_num
)
{
$index_
=
$index_min
-
$cream_num
;
$index_
=
$index_min
-
$cream_num
;
$list
=
$this
->
redis
->
zRange
(
self
::
SORT_KEY
.
$site_id
,
$index_
,
$page_size
,
true
);
$list
=
$this
->
redis
->
zR
evR
ange
(
self
::
SORT_KEY
.
$site_id
,
$index_
,
$page_size
,
true
);
$result
=
$list
;
$result
=
$list
;
}
}
return
$result
;
return
$result
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment