屮...
This commit is contained in:
parent
2a21a57ede
commit
37229a1743
|
@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("STapi/project")
|
||||
|
@ -29,22 +30,19 @@ public class ShangTangController {
|
|||
private TaskListControllerDao taskListControllerDao;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 事件模板分页查询接口
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping("tamplate")
|
||||
@ApiOperation("事件模板分页查询接口")
|
||||
public JSONObject tamplate() {
|
||||
|
||||
return shangTangService.template();
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 定时插入场景任务列表
|
||||
*
|
||||
*/
|
||||
@RequestMapping("insertTaskList")
|
||||
@ApiOperation("场景任务列表插入")
|
||||
|
@ -54,29 +52,27 @@ public class ShangTangController {
|
|||
|
||||
taskListControllerDao.deleteAll();
|
||||
|
||||
JSONObject jobj = this.tamplate();
|
||||
JSONObject datajobj = jobj.getJSONObject("data");
|
||||
JSONArray tamplateList = datajobj.getJSONArray("dataList");
|
||||
//JSONArray tamplateList = jobj.getJSONArray("data");//构建JSONArray数组
|
||||
|
||||
for (int i = 0 ; i < tamplateList.size();i++) {
|
||||
Map<String, Object> key = (Map<String, Object>) tamplateList.get(i);
|
||||
Optional<JSONObject> jobj = Optional.ofNullable(this.tamplate());
|
||||
Optional<JSONObject> datajobj = Optional.ofNullable(jobj.orElse(new JSONObject()).getJSONObject("data"));
|
||||
Optional<JSONArray> tamplateList = Optional.ofNullable(datajobj.orElse(new JSONObject()).getJSONArray("dataList"));
|
||||
tamplateList.orElse(new JSONArray()).parallelStream().forEach(index -> {
|
||||
Map<String, Object> key = (Map<String, Object>) index;
|
||||
String eventType = (String) key.get("eventType");
|
||||
String eventCnName = (String) key.get("eventCnName");
|
||||
JSONObject taskListBody = shangTangService.tasklist(eventType);
|
||||
if (taskListBody.size()>0){
|
||||
JSONObject taskdatajobj = taskListBody.getJSONObject("data");
|
||||
if (taskdatajobj!=null){
|
||||
JSONArray taskdatajobjJSONArray = taskdatajobj.getJSONArray("dataList");
|
||||
if (taskdatajobjJSONArray!=null){
|
||||
for (int j = 0 ; j < taskdatajobjJSONArray.size();j++) {
|
||||
Map<String, Object> key1 = (Map<String, Object>)taskdatajobjJSONArray.get(j);
|
||||
|
||||
if (taskListBody.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
Optional<JSONObject> taskdatajobj = Optional.ofNullable(taskListBody.getJSONObject("data"));
|
||||
taskdatajobj.ifPresent(task -> {
|
||||
Optional<JSONArray> taskdatajobjJSONArray = Optional.ofNullable(task.getJSONArray("dataList"));
|
||||
taskdatajobjJSONArray.orElse(new JSONArray()).stream().forEach(index_ -> {
|
||||
Map<String, Object> key1 = (Map<String, Object>) index_;
|
||||
String taskSerial = (String) key1.get("taskSerial");
|
||||
Integer taskStatus = (Integer) key1.get("taskStatus");
|
||||
|
||||
JSONObject taskDetailObj = shangTangService.tasklistDetail(taskSerial);
|
||||
JSONObject taskDetail = taskDetailObj.getJSONObject("data");
|
||||
Optional<JSONObject> taskDetailObj = Optional.ofNullable(shangTangService.tasklistDetail(taskSerial));
|
||||
JSONObject taskDetail = taskDetailObj.orElse(new JSONObject()).getJSONObject("data");
|
||||
|
||||
TaskListControllerEntity taskListobj = new TaskListControllerEntity();
|
||||
|
||||
|
@ -93,10 +89,47 @@ public class ShangTangController {
|
|||
taskListobj.setEventType(eventType);
|
||||
taskListobj.setEventCnName(eventCnName);
|
||||
taskListControllerDao.insert(taskListobj);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
// for (int i = 0; i < tamplateList.orElse(new JSONArray()).size(); i++) {
|
||||
// Map<String, Object> key = (Map<String, Object>) tamplateList.get().get(i);
|
||||
// String eventType = (String) key.get("eventType");
|
||||
// String eventCnName = (String) key.get("eventCnName");
|
||||
// JSONObject taskListBody = shangTangService.tasklist(eventType);
|
||||
// if (taskListBody.size() > 0) {
|
||||
// JSONObject taskdatajobj = taskListBody.getJSONObject("data");
|
||||
// if (taskdatajobj != null) {
|
||||
// JSONArray taskdatajobjJSONArray = taskdatajobj.getJSONArray("dataList");
|
||||
// if (taskdatajobjJSONArray != null) {
|
||||
// for (int j = 0; j < taskdatajobjJSONArray.size(); j++) {
|
||||
// Map<String, Object> key1 = (Map<String, Object>) taskdatajobjJSONArray.get(j);
|
||||
//
|
||||
// String taskSerial = (String) key1.get("taskSerial");
|
||||
// Integer taskStatus = (Integer) key1.get("taskStatus");
|
||||
//
|
||||
// JSONObject taskDetailObj = shangTangService.tasklistDetail(taskSerial);
|
||||
// JSONObject taskDetail = taskDetailObj.getJSONObject("data");
|
||||
//
|
||||
// TaskListControllerEntity taskListobj = new TaskListControllerEntity();
|
||||
//
|
||||
// if (taskDetail != null) {
|
||||
// String taskName = taskDetail.getString("taskName");
|
||||
// taskListobj.setTaskName(taskName);
|
||||
// } else {
|
||||
// taskListobj.setTaskName("任务停止");
|
||||
// }
|
||||
//
|
||||
// taskListobj.setTaskSerial(taskSerial);
|
||||
// taskListobj.setTaskStatus(taskStatus);
|
||||
//
|
||||
// taskListobj.setEventType(eventType);
|
||||
// taskListobj.setEventCnName(eventCnName);
|
||||
// taskListControllerDao.insert(taskListobj);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
|
|
@ -69,6 +69,7 @@ public class ShangTangService {
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
//事件模板分页查询接口
|
||||
public JSONObject template() {
|
||||
String token = this.shangtangToken();
|
||||
|
|
Loading…
Reference in New Issue