Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseBussinessService.java

@@ -68,18 +68,25 @@ public class EnterpriseBussinessService {
         contentParam.put("data_type", "kaibiao");
         contentParam.put("filter_type", 2);
         contentParam.put("strategy_id", mongoContentId);
-        Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
-
+        Map<String, Object> contentMap = null;
+        try {
+           contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
             log.info("contentData:{}", JSONUtil.toJsonStr(contentMap));
+        } catch (Exception e) {
+            data.put("content", e.getMessage());
+            map.put("data", data);
+            return BeanUtil.toBean(map, R.class);
+        }
+
         Map contentData = MapUtils.getMap(contentMap, "data", null);
 
         if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
+            data.put("content", JSONUtil.toJsonStr(contentMap));
+            map.put("data", data);
             return BeanUtil.toBean(map, R.class);
         }
 
-        String htmlContent = MapUtils.getString(contentData, "htmlContent");
-
-        data.put("content", htmlContent);
+        data.put("content", MapUtils.getString(contentData, "htmlContent"));
         map.put("data", data);
 
         return BeanUtil.toBean(map, R.class);

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseProjectService.java

@@ -131,21 +131,27 @@ public class EnterpriseProjectService {
         }
 
         HashMap<String, Object> contentParam = new HashMap<>();
-        contentParam.put("data_type", "bid_plan");
+        contentParam.put("data_type", "zhaobiao_new");
         contentParam.put("filter_type", 2);
         contentParam.put("strategy_id", contentId);
-        Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
-
+        Map<String, Object> contentMap = null;
+        try {
+            contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
             log.info("contentData:{}", JSONUtil.toJsonStr(contentMap));
+        } catch (Exception e) {
+            data.put("content", e.getMessage());
+            map.put("data", data);
+            return BeanUtil.toBean(map, R.class);
+        }
         Map contentData = MapUtils.getMap(contentMap, "data", null);
 
         if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
+            data.put("content", JSONUtil.toJsonStr(contentMap));
+            map.put("data", data);
             return BeanUtil.toBean(map, R.class);
         }
 
-        String htmlContent = MapUtils.getString(contentData, "htmlContent");
-
-        data.put("content", htmlContent);
+        data.put("content", MapUtils.getString(contentData, "htmlContent"));
         map.put("data", data);
 
         return BeanUtil.toBean(map, R.class);