wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
wangliwen 2022-08-01 10:13:33 +08:00
parent ff3e590dda 00651bc910
commit b68daeda1c
8 changed files with 92 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
renren-admin/src/main/java/io/renren/common/controller/CensusControllerV2.java
View File

@ -342,40 +342,36 @@ public class CensusControllerV2 {
List<Map<String, Object>> dbAmount = (List<Map<String, Object>>) map.get("total"); List<Map<String, Object>> dbAmount = (List<Map<String, Object>>) map.get("total");
return dbAmount.stream().filter(index -> "基础设施".equals(index.get("type").toString())) return dbAmount.stream().filter(index -> "基础设施".equals(index.get("type").toString()))
.mapToLong(index -> Long.parseLong(index.get("count").toString())).sum(); .mapToLong(index -> Long.parseLong(index.get("count").toString())).sum();
}).thenAccept(sum -> { }).thenAccept(sum -> result.add(new HashMap<String, Object>() {
result.add(new HashMap<String, Object>() {
{ {
put("amount", sum); put("amount", sum);
put("type", "视频资源数量"); put("type", "视频资源数量");
} }
}); }));
});
} }
break; break;
case BAOTOU: { // 包头 case BAOTOU: { // 包头
allAmount = CompletableFuture.supplyAsync(() -> { // 获取平台总基础设施数目 allAmount = CompletableFuture.supplyAsync(() -> { // 获取平台总基础设施数目
return jdbcTemplate.queryForObject("SELECT COUNT(id) FROM tb_data_resource WHERE type = '基础设施' AND del_flag = 0", Long.class); return jdbcTemplate.queryForObject("SELECT COUNT(id) FROM tb_data_resource WHERE type = '基础设施' AND del_flag = 0", Long.class);
}).thenAccept(sum -> { }).thenAccept(sum -> result.add(new HashMap<String, Object>() {
result.add(new HashMap<String, Object>() {
{ {
put("amount", sum); put("amount", sum);
put("type", "视频资源数量"); put("type", "视频资源数量");
} }
}); }));
});
} }
break; break;
case TSINGTAO_XHA: { // 青岛西海岸 case TSINGTAO_XHA: { // 青岛西海岸
allAmount = CompletableFuture.supplyAsync(() -> { // 获取平台总基础设施数目 allAmount = CompletableFuture.supplyAsync(() -> { // 获取平台总基础设施数目
List<Long> result_ = new CopyOnWriteArrayList<>(); List<Long> result_ = new CopyOnWriteArrayList<>();
String url = String.format(tsingtao_xhaProperties.getCloudcam(), "", 1, 10); String url = tsingtao_xhaProperties.getCamCount();
logger.info(url); logger.info(url);
Request request = new Request.Builder().url(url).build(); Request request = new Request.Builder().url(url).build();
try (Response response = client.newCall(request).execute()) { try (Response response = client.newCall(request).execute()) {
if (response.isSuccessful()) { if (response.isSuccessful()) {
JSONObject jsonObject = JSON.parseObject(response.body().string()); JSONObject jsonObject = JSON.parseObject(response.body().string());
if (jsonObject.containsKey("data")) { if (jsonObject.containsKey("errorNo") && jsonObject.getLongValue("errorNo") == 200) {
result_.add(jsonObject.getJSONObject("data").getLongValue("total")); result_.add(jsonObject.getLongValue("body"));
} }
} else { } else {
logger.error("青岛西海岸获取失败"); logger.error("青岛西海岸获取失败");
@ -383,15 +379,13 @@ public class CensusControllerV2 {
} catch (Exception exception) { } catch (Exception exception) {
logger.error("青岛西海岸失败", exception); logger.error("青岛西海岸失败", exception);
} }
return result_.stream().filter(index -> index != null).findAny().orElse(0l); return result_.stream().filter(Objects::nonNull).findAny().orElse(0L);
}).thenAccept(sum -> { }).thenAccept(sum -> result.add(new HashMap<String, Object>() {
result.add(new HashMap<String, Object>() {
{ {
put("amount", sum); put("amount", sum);
put("type", "视频资源数量"); put("type", "视频资源数量");
} }
}); }));
});
} }
break; break;
} }
@ -461,19 +455,17 @@ public class CensusControllerV2 {
{ {
List<Map> lists = (dataResource != null && dataResource.containsKey("data") && dataResource.get("data") != null) ? (List<Map>) dataResource.get("data") : new ArrayList<>(); List<Map> lists = (dataResource != null && dataResource.containsKey("data") && dataResource.get("data") != null) ? (List<Map>) dataResource.get("data") : new ArrayList<>();
ArrayList<Map> list = new ArrayList<>(); ArrayList<Map> list = new ArrayList<>();
lists.forEach(item -> { lists.forEach(item -> list.add(new HashMap<String, Object>() {{
list.add(new HashMap<String, Object>() {{
put("服务名称", item.get("zyname")); put("服务名称", item.get("zyname"));
put("申请次数", item.get("syqk")); put("申请次数", item.get("syqk"));
}}); }}));
});
put("resourceTop5", list); put("resourceTop5", list);
} }
}); });
} }
break; break;
case TSINGTAO_XHA: { // 青岛西海岸 case TSINGTAO_XHA: { // 青岛西海岸
Long total = 0L; Long total;
Request request = new Request.Builder().url(tsingtao_xhaProperties.getResourcecount()).build(); Request request = new Request.Builder().url(tsingtao_xhaProperties.getResourcecount()).build();
try (Response response = client.newCall(request).execute()) { try (Response response = client.newCall(request).execute()) {
if (response.isSuccessful()) { if (response.isSuccessful()) {

2
renren-admin/src/main/java/io/renren/common/domain/Tsingtao_xhaProperties.java
View File

@ -1,6 +1,5 @@
package io.renren.common.domain; package io.renren.common.domain;
import lombok.Data; import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.PropertySource; import org.springframework.context.annotation.PropertySource;
@ -21,4 +20,5 @@ public class Tsingtao_xhaProperties {
private String resourcecount; private String resourcecount;
private String resourceapplyinfo; private String resourceapplyinfo;
private String sjzy; private String sjzy;
private String camCount;
} }

1
renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraOrgenizationMapper.java
View File

@ -1,6 +1,5 @@
package io.renren.modules.monitor.mapper; package io.renren.modules.monitor.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import io.renren.common.dao.BaseDao; import io.renren.common.dao.BaseDao;
import io.renren.modules.monitor.entity.CameraOrganization; import io.renren.modules.monitor.entity.CameraOrganization;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;

71
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -538,7 +538,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
List<Long> result = new CopyOnWriteArrayList<>(); List<Long> result = new CopyOnWriteArrayList<>();
CompletableFuture cloud = CompletableFuture cloud =
CompletableFuture.runAsync(() -> { // 云脑专网 CompletableFuture.runAsync(() -> { // 云脑专网
String url = tsingtao_xhaProperties.getCloudcam(); String url = tsingtao_xhaProperties.getCamCount();
logger.info(url); logger.info(url);
Request request = new Request.Builder().url(url).build(); Request request = new Request.Builder().url(url).build();
try (Response response = client.newCall(request).execute()) { try (Response response = client.newCall(request).execute()) {
@ -1874,35 +1874,75 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
@Override @Override
public List<Map> selectDevelopDoc() { public List<Map> selectDevelopDoc() {
//List<Map> result = new ArrayList<>();
//List<Map<String, Object>> dtoMaps = baseDao.selectDevelopDocResource();
//Map<String, List<Map<String, Object>>> resourceTypeMap = dtoMaps.stream().collect(Collectors.groupingBy(m -> m.get("type").toString()));
//resourceTypeMap.forEach((key, value) -> {
// if (!"组件服务".equals(key)) {
// Map<String, Object> map = new HashMap<>();
// map.put("title", key);
// map.put("children", value);
// result.add(map);
// }
//});
//if (resourceTypeMap.get("组件服务") != null) {
// Map componentMap = new HashMap();
// componentMap.put("title", "组件服务");
// Map<String, List> map = new ConcurrentHashMap<>();
// CompletableFuture.allOf(resourceTypeMap.get("组件服务").stream()
// .map(it -> CompletableFuture.runAsync(() -> selectAttrsByResourceId(Long.parseLong(it.get("id").toString()))
// .stream()
// .filter(temp -> "组件类型".equals(temp.getAttrType()))
// .forEach(attr -> {
// if (map.get(attr.getAttrValue()) != null) {
// map.get(attr.getAttrValue()).add(it);
// } else {
// map.put(attr.getAttrValue(), Collections.synchronizedList(new ArrayList() {{
// add(it);
// }}));
// }
// }), executor))
// .collect(Collectors.toList())
// .toArray(new CompletableFuture[resourceTypeMap.get("组件服务").size()]))
// .join();
// componentMap.put("children", map.entrySet().stream().map(it -> new HashMap() {{
// put("title", it.getKey());
// put("children", it.getValue());
// }}).collect(Collectors.toList()));
// result.add(componentMap);
//}
//return result;
List<Map> result = new ArrayList<>(); List<Map> result = new ArrayList<>();
List<Map<String, Object>> dtoMaps = baseDao.selectDevelopDocResource(); List<Map<String, Object>> dtoMaps = baseDao.selectDevelopDocResource();
Map<String, List<Map<String, Object>>> resourceTypeMap = dtoMaps.stream().collect(Collectors.groupingBy(m -> m.get("type").toString())); Map<String, List<Map<String, Object>>> resourceTypeMap = dtoMaps.stream().collect(Collectors.groupingBy(m -> m.get("type").toString()));
resourceTypeMap.forEach((key, value) -> { resourceTypeMap.entrySet().stream().forEach(temp -> {
if (!"组件服务".equals(key)) { if (!"组件服务".equals(temp.getKey())) {
Map<String, Object> map = new HashMap<>(); Map map = new HashMap();
map.put("title", key); map.put("title", temp.getKey());
map.put("children", value); map.put("children", temp.getValue());
result.add(map); result.add(map);
} }
}); });
if (resourceTypeMap.get("组件服务") != null) { if (resourceTypeMap.get("组件服务") != null) {
Map<String, Object> componentMap = new HashMap<>(); Map componentMap = new HashMap();
componentMap.put("title", "组件服务"); componentMap.put("title", "组件服务");
Map<String, List> map = new ConcurrentHashMap<>(); Map<String, List> map = new ConcurrentHashMap<>();
CompletableFuture[] completableFutures = resourceTypeMap.get("组件服务").stream().map(it -> CompletableFuture.runAsync(() -> selectAttrsByResourceId(Long.parseLong(it.get("id").toString())).stream() List<CompletableFuture> tasks = resourceTypeMap.get("组件服务").stream().map(it -> {
.filter(temp -> "组件类型".equals(temp.getAttrType())).forEach(attr -> { CompletableFuture task = CompletableFuture.runAsync(() -> {
selectAttrsByResourceId(Long.parseLong(it.get("id").toString())).stream().filter(temp -> "组件类型".equals(temp.getAttrType())).forEach(attr -> {
if (map.get(attr.getAttrValue()) != null) { if (map.get(attr.getAttrValue()) != null) {
map.get(attr.getAttrValue()).add(it); map.get(attr.getAttrValue()).add(it);
} else { } else {
map.put(attr.getAttrValue(), Collections.synchronizedList(new ArrayList() {{ map.put(attr.getAttrValue(), (List) Collections.synchronizedList(new ArrayList() {{
add(it); add(it);
}})); }}));
} }
}), executor)) });
.collect(Collectors.toList()) }, executor);
.toArray(new CompletableFuture[resourceTypeMap.get("组件服务").size()]); return task;
CompletableFuture.allOf(completableFutures).join(); }).collect(Collectors.toList());
componentMap.put("children", map.entrySet().stream().map(it -> new HashMap<String, Object>() {{ CompletableFuture.allOf(tasks.toArray(new CompletableFuture[tasks.size()])).join();
componentMap.put("children", map.entrySet().stream().map(it -> new HashMap() {{
put("title", it.getKey()); put("title", it.getKey());
put("children", it.getValue()); put("children", it.getValue());
}}).collect(Collectors.toList())); }}).collect(Collectors.toList()));
@ -1910,6 +1950,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
} }
return result; return result;
} }
} }

3
renren-admin/src/main/resources/application-dev.yml
View File

@ -6,8 +6,7 @@ spring:
#MySQL #MySQL
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://15.2.21.238:3310/share_platform?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false url: jdbc:mysql://192.168.124.236:3306/share_platform?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false
#url: jdbc:mysql://15.2.21.221:3306/share_platform?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false
username: root username: root
password: Hisense2019 password: Hisense2019
#Hisense2019 #Hisense2019

2
renren-admin/src/main/resources/application-show.yml
View File

@ -5,7 +5,7 @@ spring:
druid: druid:
#MySQL #MySQL
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://15.2.21.238:3310/share_platform_show?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false url: jdbc:mysql://192.168.124.236:3310/share_platform_show?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false
username: root username: root
password: Hisense2019 password: Hisense2019
# #Oracle # #Oracle

4
renren-admin/src/main/resources/application-test.yml
View File

@ -5,9 +5,9 @@ spring:
druid: druid:
#MySQL #MySQL
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://15.2.21.238:3310/share_platform?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true url: jdbc:mysql://192.168.124.243:3306/share_platform?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: root username: root
password: Hisense2019 password: Liwen073898!
initial-size: 10 initial-size: 10
max-active: 100 max-active: 100
min-idle: 10 min-idle: 10

5
renren-admin/src/main/resources/domain/tsingtao-xha.properties
View File

@ -1,7 +1,8 @@
tsingtao-xha.cloudhls=http://10.10.30.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=%s&protocol=hls tsingtao-xha.cloudhls=http://10.10.30.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=%s&protocol=hls
tsingtao-xha.localhls=http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=%s&protocol=hls tsingtao-xha.localhls=http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=%s&protocol=hls
tsingtao-xha.cloudcam=http://10.10.30.9:8001/data_service/getCamera/getCameraCount tsingtao-xha.cloudcam=http://10.10.30.9:8001/hx-weather-warning/camera/getCameraListByName?name=%s&pageNo=%d&pageSize=%d
tsingtao-xha.localcam=http://10.10.30.57:9537/data_service/getCamera/getCameraCount tsingtao-xha.localcam=http://10.134.135.9:8001/hx-weather-warning/camera/getCameraListByName?name=%s&pageNo=%d&pageSize=%d
tsingtao-xha.resourcecount=http://10.10.30.24:30090/api/share-portal/platform/catalogue/query?catalogueId=&departmentId=&serviceName=&type=&orderField=requestNum&orderType=desc&pageNum=1&pageSize=10&serviceType=data&rq=1655106309671.43 tsingtao-xha.resourcecount=http://10.10.30.24:30090/api/share-portal/platform/catalogue/query?catalogueId=&departmentId=&serviceName=&type=&orderField=requestNum&orderType=desc&pageNum=1&pageSize=10&serviceType=data&rq=1655106309671.43
tsingtao-xha.resourceapplyinfo=http://10.10.30.24:30058/share-portal/platform/index/abilityMarket/count tsingtao-xha.resourceapplyinfo=http://10.10.30.24:30058/share-portal/platform/index/abilityMarket/count
tsingtao-xha.sjzy=http://10.10.30.24:30090/api/share-portal/platform/catalogue/query?catalogueId=&departmentId=&serviceName=%s&type=&orderField=%s&orderType=%s&pageNum=%s&pageSize=%s&serviceType=data&rq=1655106309671.43 tsingtao-xha.sjzy=http://10.10.30.24:30090/api/share-portal/platform/catalogue/query?catalogueId=&departmentId=&serviceName=%s&type=&orderField=%s&orderType=%s&pageNum=%s&pageSize=%s&serviceType=data&rq=1655106309671.43
tsingtao-xha.camCount=http://10.10.30.57:9537/data_service/getCamera/getCameraCount