Browse Source

修改主键

yq 3 years ago
parent
commit
97660e751e

+ 2 - 4
system-model/src/main/java/com/bizmatics/model/SysAsyncTask.java

@@ -2,6 +2,7 @@ package com.bizmatics.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.bizmatics.common.mvc.base.BaseModel;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,7 +11,7 @@ import java.util.Date;
  * @author fzq
  */
 @Data
-public class SysAsyncTask {
+public class SysAsyncTask extends BaseModel {
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     private String funcType;
@@ -20,7 +21,4 @@ public class SysAsyncTask {
     private String resultType;
     private String resultKey;
     private String result;
-    private String createUserId;
-    private String createUserName;
-    private Date createTime;
 }

+ 7 - 21
system-model/src/main/java/com/bizmatics/model/SysConfig.java

@@ -1,6 +1,7 @@
 package com.bizmatics.model;
 
 
+import com.bizmatics.common.mvc.base.BaseModel;
 import com.bizmatics.model.base.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -11,14 +12,14 @@ import javax.validation.constraints.Size;
 /**
  * 参数配置表 sys_config
  */
-public class SysConfig extends BaseEntity {
+public class SysConfig extends BaseModel {
     private static final long serialVersionUID = 1L;
 
     /**
      * 参数主键
      */
 
-    private Long configId;
+    private Long id;
 
     /**
      * 参数名称
@@ -44,12 +45,12 @@ public class SysConfig extends BaseEntity {
 
     private String configType;
 
-    public Long getConfigId() {
-        return configId;
+    public Long getId() {
+        return id;
     }
 
-    public void setConfigId(Long configId) {
-        this.configId = configId;
+    public void setId(Long id) {
+        this.id = id;
     }
 
     @NotBlank(message = "参数名称不能为空")
@@ -90,19 +91,4 @@ public class SysConfig extends BaseEntity {
         this.configType = configType;
     }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("configId", getConfigId())
-                .append("configName", getConfigName())
-                .append("configKey", getConfigKey())
-                .append("configValue", getConfigValue())
-                .append("configType", getConfigType())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
-    }
 }

+ 7 - 25
system-model/src/main/java/com/bizmatics/model/SysDictData.java

@@ -1,6 +1,7 @@
 package com.bizmatics.model;
 
 import com.bizmatics.common.core.constants.CommonConst;
+import com.bizmatics.common.mvc.base.BaseModel;
 import com.bizmatics.model.base.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -11,14 +12,14 @@ import javax.validation.constraints.Size;
 /**
  * 字典数据表 sys_dict_data
  */
-public class SysDictData extends BaseEntity {
+public class SysDictData extends BaseModel {
     private static final long serialVersionUID = 1L;
 
     /**
      * 字典编码
      */
 
-    private Long dictCode;
+    private Long id;
 
     /**
      * 字典排序
@@ -66,12 +67,12 @@ public class SysDictData extends BaseEntity {
 
     private String status;
 
-    public Long getDictCode() {
-        return dictCode;
+    public Long getId() {
+        return id;
     }
 
-    public void setDictCode(Long dictCode) {
-        this.dictCode = dictCode;
+    public void setId(Long id) {
+        this.id = id;
     }
 
     public Long getDictSort() {
@@ -149,23 +150,4 @@ public class SysDictData extends BaseEntity {
         this.status = status;
     }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("dictCode", getDictCode())
-                .append("dictSort", getDictSort())
-                .append("dictLabel", getDictLabel())
-                .append("dictValue", getDictValue())
-                .append("dictType", getDictType())
-                .append("cssClass", getCssClass())
-                .append("listClass", getListClass())
-                .append("isDefault", getIsDefault())
-                .append("status", getStatus())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
-    }
 }

+ 7 - 20
system-model/src/main/java/com/bizmatics/model/SysDictType.java

@@ -2,6 +2,7 @@ package com.bizmatics.model;
 
 
 
+import com.bizmatics.common.mvc.base.BaseModel;
 import com.bizmatics.model.base.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -12,14 +13,14 @@ import javax.validation.constraints.Size;
 /**
  * 字典类型表 sys_dict_type
  */
-public class SysDictType extends BaseEntity {
+public class SysDictType extends BaseModel {
     private static final long serialVersionUID = 1L;
 
     /**
      * 字典主键
      */
 
-    private Long dictId;
+    private Long id;
 
     /**
      * 字典名称
@@ -39,12 +40,12 @@ public class SysDictType extends BaseEntity {
 
     private String status;
 
-    public Long getDictId() {
-        return dictId;
+    public Long getId() {
+        return id;
     }
 
-    public void setDictId(Long dictId) {
-        this.dictId = dictId;
+    public void setId(Long id) {
+        this.id = id;
     }
 
     @NotBlank(message = "字典名称不能为空")
@@ -75,18 +76,4 @@ public class SysDictType extends BaseEntity {
         this.status = status;
     }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("dictId", getDictId())
-                .append("dictName", getDictName())
-                .append("dictType", getDictType())
-                .append("status", getStatus())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
-    }
 }

+ 0 - 2
system-service/src/main/java/com/bizmatics/service/dto/SysFileQueryRequest.java

@@ -16,6 +16,4 @@ public class SysFileQueryRequest {
     private List<String> fileIds;
 
     private String duration;
-
-    private String
 }