Kaynağa Gözat

编译报错修复

linhuili 3 yıl önce
ebeveyn
işleme
721e53d5e2

+ 2 - 5
src/main/java/com/persagy/dmp/middleware/service/impl/AbstractBaseServiceImpl.java

@@ -4,17 +4,13 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
-import com.persagy.dmp.basic.utils.JsonNodeUtils;
 import com.persagy.dmp.common.model.entity.BaseEntity;
-import com.persagy.dmp.common.utils.JsonHelper;
 import com.persagy.dmp.middleware.entity.dto.InstanceUrlParam;
 import com.persagy.dmp.middleware.entity.response.CommonResult;
 import com.persagy.dmp.middleware.entity.response.DmpResult;
@@ -55,7 +51,8 @@ public class AbstractBaseServiceImpl<T> implements IBaseService<T> {
         // 转换参数
         JSONObject para = null;
         try {
-            para = JsonHelper.toJSONObject(dmpRequest);
+            String jsonStr = objectMapper.writeValueAsString(dmpRequest);
+            para = JSONObject.parseObject(jsonStr);
         } catch (IOException e) {
             log.error(e.getMessage(), e);
             return null;

+ 6 - 2
src/main/java/com/persagy/dmp/middleware/service/impl/SpaceServiceImpl.java

@@ -4,11 +4,11 @@ import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
-import com.persagy.dmp.common.utils.JsonHelper;
 import com.persagy.dmp.middleware.client.DmpRwdClient;
 import com.persagy.dmp.middleware.constant.CommonConsant;
 import com.persagy.dmp.middleware.constant.enums.ClassCodeEnum;
@@ -49,6 +49,9 @@ public class SpaceServiceImpl implements ISpaceService {
     private IBaseService baseService;
 
     @Autowired
+    private ObjectMapper objectMapper;
+
+    @Autowired
     private IWdDefineTypeRelService iWdDefineTypeRelService;
 
     /**
@@ -277,7 +280,8 @@ public class SpaceServiceImpl implements ISpaceService {
         //查询空间类型
         JSONObject object = null;
         try {
-            object = JsonHelper.toJSONObject(queryCriteria);
+            String jsonStr = objectMapper.writeValueAsString(queryCriteria);
+            object = JSONObject.parseObject(jsonStr);
         } catch (IOException e) {
             e.printStackTrace();
         }

+ 5 - 1
src/main/resources/bootstrap.yml

@@ -1,6 +1,10 @@
 server:
-  port: 8837
+  port: 8831
 spring:
   application:
     # 应用名称
     name: persagy-dmp-middleware
+config:
+  file:
+    absolute:
+      path: ${CONFIG_FILE_PATH:D:\SpringCloud}