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

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-07-20 14:51:13 +08:00
parent 88f72d0fc7 dc51b673a1
commit 6d733c3c48
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1065,7 +1065,6 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
@Override
public Object selectResourceListByType(String type) {
if ("基础设施".equals(type)) {
List <Map> resourceList = new ArrayList<>();
Map<String, Object> infrastructureList = (Map<String, Object>) this.selectInfrastructureList();

2
renren-admin/src/main/java/io/renren/modules/resourceCar/controller/ResourceCarController.java
View File

@ -100,7 +100,7 @@ public class ResourceCarController {
@GetMapping("/selectResourceListByDept")
@ApiOperation("根据部门查询申购车资源列表")
@LogOperation("根据部门查询申购车资源列表")
public Result selectResourceListByDept(@RequestParam String name, @RequestParam Long deptId, @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
public Result selectResourceListByDept(String name, @RequestParam Long deptId, @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
return new Result().ok(resourceCarService.selectResourceListByDept(name, deptId, pageNum, pageSize));
}

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

@ -1,5 +1,5 @@
tsingtao-xha.cloudhls=http://10.10.30.9:8001/hx-weatherwarning/camera/getCameraLiveStreamByCode?cameraCode=%s&protocol=hls
tsingtao-xha.localhls=http://10.134.135.9:8001/hx-weatherwarning/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.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