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

Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into show 

# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
This commit is contained in:
dinggang 2022-11-02 13:58:00 +08:00
parent 79a1938e98
commit b33527cf6c
6 changed files with 55 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -635,7 +635,8 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
}).thenAccept(sum -> re.add(new HashMap<String, Object>() {
{
put("count", sum + "");
put("type", "基础设施");
put("type", "视频资源");//演示版本临时改名为视频资源
//put("type", "基础设施");
}
}));
Long total;
@ -678,7 +679,8 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
QueryWrapper<CameraChannel> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("check_status", 1).ne("gps_x", "").ne("gps_y", "").isNotNull("gps_x").isNotNull("gps_y");
put("count", cameraChannelMapper.selectCount(queryWrapper) + "");
put("type", "基础设施");
put("type", "视频资源");
//put("type", "基础设施");
}
});
@ -687,7 +689,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
default:
break;
}
List<String> temp = new ArrayList<>();
/*List<String> temp = new ArrayList<>();
re.forEach(map -> temp.add(map.get("type").toString()));
Arrays.stream(censusTypes).filter(index -> !temp.contains(index)).forEach(index -> { // 数据库内不存在的资源类型
Map<String, Object> nullMap = new HashMap<String, Object>() {
@ -697,7 +699,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
}
};
re.add(nullMap);
});
});*/
resultMap.put("total", re);
return resultMap;

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

@ -6,9 +6,13 @@ spring:
#MySQL
driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://192.168.124.236:3306/share_platform?useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false
# url: jdbc:mysql://localhost:3306/share_platform?useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false
url: jdbc:mysql://192.168.124.46:3306/share_platform?useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false
username: root
# password: 123456
password: Liwen073898!
# password: Hisense2019
#Hisense2019
# #Oracle
# driver-class-name: oracle.jdbc.OracleDriver

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

@ -5,7 +5,7 @@ spring:
druid:
#MySQL
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/share_platform?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false
url: jdbc:mysql://127.0.0.1:3306/share_platform?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: root
# driver-class-name: com.mysql.cj.jdbc.Driver

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

@ -4,10 +4,16 @@ spring:
datasource:
druid:
#MySQL
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.124.236:3310/share_platform_show?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&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false
# url: jdbc:mysql://localhost:3306/share_platform?useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false
# url: jdbc:mysql://192.168.124.46:3306/share_platform?useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false
username: root
# password: 123456
# password: Liwen073898!
password: Hisense2019
#Hisense2019
# #Oracle
# driver-class-name: oracle.jdbc.OracleDriver
# url: jdbc:oracle:thin:@192.168.10.10:1521:xe
@ -23,14 +29,17 @@ spring:
# url: jdbc:postgresql://192.168.10.10:5432/postgres
# username: postgres
# password: 123456
initial-size: 10
max-active: 100
min-idle: 10
max-wait: 10
initial-size: 50
max-active: 1000
min-idle: 100
max-wait: 100
removeAbandoned: true
removeAbandonedTimeout: 300
logAbandoned: false
pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 20
time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000
min-evictable-idle-time-millis: 60000
#Oracle需要打开注释
validation-query: SELECT 1
test-while-idle: true
@ -49,24 +58,40 @@ spring:
wall:
config:
multi-statement-allow: true
flyway:
enabled: true
validate-on-migrate: false
# 允许乱序执行
out-of-order: true
#上传的静态资源配置
resource:
root_url: 192.168.124.236
pic-host: http://${resource.root_url}:${server.port}${server.servlet.context-path}
path: /home/yth/files/
devModelFilePath: /home/yth/files/devModelFile
# 大数据部门相关配置
# 大数据部门相关配置（平台部署部门）
big_date:
name: 青岛市大数据发展管理局
assignee_role_name: 部门审批人
assignee_district_role_name: 区审批人
assignee_city_role_name: 市审批人
# 平台部署级别 (PROVINCE:省 PREFECTURE:地级市 DISTRICT:区县 STREET:街道)
stage: PREFECTURE
hisense:
gateway:
name: 聚好看网关
url: http://devtest-security-app.hismarttv.com:8080
qdyjj:
ipAndPort: 15.2.21.238:9015
yawei:
enable: false
sso:
mode:
##多数据源的配置，需要引用renren-dynamic-datasource
#dynamic:
@ -80,4 +105,11 @@ qdyjj:
# driver-class-name: org.postgresql.Driver
# url: jdbc:postgresql://123456:5432/security_enterprise
# username: postgres
# password: 123456
# password: 123456
#同步摄像头标签表t_channel_mtm_label需要链接的数据库配置
synchro:
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
username: root
password: Hisense2019

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

@ -5,7 +5,7 @@ spring:
druid:
#MySQL
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.124.243:3306/share_platform?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
url: jdbc:mysql://192.168.124.46:3306/share_platform?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: root
password: Liwen073898!
initial-size: 10
@ -37,7 +37,7 @@ spring:
#上传的静态资源配置
resource:
root_url: 192.168.124.243
root_url: 192.168.124.46
path: /home/yth/files/
devModelFilePath: /home/yth/files/devModelFile
# 大数据部门相关配置

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

@ -46,7 +46,7 @@ server:
spring:
# 环境 dev|test|prod|show
profiles:
active: dev
active: show
messages:
encoding: UTF-8
basename: i18n/messages