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
251bf766
Commit
251bf766
authored
May 13, 2019
by
caojingji
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'remotes/master/master' into caopeng_bate1
parents
7d616a65
e27defe0
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
238 additions
and
0 deletions
+238
-0
src/main/java/com/founder/interservice/dzgz/controller/DzgzController.java
+1
-0
src/main/java/com/founder/interservice/dzgz/model/DzgzTask.java
+2
-0
src/main/java/com/founder/interservice/dzgz/service/impl/DzgzScheduledServer.java
+165
-0
src/main/java/com/founder/interservice/mapper/xzxt/DzgzTaskMapper.java
+3
-0
src/main/java/com/founder/interservice/mapper/xzxt/DzgzTaskResultMapper.java
+2
-0
src/main/resources/mybatis/mapper/xzxt/DzgzTaskMapper.xml
+58
-0
src/main/resources/mybatis/mapper/xzxt/DzgzTaskResultMapper.xml
+7
-0
No files found.
src/main/java/com/founder/interservice/dzgz/controller/DzgzController.java
View file @
251bf766
...
...
@@ -298,6 +298,7 @@ public class DzgzController {
dzgzTask
.
setLc
(
node
.
getJSONArray
(
"lc"
).
toString
());
dzgzTask
.
setProgress
(
"0"
);
dzgzTask
.
setState
(
"QUEUEING"
);
dzgzTask
.
setGlxxXxzjbh
(
KeyUtil
.
getUniqueKey
(
"GL"
));
if
(
null
!=
user
){
dzgzTask
.
setFsrJh
(
user
.
getUsername
());
dzgzTask
.
setFsrSfzh
(
user
.
getCard_id
());
...
...
src/main/java/com/founder/interservice/dzgz/model/DzgzTask.java
View file @
251bf766
...
...
@@ -8,6 +8,8 @@ import java.util.Date;
@Data
public
class
DzgzTask
{
private
String
cdtlfxzt
;
//案前踩点案后逃离分析状态 0-未分析完成 1-分析完成
private
String
glxxXxzjbh
;
//关联信息信息主键编号---用于判断该任务为普通的电子固证去值还是案前踩点,案后逃离信息取值
private
String
rwresult
;
//任务结果
private
String
rwsd
;
//任务时段 0-当天该时段 1-前一天该时段 2-前两天该时段 3-前三天该时段 4-前四天(整天) 5-前五天(整天) 6-后三天(整三天)
private
String
taskId
;
//任务编号
...
...
src/main/java/com/founder/interservice/dzgz/service/impl/DzgzScheduledServer.java
View file @
251bf766
This diff is collapsed.
Click to expand it.
src/main/java/com/founder/interservice/mapper/xzxt/DzgzTaskMapper.java
View file @
251bf766
...
...
@@ -6,6 +6,7 @@ import com.founder.interservice.dzgz.model.DzgzTaskResult;
import
org.springframework.stereotype.Repository
;
import
java.util.List
;
import
java.util.Map
;
@Repository
public
interface
DzgzTaskMapper
{
...
...
@@ -25,4 +26,6 @@ public interface DzgzTaskMapper {
int
getDzgjResultDetailListTotalCount
(
DzgzTaskResult
dzgzTaskResult
)
throws
Exception
;
List
<
DzgzTask
>
queryAllUnFinishTask
();
List
<
DzgzTask
>
queryAllAjwfxTask
(
Map
map
);
}
src/main/java/com/founder/interservice/mapper/xzxt/DzgzTaskResultMapper.java
View file @
251bf766
...
...
@@ -20,4 +20,6 @@ public interface DzgzTaskResultMapper {
int
dzgzDetailIsExist
(
RegionalTaskResultDetail
param
)
throws
Exception
;
int
existsDzgzTaskResult
(
DzgzTaskResult
dzgzTask
);
List
<
String
>
getAllImsiResultsByTaskid
(
String
taskId
);
}
src/main/resources/mybatis/mapper/xzxt/DzgzTaskMapper.xml
View file @
251bf766
...
...
@@ -41,6 +41,7 @@
INSERT INTO TB_ST_DZGZTASK
(
TASK_ID,
GLXX_XXZJBH,
RWSD,
TASK_NAME,
TASK_CASE_ID,
...
...
@@ -61,6 +62,12 @@
VALUES
(
#{taskId},
<if
test=
"glxxXxzjbh != null and glxxXxzjbh != ''"
>
#{glxxXxzjbh},
</if>
<if
test=
"glxxXxzjbh == null || glxxXxzjbh == ''"
>
null,
</if>
<if
test=
"rwsd != null and rwsd != ''"
>
#{rwsd},
</if>
...
...
@@ -295,4 +302,54 @@
FROM TB_ST_DZGZTASK t
where t.PROGRESS!='1'
</select>
<select
id=
"queryAllAjwfxTask"
parameterType=
"java.util.Map"
resultType=
"com.founder.interservice.dzgz.model.DzgzTask"
>
select
t.TASK_ID as taskId,
t.GLXX_XXZJBH as glxxXxzjbh,
t.RWRESULT as rwresult,
t.RWSD as rwsd,
t.CDTLFXZT as cdtlfxzt,
t.TASK_NAME as taskName,
t.TASK_CASE_ID as taskCaseId,
t.QY_NAME as qyName,
t.LC as lc,
t.PROGRESS as progress,
case when t.STATE = 'QUEUEING' then '排队等待'
when t.STATE = 'STARTING' then '开始运行'
when t.STATE = 'RUNNING' then '执行中'
when t.STATE = 'FINISHED' then '执行完成'
when t.STATE = 'ERROR' then '执行错误'
when t.STATE = 'TIMEOUT' then '执行超时'
else '未发起申请'
end as state,
t.START_TIME as startTime,
t.END_TIME as endTime,
t.FSR_JH as fsrJh,
t.FSR_SFZH fsrSfzh,
t.FSR_XM fsrXm,
t.FSR_LXDH fsrLxdh,
case when t.SPZT = '-1' then '未发起申请'
when t.SPZT = '0' then '审批退回'
when t.SPZT = '0' then '审批成功'
when t.SPZT = '0' then '正在申请'
else '未发起申请'
end as spzt,
t.IP as ip,
t.DJSJ as djsj
FROM TB_ST_DZGZTASK t
where 1=1
<if
test=
"rwsd!=null and rwsd!=''"
>
and RWSD = #{rwsd}
</if>
<if
test=
"cdtlfxzt!=null and cdtlfxzt!=''"
>
and CDTLFXZT = #{cdtlfxzt}
</if>
<if
test=
"glxxXxzjbh!=null and glxxXxzjbh!=''"
>
and GLXX_XXZJBH = #{glxxXxzjbh}
</if>
<if
test=
"progressZt!=null and progressZt!=''"
>
and PROGRESS in ('1','2')
</if>
</select>
</mapper>
\ No newline at end of file
src/main/resources/mybatis/mapper/xzxt/DzgzTaskResultMapper.xml
View file @
251bf766
...
...
@@ -159,4 +159,10 @@
t.OBJECT_VALUE = #{objectValue}
</select>
<select
id =
"getAllImsiResultsByTaskid"
parameterType =
"String"
resultType=
"String"
>
select OBJECT_VALUE as objectValue
from TB_ST_DZGZTASKRESULT
where TASK_ID = #{taskId} and OBJECT_TYPE_NAME = 'IMSI'
</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