From 0e6984fb85de16976b3997fd3f61b14cdc92b1dd Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Sat, 30 Jul 2022 18:53:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E8=AE=BE=E6=96=BD=E8=A7=86=E9=A2=91=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/renren/common/domain/Tsingtao_xhaProperties.java | 1 + .../modules/monitor/mapper/CameraOrgenizationMapper.java | 1 - .../src/main/resources/domain/tsingtao-xha.properties | 7 ++++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/common/domain/Tsingtao_xhaProperties.java b/renren-admin/src/main/java/io/renren/common/domain/Tsingtao_xhaProperties.java index deaf2a61..e7194ac2 100644 --- a/renren-admin/src/main/java/io/renren/common/domain/Tsingtao_xhaProperties.java +++ b/renren-admin/src/main/java/io/renren/common/domain/Tsingtao_xhaProperties.java @@ -21,4 +21,5 @@ public class Tsingtao_xhaProperties { private String resourcecount; private String resourceapplyinfo; private String sjzy; + private String camCount; } diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraOrgenizationMapper.java b/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraOrgenizationMapper.java index 32ecc0d6..9197e9a1 100644 --- a/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraOrgenizationMapper.java +++ b/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraOrgenizationMapper.java @@ -1,6 +1,5 @@ package io.renren.modules.monitor.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import io.renren.common.dao.BaseDao; import io.renren.modules.monitor.entity.CameraOrganization; import org.apache.ibatis.annotations.Mapper; diff --git a/renren-admin/src/main/resources/domain/tsingtao-xha.properties b/renren-admin/src/main/resources/domain/tsingtao-xha.properties index f6b7177e..11ecb540 100644 --- a/renren-admin/src/main/resources/domain/tsingtao-xha.properties +++ b/renren-admin/src/main/resources/domain/tsingtao-xha.properties @@ -1,7 +1,8 @@ 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.cloudcam=http://10.10.30.9:8001/data_service/getCamera/getCameraCount -tsingtao-xha.localcam=http://10.10.30.57:9537/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.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.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 \ No newline at end of file +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 From bb13969a1a0774ce674316bdd474d7ec55999789 Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Mon, 1 Aug 2022 09:56:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E8=AE=BE=E6=96=BD=E8=A7=86=E9=A2=91=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/controller/CensusControllerV2.java | 62 +++++++--------- .../common/domain/Tsingtao_xhaProperties.java | 1 - .../service/impl/ResourceServiceImpl.java | 71 +++++++++++++++---- 3 files changed, 83 insertions(+), 51 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV2.java b/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV2.java index 22765634..ac89202f 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV2.java +++ b/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV2.java @@ -342,40 +342,36 @@ public class CensusControllerV2 { List> dbAmount = (List>) map.get("total"); return dbAmount.stream().filter(index -> "基础设施".equals(index.get("type").toString())) .mapToLong(index -> Long.parseLong(index.get("count").toString())).sum(); - }).thenAccept(sum -> { - result.add(new HashMap() { - { - put("amount", sum); - put("type", "视频资源数量"); - } - }); - }); + }).thenAccept(sum -> result.add(new HashMap() { + { + put("amount", sum); + put("type", "视频资源数量"); + } + })); } break; case BAOTOU: { // 包头 allAmount = CompletableFuture.supplyAsync(() -> { // 获取平台总基础设施数目 return jdbcTemplate.queryForObject("SELECT COUNT(id) FROM tb_data_resource WHERE type = '基础设施' AND del_flag = 0", Long.class); - }).thenAccept(sum -> { - result.add(new HashMap() { - { - put("amount", sum); - put("type", "视频资源数量"); - } - }); - }); + }).thenAccept(sum -> result.add(new HashMap() { + { + put("amount", sum); + put("type", "视频资源数量"); + } + })); } break; case TSINGTAO_XHA: { // 青岛西海岸 allAmount = CompletableFuture.supplyAsync(() -> { // 获取平台总基础设施数目 List result_ = new CopyOnWriteArrayList<>(); - String url = String.format(tsingtao_xhaProperties.getCloudcam(), "", 1, 10); + String url = tsingtao_xhaProperties.getCamCount(); 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")); + if (jsonObject.containsKey("errorNo") && jsonObject.getLongValue("errorNo") == 200) { + result_.add(jsonObject.getLongValue("body")); } } else { logger.error("青岛西海岸获取失败"); @@ -383,15 +379,13 @@ public class CensusControllerV2 { } catch (Exception exception) { logger.error("青岛西海岸失败", exception); } - return result_.stream().filter(index -> index != null).findAny().orElse(0l); - }).thenAccept(sum -> { - result.add(new HashMap() { - { - put("amount", sum); - put("type", "视频资源数量"); - } - }); - }); + return result_.stream().filter(Objects::nonNull).findAny().orElse(0L); + }).thenAccept(sum -> result.add(new HashMap() { + { + put("amount", sum); + put("type", "视频资源数量"); + } + })); } break; } @@ -461,19 +455,17 @@ public class CensusControllerV2 { { List lists = (dataResource != null && dataResource.containsKey("data") && dataResource.get("data") != null) ? (List) dataResource.get("data") : new ArrayList<>(); ArrayList list = new ArrayList<>(); - lists.forEach(item -> { - list.add(new HashMap() {{ - put("服务名称", item.get("zyname")); - put("申请次数", item.get("syqk")); - }}); - }); + lists.forEach(item -> list.add(new HashMap() {{ + put("服务名称", item.get("zyname")); + put("申请次数", item.get("syqk")); + }})); put("resourceTop5", list); } }); } break; case TSINGTAO_XHA: { // 青岛西海岸 - Long total = 0L; + Long total; Request request = new Request.Builder().url(tsingtao_xhaProperties.getResourcecount()).build(); try (Response response = client.newCall(request).execute()) { if (response.isSuccessful()) { diff --git a/renren-admin/src/main/java/io/renren/common/domain/Tsingtao_xhaProperties.java b/renren-admin/src/main/java/io/renren/common/domain/Tsingtao_xhaProperties.java index e7194ac2..157cba73 100644 --- a/renren-admin/src/main/java/io/renren/common/domain/Tsingtao_xhaProperties.java +++ b/renren-admin/src/main/java/io/renren/common/domain/Tsingtao_xhaProperties.java @@ -1,6 +1,5 @@ package io.renren.common.domain; - import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.PropertySource; diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index 3accaf62..51b4b34d 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -538,7 +538,7 @@ public class ResourceServiceImpl extends CrudServiceImpl result = new CopyOnWriteArrayList<>(); CompletableFuture cloud = CompletableFuture.runAsync(() -> { // 云脑专网 - String url = tsingtao_xhaProperties.getCloudcam(); + String url = tsingtao_xhaProperties.getCamCount(); logger.info(url); Request request = new Request.Builder().url(url).build(); try (Response response = client.newCall(request).execute()) { @@ -1874,35 +1874,75 @@ public class ResourceServiceImpl extends CrudServiceImpl selectDevelopDoc() { + //List result = new ArrayList<>(); + //List> dtoMaps = baseDao.selectDevelopDocResource(); + //Map>> resourceTypeMap = dtoMaps.stream().collect(Collectors.groupingBy(m -> m.get("type").toString())); + //resourceTypeMap.forEach((key, value) -> { + // if (!"组件服务".equals(key)) { + // Map 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 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 result = new ArrayList<>(); List> dtoMaps = baseDao.selectDevelopDocResource(); Map>> resourceTypeMap = dtoMaps.stream().collect(Collectors.groupingBy(m -> m.get("type").toString())); - resourceTypeMap.forEach((key, value) -> { - if (!"组件服务".equals(key)) { - Map map = new HashMap<>(); - map.put("title", key); - map.put("children", value); + resourceTypeMap.entrySet().stream().forEach(temp -> { + if (!"组件服务".equals(temp.getKey())) { + Map map = new HashMap(); + map.put("title", temp.getKey()); + map.put("children", temp.getValue()); result.add(map); } }); if (resourceTypeMap.get("组件服务") != null) { - Map componentMap = new HashMap<>(); + Map componentMap = new HashMap(); componentMap.put("title", "组件服务"); Map map = new ConcurrentHashMap<>(); - CompletableFuture[] completableFutures = resourceTypeMap.get("组件服务").stream().map(it -> CompletableFuture.runAsync(() -> selectAttrsByResourceId(Long.parseLong(it.get("id").toString())).stream() - .filter(temp -> "组件类型".equals(temp.getAttrType())).forEach(attr -> { + List tasks = resourceTypeMap.get("组件服务").stream().map(it -> { + 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) { map.get(attr.getAttrValue()).add(it); } else { - map.put(attr.getAttrValue(), Collections.synchronizedList(new ArrayList() {{ + map.put(attr.getAttrValue(), (List) Collections.synchronizedList(new ArrayList() {{ add(it); }})); } - }), executor)) - .collect(Collectors.toList()) - .toArray(new CompletableFuture[resourceTypeMap.get("组件服务").size()]); - CompletableFuture.allOf(completableFutures).join(); - componentMap.put("children", map.entrySet().stream().map(it -> new HashMap() {{ + }); + }, executor); + return task; + }).collect(Collectors.toList()); + CompletableFuture.allOf(tasks.toArray(new CompletableFuture[tasks.size()])).join(); + componentMap.put("children", map.entrySet().stream().map(it -> new HashMap() {{ put("title", it.getKey()); put("children", it.getValue()); }}).collect(Collectors.toList())); @@ -1910,6 +1950,7 @@ public class ResourceServiceImpl extends CrudServiceImpl Date: Mon, 1 Aug 2022 10:00:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- renren-admin/src/main/resources/application-dev.yml | 3 +-- renren-admin/src/main/resources/application-show.yml | 2 +- renren-admin/src/main/resources/application-test.yml | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/renren-admin/src/main/resources/application-dev.yml b/renren-admin/src/main/resources/application-dev.yml index e546975c..0423c5c5 100644 --- a/renren-admin/src/main/resources/application-dev.yml +++ b/renren-admin/src/main/resources/application-dev.yml @@ -6,8 +6,7 @@ spring: #MySQL 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://15.2.21.221:3306/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 username: root password: Hisense2019 #Hisense2019 diff --git a/renren-admin/src/main/resources/application-show.yml b/renren-admin/src/main/resources/application-show.yml index 488552e8..a7873999 100644 --- a/renren-admin/src/main/resources/application-show.yml +++ b/renren-admin/src/main/resources/application-show.yml @@ -5,7 +5,7 @@ spring: druid: #MySQL 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 password: Hisense2019 # #Oracle diff --git a/renren-admin/src/main/resources/application-test.yml b/renren-admin/src/main/resources/application-test.yml index 400f5181..9354ba84 100644 --- a/renren-admin/src/main/resources/application-test.yml +++ b/renren-admin/src/main/resources/application-test.yml @@ -5,9 +5,9 @@ spring: druid: #MySQL 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 - password: Hisense2019 + password: Liwen073898! initial-size: 10 max-active: 100 min-idle: 10 From ff3e590ddaed5365650b14cb5f0c3cca404497a6 Mon Sep 17 00:00:00 2001 From: yitonglei Date: Mon, 1 Aug 2022 10:04:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1=E3=80=81flyway=E6=8F=90=E4=BA=A4=E7=9A=84?= =?UTF-8?q?sql=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=B7=E4=B8=BA4.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/{V4.3__init_tableCache.sql => V4.4__init_tableCache.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename renren-admin/src/main/resources/db/{V4.3__init_tableCache.sql => V4.4__init_tableCache.sql} (100%) diff --git a/renren-admin/src/main/resources/db/V4.3__init_tableCache.sql b/renren-admin/src/main/resources/db/V4.4__init_tableCache.sql similarity index 100% rename from renren-admin/src/main/resources/db/V4.3__init_tableCache.sql rename to renren-admin/src/main/resources/db/V4.4__init_tableCache.sql