Explorar o código

feat(adm-diagram): 不适用标准字段

liyang %!s(int64=3) %!d(string=hai) anos
pai
achega
406a14c71f

+ 1 - 1
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/demo/DemoDataStrategy.java

@@ -39,7 +39,7 @@ public class DemoDataStrategy implements DataStrategy {
 		readFiles((majCode, sysCode, typeCode, typeDir) -> {
 			DiagramType diagramType = new DiagramType();
 			diagramType.setMajor(majCode);
-			diagramType.setSystem(sysCode);
+			diagramType.setDSystem(sysCode);
 			diagramType.setCode(typeCode);
 			diagramType.setName(typeDir.getName());
 

+ 3 - 1
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/entity/DiagramEntity.java

@@ -1,5 +1,6 @@
 package com.persagy.adm.diagram.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,6 +12,7 @@ import lombok.ToString;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
+@TableName(value = "diagram")
 public class DiagramEntity extends AuditableEntity<DiagramEntity> {
 
     private String id;
@@ -33,7 +35,7 @@ public class DiagramEntity extends AuditableEntity<DiagramEntity> {
     /**
      * 所属的系统类型
      */
-    private String system;
+    private String btSystem;
 
     /**
      * 引用的模板id

+ 3 - 1
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/entity/DiagramType.java

@@ -1,5 +1,6 @@
 package com.persagy.adm.diagram.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,6 +12,7 @@ import lombok.ToString;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
+@TableName(value = "diagram_type")
 public class DiagramType extends AuditableEntity<DiagramType> {
 
     /**
@@ -21,7 +23,7 @@ public class DiagramType extends AuditableEntity<DiagramType> {
     /**
      * 所属系统
      */
-    private String system;
+    private String dSystem;
 
     /**
      * 系统图类型的编码

+ 3 - 1
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/entity/LegendEntity.java

@@ -1,5 +1,6 @@
 package com.persagy.adm.diagram.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,6 +12,7 @@ import lombok.ToString;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
+@TableName(value = "diagram_legend")
 public class LegendEntity extends AuditableEntity<LegendEntity> {
 
     private String name;
@@ -25,7 +27,7 @@ public class LegendEntity extends AuditableEntity<LegendEntity> {
     /**
      * 所属系统代码
      */
-    private String system;
+    private String btSystem;
 
     /**
      * 图例内容,json格式

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

@@ -44,7 +44,7 @@ public class ModelAdapter {
 		legend.setName(legendEntity.getName());
 		legend.setCode(legendEntity.getCode());
 		legend.setRemark(legendEntity.getRemark());
-		legend.setSystem(legendEntity.getSystem());
+		legend.setSystem(legendEntity.getBtSystem());
 		return legend;
 	}
 
@@ -54,7 +54,7 @@ public class ModelAdapter {
 		entity.setName(legend.getName());
 		entity.setCode(legend.getCode());
 		entity.setRemark(legend.getRemark());
-		entity.setSystem(legend.getSystem());
+		entity.setBtSystem(legend.getSystem());
 		entity.setLegendContent(parser.toJson(legend));
 		return entity;
 	}
@@ -66,7 +66,7 @@ public class ModelAdapter {
 		diagram.setRemark(diagramEntity.getRemark());
 		diagram.setType(diagramEntity.getType());
 		diagram.setTemplateId(diagramEntity.getTemplateId());
-		diagram.setSystem(diagramEntity.getSystem());
+		diagram.setSystem(diagramEntity.getBtSystem());
 		diagram.setProjectId(diagramEntity.getProjectId());
 		diagram.setSystemId(diagramEntity.getSystemId());
 		diagram.setGroupCode(diagramEntity.getGroupCode());
@@ -81,7 +81,7 @@ public class ModelAdapter {
 		entity.setRemark(diagram.getRemark());
 		entity.setType(diagram.getType());
 		entity.setTemplateId(diagram.getTemplateId());
-		entity.setSystem(diagram.getSystem());
+		entity.setBtSystem(diagram.getSystem());
 		entity.setProjectId(diagram.getProjectId());
 		entity.setSystemId(diagram.getSystemId());
 		entity.setGroupCode(diagram.getGroupCode());

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

@@ -1,5 +1,6 @@
 package com.persagy.adm.diagram.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -9,9 +10,9 @@ import lombok.ToString;
  * 模板实体
  */
 @Data
-
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
+@TableName(value = "diagram_template")
 public class TemplateEntity extends AuditableEntity<TemplateEntity> {
 
     /**

+ 1 - 1
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/manage/DemoDiagramManager.java

@@ -62,7 +62,7 @@ public class DemoDiagramManager {
 		List<Folder> folders = new ArrayList<>();
 		for (DiagramType type : types) {
 			Folder fm = Folder.getFolder(type.getMajor(), Folder.TYPE_MAJ, folders, maj);
-			Folder fs = Folder.getFolder(type.getSystem(), Folder.TYPE_SYS, (List)fm.getChildren(), sys);
+			Folder fs = Folder.getFolder(type.getDSystem(), Folder.TYPE_SYS, (List)fm.getChildren(), sys);
 
 			Folder ft = new Folder();
 			fs.getChildren().add(ft);

+ 1 - 1
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/manage/TemplateManager.java

@@ -65,7 +65,7 @@ public class TemplateManager {
 		List<Folder> folders = new ArrayList<>();
 		for (DiagramType type : types) {
 			Folder fm = Folder.getFolder(type.getMajor(), Folder.TYPE_MAJ, folders, maj);
-			Folder fs = Folder.getFolder(type.getSystem(), Folder.TYPE_SYS, (List)fm.getChildren(), sys);
+			Folder fs = Folder.getFolder(type.getDSystem(), Folder.TYPE_SYS, (List)fm.getChildren(), sys);
 
 			Folder ft = new Folder();
 			fs.getChildren().add(ft);

+ 2 - 2
adm-business/adm-diagram/src/main/resources/mapper/Diagram.xml

@@ -7,7 +7,7 @@
         <result column="name" property="name" jdbcType="VARCHAR"/>
         <result column="remark" property="remark" jdbcType="VARCHAR"/>
         <result column="type" property="type" jdbcType="VARCHAR"/>
-        <result column="bt_system" property="system" jdbcType="VARCHAR"/>
+        <result column="bt_system" property="btSystem" jdbcType="VARCHAR"/>
         <result column="template_id" property="templateId" jdbcType="VARCHAR"/>
         <result column="project_id" property="projectId" jdbcType="VARCHAR"/>
         <result column="system_id" property="systemId" jdbcType="VARCHAR"/>
@@ -33,7 +33,7 @@
         project_id,system_id,group_code,diagram_content,
         creator,creation_time,modifier,modified_time)
         VALUES
-        (#{id},#{name},#{remark},#{type},#{system},#{templateId},
+        (#{id},#{name},#{remark},#{type},#{btSystem},#{templateId},
         #{projectId},#{systemId},#{groupCode},#{diagramContent},
         #{creator}, #{creationTime},#{modifier},#{modifiedTime})
     </insert>

+ 1 - 1
adm-business/adm-diagram/src/main/resources/mapper/DiagramType.xml

@@ -5,7 +5,7 @@
     <resultMap id="diagramTypeBaseMap" type="com.persagy.adm.diagram.entity.DiagramType">
         <id column="id" property="id" jdbcType="VARCHAR"/>
         <result column="major" property="major" jdbcType="VARCHAR"/>
-        <result column="d_system" property="system" jdbcType="VARCHAR"/>
+        <result column="d_system" property="dSystem" jdbcType="VARCHAR"/>
         <result column="code" property="code" jdbcType="VARCHAR"/>
         <result column="name" property="name" jdbcType="VARCHAR"/>
         <result column="remark" property="remark" jdbcType="VARCHAR"/>

+ 2 - 2
adm-business/adm-diagram/src/main/resources/mapper/Legend.xml

@@ -6,7 +6,7 @@
         <id column="id" property="id" jdbcType="VARCHAR"/>
         <result column="name" property="name" jdbcType="VARCHAR"/>
         <result column="code" property="code" jdbcType="VARCHAR"/>
-        <result column="bt_system" property="system" jdbcType="VARCHAR"/>
+        <result column="bt_system" property="btSystem" jdbcType="VARCHAR"/>
         <result column="legend_content" property="legendContent" jdbcType="VARCHAR"/>
         <result column="remark" property="remark" jdbcType="VARCHAR"/>
         <result column="creator" property="creator" jdbcType="VARCHAR"/>
@@ -26,7 +26,7 @@
         INSERT INTO diagram_legend
         (id,bt_system,code,name,remark,legend_content,creator,creation_time,
         modifier,modified_time)
-        VALUES (#{id},#{system},#{code},#{name},#{remark},#{legendContent},#{creator},
+        VALUES (#{id},#{btSystem},#{code},#{name},#{remark},#{legendContent},#{creator},
         #{creationTime},#{modifier},#{modifiedTime})
     </insert>