bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/common/enum/RESPONSE_CODE_ENUM.java

-package cn.wisenergy.datastation.common.core.utils.exception;
-
-/**
- * 响应编码
- */
-public enum RESPONSE_CODE_ENUM {
-
-    /* ******************** 系统异常 ********************* */
-    PARAM_NOT_VALID("400", "请求的参数不合法"),
-    RESOURCE_NOT_FOUND("404", "请求的资源不存在"),
-    METHOD_NOT_SUPPORTED("405", "不支持的请求方法"),
-    MEDIA_TYPE_NOT_ACCEPT("406", "无法接受请求中的媒体类型"),
-    MEDIA_TYPE_NOT_SUPPORTED("415", "不支持的媒体类型"),
-    SERVER_ERROR("500", "服务异常"),
-
-    /* ******************** 业务自定义异常 **************** */
-    REQUEST_PARAMS_ERROR("1001", "参数异常"),
-    GAIN_DATA_FAIL("1003", "获取数据失败"),
-    UPLOAD_FAILURE("1005", "上传失败"),
-    AZKABAN_PROJECT_REPEAT("1006", "工程名重复"),
-
-    HBASE_IOEXCEPTION("1008", "连接hbase异常"),
-    CREATE_FLOW_PROJECT_ERROR("1009", "业务流程名称重复"),
-    CREATE_FLOW_NODE_ERROR("1010", "业务节点名称重复"),
-
-    FLUME_AGENT_ERROR("1011", "agent名称重复"),
-    FLUME_AGENT_RUNNING("1012", "agent正在运行，不可操作"),
-    PARAMETER_PARSING_FAILED("1013", "参数解析失败"),
-    EMPTY_NODE_LIST_RUN_FAILED("1014", "节点集合为空，运行失败"),
-
-    FLOW_RESOURCE_REPEAT("1015", "目录下，有重名资源"),
-    FILE_SYSTEM_FILE_NOEXIST("1016", "目录不存在"),
-    FILE_SYSTEM_FILE_EXCEPTION("1017", "访问异常"),
-    EMPTY_NODE_RUN_FAILED("1018", "-节点内容为空"),
-    EMPTY_NODE_LIST_SAVE_FAILED("1019", "节点集合为空，保存失败"),
-    CANCEL_FLOW_CHAIN_FAILED("1020", "正在更新工作流程链，请稍后刷新页面"),
-
-    TEMPORARY_QUERY_NAME_REPEAT("1021", "hive查询任务重名"),
-    DATA_SYNC_NODE_CHECK_ERROR("1022", "数据同步节点配置错误"),
-
-    HIVE_UPLOAD_FILE_INCORRECT("1028", "文件类型不支持"),
-
-    SCHEDULE_FLOW_EXEC_REPEAT("1029", "业务流程的定时任务启动重复"),
-
-    NAME_REPEAT("1030", "名称重复"),
-    CODE_REPEAT("1031", "编码重复"),
-    MODEL_RELEASE_ERROR("1032", "已为发布状态，不能发布"),
-    MODEL_OFFLINE_ERROR("1033", "被占用，不能下线"),
-    MODEL_DELETE_ERROR("1034", "发布状态，不能删除"),
-    DIMENSION_TABLE_DATABASE_INFO_ERROR("1035", "维度表数据源信息是必须的"),
-    DIMENSION_TABLE_CREATE_TABLE_ERROR("1036", "维度表创建失败"),
-    FACT_ATTRIBUTES_CHECK_ERROR("1037", "事实表属性必须包含时间数据类型"),
-    FACT_TABLES_CREATE_TABLE_ERROR("1038", "事实表创建失败"),
-    FACT_TABLES_DATABASE_INFO_ERROR("1039", "事实表数据源信息是必须的"),
-    AGGREGATION_TABLE_DATABASE_INFO_ERROR("1040", "汇总表数据源信息是必须的"),
-    AGGREGATION_TABLE_CREATE_TABLE_ERROR("1041", "汇总表创建失败"),
-    AGGREGATION_ATTRIBUTES_CHECK_ERROR("1042", "汇总表必须配置时间周期和指标"),
-    MODEL_CREATE_ERROR("1043", "创建失败"),
-    MODEL_OFFLINE_STATUS_ERROR("1044", "当前状态为非发布状态，不允许下线"),
-    FIELD_NAME_ID_REPEAT_ERROR("1045", "字段名称id不允许重复"),
-
-    ASSET_LABEL_DELETE_ERROR("1046", "标签为引用状态,不能删除"),
-
-    QUALITY_JOB_NOT_EXIST("1047", "质量作业不存在"),
-    SYSTEM_TEMPLATE_NOT_OPERATIONAL_ERROR("1048", "系统模板不可操作"),
-    QUALITY_JOB_RUNNING_NOT_DELETE("1049", "质量作业正在运行，不能删除"),
-    QUALITY_RULE_SQL_SEMANTIC_VERIFICATION_ERROR("1050", "语义校验失败，请检查。"),
-    QUALITY_JOB_PERIOD_CRON_NOT_EXIST("1051", "CRON表达式不存在"),
-    QUALITY_JOB_RUN_TASK_NOT_FIND("1052", "找不到要停止的质量作业任务"),
-    OUTPUT_SHOW_WITH_SQL_NOT_MATCH_ERROR("1053", "输出结果说明与定义关系不匹配"),
-    LACK_A_PRIMARY_KEY_ERROR("1054", "至少包含一个主键属性"),
-    QUALITY_JOB_RUN_ERROR("1055", "启动质量作业失败，请检查质量作业参数..."),
-
-    ILLEGAL_OPERATION("1400", "违规操作"),
-
-    BUSINESS_OBJECT_NAME_REGEX_CHECK_ERROR("1500", "只允许除右斜杠、<、>、/外的字符"),
-
-    /* ******************** 登录权限 **************** */
-    USER_NAME_REPEAT("1101", "账户已存在"),
-    LOGIN_INCORRECT("1102", "登录异常"),
-    LOGIN_NOT_EXISTS("1103", "账户不存在"),
-    LOGIN_PWD_INCORRECT("1104", "账户或密码不正确"),
-    NOT_LOGIN_ERROR("1105", "重新登录"),
-    OLD_PASSWORD_INCORRECT("1106", "旧密码不正确"),
-
-    ACCOUNT_HAS_BEEN_DISABLED("1107", "此账号已被禁用"),
-    ACCOUNT_IS_LOCKED("1108", "此账号已被锁定，请稍后再试"),
-    ACCOUNT_AUTHENTICATION_FAILED("1109", "账号认证失败"),
-    UNAUTHORIZED("1110", "权限不足"),
-    ROLE_CODE_REPEAT("1111", "角色编码已存在"),
-    SYS_ROLE_DELETE_FAIL("1112", "系统角色不允许删除"),
-    SYS_MENU_DELETE_FAIL("1113", "还存在子菜单，不能直接删除"),
-    /* ******************** 操作失败 **************** */
-    REQUEST_FAIL("1100", "操作失败"),
-    /* ******************** 操作成功 **************** */
-    REQUEST_SUCCESS("200", "操作成功");
-
-
-    // 错误编码
-    private String code;
-
-    // 错误信息
-    private String msg;
-
-    // 相应编码有参构造函数
-    RESPONSE_CODE_ENUM(String code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    /**
-     * 获取编码
-     */
-    public String getCode() {
-        return code;
-    }
-
-    /**
-     * 设置编码
-     */
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    /**
-     * 获取编码信息
-     */
-    public String getMsg() {
-        return msg;
-    }
-
-    /**
-     * 设置编码信息
-     */
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-}

src/main/java/cn/wisenergy/chnmuseum/party/common/enums/AuditStatusEnum.java

+package cn.wisenergy.chnmuseum.party.common.enums;
+
+/**
+ * 审核状态
+ */
+public enum AuditStatusEnum {
+
+    TBC("1", "待审核"),
+    REFUSED("2", "已驳回"),
+    APPROVED("3", "已通过");
+
+    // 错误编码
+    private String code;
+    // 信息
+    private String msg;
+
+    // 相应编码有参构造函数
+    AuditStatusEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+}

src/main/java/cn/wisenergy/chnmuseum/party/common/mvc/RESPONSE_CODE_ENUM.java → src/main/java/cn/wisenergy/chnmuseum/party/common/enums/RESPONSE_CODE_ENUM.java

-package cn.wisenergy.chnmuseum.party.common.mvc;
+package cn.wisenergy.chnmuseum.party.common.enums;
 
 /**
  * 响应编码

src/main/java/cn/wisenergy/chnmuseum/party/common/enum/RESULT_INFO_ENUM.java → src/main/java/cn/wisenergy/chnmuseum/party/common/enums/RESULT_INFO_ENUM.java

-package cn.wisenergy.datastation.common.core.enums;
+package cn.wisenergy.chnmuseum.party.common.enums;
 
 /**
  * 响应结果信息枚举

src/main/java/cn/wisenergy/chnmuseum/party/common/validator/EnumValueValidator.java

+package cn.wisenergy.chnmuseum.party.common.validator;
+
+import cn.wisenergy.datastation.model.validator.constraints.EnumValue;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * 自定义枚举校验器
+ *
+ * @author mxy
+ * @date 2020/4/23
+ */
+@Slf4j
+public class EnumValueValidator implements ConstraintValidator<EnumValue, String> {
+
+    // 枚举校验注解
+    private EnumValue annotation;
+
+    @Override
+    public void initialize(EnumValue constraintAnnotation) {
+        annotation = constraintAnnotation;
+    }
+
+    @Override
+    public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) {
+        boolean result = false;
+
+        Class<?> cls = annotation.target();
+        boolean ignoreEmpty = annotation.ignoreEmpty();
+
+        // target为枚举，并且value有值，或者不忽视空值，才进行校验
+        if (cls.isEnum() && (StringUtils.isNotEmpty(value) || !ignoreEmpty)) {
+            Object[] objects = cls.getEnumConstants();
+            try {
+                Method method = cls.getMethod("name");
+                for (Object obj : objects) {
+                    // 将传入值与枚举值比较
+                    if (method.invoke(obj).toString().equals(value)) {
+                        result = true;
+                        break;
+                    }
+                }
+            } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+                log.warn("EnumValidator call isValid() method exception.");
+            }
+        } else {
+            result = true;
+        }
+        return result;
+    }
+}

src/main/java/cn/wisenergy/chnmuseum/party/common/validator/IdCardValidator.java

+package cn.wisenergy.chnmuseum.party.common.validator;
+
+import cn.wisenergy.datastation.model.validator.constraints.IdCard;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import java.util.regex.Pattern;
+
+/**
+ * 自定义身份证号码验证注解实现类
+ */
+public class IdCardValidator implements ConstraintValidator<IdCard, String> {
+    private static final String REG_EX = "(^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{2}[0-9Xx]$)|(^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}[0-9Xx]$)";
+    private static final Pattern PATTERN = Pattern.compile(REG_EX);
+
+    @Override
+    public void initialize(IdCard parameters) {
+    }
+
+    @Override
+    public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) {
+        if (value == null) {
+            return true;
+        }
+        return PATTERN.matcher(value).matches();
+    }
+}

src/main/java/cn/wisenergy/chnmuseum/party/common/validator/PhoneValidator.java

+package cn.wisenergy.chnmuseum.party.common.validator;
+
+import cn.wisenergy.datastation.model.validator.constraints.Phone;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import java.util.regex.Pattern;
+
+/**
+ * 自定义手机号码验证注解实现类
+ */
+public class PhoneValidator implements ConstraintValidator<Phone, String> {
+
+    private static final String REG_EX = "^1[3,4,5,6,7,8,9]\\d{9}$";
+    private static final Pattern PATTERN = Pattern.compile(REG_EX);
+
+    @Override
+    public void initialize(Phone parameters) {
+    }
+
+    @Override
+    public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) {
+        if (value == null) {
+            return true;
+        }
+        return PATTERN.matcher(value).matches();
+    }
+}

src/main/java/cn/wisenergy/chnmuseum/party/common/validator/constraints/EnumValue.java

+package cn.wisenergy.chnmuseum.party.common.validator.constraints;
+
+import cn.wisenergy.datastation.model.validator.EnumValueValidator;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * 自定义枚举校验注解
+ *
+ * @author mxy
+ * @date 2020/4/23
+ */
+@Documented
+@Constraint(validatedBy = {EnumValueValidator.class})
+@Target({METHOD, FIELD, ANNOTATION_TYPE})
+@Retention(RUNTIME)
+public @interface EnumValue {
+
+    String message() default "枚举不合规范";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+
+    /**
+     * 目标枚举类
+     */
+    Class<?> target() default Class.class;
+
+    /**
+     * 是否忽略空值
+     */
+    boolean ignoreEmpty() default true;
+}

src/main/java/cn/wisenergy/chnmuseum/party/common/validator/constraints/IdCard.java

+package cn.wisenergy.chnmuseum.party.common.validator.constraints;
+
+import cn.wisenergy.datastation.model.validator.IdCardValidator;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * 自定义身份证号码正则验证注解
+ */
+@Documented
+@Constraint(validatedBy = {IdCardValidator.class})
+@Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER})
+@Retention(RUNTIME)
+public @interface IdCard {
+    String message() default "请输入有效的身份证号码";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+
+}

src/main/java/cn/wisenergy/chnmuseum/party/common/validator/constraints/Phone.java

+package cn.wisenergy.chnmuseum.party.common.validator.constraints;
+
+import cn.wisenergy.datastation.model.validator.PhoneValidator;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * 自定义手机号码正则验证注解
+ */
+@Documented
+@Constraint(validatedBy = {PhoneValidator.class})
+@Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER})
+@Retention(RUNTIME)
+public @interface Phone {
+    String message() default "请输入有效的手机号码";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+
+}

src/main/java/cn/wisenergy/chnmuseum/party/common/validator/groups/Add.java

+package cn.wisenergy.chnmuseum.party.common.validator.groups;
+
+import javax.validation.groups.Default;
+
+/**
+ * Validator分组验证：添加
+ *
+ * @author geekidea
+ * @date 2020/3/8
+ **/
+public interface Add extends Default {
+}

src/main/java/cn/wisenergy/chnmuseum/party/common/validator/groups/Update.java

+package cn.wisenergy.chnmuseum.party.common.validator.groups;
+
+import javax.validation.groups.Default;
+
+/**
+ * Validator分组验证：修改
+ *
+ * @author geekidea
+ * @date 2020/3/8
+ **/
+public interface Update extends Default {
+}

src/main/java/cn/wisenergy/chnmuseum/party/common/vo/BaseEntity.java

+package cn.wisenergy.chnmuseum.party.common.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * PO对象的基类
+ */
+public abstract class BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = -7061351572696456575L;
+
+    /**
+     * 标识id
+     */
+    private Long id;
+
+    /**
+     * 创建时间
+     */
+    private Date createDate;
+
+    /**
+     * 修改时间
+     */
+    private Date modifyDate;
+
+    /**
+     * 标记
+     */
+    private Boolean flag = true;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getModifyDate() {
+        return modifyDate;
+    }
+
+    public void setModifyDate(Date modifyDate) {
+        this.modifyDate = modifyDate;
+    }
+
+    public Boolean getFlag() {
+        return flag;
+    }
+
+    public void setFlag(Boolean flag) {
+        this.flag = flag;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        BaseEntity that = (BaseEntity) o;
+
+        if (!id.equals(that.id)) return false;
+        if (!createDate.equals(that.createDate)) return false;
+        if (!modifyDate.equals(that.modifyDate)) return false;
+        return flag.equals(that.flag);
+    }
+
+    @Override
+    public int hashCode() {
+        int hashCode = 17;
+        hashCode += null == getId() ? 0 : getId().hashCode() * 31;
+        return hashCode;
+    }
+
+}

src/main/java/cn/wisenergy/chnmuseum/party/common/vo/BasePageOrderParam.java

+package cn.wisenergy.chnmuseum.party.common.vo;
+
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.time.LocalDate;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 可排序查询参数对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("可排序查询参数对象")
+public abstract class BasePageOrderParam extends BasePageParam {
+
+    private static final long serialVersionUID = 57714391204790143L;
+
+    @ApiModelProperty("名称/编码")
+    private String nameOrCode;
+
+    @ApiModelProperty("类型")
+    private String type;
+
+    @ApiModelProperty("起始修改时间")
+    private LocalDate startDate;
+
+    @ApiModelProperty("终止修改时间")
+    private LocalDate endDate;
+
+    @ApiModelProperty("排序")
+    private List<OrderItem> pageSorts;
+
+    @ApiModelProperty("创建人")
+    private String creatorName;
+
+    public void defaultPageSort(OrderItem orderItem) {
+        this.defaultPageSorts(Collections.singletonList(orderItem));
+    }
+
+    public void defaultPageSorts(List<OrderItem> pageSorts) {
+        if (CollectionUtils.isEmpty(pageSorts)) {
+            return;
+        }
+        this.pageSorts = pageSorts;
+    }
+
+}

src/main/java/cn/wisenergy/chnmuseum/party/common/vo/BasePageParam.java

+package cn.wisenergy.chnmuseum.party.common.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 查询参数
+ */
+@Data
+@ApiModel("查询参数对象")
+public abstract class BasePageParam implements Serializable {
+
+    private static final long serialVersionUID = -3263921252635611410L;
+
+//    @ApiModelProperty(value = "页码,默认为1", example = "1")
+//    private Long pageIndex = CommonConstant.DEFAULT_PAGE_INDEX;
+//
+//    @ApiModelProperty(value = "页大小,默认为10", example = "10")
+//    private Long pageSize = CommonConstant.DEFAULT_PAGE_SIZE;
+//
+//    @ApiModelProperty(value = "搜索字符串", example = "")
+//    private String keyword;
+//
+//    public void setPageIndex(Long pageIndex) {
+//        if (pageIndex == null || pageIndex <= 0) {
+//            this.pageIndex = CommonConstant.DEFAULT_PAGE_INDEX;
+//        } else {
+//            this.pageIndex = pageIndex;
+//        }
+//    }
+//
+//    public void setPageSize(Long pageSize) {
+//        if (pageSize == null || pageSize <= 0) {
+//            this.pageSize = CommonConstant.DEFAULT_PAGE_SIZE;
+//        } else {
+//            this.pageSize = pageSize;
+//        }
+//    }
+
+}

src/main/java/cn/wisenergy/chnmuseum/party/common/vo/CommonConstant.java

+package cn.wisenergy.chnmuseum.party.common.vo;
+
+/**
+ * 公共常量
+ */
+public interface CommonConstant {
+
+    /**
+     * 默认页码为1
+     */
+    Long DEFAULT_PAGE_INDEX = 1L;
+
+    /**
+     * 默认页大小为10
+     */
+    Long DEFAULT_PAGE_SIZE = 10L;
+
+    /**
+     * 分页总行数名称
+     */
+    String PAGE_TOTAL_NAME = "total";
+
+    /**
+     * 分页数据列表名称
+     */
+    String PAGE_RECORDS_NAME = "records";
+
+    /**
+     * 分页当前页码名称
+     */
+    String PAGE_INDEX_NAME = "pageIndex";
+
+    /**
+     * 分页当前页大小名称
+     */
+    String PAGE_SIZE_NAME = "pageSize";
+
+    /**
+     * 登录用户
+     */
+    String LOGIN_SYS_USER = "loginSysUser";
+
+    /**
+     * 登录token
+     */
+    String JWT_DEFAULT_TOKEN_NAME = "token";
+
+    /**
+     * JWT用户名
+     */
+    String JWT_USERNAME = "username";
+
+    /**
+     * JWT刷新新token响应状态码
+     */
+    int JWT_REFRESH_TOKEN_CODE = 460;
+
+    /**
+     * JWT刷新新token响应状态码，
+     * Redis中不存在，但jwt未过期，不生成新的token，返回361状态码
+     */
+    int JWT_INVALID_TOKEN_CODE = 461;
+
+    /**
+     * JWT Token默认密钥
+     */
+    String JWT_DEFAULT_SECRET = "666666";
+
+    /**
+     * JWT 默认过期时间，3600L，单位秒
+     */
+    Long JWT_DEFAULT_EXPIRE_SECOND = 3600L;
+
+    /**
+     * 默认头像
+     */
+    String DEFAULT_HEAD_URL = "";
+
+    /**
+     * 管理员角色名称
+     */
+    String ADMIN_ROLE_NAME = "管理员";
+
+    String ADMIN_LOGIN = "adminLogin";
+
+    /**
+     * 验证码token
+     */
+    String VERIFY_TOKEN = "verifyToken";
+
+    /**
+     * 图片
+     */
+    String IMAGE = "image";
+
+    /**
+     * JPEG
+     */
+    String JPEG = "JPEG";
+
+    /**
+     * base64前缀
+     */
+    String BASE64_PREFIX = "data:image/png;base64,";
+
+    /**
+     * ..
+     */
+    String SPOT_SPOT = "..";
+
+    /**
+     * ../
+     */
+    String SPOT_SPOT_BACKSLASH = "../";
+
+    /**
+     * SpringBootAdmin登录信息
+     */
+    String ADMIN_LOGIN_SESSION = "adminLoginSession";
+
+    /**
+     * 用户浏览器代理
+     */
+    String USER_AGENT = "User-Agent";
+
+    /**
+     * 本机地址IP
+     */
+    String LOCALHOST_IP = "127.0.0.1";
+    /**
+     * 本机地址名称
+     */
+    String LOCALHOST_IP_NAME = "本机地址";
+    /**
+     * 局域网IP
+     */
+    String LAN_IP = "192.168";
+    /**
+     * 局域网名称
+     */
+    String LAN_IP_NAME = "局域网";
+}

src/main/java/cn/wisenergy/chnmuseum/party/common/vo/GenericPageParam.java

+package cn.wisenergy.chnmuseum.party.common.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "通用查询参数", description = "通用查询参数")
+public class GenericPageParam extends BasePageOrderParam {
+
+}

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AssetController.java

-package cn.wisenergy.chnmuseum.party.web.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
-
-/**
- * <p>
- * 视频 前端控制器
- * </p>
- *
- * @author Danny Lee
- * @since 2021-03-16
- */
-@RestController
-@RequestMapping("/party/asset")
-public class AssetController extends BaseController {
-
-}
-

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/base/BaseController.java

 package cn.wisenergy.chnmuseum.party.web.controller.base;
 
 import cn.wisenergy.chnmuseum.party.auth.util.JwtTokenUtil;
+import cn.wisenergy.chnmuseum.party.common.enums.RESPONSE_CODE_ENUM;
+import cn.wisenergy.chnmuseum.party.common.enums.RESULT_INFO_ENUM;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SimplePropertyPreFilter;
@@ -55,8 +57,8 @@ public class BaseController implements Serializable {
      */
     protected Map<String, Object> getResult(Object obj) {
         Map<String, Object> map = new HashMap<>();
-        map.put(cn.wisenergy.datastation.common.core.enums.RESULT_INFO_ENUM.RESULT_CODE.getKey(), cn.wisenergy.datastation.common.core.utils.exception.RESPONSE_CODE_ENUM.REQUEST_SUCCESS.getCode());
-        map.put(cn.wisenergy.datastation.common.core.enums.RESULT_INFO_ENUM.RESULT_BODY.getKey(), obj);
+        map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), RESPONSE_CODE_ENUM.REQUEST_SUCCESS.getCode());
+        map.put(RESULT_INFO_ENUM.RESULT_BODY.getKey(), obj);
         return map;
     }
 
@@ -67,8 +69,8 @@ public class BaseController implements Serializable {
      */
     protected Map<String, Object> getSuccessResult() {
         Map<String, Object> map = new HashMap<>();
-        map.put(cn.wisenergy.datastation.common.core.enums.RESULT_INFO_ENUM.RESULT_CODE.getKey(), cn.wisenergy.datastation.common.core.utils.exception.RESPONSE_CODE_ENUM.REQUEST_SUCCESS.getCode());
-        map.put(cn.wisenergy.datastation.common.core.enums.RESULT_INFO_ENUM.RESULT_MSG.getKey(), cn.wisenergy.datastation.common.core.utils.exception.RESPONSE_CODE_ENUM.REQUEST_SUCCESS.getMsg());
+        map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), RESPONSE_CODE_ENUM.REQUEST_SUCCESS.getCode());
+        map.put(RESULT_INFO_ENUM.RESULT_MSG.getKey(), RESPONSE_CODE_ENUM.REQUEST_SUCCESS.getMsg());
         return map;
     }
 
@@ -81,8 +83,8 @@ public class BaseController implements Serializable {
      */
     protected Map<String, Object> getFailResult(String code, String msg) {
         Map<String, Object> map = new HashMap<>();
-        map.put(cn.wisenergy.datastation.common.core.enums.RESULT_INFO_ENUM.RESULT_CODE.getKey(), code);
-        map.put(cn.wisenergy.datastation.common.core.enums.RESULT_INFO_ENUM.RESULT_MSG.getKey(), msg);
+        map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), code);
+        map.put(RESULT_INFO_ENUM.RESULT_MSG.getKey(), msg);
         return map;
     }
 
@@ -92,10 +94,10 @@ public class BaseController implements Serializable {
      * @param responseCodeEnum 特定状态码
      * @return map
      */
-    protected Map<String, Object> getFailResult(cn.wisenergy.datastation.common.core.utils.exception.RESPONSE_CODE_ENUM responseCodeEnum) {
+    protected Map<String, Object> getFailResult(RESPONSE_CODE_ENUM responseCodeEnum) {
         Map<String, Object> map = new HashMap<>();
-        map.put(cn.wisenergy.datastation.common.core.enums.RESULT_INFO_ENUM.RESULT_CODE.getKey(), responseCodeEnum.getCode());
-        map.put(cn.wisenergy.datastation.common.core.enums.RESULT_INFO_ENUM.RESULT_MSG.getKey(), responseCodeEnum.getMsg());
+        map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), responseCodeEnum.getCode());
+        map.put(RESULT_INFO_ENUM.RESULT_MSG.getKey(), responseCodeEnum.getMsg());
         return map;
     }
 
@@ -106,8 +108,8 @@ public class BaseController implements Serializable {
      */
     protected Map<String, Object> getFailResult() {
         Map<String, Object> map = new HashMap<>();
-        map.put(cn.wisenergy.datastation.common.core.enums.RESULT_INFO_ENUM.RESULT_CODE.getKey(), cn.wisenergy.datastation.common.core.utils.exception.RESPONSE_CODE_ENUM.SERVER_ERROR.getCode());
-        map.put(cn.wisenergy.datastation.common.core.enums.RESULT_INFO_ENUM.RESULT_MSG.getKey(), cn.wisenergy.datastation.common.core.utils.exception.RESPONSE_CODE_ENUM.SERVER_ERROR.getMsg());
+        map.put(RESULT_INFO_ENUM.RESULT_CODE.getKey(), RESPONSE_CODE_ENUM.SERVER_ERROR.getCode());
+        map.put(RESULT_INFO_ENUM.RESULT_MSG.getKey(), RESPONSE_CODE_ENUM.SERVER_ERROR.getMsg());
         return map;
     }
 

src/main/resources/templates/controller.java.vm

 package ${package.Controller};
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 #if(${superControllerClassPackage})
 import com.wisenergy.DigDataStation.common.controller.BaseController;
 #end
 import ${package.Entity}.${entity};
 import ${package.Service}.${table.serviceName};
-import com.wisenergy.DigDataStation.utils.Exception.InterfaceException;
-import com.wisenergy.DigDataStation.utils.Exception.RESPONSE_CODE_ENUM;
+import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
+import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
+import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
 #if(${swagger2})
 
 import io.swagger.annotations.Api;
@@ -19,14 +20,11 @@ import io.swagger.annotations.ApiOperation;
 
 #end
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
-#if(${restControllerStyle})
-import org.springframework.web.bind.annotation.RestController;
-#else
+import org.springframework.web.bind.annotation.*;
 import org.springframework.stereotype.Controller;
-#end
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -120,7 +118,7 @@ public class ${table.controllerName} {
 			@ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataType = "String")
 	})
 	public Map<String, Object> updateStatus(@NotNull(message = "$!{table.comment}ID不能为空") @PathVariable("id") Long id, @RequestParam("status") AuditStatusEnum status) {
-		boolean flag = atomicIndexService.updateAuditStatusById(id, status);
+		boolean flag = ${table.entityPath}Service.updateAuditStatusById(id, status);
 		if (flag) {
 			return getSuccessResult();
 		}
@@ -149,10 +147,10 @@ public class ${table.controllerName} {
 	#end
 	@ApiOperation(value = "获取$!{table.comment}全部列表(无分页)", notes = "获取$!{table.comment}全部列表(无分页)")
 	@ApiImplicitParams(value = {
-			@ApiImplicitParam(name = "status", value = "审核状态", paramType = "query", dataType = "String")
+			@ApiImplicitParam(name = "auditStatus", value = "审核状态", paramType = "query", dataType = "String")
 	})
-    public Map<String, Object> get${entity}List(@RequestParam(value = "status", defaultValue = "APPROVED", required = false) ModelStatusEnum status) {
-        List<${entity}> ${table.entityPath}List = ${table.entityPath}Service.list(Wrappers.<${entity}>lambdaQuery().eq(${entity}::getStatus, status.name()));
+    public Map<String, Object> get${entity}List(@RequestParam(value = "auditStatus", defaultValue = "APPROVED", required = false) AuditStatusEnum auditStatus) {
+        List<${entity}> ${table.entityPath}List = ${table.entityPath}Service.list(Wrappers.<${entity}>lambdaQuery().eq(${entity}::getAuditStatus, auditStatus.name()));
         return getResult(${table.entityPath}List);
     }
 
@@ -182,10 +180,10 @@ public class ${table.controllerName} {
 		// 根据创建时间区间检索
 		if (genericPageParam.getStartDate() != null && genericPageParam.getEndDate() != null) {
 			queryWrapper.ge(${entity}::getCreateTime, genericPageParam.getStartDate().atTime(0, 0, 0))
-				.le(AtomicIndex::getModifyDate, genericPageParam.getEndDate().atTime(23, 59, 59));
+				.le(${entity}::getCreateTime, genericPageParam.getEndDate().atTime(23, 59, 59));
 		}
 		// 设置排序规则
-		queryWrapper.orderByDesc(${entity}::getCreateDate);
+		queryWrapper.orderByDesc(${entity}::getCreateTime);
 		// 设置查询内容
 		queryWrapper.select(
 				${entity}::getId,