Преглед изворни кода

修改数据使用中字段名称

fengyanjie пре 4 година
родитељ
комит
b4f3612ece

+ 16 - 16
dmp-model/src/main/java/com/persagy/dmp/rwd/model/ClassDefModel.java

@@ -10,22 +10,22 @@ import java.util.Date;
 @Getter
 public class ClassDefModel {
 
-	private String id;
-	private String code;
-	private ObjType objType;
-	private String name;
-	private String aliasCode;
-	private String aliasName;
-	private String type;
-	private String groupCode;
-	private String projectId;
-	private String majorCode;
-	private String systemCode;
-	private String equipmentCode;
-	private String parentCode;
+    private String id;
+    private String code;
+    private ObjType objType;
+    private String name;
+    private String aliasCode;
+    private String aliasName;
+    private String type;
+    private String groupCode;
+    private String projectId;
+    private String majorCode;
+    private String systemCode;
+    private String equipmentCode;
+    private String parentCode;
 
-	private Integer state;//状态 0.历史版本 1.使用中
-	private String version;//版本
-	private Date lastUpdateTime;//最后更新时间
+    private Integer isUsed;//状态 0.历史版本 1.使用中
+    private String version;//版本
+    private Date lastUpdateTime;//最后更新时间
 
 }

+ 28 - 28
dmp-model/src/main/java/com/persagy/dmp/rwd/model/FuncidDefModel.java

@@ -12,34 +12,34 @@ import java.util.Date;
 @Getter
 public class FuncidDefModel {
 
-	private String id;
-	private String code;
-	private String origCode;
-	private String name;
-	private String aliasCode;
-	private String aliasName;
-	private String classCode;
-	private FuncidCategory category;
-	private String type;
-	private String groupCode;
-	private String projectId;
-	private String firstTag;
-	private String secondTag;
-	private String priority;
-	private String inputMode;
-	private String unit;
-	private FuncidDataType dataType;
-	private String origDataType;
-	private Boolean isMultiple;
-	private Boolean isRegion;
-	private String formater;
-	private ArrayNode dataSource;
-	private String note;
-	private Boolean subFlag;
-	private Boolean weakPoint;
+    private String id;
+    private String code;
+    private String origCode;
+    private String name;
+    private String aliasCode;
+    private String aliasName;
+    private String classCode;
+    private FuncidCategory category;
+    private String type;
+    private String groupCode;
+    private String projectId;
+    private String firstTag;
+    private String secondTag;
+    private String priority;
+    private String inputMode;
+    private String unit;
+    private FuncidDataType dataType;
+    private String origDataType;
+    private Boolean isMultiple;
+    private Boolean isRegion;
+    private String formater;
+    private ArrayNode dataSource;
+    private String note;
+    private Boolean subFlag;
+    private Boolean weakPoint;
 
-	private Integer state;//状态 0.历史版本 1.使用中
-	private String version;//版本
-	private Date lastUpdateTime;//最后更新时间
+    private Integer isUsed;//状态 0.历史版本 1.使用中
+    private String version;//版本
+    private Date lastUpdateTime;//最后更新时间
 
 }

+ 61 - 59
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/entity/ClassDef.java

@@ -4,6 +4,7 @@ import com.persagy.dmp.rwd.enums.ObjType;
 import com.persagy.dmp.rwd.model.ClassDefModel;
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import java.util.Date;
@@ -12,69 +13,70 @@ import java.util.Date;
 @Getter
 @Entity
 @Table(name = "rwd_def_class")
+@Where(clause = "is_used = 1")
 @IdClass(GroupPK.class)
 public class ClassDef {
 
-	@Id
-	private String id;
-	@Id
-	private String groupCode;
-	private String code;
-	@Enumerated(value = EnumType.STRING)
-	private ObjType objType;
-	private String name;
-	private String aliasCode;
-	private String aliasName;
-	private String type;
-	private String projectId;
-	private String majorCode;
-	private String systemCode;
-	private String equipmentCode;
-	private String parentCode;
-	private Integer state;//状态 0.历史版本 1.使用中
-	private String version;//版本
-	private Date lastUpdateTime;//最后更新时间
+    @Id
+    private String id;
+    @Id
+    private String groupCode;
+    private String code;
+    @Enumerated(value = EnumType.STRING)
+    private ObjType objType;
+    private String name;
+    private String aliasCode;
+    private String aliasName;
+    private String type;
+    private String projectId;
+    private String majorCode;
+    private String systemCode;
+    private String equipmentCode;
+    private String parentCode;
+    private Integer isUsed;//使用状态 0.历史版本 1.使用中
+    private String version;//版本
+    private Date lastUpdateTime;//最后更新时间
 
-	public static ClassDef fromModel(ClassDefModel model) {
-		ClassDef entity = new ClassDef();
-		entity.setId(model.getId());
-		entity.setCode(model.getCode());
-		entity.setObjType(model.getObjType());
-		entity.setName(model.getName());
-		entity.setAliasCode(model.getAliasCode());
-		entity.setAliasName(model.getAliasName());
-		entity.setType(model.getType());
-		entity.setGroupCode(model.getGroupCode());
-		entity.setProjectId(model.getProjectId());
-		entity.setMajorCode(model.getMajorCode());
-		entity.setSystemCode(model.getSystemCode());
-		entity.setEquipmentCode(model.getEquipmentCode());
-		entity.setParentCode(model.getParentCode());
-		entity.setState(model.getState());//状态 0.历史版本 1.使用中
-		entity.setVersion(model.getVersion());//版本
-		entity.setLastUpdateTime(model.getLastUpdateTime());//发布时间
-		return entity;
-	}
+    public static ClassDef fromModel(ClassDefModel model) {
+        ClassDef entity = new ClassDef();
+        entity.setId(model.getId());
+        entity.setCode(model.getCode());
+        entity.setObjType(model.getObjType());
+        entity.setName(model.getName());
+        entity.setAliasCode(model.getAliasCode());
+        entity.setAliasName(model.getAliasName());
+        entity.setType(model.getType());
+        entity.setGroupCode(model.getGroupCode());
+        entity.setProjectId(model.getProjectId());
+        entity.setMajorCode(model.getMajorCode());
+        entity.setSystemCode(model.getSystemCode());
+        entity.setEquipmentCode(model.getEquipmentCode());
+        entity.setParentCode(model.getParentCode());
+        entity.setIsUsed(model.getIsUsed());//状态 0.历史版本 1.使用中
+        entity.setVersion(model.getVersion());//版本
+        entity.setLastUpdateTime(model.getLastUpdateTime());//发布时间
+        return entity;
+    }
 
-	public ClassDefModel toModel() {
-		ClassDefModel model = new ClassDefModel();
-		model.setId(this.getId());
-		model.setCode(this.getCode());
-		model.setObjType(this.getObjType());
-		model.setName(this.getName());
-		model.setAliasCode(this.getAliasCode());
-		model.setAliasName(this.getAliasName());
-		model.setType(this.getType());
-		model.setGroupCode(this.getGroupCode());
-		model.setProjectId(this.getProjectId());
-		model.setMajorCode(this.getMajorCode());
-		model.setSystemCode(this.getSystemCode());
-		model.setEquipmentCode(this.getEquipmentCode());
-		model.setParentCode(this.getParentCode());
-		model.setState(this.getState());//状态 0.历史版本 1.使用中
-		model.setVersion(this.getVersion());//版本
-		model.setLastUpdateTime(this.getLastUpdateTime());//发布时间
-		return model;
-	}
+    public ClassDefModel toModel() {
+        ClassDefModel model = new ClassDefModel();
+        model.setId(this.getId());
+        model.setCode(this.getCode());
+        model.setObjType(this.getObjType());
+        model.setName(this.getName());
+        model.setAliasCode(this.getAliasCode());
+        model.setAliasName(this.getAliasName());
+        model.setType(this.getType());
+        model.setGroupCode(this.getGroupCode());
+        model.setProjectId(this.getProjectId());
+        model.setMajorCode(this.getMajorCode());
+        model.setSystemCode(this.getSystemCode());
+        model.setEquipmentCode(this.getEquipmentCode());
+        model.setParentCode(this.getParentCode());
+        model.setIsUsed(this.getIsUsed());//状态 0.历史版本 1.使用中
+        model.setVersion(this.getVersion());//版本
+        model.setLastUpdateTime(this.getLastUpdateTime());//发布时间
+        return model;
+    }
 
 }

+ 5 - 3
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/entity/FuncidDef.java

@@ -7,6 +7,7 @@ import com.persagy.dmp.rwd.model.FuncidDefModel;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.Type;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import java.util.Date;
@@ -15,6 +16,7 @@ import java.util.Date;
 @Getter
 @Entity
 @Table(name = "rwd_def_funcid")
+@Where(clause = "is_used = 1")
 @IdClass(GroupPK.class)
 public class FuncidDef {
 
@@ -51,7 +53,7 @@ public class FuncidDef {
     private String note;
     private Boolean subFlag;
     private Boolean weakPoint;
-    private Integer state;//状态 0.历史版本 1.使用中
+    private Integer isUsed;//状态 0.历史版本 1.使用中
     private String version;//版本
     private Date lastUpdateTime;//最后更新时间
 
@@ -82,7 +84,7 @@ public class FuncidDef {
         entity.setNote(model.getNote());
         entity.setSubFlag(model.getSubFlag());
         entity.setWeakPoint(model.getWeakPoint());
-        entity.setState(model.getState());//状态 0.历史版本 1.使用中
+        entity.setIsUsed(model.getIsUsed());//状态 0.历史版本 1.使用中
         entity.setVersion(model.getVersion());//版本
         entity.setLastUpdateTime(model.getLastUpdateTime());//发布时间
         return entity;
@@ -115,7 +117,7 @@ public class FuncidDef {
         model.setNote(this.getNote());
         model.setSubFlag(this.getSubFlag());
         model.setWeakPoint(this.getWeakPoint());
-        model.setState(this.getState());//状态 0.历史版本 1.使用中
+        model.setIsUsed(this.getIsUsed());//状态 0.历史版本 1.使用中
         model.setVersion(this.getVersion());//版本
         model.setLastUpdateTime(this.getLastUpdateTime());//发布时间
         return model;

+ 2 - 2
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/ClassDefChangeRecordService.java

@@ -295,7 +295,7 @@ public class ClassDefChangeRecordService {
             classDef.setSystemCode(item.getSystemCode());
             classDef.setEquipmentCode(item.getEquipmentCode());
             classDef.setParentCode(item.getParentCode());
-            classDef.setState(1);
+            classDef.setIsUsed(1);
             classDef.setVersion(version);
             classDef.setLastUpdateTime(new Date());
             classDefList.add(classDef);
@@ -304,7 +304,7 @@ public class ClassDefChangeRecordService {
         List<ClassDefModel> classDefModelList = queryClassDef(null, codeList);
         if (classDefModelList != null) {
             classDefModelList.forEach(item -> {
-                item.setState(0);
+                item.setIsUsed(0);
                 item.setLastUpdateTime(new Date());
                 classDefList.add(ClassDef.fromModel(item));
             });

+ 2 - 2
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/FuncidDefChangeRecordService.java

@@ -419,13 +419,13 @@ public class FuncidDefChangeRecordService {
                 List<RwdeditRefTypeInfos> refInfos = rwdeditRefTypeInfosService.query(queryRef).getData();
                 funcidDef.setDataSource(JacksonMapper.toObject(JacksonMapper.toSimpleJson(refInfos), ArrayNode.class));
             }
-            funcidDef.setState(1);//状态 0.历史版本 1.使用中
+            funcidDef.setIsUsed(1);//状态 0.历史版本 1.使用中
             funcidDef.setVersion(version);//版本
             funcidDef.setLastUpdateTime(new Date());//发布时间
             funcidDefList.add(funcidDef);
             FuncidDefModel funcidDefModel = queryFuncidDef(item.getCode(), item.getClassCode());
             if (funcidDefModel != null) {
-                funcidDefModel.setState(0);
+                funcidDefModel.setIsUsed(0);
                 funcidDefModel.setLastUpdateTime(new Date());
                 funcidDefList.add(FuncidDef.fromModel(funcidDefModel));
             }