Skip to content

B
bigdatainterservice
Commit 26cff7ec by yanru
Options

修改保存多区域碰撞分析-发送任务、时空伴随-任务发送接口的返回值

parent ac7bd29d
Showing with 54 additions and 49 deletions
src/main/java/com/founder/interservice/controller/PushWaDataController.java
......@@ -168,23 +168,25 @@ public class PushWaDataController {
if (!StringUtils.isEmpty(result) && result.contains("{")) {
JSONObject resultObject = JSONObject.parseObject(result);
if (null != resultObject && resultObject.containsKey("data") && null != resultObject.get("data")) {
String taskId = resultObject.get("data").toString();
trackParam.setTaskId(taskId);
trackParam.setProgress("0");
trackParam.setState("QUEUEING");
trackParam.setTaskName(taskName);//设置任务名称
trackParam.setTaskCaseId(taskCaseId); //设置案件编号
trackParam.setObjectValue(objectValue); //设置需要伴随的标识号
if (!StringUtil.ckeckEmpty(objectType) && !StringUtil.ckeckEmpty(objectValue)
&& !StringUtil.ckeckEmpty(startTime) && !StringUtil.ckeckEmpty(endTime)) {
trackParam.setObjectType(objectType);//设置标识号类型
Object taskIdObj = resultObject.get("data");
if(null!=taskIdObj&&""!=taskIdObj) {
trackParam.setTaskId(taskIdObj.toString());
trackParam.setProgress("0");
trackParam.setState("QUEUEING");
trackParam.setTaskName(taskName);//设置任务名称
trackParam.setTaskCaseId(taskCaseId); //设置案件编号
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);
if (!StringUtil.ckeckEmpty(objectType) && !StringUtil.ckeckEmpty(objectValue)
&& !StringUtil.ckeckEmpty(startTime) && !StringUtil.ckeckEmpty(endTime)) {
trackParam.setObjectType(objectType);//设置标识号类型
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){
......
src/main/java/com/founder/interservice/protogenesis/controller/ProtoController.java
......@@ -291,44 +291,47 @@ public class ProtoController {
if (!StringUtils.isEmpty(result) && result.contains("{")) {
JSONObject resultObject = JSONObject.parseObject(result);
if (null != resultObject && resultObject.containsKey("data")&&null!=resultObject.get("data")) {
String taskId = resultObject.get("data").toString();
JSONObject paramObject = JSONObject.parseObject(param);
RegionalTask regionalTask = new RegionalTask();
List<Regional> regionalList = null;
regionalTask.setTaskId(taskId);
regionalTask.setTaskName(paramObject.getString("taskName"));
regionalTask.setTaskCaseId(paramObject.getString("taskCaseId"));
regionalTask.setDjsj(new Date());
regionalTask.setProgress("0");
regionalTask.setState("QUEUEING");
if (paramObject != null) {
JSONObject jsonObject1 = paramObject.getJSONObject("perform");
if (jsonObject1 != null) {
regionalTask.setExpression(jsonObject1.getString("expression"));
JSONArray jsonArray = jsonObject1.getJSONArray("regional");
if (jsonArray != null && !jsonArray.isEmpty()) {
regionalList = new ArrayList<>();
for (int i = 0; i <= jsonArray.size() - 1; i++) {
JSONObject object = jsonArray.getJSONObject(i);
if (object != null) {
Regional regional = new Regional();
regional.setTaskId(taskId);
regional.setDjsj(new Date());
regional.setRegionalId(KeyUtil.getUniqueKey("RT"));
regional.setName(object.getString("name"));
regional.setLc(object.getJSONArray("lc").toJSONString());
regional.setSource(object.getJSONArray("source").toJSONString());
regional.setStartTime(new Date(object.getLong("startTime")));
regional.setEndTime(new Date(object.getLong("endTime")));
regionalList.add(regional);
Object taskIdObj = resultObject.get("data");
if (null != taskIdObj && "" != taskIdObj) {
String taskId = taskIdObj.toString();
JSONObject paramObject = JSONObject.parseObject(param);
RegionalTask regionalTask = new RegionalTask();
List<Regional> regionalList = null;
regionalTask.setTaskId(taskId);
regionalTask.setTaskName(paramObject.getString("taskName"));
regionalTask.setTaskCaseId(paramObject.getString("taskCaseId"));
regionalTask.setDjsj(new Date());
regionalTask.setProgress("0");
regionalTask.setState("QUEUEING");
if (paramObject != null) {
JSONObject jsonObject1 = paramObject.getJSONObject("perform");
if (jsonObject1 != null) {
regionalTask.setExpression(jsonObject1.getString("expression"));
JSONArray jsonArray = jsonObject1.getJSONArray("regional");
if (jsonArray != null && !jsonArray.isEmpty()) {
regionalList = new ArrayList<>();
for (int i = 0; i <= jsonArray.size() - 1; i++) {
JSONObject object = jsonArray.getJSONObject(i);
if (object != null) {
Regional regional = new Regional();
regional.setTaskId(taskId);
regional.setDjsj(new Date());
regional.setRegionalId(KeyUtil.getUniqueKey("RT"));
regional.setName(object.getString("name"));
regional.setLc(object.getJSONArray("lc").toJSONString());
regional.setSource(object.getJSONArray("source").toJSONString());
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) {
regionalAnalysisService.saveRegionalTask(regionalTask);
if (regionalTask != null) {
regionalAnalysisService.saveRegionalTask(regionalTask);
}
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment