Compare commits
No commits in common. "6f960da803ae598870a8f6623325745f62c79ec6" and "da8340d41eed9f720f36943096dfad4798b4fde1" have entirely different histories.
6f960da803
...
da8340d41e
|
|
@ -10,8 +10,6 @@ import io.renren.common.utils.MessageUtils;
|
||||||
import io.renren.modules.activiti.dto.TaskDTO;
|
import io.renren.modules.activiti.dto.TaskDTO;
|
||||||
import io.renren.modules.demanData.dto.TDemandDataDTO;
|
import io.renren.modules.demanData.dto.TDemandDataDTO;
|
||||||
import io.renren.modules.demanData.service.TDemandDataService;
|
import io.renren.modules.demanData.service.TDemandDataService;
|
||||||
import io.renren.modules.demandComment.dto.TDemandCommentDTO;
|
|
||||||
import io.renren.modules.demandComment.service.TDemandCommentService;
|
|
||||||
import io.renren.modules.processForm.dto.TAbilityApplicationDTO;
|
import io.renren.modules.processForm.dto.TAbilityApplicationDTO;
|
||||||
import io.renren.modules.processForm.service.TAbilityApplicationService;
|
import io.renren.modules.processForm.service.TAbilityApplicationService;
|
||||||
import io.renren.modules.resource.dto.ResourceDTO;
|
import io.renren.modules.resource.dto.ResourceDTO;
|
||||||
|
|
@ -64,9 +62,6 @@ public class ActTaskService extends BaseServiceImpl {
|
||||||
public static String Task_HANDLE_STATE_BACK = "back"; //回退
|
public static String Task_HANDLE_STATE_BACK = "back"; //回退
|
||||||
public static String Task_HANDLE_STATE_STOP = "stop"; //终止
|
public static String Task_HANDLE_STATE_STOP = "stop"; //终止
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private TDemandCommentService tDemandCommentService;
|
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
protected TaskService taskService;
|
protected TaskService taskService;
|
||||||
@Autowired
|
@Autowired
|
||||||
|
|
@ -171,16 +166,6 @@ public class ActTaskService extends BaseServiceImpl {
|
||||||
listDto.add(dto);
|
listDto.add(dto);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
TDemandCommentDTO tDemandCommentDTO = tDemandCommentService.get(Long.valueOf(dto.getBusinessKey()));
|
|
||||||
if (tDemandCommentDTO != null) {
|
|
||||||
Map<String, Object> variables = oMapper.convertValue(tDemandCommentDTO, Map.class);
|
|
||||||
processVariable.putAll(variables);
|
|
||||||
processVariable.putAll(task.getProcessVariables());
|
|
||||||
dto.setParams(processVariable);
|
|
||||||
listDto.add(dto);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return new PageData<>(listDto, (int) taskQuery.count());
|
return new PageData<>(listDto, (int) taskQuery.count());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -255,45 +255,89 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
||||||
if ("基础设施".equals(resourceDTO.getType())) { // 基础设施
|
if ("基础设施".equals(resourceDTO.getType())) { // 基础设施
|
||||||
logger.info("西海岸基础设施");
|
logger.info("西海岸基础设施");
|
||||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
OkHttpClient client = new OkHttpClient();
|
CompletableFuture cloud = CompletableFuture.runAsync(() -> { // 云脑专网
|
||||||
String url = String.format(tsingtao_xhaProperties.getCloudcam(), org.apache.commons.lang3.StringUtils.isNotEmpty(resourceDTO.getName()) ? resourceDTO.getName() : "", pageNum, pageSize);
|
OkHttpClient client = new OkHttpClient();
|
||||||
logger.info(url);
|
String url = String.format(tsingtao_xhaProperties.getCloudcam(), org.apache.commons.lang3.StringUtils.isNotEmpty(resourceDTO.getName()) ? resourceDTO.getName() : "", pageNum, pageSize);
|
||||||
Request request = new Request.Builder().url(url).build();
|
logger.info(url);
|
||||||
try (Response response = client.newCall(request).execute()) {
|
Request request = new Request.Builder().url(url).build();
|
||||||
if (response.isSuccessful()) {
|
try (Response response = client.newCall(request).execute()) {
|
||||||
String body = response.body().string();
|
if (response.isSuccessful()) {
|
||||||
JSONObject jsonObject_ = JSON.parseObject(body);
|
String body = response.body().string();
|
||||||
logger.info("西海岸接口返回：{}" + body, url);
|
JSONObject jsonObject_ = JSON.parseObject(body);
|
||||||
if (jsonObject_.containsKey("data")) {
|
logger.info("西海岸接口返回：{}" + body, url);
|
||||||
if (jsonObject_.getJSONObject("data").containsKey("list")) {
|
if (jsonObject_.containsKey("data")) {
|
||||||
resultPage.setTotal(jsonObject_.getJSONObject("data").getLongValue("total"));
|
if (jsonObject_.getJSONObject("data").containsKey("list")) {
|
||||||
resultPage.setRecords(jsonObject_.getJSONObject("data").getJSONArray("list").stream().map(index -> (JSONObject) JSON.toJSON(index)).map(index -> {
|
resultPage.setTotal(jsonObject_.getJSONObject("data").getLongValue("total"));
|
||||||
ResourceDTO resourceDTO1 = new ResourceDTO();
|
resultPage.setRecords(jsonObject_.getJSONObject("data").getJSONArray("list").stream().map(index -> (JSONObject) JSON.toJSON(index)).map(index -> {
|
||||||
resourceDTO1.setId(Long.valueOf(index.getString("id")));
|
ResourceDTO resourceDTO1 = new ResourceDTO();
|
||||||
resourceDTO1.setDelFlag(index.getIntValue("delFlag"));
|
resourceDTO1.setId(Long.valueOf(index.getString("id")));
|
||||||
resourceDTO1.setLink(index.getString("cameraIndexCode"));
|
resourceDTO1.setDelFlag(index.getIntValue("delFlag"));
|
||||||
resourceDTO1.setName(index.getString("name"));
|
resourceDTO1.setLink(index.getString("cameraIndexCode"));
|
||||||
resourceDTO1.setType("基础设施");
|
resourceDTO1.setName(index.getString("name"));
|
||||||
try {
|
resourceDTO1.setType("基础设施");
|
||||||
resourceDTO1.setCreateDate(sdf.parse(index.getString("createdTime")));
|
try {
|
||||||
} catch (ParseException e) {
|
resourceDTO1.setCreateDate(sdf.parse(index.getString("createdTime")));
|
||||||
logger.error("时间异常");
|
} catch (ParseException e) {
|
||||||
resourceDTO1.setCreateDate(new Date());
|
logger.error("时间异常");
|
||||||
}
|
resourceDTO1.setCreateDate(new Date());
|
||||||
return resourceDTO1;
|
}
|
||||||
}).collect(Collectors.toList()));
|
return resourceDTO1;
|
||||||
} else {
|
}).collect(Collectors.toList()));
|
||||||
resultPage.setRecords(new ArrayList<>());
|
} else {
|
||||||
resultPage.setTotal(0);
|
resultPage.setRecords(new ArrayList<>());
|
||||||
}
|
resultPage.setTotal(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
logger.error("获取失败");
|
||||||
}
|
}
|
||||||
} else {
|
} catch (Exception exception) {
|
||||||
logger.error("获取失败");
|
logger.error("失败", exception);
|
||||||
}
|
}
|
||||||
} catch (Exception exception) {
|
});
|
||||||
logger.error("失败", exception);
|
CompletableFuture local = CompletableFuture.runAsync(() -> { // 金宏网
|
||||||
}
|
OkHttpClient client = new OkHttpClient();
|
||||||
|
String url = String.format(tsingtao_xhaProperties.getLocalcam(), org.apache.commons.lang3.StringUtils.isNotEmpty(resourceDTO.getName()) ? resourceDTO.getName() : "", pageNum, pageSize);
|
||||||
|
logger.info(url);
|
||||||
|
Request request = new Request.Builder().url(url).build();
|
||||||
|
try (Response response = client.newCall(request).execute()) {
|
||||||
|
if (response.isSuccessful()) {
|
||||||
|
String body = response.body().string();
|
||||||
|
JSONObject jsonObject_ = JSON.parseObject(body);
|
||||||
|
logger.info("西海岸接口返回：{}" + body, url);
|
||||||
|
if (jsonObject_.containsKey("data")) {
|
||||||
|
if (jsonObject_.getJSONObject("data").containsKey("list")) {
|
||||||
|
resultPage.setTotal(jsonObject_.getJSONObject("data").getLongValue("total"));
|
||||||
|
resultPage.setRecords(jsonObject_.getJSONObject("data").getJSONArray("list").stream().map(index -> (JSONObject) JSON.toJSON(index)).map(index -> {
|
||||||
|
ResourceDTO resourceDTO1 = new ResourceDTO();
|
||||||
|
resourceDTO1.setId(Long.valueOf(index.getString("id")));
|
||||||
|
resourceDTO1.setDelFlag(index.getIntValue("delFlag"));
|
||||||
|
resourceDTO1.setLink(index.getString("cameraIndexCode"));
|
||||||
|
resourceDTO1.setName(index.getString("name"));
|
||||||
|
resourceDTO1.setType("基础设施");
|
||||||
|
try {
|
||||||
|
resourceDTO1.setCreateDate(sdf.parse(index.getString("createdTime")));
|
||||||
|
} catch (ParseException e) {
|
||||||
|
logger.error("时间异常");
|
||||||
|
resourceDTO1.setCreateDate(new Date());
|
||||||
|
}
|
||||||
|
return resourceDTO1;
|
||||||
|
}).collect(Collectors.toList()));
|
||||||
|
} else {
|
||||||
|
resultPage.setRecords(new ArrayList<>());
|
||||||
|
resultPage.setTotal(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
logger.error("获取失败");
|
||||||
|
}
|
||||||
|
} catch (Exception exception) {
|
||||||
|
logger.error("失败", exception);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
CompletableFuture.allOf(cloud, local);
|
||||||
} else {
|
} else {
|
||||||
logger.info("西海岸基普通");
|
logger.info("西海岸基普通");
|
||||||
if (resourceDTO.getInfoList().isEmpty()) {
|
if (resourceDTO.getInfoList().isEmpty()) {
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.concurrent.CopyOnWriteArrayList;
|
import java.util.concurrent.CopyOnWriteArrayList;
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -35,21 +36,41 @@ public class TsingtaoXHAVideoPreviewService extends AbstractVideoPreviewService
|
||||||
@Override
|
@Override
|
||||||
public String getHls(String key) {
|
public String getHls(String key) {
|
||||||
List<String> result = new CopyOnWriteArrayList<>();
|
List<String> result = new CopyOnWriteArrayList<>();
|
||||||
|
CompletableFuture cloud =
|
||||||
OkHttpClient client = new OkHttpClient();
|
CompletableFuture.runAsync(() -> { // 云脑专网
|
||||||
Request request = new Request.Builder().url(String.format(tsingtao_xhaProperties.getCloudhls(), key)).build();
|
OkHttpClient client = new OkHttpClient();
|
||||||
try (Response response = client.newCall(request).execute()) {
|
Request request = new Request.Builder().url(String.format(tsingtao_xhaProperties.getCloudhls(), key)).build();
|
||||||
if (response.isSuccessful()) {
|
try (Response response = client.newCall(request).execute()) {
|
||||||
JSONObject jsonObject = JSON.parseObject(response.body().string());
|
if (response.isSuccessful()) {
|
||||||
if (jsonObject.containsKey("data")) {
|
JSONObject jsonObject = JSON.parseObject(response.body().string());
|
||||||
result.add(jsonObject.getString("data"));
|
if (jsonObject.containsKey("data")) {
|
||||||
}
|
result.add(jsonObject.getString("data"));
|
||||||
} else {
|
}
|
||||||
logger.error("西海岸预览地址获取失败");
|
} else {
|
||||||
}
|
logger.error("西海岸预览地址获取失败");
|
||||||
} catch (Exception exception) {
|
}
|
||||||
logger.error("西海岸预览地址获取失败", exception);
|
} catch (Exception exception) {
|
||||||
}
|
logger.error("西海岸预览地址获取失败", exception);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
CompletableFuture local =
|
||||||
|
CompletableFuture.runAsync(() -> { // 金宏网
|
||||||
|
OkHttpClient client = new OkHttpClient();
|
||||||
|
Request request = new Request.Builder().url(String.format(tsingtao_xhaProperties.getLocalhls(), key)).build();
|
||||||
|
try (Response response = client.newCall(request).execute()) {
|
||||||
|
if (response.isSuccessful()) {
|
||||||
|
JSONObject jsonObject = JSON.parseObject(response.body().string());
|
||||||
|
if (jsonObject.containsKey("data")) {
|
||||||
|
result.add(jsonObject.getString("data"));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
logger.error("西海岸预览地址获取失败");
|
||||||
|
}
|
||||||
|
} catch (Exception exception) {
|
||||||
|
logger.error("西海案预览地址获取失败", exception);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
CompletableFuture.allOf(cloud, local);
|
||||||
return result.stream().filter(index -> StringUtils.isNotEmpty(index)).findAny().orElse(null);
|
return result.stream().filter(index -> StringUtils.isNotEmpty(index)).findAny().orElse(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue