Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xzxt-api-report
Overview
Overview
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
雷紫添
xzxt-api-report
Commits
ef961c64
Commit
ef961c64
authored
Jul 20, 2022
by
wang_jiaxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
同火车去重
parent
30d8f274
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
2 deletions
+26
-2
src/main/java/com/founder/service/impl/GjServiceImpl.java
+26
-2
No files found.
src/main/java/com/founder/service/impl/GjServiceImpl.java
View file @
ef961c64
...
...
@@ -1636,7 +1636,7 @@ public class GjServiceImpl implements GjService {
"people_trail01 where _type= "
+
"'hcdpall' and "
+
"DD = '"
+
obj
.
get
(
"DD"
)
+
"' AND KSSJ >= '"
+
obj
.
get
(
"KSSJ"
)+
"' AND KSSJ <= '"
+
obj
.
get
(
"KSSJ"
)+
" ' limit 0,1000"
;
obj
.
get
(
"KSSJ"
)+
"' AND KSSJ <= '"
+
obj
.
get
(
"KSSJ"
)+
" '
order by KSSJ desc, DD desc, ZJHM desc, JLRKSJ desc
limit 0,1000"
;
String
wbDdMap
=
EsUtils
.
newQueryEss
(
request
,
newSql
);
JSONObject
object
=
JSONObject
.
parseObject
(
wbDdMap
);
JSONArray
jsonArray
=
object
.
getJSONArray
(
"data"
);
...
...
@@ -1644,6 +1644,18 @@ public class GjServiceImpl implements GjService {
for
(
int
j
=
0
;
j
<
jsonArray
.
size
();
j
++)
{
JSONObject
arrayJSONObject
=
jsonArray
.
getJSONObject
(
j
);
if
(!
arrayJSONObject
.
getString
(
"ZJHM"
).
equals
(
zjhm
))
{
if
(
j
>
1
)
{
JSONObject
lastObject
=
jsonArray
.
getJSONObject
(
j
-
1
);
if
(!
lastObject
.
getString
(
"ZJHM"
).
equals
(
zjhm
))
{
if
(
Objects
.
equals
(
lastObject
.
getString
(
"KSSJ"
),
arrayJSONObject
.
getString
(
"KSSJ"
))
&&
Objects
.
equals
(
lastObject
.
getString
(
"DD"
),
arrayJSONObject
.
getString
(
"DD"
))
&&
Objects
.
equals
(
lastObject
.
getString
(
"SFD"
),
arrayJSONObject
.
getString
(
"SFD"
))
&&
Objects
.
equals
(
lastObject
.
getString
(
"MDD"
),
arrayJSONObject
.
getString
(
"MDD"
))
&&
Objects
.
equals
(
lastObject
.
getString
(
"ZJHM"
),
arrayJSONObject
.
getString
(
"ZJHM"
)))
{
continue
;
}
}
}
HashMap
<
String
,
Object
>
txry
=
new
HashMap
<>();
txry
.
put
(
"dd"
,
arrayJSONObject
.
getString
(
"DD"
));
txry
.
put
(
"xb"
,
arrayJSONObject
.
getString
(
"XB"
));
...
...
@@ -1719,7 +1731,7 @@ public class GjServiceImpl implements GjService {
"people_trail01 where _type= "
+
"'hcdpall' and "
+
"DD = '"
+
obj
.
get
(
"DD"
)
+
"' AND CXH = '"
+
obj
.
get
(
"CXH"
)+
"' AND KSSJ >= '"
+
obj
.
get
(
"KSSJ"
)+
"' AND KSSJ <= '"
+
obj
.
get
(
"KSSJ"
)+
" ' limit 0,1000"
;
obj
.
get
(
"KSSJ"
)+
"' AND KSSJ <= '"
+
obj
.
get
(
"KSSJ"
)+
" '
order by KSSJ desc, DD desc, ZJHM desc, JLRKSJ desc
limit 0,1000"
;
String
wbDdMap
=
EsUtils
.
newQueryEss
(
request
,
newSql
);
JSONObject
object
=
JSONObject
.
parseObject
(
wbDdMap
);
JSONArray
jsonArray
=
object
.
getJSONArray
(
"data"
);
...
...
@@ -1727,6 +1739,18 @@ public class GjServiceImpl implements GjService {
for
(
int
j
=
0
;
j
<
jsonArray
.
size
();
j
++)
{
JSONObject
arrayJSONObject
=
jsonArray
.
getJSONObject
(
j
);
if
(!
arrayJSONObject
.
getString
(
"ZJHM"
).
equals
(
zjhm
))
{
if
(
j
>
1
)
{
JSONObject
lastObject
=
jsonArray
.
getJSONObject
(
j
-
1
);
if
(!
lastObject
.
getString
(
"ZJHM"
).
equals
(
zjhm
))
{
if
(
Objects
.
equals
(
lastObject
.
getString
(
"KSSJ"
),
arrayJSONObject
.
getString
(
"KSSJ"
))
&&
Objects
.
equals
(
lastObject
.
getString
(
"DD"
),
arrayJSONObject
.
getString
(
"DD"
))
&&
Objects
.
equals
(
lastObject
.
getString
(
"SFD"
),
arrayJSONObject
.
getString
(
"SFD"
))
&&
Objects
.
equals
(
lastObject
.
getString
(
"MDD"
),
arrayJSONObject
.
getString
(
"MDD"
))
&&
Objects
.
equals
(
lastObject
.
getString
(
"ZJHM"
),
arrayJSONObject
.
getString
(
"ZJHM"
)))
{
continue
;
}
}
}
HashMap
<
String
,
Object
>
txry
=
new
HashMap
<>();
txry
.
put
(
"dd"
,
arrayJSONObject
.
getString
(
"DD"
));
txry
.
put
(
"xb"
,
arrayJSONObject
.
getString
(
"XB"
));
...
...
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