dc-digital自测bug修复

dc-business/dc-digital/src/main/java/com/persagy/dc/define/controller/GraphDefineController.java

@@ -31,13 +31,11 @@ public class GraphDefineController {
     private IGraphDefineService service;
 
     @PostMapping("query")
-    public CommonResult<PageList<ObjectType>> query(@RequestBody QueryCriteria criteria) {
+    public CommonResult<PageList<GraphDefine>> query(@RequestBody QueryCriteria criteria) {
         if(criteria == null) {
             throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
         }
         QueryWrapper<GraphDefine> wrapper = new QueryWrapper<>();
-        // 添加所属项目条件
-        DigitalCommonUtils.ensureProjectCriteria(wrapper);
         // 转换查询条件
         criteria.toWrapper(wrapper);
         Page page = service.queryByCondition(criteria.toPage(), wrapper);
@@ -46,7 +44,6 @@ public class GraphDefineController {
 
     @PostMapping("/create")
     public CommonResult<GraphDefine> create(@RequestBody GraphDefine vo){
-        vo.setProjectId(DigitalCommonUtils.getProjectId());
         vo = service.insert(vo);
         return ResultHelper.single(vo);
     }

dc-business/dc-digital/src/main/java/com/persagy/dc/define/entity/GraphDefine.java

@@ -23,12 +23,10 @@ public class GraphDefine extends AuditableEntity {
     @NotNull(message = "名称不允许为空")
     @Length(max = 200)
     private String name;
-    /** 项目ID */
-    private String projectId;
     /** 一级分类 */
-    private String firstTag;
+    private String firstCategory;
     /** 二级分类 */
-    private String secondTag;
+    private String secondCategory;
     /** 分类说明 */
     private String remark;
     /** 关系两侧对象类别 */

dc-business/dc-digital/src/main/java/com/persagy/dc/parser/entity/EnumVO.java

@@ -12,6 +12,8 @@ public class EnumVO {
 
     /** 编码 */
     private String code;
+    /** 名称 */
+    private String name;
     /** 上级编码 */
     private String parentCode;
 }

dc-business/dc-digital/src/main/java/com/persagy/dc/parser/service/impl/AbstractInfoDataParser.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeType;
+import com.fasterxml.jackson.databind.type.TypeFactory;
 import com.persagy.dc.basic.constant.DigitalDataCategory;
 import com.persagy.dc.common.exception.BusinessException;
 import com.persagy.dc.common.helper.SpringHelper;
@@ -27,7 +28,7 @@ import java.util.List;
 @Slf4j
 public abstract class AbstractInfoDataParser implements IInfoDataParser {
 
-    private static ObjectMapper objectMapper;
+    private static ObjectMapper objectMapper = new ObjectMapper();
 
     /**
      * 接口实现