1.大屏业务模块详情api返回处理

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/DPSubServiceImpl.java

@@ -102,7 +102,7 @@ public class DPSubServiceImpl {
         Object api = JsonValueUtils.getValueByKey(jsonObject, "dataConfig", "dataConfig.api");
         String renderType = jsonObject.getString("renderType");
         Object apiResult = null;
-        ResponseModel responseModel = this.getApiResult((JSONObject) api, !ValidationUtil.isEmpty(resultConvert) ? resultConvert.toString() : null);
+        ResponseModel responseModel = this.getApiResult((JSONObject) api, !ValidationUtil.isEmpty(resultConvert) ? resultConvert.toString() : null ,null);
         if (!ValidationUtil.isEmpty(responseModel.getResult())) {
             apiResult = responseModel.getResult();
         }else{
@@ -143,7 +143,7 @@ public class DPSubServiceImpl {
 
         if (!ValidationUtil.isEmpty(api)) {
             long s = System.currentTimeMillis();
-            ResponseModel responseModel = this.getApiResult((JSONObject) api, !ValidationUtil.isEmpty(resultConvert) ? resultConvert.toString() : null);
+            ResponseModel responseModel = this.getApiResult((JSONObject) api, !ValidationUtil.isEmpty(resultConvert) ? resultConvert.toString() : null,null);
             if (!ValidationUtil.isEmpty(responseModel.getResult())) {
                 apiResult = responseModel.getResult();
                 if(!CollectionUtils.isEmpty(subResultParams)){
@@ -700,7 +700,7 @@ public class DPSubServiceImpl {
                 }
             } else if ("checkbox".equals(xObj.getString("componentKey"))) {
                 if (!ValidationUtil.isEmpty(visualParams.getJSONObject("api"))){
-                    ResponseModel checkboxResult = this.getApiResult(visualParams.getJSONObject("api"), null);
+                    ResponseModel checkboxResult = this.getApiResult(visualParams.getJSONObject("api"), null,apiResult);
                     if (!ValidationUtil.isEmpty(checkboxResult) && checkboxResult.getStatus() == 200 && !ValidationUtil.isEmpty(value)) {
                         List<Object> collect = ((JSONArray) checkboxResult.getResult()).stream().filter(y -> ((JSONArray) value).contains(JsonValueUtils.getValueByKey(y, "valueKey", "valueKey"))).collect(Collectors.toList());
                         String nameKey = collect.stream().map(item -> ((JSONObject) item).getString("nameKey")).collect(Collectors.joining("、"));
@@ -708,8 +708,8 @@ public class DPSubServiceImpl {
                     }
                 }
             } else if ("select".equals(xObj.getString("componentKey"))) {
-                if (!ValidationUtil.isEmpty(visualParams.getJSONObject("api"))){
-                    ResponseModel selectResult = this.getApiResult(visualParams.getJSONObject("api"), null);
+                if (!ValidationUtil.isEmpty(visualParams.getJSONObject("api")) && StrUtil.isNotEmpty(visualParams.getJSONObject("api").getString("apiPath"))){
+                    ResponseModel selectResult = this.getApiResult(visualParams.getJSONObject("api"), null,apiResult);
                     if (!ValidationUtil.isEmpty(selectResult) && selectResult.getStatus() == 200 && !ValidationUtil.isEmpty(value)) {
                         ((JSONArray) selectResult.getResult()).stream().filter(y -> value.equals(JsonValueUtils.getValueByKey(y, "valueKey", "valueKey")+"")).findFirst().ifPresent(z -> {
                             jsonObject.put("value", ((JSONObject) z).getString("nameKey"));
@@ -725,7 +725,7 @@ public class DPSubServiceImpl {
                 }
             } else if ("radio".equals(xObj.getString("componentKey"))) {
                 if (!ValidationUtil.isEmpty(visualParams.getJSONObject("api"))){
-                    ResponseModel checkboxResult = this.getApiResult(visualParams.getJSONObject("api"), null);
+                    ResponseModel checkboxResult = this.getApiResult(visualParams.getJSONObject("api"), null,apiResult);
                     if (!ValidationUtil.isEmpty(checkboxResult) && checkboxResult.getStatus() == 200 && !ValidationUtil.isEmpty(value)) {
                         List<Object> collect = ((JSONArray) checkboxResult.getResult()).stream().filter(y -> ((JSONArray) value).contains(JsonValueUtils.getValueByKey(y, "valueKey", "valueKey"))).collect(Collectors.toList());
                         String nameKey = collect.stream().map(item -> ((JSONObject) item).getString("nameKey")).collect(Collectors.joining("、"));
@@ -785,7 +785,7 @@ public class DPSubServiceImpl {
         return map;
     }
 
-    public ResponseModel getApiResult(JSONObject apiObj, String resultConvert) {
+    public ResponseModel getApiResult(JSONObject apiObj, String resultConvert, JSONObject detailResult) {
         String url = apiObj.getString("apiPath");
         if(ValidationUtil.isEmpty(url)){
             return null;
@@ -799,6 +799,8 @@ public class DPSubServiceImpl {
                 JSONObject xObj = (JSONObject) x;
                 if ("staticValue".equals(JsonValueUtils.getValueByKey(x, "value", "value.source"))){
                     queryParam.put(xObj.getString("name"), xObj.getJSONObject("value").getString("value"));
+                }else if ("sketchProps".equals(JsonValueUtils.getValueByKey(x, "value", "value.source"))){
+                    queryParam.put(xObj.getString("name"), detailResult.getString(xObj.getJSONObject("value").getString("value")));
                 }
             });
             if (!ValidationUtil.isEmpty(queryParam)){