Forráskód Böngészése

修改模型序列化配置;Diagram中额外字段统一处理;数据库修改,template表code字段可以为空

zhaoyk 3 éve
szülő
commit
35b6130cfd

+ 1 - 1
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/core/impl/DataStrategyImpl.java

@@ -302,7 +302,7 @@ public class DataStrategyImpl implements DataStrategy {
             Diagram diagram = modelAdapter.toDiagram(diagramEntity);
             ObjectNode node = map.get(diagramEntity.getSystemId());
             if (node != null) {
-                diagram.setSystemInstanceName(node.get(Constants.NAME).asText());
+                diagram.setExtraProp("systemInstanceName", node.get(Constants.NAME).asText());
             }
             return diagram;
         }).collect(Collectors.toList());

+ 9 - 36
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/core/model/Diagram.java

@@ -13,69 +13,58 @@ import java.util.*;
  */
 public class Diagram {
 
-	@Expose
+	@Expose(serialize = false)
 	private String id;
 
 	/**
 	 * 系统图名称
 	 */
-	@Expose
+	@Expose(serialize = false)
 	private String name;
 
 	/**
 	 * 描述信息
 	 */
-	@Expose
+	@Expose(serialize = false)
 	private String remark;
 
 	/**
 	 * 系统图类型编码
 	 */
-	@Expose
+	@Expose(serialize = false)
 	private String type;
 
 	/**
 	 * 引用的模板id
 	 */
-	@Expose
+	@Expose(serialize = false)
 	private String templateId;
 
 	/**
 	 * 所属的系统类型
 	 */
-	@Expose
+	@Expose(serialize = false)
 	private String system;
 
 	/**
 	 * 项目id
 	 */
-	@Expose
+	@Expose(serialize = false)
 	private String projectId;
 
 	/**
 	 * 对应的系统实例id
 	 */
-	@Expose
+	@Expose(serialize = false)
 	private String systemId;
-	/**
-	 * 对应的系统实例名称
-	 */
-	@Expose
-	private String systemInstanceName;
 
 	/**
 	 * 集团编码
 	 */
-	@Expose
+	@Expose(serialize = false)
 	private String groupCode;
 
 	/**
-	 * 系统图状态
-	 */
-	@Expose
-	private String state;
-
-	/**
 	 * 其他字段信息
 	 */
 	@Expose(serialize = false)
@@ -234,14 +223,6 @@ public class Diagram {
 		this.systemId = systemId;
 	}
 
-	public String getSystemInstanceName() {
-		return systemInstanceName;
-	}
-
-	public void setSystemInstanceName(String systemInstanceName) {
-		this.systemInstanceName = systemInstanceName;
-	}
-
 	public String getGroupCode() {
 		return groupCode;
 	}
@@ -250,14 +231,6 @@ public class Diagram {
 		this.groupCode = groupCode;
 	}
 
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-
 	public Object getExtraProp(String propName) {
 		return extraProps != null ? extraProps.get(propName) : null;
 	}

+ 5 - 5
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/core/model/legend/Legend.java

@@ -12,19 +12,19 @@ import java.util.List;
  */
 public class Legend {
 
-	@Expose
+	@Expose(serialize = false)
 	private String id;
 
-	@Expose
+	@Expose(serialize = false)
 	private String code;
 
-	@Expose
+	@Expose(serialize = false)
 	private String name;
 
-	@Expose
+	@Expose(serialize = false)
 	private String remark;
 
-	@Expose
+	@Expose(serialize = false)
 	private String system;
 
 	@Expose

+ 5 - 5
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/core/model/template/DiagramTemplate.java

@@ -21,31 +21,31 @@ public class DiagramTemplate {
 	/**
 	 * 模板对应的系统图类型代码
 	 */
-	@Expose
+	@Expose(serialize = false)
 	private String diagramType;
 
 	/**
 	 * 模板id
 	 */
-	@Expose
+	@Expose(serialize = false)
 	private String id;
 
 	/**
 	 * 模板名称
 	 */
-	@Expose
+	@Expose(serialize = false)
 	private String name;
 
 	/**
 	 * 模板编码
 	 */
-	@Expose
+	@Expose(serialize = false)
 	private String code;
 
 	/**
 	 * 描述信息
 	 */
-	@Expose
+	@Expose(serialize = false)
 	private String remark;
 
 	/**

+ 2 - 2
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/entity/ModelAdapter.java

@@ -70,7 +70,7 @@ public class ModelAdapter {
 		diagram.setProjectId(diagramEntity.getProjectId());
 		diagram.setSystemId(diagramEntity.getSystemId());
 		diagram.setGroupCode(diagramEntity.getGroupCode());
-		diagram.setState(diagramEntity.getState());
+		diagram.setExtraProp("state", diagramEntity.getState());
 		return diagram;
 	}
 
@@ -85,7 +85,7 @@ public class ModelAdapter {
 		entity.setProjectId(diagram.getProjectId());
 		entity.setSystemId(diagram.getSystemId());
 		entity.setGroupCode(diagram.getGroupCode());
-		entity.setState(diagram.getState());
+		entity.setState((String) diagram.getExtraProp("state"));
 		entity.setDiagramContent(parser.toJson(diagram));
 		return entity;
 	}

+ 1 - 1
adm-business/adm-diagram/src/main/resources/db.init/schema.sql

@@ -20,7 +20,7 @@ CREATE TABLE IF NOT EXISTS `diagram_template` (
   `id` varchar(40) NOT NULL COMMENT '主键',
   `diagram_type` varchar(40) NOT NULL COMMENT '模板对应的系统图类型代码',
   `name` varchar(40) DEFAULT NULL COMMENT '模板名称',
-  `code` varchar(40) NOT NULL COMMENT '模板编码',
+  `code` varchar(40) DEFAULT NULL COMMENT '模板编码',
   `remark` varchar(255) DEFAULT NULL COMMENT '描述信息',
   `template_content` json DEFAULT NULL COMMENT '模板内容,json格式',
   `creator` varchar(32) DEFAULT NULL COMMENT '创建人',