From de784a3bd87b7bc6d6533f2a3bb7426a696860ea Mon Sep 17 00:00:00 2001
From: lishangbu <shangshili@hotmail.com>
Date: Thu, 30 Dec 2021 14:14:47 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=9F=BA=E7=A1=80=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pigx/common/data/mybatis/BaseEntity.java  | 21 +++++++++++++++++++
 .../pigx/admin/api/entity/SysPublicParam.java | 19 +----------------
 .../impl/SysPublicParamServiceImpl.java       |  4 ++--
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/BaseEntity.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/BaseEntity.java
index 0902499fe..3d805f65f 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/BaseEntity.java
+++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/BaseEntity.java
@@ -1,7 +1,11 @@
 package com.pig4cloud.pigx.common.data.mybatis;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -22,24 +26,41 @@ public class BaseEntity implements Serializable {
 	 * 创建者
 	 */
 	@TableField(fill = FieldFill.INSERT)
+	@ApiModelProperty(value = "创建人", example = "admin")
+	@ExcelProperty(value = "创建人")
 	private String createBy;
 
 	/**
 	 * 创建时间
 	 */
 	@TableField(fill = FieldFill.INSERT)
+	@ApiModelProperty(value = "创建时间", example = "2021-12-20 13:27:44")
+	@ExcelProperty(value = "创建时间")
 	private LocalDateTime createTime;
 
 	/**
 	 * 更新者
 	 */
 	@TableField(fill = FieldFill.INSERT_UPDATE)
+	@ApiModelProperty(value = "更新人", example = "admin")
+	@ExcelIgnore
 	private String updateBy;
 
 	/**
 	 * 更新时间
 	 */
 	@TableField(fill = FieldFill.INSERT_UPDATE)
+	@ApiModelProperty(value = "更新时间", example = "2021-12-20 13:27:44")
+	@ExcelIgnore
 	private LocalDateTime updateTime;
 
+	/**
+	 * 是否删除 1：已删除 0：正常
+	 */
+	@TableLogic
+	@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
+	@TableField(fill = FieldFill.INSERT)
+	@ExcelIgnore
+	private String delFlag;
+
 }
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java
index c29145a6c..2fe116ef6 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java
@@ -24,8 +24,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 公共参数配置
  *
@@ -84,26 +82,11 @@ public class SysPublicParam extends Model<SysPublicParam> {
 	@ApiModelProperty(value = "编码", example = "^(PIG|PIGX)$")
 	private String validateCode;
 
-	/**
-	 * 创建时间
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	@ApiModelProperty(value = "创建时间", example = "2019-03-21 12:28:48")
-	private Date createTime;
-
-	/**
-	 * 修改时间
-	 */
-	@TableField(fill = FieldFill.UPDATE)
-	@ApiModelProperty(value = "修改时间", example = "2019-03-21 12:28:48")
-	private Date updateTime;
-
 	/**
 	 * 是否是系统内置
 	 */
-	@TableField(value = "`system`")
 	@ApiModelProperty(value = "是否是系统内置")
-	private String system;
+	private String systemFlag;
 
 	/**
 	 * 配置类型：0-默认；1-检索；2-原文；3-报表；4-安全；5-文档；6-消息；9-其他
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysPublicParamServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysPublicParamServiceImpl.java
index fbaecbd6e..d639965a9 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysPublicParamServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysPublicParamServiceImpl.java
@@ -63,7 +63,7 @@ public class SysPublicParamServiceImpl extends ServiceImpl<SysPublicParamMapper,
 	public R updateParam(SysPublicParam sysPublicParam) {
 		SysPublicParam param = this.getById(sysPublicParam.getPublicId());
 		// 系统内置
-		if (DictTypeEnum.SYSTEM.getType().equals(param.getSystem())) {
+		if (DictTypeEnum.SYSTEM.getType().equals(param.getSystemFlag())) {
 			return R.failed("系统内置参数不能删除");
 		}
 		return R.ok(this.updateById(sysPublicParam));
@@ -79,7 +79,7 @@ public class SysPublicParamServiceImpl extends ServiceImpl<SysPublicParamMapper,
 	public R removeParam(Long publicId) {
 		SysPublicParam param = this.getById(publicId);
 		// 系统内置
-		if (DictTypeEnum.SYSTEM.getType().equals(param.getSystem())) {
+		if (DictTypeEnum.SYSTEM.getType().equals(param.getSystemFlag())) {
 			return R.failed("系统内置参数不能删除");
 		}
 		return R.ok(this.removeById(publicId));