西海岸特殊处理
This commit is contained in:
wangliwen
parent
ecdd006c4e
commit
a4500ca2bb
|
|
@ -145,8 +145,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
wrapper.in(true, "del_flag", 0, 5);
|
||||
}
|
||||
}
|
||||
wrapper.orderByAsc("del_flag")
|
||||
.orderByDesc("create_date");
|
||||
wrapper.orderByAsc("del_flag").orderByDesc("create_date");
|
||||
return wrapper;
|
||||
}
|
||||
|
||||
|
|
@ -211,8 +210,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
return null;
|
||||
}
|
||||
QueryWrapper<AttrEntity> wrapper = new QueryWrapper<>();
|
||||
wrapper.eq("data_resource_id", id)
|
||||
.eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag());
|
||||
wrapper.eq("data_resource_id", id).eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag());
|
||||
List<AttrEntity> attrEntities = attrDao.selectList(wrapper);
|
||||
resourceDTO.setInfoList(attrEntities == null ? new ArrayList<>() : attrEntities); // npe?
|
||||
return resourceDTO;
|
||||
|
|
@ -257,88 +255,84 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
if ("基础设施".equals(resourceDTO.getType())) { // 基础设施
|
||||
logger.info("西海岸基础设施");
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
CompletableFuture cloud =
|
||||
CompletableFuture.runAsync(() -> { // 云脑专网
|
||||
OkHttpClient client = new OkHttpClient();
|
||||
String url = String.format(tsingtao_xhaProperties.getCloudcam(), 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()) {
|
||||
JSONObject jsonObject_ = JSON.parseObject(response.body().string());
|
||||
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(null);
|
||||
resultPage.setTotal(0);
|
||||
CompletableFuture cloud = CompletableFuture.runAsync(() -> { // 云脑专网
|
||||
OkHttpClient client = new OkHttpClient();
|
||||
String url = String.format(tsingtao_xhaProperties.getCloudcam(), 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()) {
|
||||
JSONObject jsonObject_ = JSON.parseObject(response.body().string());
|
||||
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 {
|
||||
logger.error("获取失败");
|
||||
resultPage.setRecords(null);
|
||||
resultPage.setTotal(0);
|
||||
}
|
||||
} catch (Exception exception) {
|
||||
logger.error("失败", exception);
|
||||
|
||||
}
|
||||
});
|
||||
CompletableFuture local =
|
||||
CompletableFuture.runAsync(() -> { // 金宏网
|
||||
OkHttpClient client = new OkHttpClient();
|
||||
String url = String.format(tsingtao_xhaProperties.getLocalcam(), 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()) {
|
||||
JSONObject jsonObject_ = JSON.parseObject(response.body().string());
|
||||
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(null);
|
||||
resultPage.setTotal(0);
|
||||
} else {
|
||||
logger.error("获取失败");
|
||||
}
|
||||
} catch (Exception exception) {
|
||||
logger.error("失败", exception);
|
||||
}
|
||||
});
|
||||
CompletableFuture local = CompletableFuture.runAsync(() -> { // 金宏网
|
||||
OkHttpClient client = new OkHttpClient();
|
||||
String url = String.format(tsingtao_xhaProperties.getLocalcam(), 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()) {
|
||||
JSONObject jsonObject_ = JSON.parseObject(response.body().string());
|
||||
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 {
|
||||
logger.error("获取失败");
|
||||
resultPage.setRecords(null);
|
||||
resultPage.setTotal(0);
|
||||
}
|
||||
} catch (Exception exception) {
|
||||
logger.error("失败", exception);
|
||||
|
||||
}
|
||||
});
|
||||
} else {
|
||||
logger.error("获取失败");
|
||||
}
|
||||
} catch (Exception exception) {
|
||||
logger.error("失败", exception);
|
||||
}
|
||||
});
|
||||
CompletableFuture.allOf(cloud, local);
|
||||
} else {
|
||||
logger.info("西海岸基普通");
|
||||
|
|
@ -371,16 +365,70 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
@Override
|
||||
public List<AttrEntity> selectAttrsByResourceId(Long resourceId) {
|
||||
QueryWrapper<AttrEntity> wrapper = new QueryWrapper<>();
|
||||
wrapper.eq("data_resource_id", resourceId)
|
||||
.eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag())
|
||||
.orderByDesc("attr_type");
|
||||
wrapper.eq("data_resource_id", resourceId).eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag()).orderByDesc("attr_type");
|
||||
return attrDao.selectList(wrapper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object selectTotal() {
|
||||
HashMap<String, Object> resultMap = new HashMap<>();
|
||||
resultMap.put("total", resourceDao.selectTypeCount(null));
|
||||
List<Map> re = resourceDao.selectTypeCount(null);
|
||||
switch (Constant.ProjectPlace.getByFlag(projectPlace)) {
|
||||
case TSINGTAO_XHA: { // 青岛西海岸
|
||||
CompletableFuture allAmount = CompletableFuture.supplyAsync(() -> { // 获取平台总基础设施数目
|
||||
List<Long> result_ = new CopyOnWriteArrayList<>();
|
||||
CompletableFuture cloud =
|
||||
CompletableFuture.runAsync(() -> { // 云脑专网
|
||||
OkHttpClient client = new OkHttpClient();
|
||||
String url = String.format(tsingtao_xhaProperties.getCloudcam(), "", 1, 10);
|
||||
logger.info(url);
|
||||
Request request = new Request.Builder().url(url).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.getJSONObject("data").getLongValue("total"));
|
||||
}
|
||||
} else {
|
||||
logger.error("青岛西海岸获取失败");
|
||||
}
|
||||
} catch (Exception exception) {
|
||||
logger.error("青岛西海岸失败", exception);
|
||||
}
|
||||
});
|
||||
CompletableFuture local =
|
||||
CompletableFuture.runAsync(() -> { // 金宏网
|
||||
OkHttpClient client = new OkHttpClient();
|
||||
String url = String.format(tsingtao_xhaProperties.getLocalcam(), "", 1, 10);
|
||||
logger.info(url);
|
||||
Request request = new Request.Builder().url(url).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.getJSONObject("data").getLongValue("total"));
|
||||
}
|
||||
} else {
|
||||
logger.error("青岛西海岸获取失败");
|
||||
}
|
||||
} catch (Exception exception) {
|
||||
logger.error("青岛西海岸失败", exception);
|
||||
}
|
||||
});
|
||||
CompletableFuture.allOf(cloud, local);
|
||||
return result_.stream().filter(index -> index != null).findAny().orElse(0l);
|
||||
}).thenAccept(sum -> {
|
||||
re.add(new HashMap<String, Object>() {
|
||||
{
|
||||
put("amount", sum);
|
||||
put("type", "视频资源数量");
|
||||
}
|
||||
});
|
||||
});
|
||||
allAmount.join();
|
||||
}
|
||||
}
|
||||
resultMap.put("total", re);
|
||||
return resultMap;
|
||||
}
|
||||
|
||||
|
|
@ -389,9 +437,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
public Object selectNewest(JSONObject jsonObject) {
|
||||
IPage<ResourceEntity> page = new Page<>(jsonObject.getIntValue("pageNum"), jsonObject.getIntValue("pageSize"));
|
||||
QueryWrapper<ResourceEntity> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq(StringUtils.isNotBlank(jsonObject.getString("type")), "type", jsonObject.getString("type"))
|
||||
.eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag())
|
||||
.orderByDesc("create_date");
|
||||
queryWrapper.eq(StringUtils.isNotBlank(jsonObject.getString("type")), "type", jsonObject.getString("type")).eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag()).orderByDesc("create_date");
|
||||
return resourceDao.selectPage(page, queryWrapper);
|
||||
|
||||
}
|
||||
|
|
@ -403,8 +449,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
List<ResourceDTO> resourceDTOS = resourceDao.selectMostPopular(selectMap);
|
||||
page.setRecords(resourceDTOS);
|
||||
QueryWrapper<ResourceEntity> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag())
|
||||
.eq("type", jsonObject.getString("type"));
|
||||
queryWrapper.eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag()).eq("type", jsonObject.getString("type"));
|
||||
Integer count = resourceDao.selectCount(queryWrapper);
|
||||
page.setTotal(count);
|
||||
return page;
|
||||
|
|
@ -417,9 +462,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
ResourceEntity entity = new ResourceEntity();
|
||||
entity.setVisits((resourceEntity.getVisits() == null ? 0 : resourceEntity.getVisits()) + 1);
|
||||
UpdateWrapper<ResourceEntity> updateWrapper = new UpdateWrapper<>();
|
||||
updateWrapper.lambda()
|
||||
.eq(ResourceEntity::getId, resourceEntity.getId())
|
||||
.eq(ResourceEntity::getDelFlag, ResourceEntityDelFlag.NORMAL.getFlag());
|
||||
updateWrapper.lambda().eq(ResourceEntity::getId, resourceEntity.getId()).eq(ResourceEntity::getDelFlag, ResourceEntityDelFlag.NORMAL.getFlag());
|
||||
resourceDao.update(entity, updateWrapper);
|
||||
ResourceBrowseEntity browseEntity = new ResourceBrowseEntity();
|
||||
browseEntity.setResourceId(id);
|
||||
|
|
@ -487,16 +530,14 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
HashMap<String, Object> resourceMap = new HashMap<>();
|
||||
resourceMap.put("type", "全部能力目录");
|
||||
QueryWrapper<ResourceEntity> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("del_flag", 0)
|
||||
.eq(StringUtils.isNotBlank(jsonObject.getString("type")), "type", jsonObject.getString("type"));
|
||||
queryWrapper.eq("del_flag", 0).eq(StringUtils.isNotBlank(jsonObject.getString("type")), "type", jsonObject.getString("type"));
|
||||
resourceMap.put("total", resourceDao.selectCount(queryWrapper));
|
||||
resultList.add(resourceMap);
|
||||
List<Map<String, Object>> typeMapList = resourceDao.selectGroupByDeptId(jsonObject.getString("type"));
|
||||
if (typeMapList.isEmpty()) {
|
||||
return resultList;
|
||||
}
|
||||
Map<String, List<Map<String, Object>>> listMap = typeMapList.stream()
|
||||
.collect(Collectors.groupingBy(m -> m.get("type").toString()));
|
||||
Map<String, List<Map<String, Object>>> listMap = typeMapList.stream().collect(Collectors.groupingBy(m -> m.get("type").toString()));
|
||||
//区级要根据行政区划多加一层结构
|
||||
listMap.entrySet().stream().filter(index -> !"区级".equals(index.getKey())).forEach(item -> {
|
||||
HashMap<String, Object> map = new HashMap<>();
|
||||
|
|
@ -510,8 +551,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
}
|
||||
});
|
||||
Optional<List<Map<String, Object>>> areaList = Optional.ofNullable(listMap.get("区级"));
|
||||
Optional<Map<String, List<Map<String, Object>>>> areaTypeList = Optional.ofNullable(areaList.orElse(new ArrayList<>()).stream()
|
||||
.collect(Collectors.groupingBy(m -> m.get("districtName").toString())));
|
||||
Optional<Map<String, List<Map<String, Object>>>> areaTypeList = Optional.ofNullable(areaList.orElse(new ArrayList<>()).stream().collect(Collectors.groupingBy(m -> m.get("districtName").toString())));
|
||||
HashMap<Object, Object> areaMap = new HashMap<>();
|
||||
areaMap.put("type", "区级");
|
||||
Integer integer = resourceDao.selectTypeCountByDept("区级", jsonObject.getString("type"));
|
||||
|
|
@ -707,9 +747,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
*/
|
||||
@Override
|
||||
public void KnowledgeBase() {
|
||||
final List<String> knowledgeUUID =
|
||||
jdbcTemplate.queryForList("SELECT note1 FROM tb_data_resource WHERE type ='知识库' AND note1 IS NOT NULL FOR UPDATE;", String.class)
|
||||
.stream().distinct().collect(Collectors.toList());
|
||||
final List<String> knowledgeUUID = jdbcTemplate.queryForList("SELECT note1 FROM tb_data_resource WHERE type ='知识库' AND note1 IS NOT NULL FOR UPDATE;", String.class).stream().distinct().collect(Collectors.toList());
|
||||
final int pageSize = 100;
|
||||
final OkHttpClient client = new OkHttpClient();
|
||||
Arrays.stream(catalogIds).map(index -> {
|
||||
|
|
@ -733,19 +771,11 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
String bizContent_ = bizContentParam.toJSONString();
|
||||
logger.info("biz_content参数：{}", bizContent_);
|
||||
// 通过FormBody对象构建Builder来添加表单参数
|
||||
FormBody.Builder signFormBody = new FormBody.Builder()
|
||||
.add("app_id", appId)
|
||||
.add("interface_id", methodId)
|
||||
.add("version", version)
|
||||
.add("timestamp", String.valueOf(timestamp))
|
||||
.add("origin", origin)
|
||||
.add("charset", charset)
|
||||
.add("biz_content", bizContent_);
|
||||
FormBody.Builder signFormBody = new FormBody.Builder().add("app_id", appId).add("interface_id", methodId).add("version", version).add("timestamp", String.valueOf(timestamp)).add("origin", origin).add("charset", charset).add("biz_content", bizContent_);
|
||||
logger.info(index + "分页{}对接知识库数据请求参数：" + signFormBody.build().contentType().toString(), page);
|
||||
|
||||
Request signRequest = new Request.Builder().url(sign).post(signFormBody.build()).build();
|
||||
Response signResponse =
|
||||
client.newCall(signRequest).execute();
|
||||
Response signResponse = client.newCall(signRequest).execute();
|
||||
String signResult = signResponse.body().string();
|
||||
logger.info("{}分页signResult数据：" + signResult, page);
|
||||
JSONObject signJsonObject = JSON.parseObject(signResult);
|
||||
|
|
|
|||
Loading…
Reference in New Issue