Merge remote-tracking branch 'origin/master'

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

@@ -69,7 +69,8 @@ public class CensusControllerV2 {
     private String[] censusTypes; // 需要进行统计的资源类型
 
     @GetMapping(value = "/whole_amount")
-    @ApiOperation("平台概览")
+    @ApiOperation("能力云图-平台概览")
+    @LogOperation("能力云图-平台概览")
     public Result<List<Map<String, Object>>> wholeAmount() {
         List<Map<String, Object>> result = new CopyOnWriteArrayList<>();
 
@@ -406,9 +407,7 @@ public class CensusControllerV2 {
             break;
             case TSINGTAO: { // TODO 青岛大数据局
                 TsingtaoDataResourceService tsingtaoDataResourceService = new TsingtaoDataResourceService();
-                GetDataResourceListDto getDataResourceListDto = new GetDataResourceListDto();
+                GetDataResourceListDto getDataResourceListDto = new GetDataResourceListDto().setPageNum(1).setPageSize(5);
-                getDataResourceListDto.setPageNum(1);
-                getDataResourceListDto.setPageSize(5);
                 HashMap dataResource = (HashMap) tsingtaoDataResourceService.getDataResource(getDataResourceListDto);
                 JSONObject data = JSON.parseObject(JSON.toJSONString(dataResource.get("data")));
                 result.add(new HashMap<String, Object>() {
@@ -431,13 +430,21 @@ public class CensusControllerV2 {
                 });
                 result.add(new HashMap<String, Object>() {
                     {
-                        put("resourceTop5", data.get("data"));
+                        String ja = data.getString("data");
+                        List<Map> lists = JSON.parseArray(ja, Map.class);
+                        ArrayList<Map> list = new ArrayList<>();
+                        lists.forEach(item -> {
+                            list.add(new HashMap<String, Object>(){{
+                                put("服务名称", item.get("zyname"));
+                                put("申请次数", item.get("syqk"));
+                            }});
+                        });
+                        put("resourceTop5", list);
                     }
                 });
             }
             break;
             case TSINGTAO_XHA: { // 青岛西海岸
-                allAmount = CompletableFuture.supplyAsync(() -> { // 获取平台数据资源总数目
                 OkHttpClient client = new OkHttpClient();
                 Long total = 0L;
                 Request request = new Request.Builder().url(tsingtao_xhaProperties.getResourcecount()).build();
@@ -446,6 +453,13 @@ public class CensusControllerV2 {
                         JSONObject jsonObject = JSON.parseObject(response.body().string());
                         if (jsonObject.containsKey("data")) {
                             total = jsonObject.getJSONObject("data").getLongValue("total");
+                            Long finalTotal = total;
+                            result.add(new HashMap<String, Object>() {
+                                {
+                                    put("amount", finalTotal);
+                                    put("type", "总数据量");
+                                }
+                            });
                         }
                     } else {
                         logger.error("青岛西海岸获取失败");
@@ -453,20 +467,11 @@ public class CensusControllerV2 {
                 } catch (Exception exception) {
                     logger.error("青岛西海岸失败", exception);
                 }
-                    return total;
-                }).thenAccept(sum -> {
-                    result.add(new HashMap<String, Object>() {
-                        {
-                            put("amount", sum);
-                            put("type", "总数据量");
-                        }
-                    });
-                }); // 处理总数目
 
-                applyInfo = CompletableFuture.runAsync(() -> {
+
-                    OkHttpClient client = new OkHttpClient();
+                OkHttpClient client1 = new OkHttpClient();
-                    Request request = new Request.Builder().url(tsingtao_xhaProperties.getResourceapplyinfo()).build();
+                Request request1 = new Request.Builder().url(tsingtao_xhaProperties.getResourceapplyinfo()).build();
-                    try (Response response = client.newCall(request).execute()) {
+                try (Response response = client1.newCall(request1).execute()) {
                     if (response.isSuccessful()) {
                         JSONObject jsonObject = JSON.parseObject(response.body().string());
                         if (jsonObject.containsKey("data")) {
@@ -500,30 +505,9 @@ public class CensusControllerV2 {
                 } catch (Exception exception) {
                     logger.error("青岛西海岸失败", exception);
                 }
-                });
             }
             break;
         }
-        if (allAmount == null) {
-            allAmount = CompletableFuture.runAsync(() -> {
-                try {
-                    Thread.sleep(100l);
-                } catch (InterruptedException e) {
-                    throw new RuntimeException(e);
-                }
-            });
-        }
-        if (applyInfo == null) {
-            applyInfo = CompletableFuture.runAsync(() -> {
-                try {
-                    Thread.sleep(100l);
-                } catch (InterruptedException e) {
-                    throw new RuntimeException(e);
-                }
-            });
-        }
-        CompletableFuture<Void> all = CompletableFuture.allOf(allAmount, applyInfo);
-        all.join();
         return new Result().ok(result);
     }
 

renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java

@@ -130,7 +130,8 @@ public class ResourceController {
     }
 
     @GetMapping("/{id}")
-    @ApiOperation("信息")
+    @ApiOperation("查询能力资源详细信息")
+    @LogOperation("查询能力资源详细信息")
     public Result<ResourceDTO> get(@PathVariable("id") Long id) {
         ResourceDTO data = resourceService.get(id);
         return new Result<ResourceDTO>().ok(data);
@@ -276,6 +277,7 @@ public class ResourceController {
 
     @GetMapping("ZywMessage")
     @ApiOperation("资源转发")
+    @LogOperation("资源转发")
     public Result ZywMessage() {
         String url = "http://15.72.158.81/zyjk/ZywMessage.asmx";
         String parame = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
@@ -303,6 +305,7 @@ public class ResourceController {
 
     @GetMapping("ZywMessage/list")
     @ApiOperation("资源列表转发")
+    @LogOperation("资源列表转发")
     public Result ZywMessageList(@ApiParam("页数") Integer page,
                                  @ApiParam("页大小") Integer size,
                                  @ApiParam("排序字段；fbrq（发布日期），syqk（申请数量）") String pxcol,
@@ -355,6 +358,7 @@ public class ResourceController {
 
     @GetMapping("qdyjjWeather")
     @ApiOperation("青岛应急局-查询青岛市地区天气信息")
+    @LogOperation("青岛应急局-查询青岛市地区天气信息")
     public Result qdyjjWeather(String cityName) {
         String loginUrl = "http://" + ipAndPort + "/service-oauth/login";
         String weatherUrl = "http://" + ipAndPort + "/service-map/qxWeather/getTodayWeatherInfo";
@@ -384,6 +388,7 @@ public class ResourceController {
 
     @GetMapping("knowledgeBase")
     @ApiOperation("对接知识库数据")
+    @LogOperation("对接知识库数据")
     public Result<String> knowledgeBase() {
         resourceService.KnowledgeBase();
         return new Result().ok("任务开启成功！");

renren-admin/src/main/java/io/renren/modules/resource/dto/GetDataResourceListDto.java

@@ -1,11 +1,13 @@
 package io.renren.modules.resource.dto;
 
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 /**
  * 数据资源查询参数对象
  */
 @Data
+@Accessors(chain=true)
 public class GetDataResourceListDto {
 
     //名称，模糊查询

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

@@ -3,5 +3,5 @@ tsingtao-xha.localhls=http://10.134.135.9:8001/hx-weatherwarning/camera/getCamer
 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.134.135.24:30058/shareportal/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