Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
bigdatainterservice
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
曹鹏
bigdatainterservice
Commits
cdf8b523
Commit
cdf8b523
authored
Jun 11, 2019
by
wangling
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
438dee73
2a67f58c
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
194 additions
and
10 deletions
+194
-10
src/main/java/com/founder/interservice/mapper/xzxt/TrackTogetherMapper.java
+2
-0
src/main/java/com/founder/interservice/regionalanalysis/service/impl/RegionalsScheduledService.java
+1
-1
src/main/java/com/founder/interservice/tracktraveltogether/controller/TrackTogetherContoller.java
+6
-2
src/main/java/com/founder/interservice/tracktraveltogether/service/TrackTogetherService.java
+2
-0
src/main/java/com/founder/interservice/tracktraveltogether/service/impl/TogetherScheduledService.java
+160
-7
src/main/java/com/founder/interservice/tracktraveltogether/service/impl/TrackTogetherServiceImpl.java
+5
-0
src/main/resources/mybatis/mapper/xzxt/TrackTogetkerTaskMapper.xml
+18
-0
No files found.
src/main/java/com/founder/interservice/mapper/xzxt/TrackTogetherMapper.java
View file @
cdf8b523
...
...
@@ -20,4 +20,6 @@ public interface TrackTogetherMapper {
* @return
*/
public
List
<
TrackTogetherTask
>
queryTasksByAsjbhAndFwbsh
(
TrackTogetherTask
taskParam
);
int
queryTasksByAsjbhAndFwbshCount
(
TrackTogetherTask
taskParam
);
}
src/main/java/com/founder/interservice/regionalanalysis/service/impl/RegionalsScheduledService.java
View file @
cdf8b523
...
...
@@ -238,7 +238,7 @@ public class RegionalsScheduledService {
/**
* 通过区域碰撞的结果 使用第四个接口调取关联数据(原生方法)
*/
public
void
getAndSaveRydetail
(
List
<
RegionalsTaskResult
>
resultsList
)
{
public
void
getAndSaveRydetail
(
List
<
RegionalsTaskResult
>
resultsList
)
throws
Exception
{
if
(
resultsList
!=
null
&&
!
resultsList
.
isEmpty
())
{
for
(
RegionalsTaskResult
result
:
resultsList
)
{
String
objType
=
result
.
getObjectType
();
...
...
src/main/java/com/founder/interservice/tracktraveltogether/controller/TrackTogetherContoller.java
View file @
cdf8b523
...
...
@@ -169,6 +169,7 @@ public class TrackTogetherContoller {
taskParam
.
setBegin
(
begin
);
taskParam
.
setEnd
(
end
);
List
<
TrackTogetherTask
>
togetherTaskLsit
=
trackTogetherService
.
queryTasksByAsjbhAndFwbsh
(
taskParam
);
int
count
=
trackTogetherService
.
queryTasksByAsjbhAndFwbshCount
(
taskParam
);
if
(
null
!=
togetherTaskLsit
&&
!
togetherTaskLsit
.
isEmpty
()){
togetherTaskVOS
=
new
ArrayList
<>();
for
(
TrackTogetherTask
task
:
togetherTaskLsit
)
{
...
...
@@ -207,7 +208,10 @@ public class TrackTogetherContoller {
togetherTaskVO
.
setState
(
"运行中"
);
break
;
case
"FINISHED"
:
togetherTaskVO
.
setState
(
"已完成"
);
togetherTaskVO
.
setState
(
"标识号调取完成"
);
break
;
case
"END"
:
togetherTaskVO
.
setState
(
"伴随调取完成"
);
break
;
case
"TIMEOUT"
:
togetherTaskVO
.
setState
(
"计算超时"
);
...
...
@@ -224,7 +228,7 @@ public class TrackTogetherContoller {
}
else
{
togetherTaskVOS
=
new
ArrayList
<>();
}
resultMap
.
put
(
"total"
,
togetherTaskVOS
.
size
()
);
resultMap
.
put
(
"total"
,
count
);
resultMap
.
put
(
"rows"
,
togetherTaskVOS
);
}
catch
(
InterServiceException
e
){
e
.
printStackTrace
();
...
...
src/main/java/com/founder/interservice/tracktraveltogether/service/TrackTogetherService.java
View file @
cdf8b523
...
...
@@ -27,6 +27,8 @@ public interface TrackTogetherService {
public
List
<
TrackTogetherTask
>
queryTasksByAsjbhAndFwbsh
(
TrackTogetherTask
taskParam
);
public
int
queryTasksByAsjbhAndFwbshCount
(
TrackTogetherTask
taskParam
);
public
List
<
TogetherTaskResult
>
getTogetherTaskResultList
(
TogetherTaskResult
taskParam
);
int
getTogetherTaskResultListTotalCount
(
TogetherTaskResult
taskParam
);
...
...
src/main/java/com/founder/interservice/tracktraveltogether/service/impl/TogetherScheduledService.java
View file @
cdf8b523
This diff is collapsed.
Click to expand it.
src/main/java/com/founder/interservice/tracktraveltogether/service/impl/TrackTogetherServiceImpl.java
View file @
cdf8b523
...
...
@@ -164,6 +164,11 @@ public class TrackTogetherServiceImpl implements TrackTogetherService {
}
@Override
public
int
queryTasksByAsjbhAndFwbshCount
(
TrackTogetherTask
taskParam
)
{
return
trackTogetherMapper
.
queryTasksByAsjbhAndFwbshCount
(
taskParam
);
}
@Override
public
List
<
TogetherTaskResult
>
getTogetherTaskResultList
(
TogetherTaskResult
taskParam
)
{
return
togetherTaskResultMapper
.
getTogetherTaskResultList
(
taskParam
);
}
...
...
src/main/resources/mybatis/mapper/xzxt/TrackTogetkerTaskMapper.xml
View file @
cdf8b523
...
...
@@ -38,4 +38,21 @@
) t2
where rn
<![CDATA[ > ]]>
#{begin }
</select>
<select
id=
"queryTasksByAsjbhAndFwbshCount"
parameterType=
"com.founder.interservice.tracktraveltogether.model.TrackTogetherTask"
resultType=
"java.lang.Integer"
>
select
count(*)
from TB_ST_TRACKTOGETHERTASK t
<where>
<if
test=
"taskCaseId != null and taskCaseId != ''"
>
t.TASK_CASE_ID = #{taskCaseId}
</if>
<if
test=
"objectValue != null and objectValue != ''"
>
and t.OBJECT_VALUE = #{objectValue}
</if>
<if
test=
"taskId != null and taskId != ''"
>
and t.TASK_ID = #{taskId}
</if>
</where>
</select>
</mapper>
\ No newline at end of file
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