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
26cff7ec
Commit
26cff7ec
authored
May 17, 2019
by
yanru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改保存多区域碰撞分析-发送任务、时空伴随-任务发送接口的返回值
parent
ac7bd29d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
49 deletions
+54
-49
src/main/java/com/founder/interservice/controller/PushWaDataController.java
+17
-15
src/main/java/com/founder/interservice/protogenesis/controller/ProtoController.java
+37
-34
No files found.
src/main/java/com/founder/interservice/controller/PushWaDataController.java
View file @
26cff7ec
...
@@ -168,23 +168,25 @@ public class PushWaDataController {
...
@@ -168,23 +168,25 @@ public class PushWaDataController {
if
(!
StringUtils
.
isEmpty
(
result
)
&&
result
.
contains
(
"{"
))
{
if
(!
StringUtils
.
isEmpty
(
result
)
&&
result
.
contains
(
"{"
))
{
JSONObject
resultObject
=
JSONObject
.
parseObject
(
result
);
JSONObject
resultObject
=
JSONObject
.
parseObject
(
result
);
if
(
null
!=
resultObject
&&
resultObject
.
containsKey
(
"data"
)
&&
null
!=
resultObject
.
get
(
"data"
))
{
if
(
null
!=
resultObject
&&
resultObject
.
containsKey
(
"data"
)
&&
null
!=
resultObject
.
get
(
"data"
))
{
String
taskId
=
resultObject
.
get
(
"data"
).
toString
();
Object
taskIdObj
=
resultObject
.
get
(
"data"
);
trackParam
.
setTaskId
(
taskId
);
if
(
null
!=
taskIdObj
&&
""
!=
taskIdObj
)
{
trackParam
.
setProgress
(
"0"
);
trackParam
.
setTaskId
(
taskIdObj
.
toString
());
trackParam
.
setState
(
"QUEUEING"
);
trackParam
.
setProgress
(
"0"
);
trackParam
.
setTaskName
(
taskName
);
//设置任务名称
trackParam
.
setState
(
"QUEUEING"
);
trackParam
.
setTaskCaseId
(
taskCaseId
);
//设置案件编号
trackParam
.
setTaskName
(
taskName
);
//设置任务名称
trackParam
.
setObjectValue
(
objectValue
);
//设置需要伴随的标识号
trackParam
.
setTaskCaseId
(
taskCaseId
);
//设置案件编号
if
(!
StringUtil
.
ckeckEmpty
(
objectType
)
&&
!
StringUtil
.
ckeckEmpty
(
objectValue
)
&&
!
StringUtil
.
ckeckEmpty
(
startTime
)
&&
!
StringUtil
.
ckeckEmpty
(
endTime
))
{
trackParam
.
setObjectType
(
objectType
);
//设置标识号类型
trackParam
.
setObjectValue
(
objectValue
);
//设置需要伴随的标识号
trackParam
.
setObjectValue
(
objectValue
);
//设置需要伴随的标识号
Date
kssj
=
startTime
.
contains
(
" "
)
?
DateUtil
.
convertStringToDateTime
(
startTime
)
:
DateUtil
.
convertStringToDate
(
startTime
);
if
(!
StringUtil
.
ckeckEmpty
(
objectType
)
&&
!
StringUtil
.
ckeckEmpty
(
objectValue
)
trackParam
.
setStartTime
(
kssj
);
&&
!
StringUtil
.
ckeckEmpty
(
startTime
)
&&
!
StringUtil
.
ckeckEmpty
(
endTime
))
{
Date
jssj
=
endTime
.
contains
(
" "
)
?
DateUtil
.
convertStringToDateTime
(
endTime
)
:
DateUtil
.
convertStringToDate
(
endTime
);
trackParam
.
setObjectType
(
objectType
);
//设置标识号类型
trackParam
.
setEndTime
(
jssj
);
trackParam
.
setObjectValue
(
objectValue
);
//设置需要伴随的标识号
Date
kssj
=
startTime
.
contains
(
" "
)
?
DateUtil
.
convertStringToDateTime
(
startTime
)
:
DateUtil
.
convertStringToDate
(
startTime
);
trackParam
.
setStartTime
(
kssj
);
Date
jssj
=
endTime
.
contains
(
" "
)
?
DateUtil
.
convertStringToDateTime
(
endTime
)
:
DateUtil
.
convertStringToDate
(
endTime
);
trackParam
.
setEndTime
(
jssj
);
}
trackTogetherService
.
saveTogetherTask
(
trackParam
);
//任务保存入库
}
}
trackTogetherService
.
saveTogetherTask
(
trackParam
);
//任务保存入库
}
}
}
}
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
...
...
src/main/java/com/founder/interservice/protogenesis/controller/ProtoController.java
View file @
26cff7ec
...
@@ -291,44 +291,47 @@ public class ProtoController {
...
@@ -291,44 +291,47 @@ public class ProtoController {
if
(!
StringUtils
.
isEmpty
(
result
)
&&
result
.
contains
(
"{"
))
{
if
(!
StringUtils
.
isEmpty
(
result
)
&&
result
.
contains
(
"{"
))
{
JSONObject
resultObject
=
JSONObject
.
parseObject
(
result
);
JSONObject
resultObject
=
JSONObject
.
parseObject
(
result
);
if
(
null
!=
resultObject
&&
resultObject
.
containsKey
(
"data"
)&&
null
!=
resultObject
.
get
(
"data"
))
{
if
(
null
!=
resultObject
&&
resultObject
.
containsKey
(
"data"
)&&
null
!=
resultObject
.
get
(
"data"
))
{
String
taskId
=
resultObject
.
get
(
"data"
).
toString
();
Object
taskIdObj
=
resultObject
.
get
(
"data"
);
JSONObject
paramObject
=
JSONObject
.
parseObject
(
param
);
if
(
null
!=
taskIdObj
&&
""
!=
taskIdObj
)
{
RegionalTask
regionalTask
=
new
RegionalTask
();
String
taskId
=
taskIdObj
.
toString
();
List
<
Regional
>
regionalList
=
null
;
JSONObject
paramObject
=
JSONObject
.
parseObject
(
param
);
regionalTask
.
setTaskId
(
taskId
);
RegionalTask
regionalTask
=
new
RegionalTask
();
regionalTask
.
setTaskName
(
paramObject
.
getString
(
"taskName"
));
List
<
Regional
>
regionalList
=
null
;
regionalTask
.
setTaskCaseId
(
paramObject
.
getString
(
"taskCaseId"
));
regionalTask
.
setTaskId
(
taskId
);
regionalTask
.
setDjsj
(
new
Date
());
regionalTask
.
setTaskName
(
paramObject
.
getString
(
"taskName"
));
regionalTask
.
setProgress
(
"0"
);
regionalTask
.
setTaskCaseId
(
paramObject
.
getString
(
"taskCaseId"
));
regionalTask
.
setState
(
"QUEUEING"
);
regionalTask
.
setDjsj
(
new
Date
());
if
(
paramObject
!=
null
)
{
regionalTask
.
setProgress
(
"0"
);
JSONObject
jsonObject1
=
paramObject
.
getJSONObject
(
"perform"
);
regionalTask
.
setState
(
"QUEUEING"
);
if
(
jsonObject1
!=
null
)
{
if
(
paramObject
!=
null
)
{
regionalTask
.
setExpression
(
jsonObject1
.
getString
(
"expression"
));
JSONObject
jsonObject1
=
paramObject
.
getJSONObject
(
"perform"
);
JSONArray
jsonArray
=
jsonObject1
.
getJSONArray
(
"regional"
);
if
(
jsonObject1
!=
null
)
{
if
(
jsonArray
!=
null
&&
!
jsonArray
.
isEmpty
())
{
regionalTask
.
setExpression
(
jsonObject1
.
getString
(
"expression"
));
regionalList
=
new
ArrayList
<>();
JSONArray
jsonArray
=
jsonObject1
.
getJSONArray
(
"regional"
);
for
(
int
i
=
0
;
i
<=
jsonArray
.
size
()
-
1
;
i
++)
{
if
(
jsonArray
!=
null
&&
!
jsonArray
.
isEmpty
())
{
JSONObject
object
=
jsonArray
.
getJSONObject
(
i
);
regionalList
=
new
ArrayList
<>();
if
(
object
!=
null
)
{
for
(
int
i
=
0
;
i
<=
jsonArray
.
size
()
-
1
;
i
++)
{
Regional
regional
=
new
Regional
();
JSONObject
object
=
jsonArray
.
getJSONObject
(
i
);
regional
.
setTaskId
(
taskId
);
if
(
object
!=
null
)
{
regional
.
setDjsj
(
new
Date
());
Regional
regional
=
new
Regional
();
regional
.
setRegionalId
(
KeyUtil
.
getUniqueKey
(
"RT"
));
regional
.
setTaskId
(
taskId
);
regional
.
setName
(
object
.
getString
(
"name"
));
regional
.
setDjsj
(
new
Date
());
regional
.
setLc
(
object
.
getJSONArray
(
"lc"
).
toJSONString
());
regional
.
setRegionalId
(
KeyUtil
.
getUniqueKey
(
"RT"
));
regional
.
setSource
(
object
.
getJSONArray
(
"source"
).
toJSONString
());
regional
.
setName
(
object
.
getString
(
"name"
));
regional
.
setStartTime
(
new
Date
(
object
.
getLong
(
"startTime"
)));
regional
.
setLc
(
object
.
getJSONArray
(
"lc"
).
toJSONString
());
regional
.
setEndTime
(
new
Date
(
object
.
getLong
(
"endTime"
)));
regional
.
setSource
(
object
.
getJSONArray
(
"source"
).
toJSONString
());
regionalList
.
add
(
regional
);
regional
.
setStartTime
(
new
Date
(
object
.
getLong
(
"startTime"
)));
regional
.
setEndTime
(
new
Date
(
object
.
getLong
(
"endTime"
)));
regionalList
.
add
(
regional
);
}
}
}
}
}
regionalTask
.
setRegionals
(
regionalList
);
}
}
regionalTask
.
setRegionals
(
regionalList
);
}
}
}
if
(
regionalTask
!=
null
)
{
if
(
regionalTask
!=
null
)
{
regionalAnalysisService
.
saveRegionalTask
(
regionalTask
);
regionalAnalysisService
.
saveRegionalTask
(
regionalTask
);
}
}
}
}
}
}
}
...
...
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