注解优化

cdssman-service/src/main/java/com/diagbot/entity/MappingConfig.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.diagbot.util.StringUtil;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -19,6 +21,7 @@ import java.util.Objects;
  * @author zhaops
  * @since 2021-06-09
  */
+@EqualsAndHashCode
 @TableName("tran_mapping_config")
 public class MappingConfig implements Serializable {
 
@@ -84,6 +87,7 @@ public class MappingConfig implements Serializable {
     /**
      * 医学标准术语id
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long conceptId;
 
     /**
@@ -257,7 +261,7 @@ public class MappingConfig implements Serializable {
                 "}";
     }
 
-    @Override
+    /*@Override
     public boolean equals(Object o) {
         if (this == o) {
             return true;
@@ -283,7 +287,7 @@ public class MappingConfig implements Serializable {
     @Override
     public int hashCode() {
         return Objects.hash(id, isDeleted, hospitalId, type, hisName, hisCode, hisDetailName, conceptId, formConceptId, isMatch);
-    }
+    }*/
 
     public static boolean nonNull(MappingConfig o) {
         return !(o == null

cdssman-service/src/main/java/com/diagbot/entity/wrapper/MappingConfigWrapper.java

@@ -2,24 +2,24 @@ package com.diagbot.entity.wrapper;
 
 import com.diagbot.entity.MappingConfig;
 import com.diagbot.util.StringUtil;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Objects;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 /**
  * @Description:
  * @Author:zhaops
  * @time: 2021/6/10 19:27
  */
-@Getter
-@Setter
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class MappingConfigWrapper extends MappingConfig {
     private String uniqueName;
     private String form;
     private String code;
 
-    @Override
+   /* @Override
     public boolean equals(Object o) {
         if (this == o) {
             return true;
@@ -37,7 +37,7 @@ public class MappingConfigWrapper extends MappingConfig {
     @Override
     public int hashCode() {
         return Objects.hash(uniqueName, form, code) + super.hashCode();
-    }
+    }*/
 
     public static boolean nonNull(MappingConfigWrapper o) {
         return !(o == null