初始化项目

elkers

2025-04-07 bd9808a81b1eafdc75a42c1c9904408dc888061d

初始化项目

 pom.xml

@@ -9,7 +9,7 @@
        <relativePath/>
    </parent>

    <groupId>com.lunhan.xxx</groupId>
    <groupId>com.nanjing.water</groupId>
    <artifactId>xxx-yyy</artifactId>
    <version>0.0.1-SNAPSHOT</version>
    <name>xxx-yyy-service</name>

 src/main/java/com/lunhan/xxx/repository/mapper/QuartzTaskErrorMapper.java

文件已删除

 src/main/java/com/lunhan/xxx/repository/mapper/QuartzTaskInfoMapper.java

文件已删除

 src/main/java/com/lunhan/xxx/repository/mapper/QuartzTaskRecordMapper.java

文件已删除

 src/main/java/com/nanjing/water/common/ConstantFactory.java

文件名从 src/main/java/com/lunhan/xxx/common/ConstantFactory.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common;
package com.nanjing.water.common;

import java.math.BigDecimal;


 src/main/java/com/nanjing/water/common/ExecutedResult.java

文件名从 src/main/java/com/lunhan/xxx/common/ExecutedResult.java 修改
@@ -1,8 +1,8 @@
package com.lunhan.xxx.common;
package com.nanjing.water.common;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.lunhan.xxx.common.enums.EResultCode;
import com.lunhan.xxx.common.util.StringUtil;
import com.nanjing.water.common.enums.EResultCode;
import com.nanjing.water.common.util.StringUtil;

import java.util.Objects;


 src/main/java/com/nanjing/water/common/PagerResult.java

文件名从 src/main/java/com/lunhan/xxx/common/PagerResult.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common;
package com.nanjing.water.common;

import java.util.ArrayList;
import java.util.List;

 src/main/java/com/nanjing/water/common/PagerResultMore.java

文件名从 src/main/java/com/lunhan/xxx/common/PagerResultMore.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common;
package com.nanjing.water.common;

import java.util.List;


 src/main/java/com/nanjing/water/common/ToBigDecimalFunction.java

文件名从 src/main/java/com/lunhan/xxx/common/ToBigDecimalFunction.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common;
package com.nanjing.water.common;

import java.math.BigDecimal;


 src/main/java/com/nanjing/water/common/cache/CacheManagerConfig.java

文件名从 src/main/java/com/lunhan/xxx/common/cache/CacheManagerConfig.java 修改
@@ -1,6 +1,6 @@
package com.lunhan.xxx.common.cache;
package com.nanjing.water.common.cache;

import com.lunhan.xxx.common.ConstantFactory;
import com.nanjing.water.common.ConstantFactory;
import org.springframework.cache.CacheManager;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

 src/main/java/com/nanjing/water/common/cache/RedisKeySerializer.java

文件名从 src/main/java/com/lunhan/xxx/common/cache/RedisKeySerializer.java 修改
@@ -1,6 +1,6 @@
package com.lunhan.xxx.common.cache;
package com.nanjing.water.common.cache;

import com.lunhan.xxx.common.config.SysConfig;
import com.nanjing.water.common.config.SysConfig;
import org.springframework.data.redis.serializer.RedisSerializer;
import org.springframework.lang.Nullable;


 src/main/java/com/nanjing/water/common/config/FileConfig.java

文件名从 src/main/java/com/lunhan/xxx/common/config/FileConfig.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.config;
package com.nanjing.water.common.config;

import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

 src/main/java/com/nanjing/water/common/config/JWTConfig.java

文件名从 src/main/java/com/lunhan/xxx/common/config/JWTConfig.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.config;
package com.nanjing.water.common.config;

import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

 src/main/java/com/nanjing/water/common/config/JdbcSetConfig.java

文件名从 src/main/java/com/lunhan/xxx/common/config/JdbcSetConfig.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.config;
package com.nanjing.water.common.config;

import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

 src/main/java/com/nanjing/water/common/config/RedisConfig.java

文件名从 src/main/java/com/lunhan/xxx/common/config/RedisConfig.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.config;
package com.nanjing.water.common.config;

import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

 src/main/java/com/nanjing/water/common/config/SysConfig.java

文件名从 src/main/java/com/lunhan/xxx/common/config/SysConfig.java 修改
@@ -1,6 +1,6 @@
package com.lunhan.xxx.common.config;
package com.nanjing.water.common.config;

import com.lunhan.xxx.common.util.SpringUtil;
import com.nanjing.water.common.util.SpringUtil;

/**
 * 获取系统配置 读取“config.properties”

 src/main/java/com/nanjing/water/common/config/TokenConfig.java

文件名从 src/main/java/com/lunhan/xxx/common/config/TokenConfig.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.config;
package com.nanjing.water.common.config;

import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

 src/main/java/com/nanjing/water/common/enums/EContentType.java

文件名从 src/main/java/com/lunhan/xxx/common/enums/EContentType.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.enums;
package com.nanjing.water.common.enums;

import java.util.Arrays;


 src/main/java/com/nanjing/water/common/enums/EHorizontalLocation.java

文件名从 src/main/java/com/lunhan/xxx/common/enums/EHorizontalLocation.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.enums;
package com.nanjing.water.common.enums;

import java.util.Arrays;


 src/main/java/com/nanjing/water/common/enums/EHttpContentType.java

文件名从 src/main/java/com/lunhan/xxx/common/enums/EHttpContentType.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.enums;
package com.nanjing.water.common.enums;

import java.util.Arrays;


 src/main/java/com/nanjing/water/common/enums/ELogger.java

文件名从 src/main/java/com/lunhan/xxx/common/enums/ELogger.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.enums;
package com.nanjing.water.common.enums;

import java.util.Arrays;
import java.util.Objects;

 src/main/java/com/nanjing/water/common/enums/ERequestTokenFrom.java

文件名从 src/main/java/com/lunhan/xxx/common/enums/ERequestTokenFrom.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.enums;
package com.nanjing.water.common.enums;

import java.util.Arrays;


 src/main/java/com/nanjing/water/common/enums/EResultCode.java

文件名从 src/main/java/com/lunhan/xxx/common/enums/EResultCode.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.enums;
package com.nanjing.water.common.enums;

/**
 * 执行结果 枚举

 src/main/java/com/nanjing/water/common/enums/EVerticalLocation.java

文件名从 src/main/java/com/lunhan/xxx/common/enums/EVerticalLocation.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.enums;
package com.nanjing.water.common.enums;

import java.util.Arrays;


 src/main/java/com/nanjing/water/common/enums/EYesOrNo.java

文件名从 src/main/java/com/lunhan/xxx/common/enums/EYesOrNo.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.enums;
package com.nanjing.water.common.enums;

import java.util.Arrays;
import java.util.Objects;

 src/main/java/com/nanjing/water/common/enums/EnumBasic.java

文件名从 src/main/java/com/lunhan/xxx/common/enums/EnumBasic.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.enums;
package com.nanjing.water.common.enums;

/**
 * 枚举基类

 src/main/java/com/nanjing/water/common/enums/IErrorCode.java

文件名从 src/main/java/com/lunhan/xxx/common/enums/IErrorCode.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.enums;
package com.nanjing.water.common.enums;

/**
 * @Author lin.liu

 src/main/java/com/nanjing/water/common/exceptions/BusinessException.java

文件名从 src/main/java/com/lunhan/xxx/common/exceptions/BusinessException.java 修改
@@ -1,6 +1,6 @@
package com.lunhan.xxx.common.exceptions;
package com.nanjing.water.common.exceptions;

import com.lunhan.xxx.common.enums.EResultCode;
import com.nanjing.water.common.enums.EResultCode;

/**
 * 自定义业务异常

 src/main/java/com/nanjing/water/common/extend/CollectorsPlus.java

文件名从 src/main/java/com/lunhan/xxx/common/extend/CollectorsPlus.java 修改
@@ -1,6 +1,6 @@
package com.lunhan.xxx.common.extend;
package com.nanjing.water.common.extend;

import com.lunhan.xxx.common.ToBigDecimalFunction;
import com.nanjing.water.common.ToBigDecimalFunction;

import java.math.BigDecimal;
import java.util.*;

 src/main/java/com/nanjing/water/common/jackson/BigNumberSerializer.java

文件名从 src/main/java/com/lunhan/xxx/common/jackson/BigNumberSerializer.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.jackson;
package com.nanjing.water.common.jackson;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.SerializerProvider;

 src/main/java/com/nanjing/water/common/jackson/JacksonConfig.java

文件名从 src/main/java/com/lunhan/xxx/common/jackson/JacksonConfig.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.jackson;
package com.nanjing.water.common.jackson;

import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;

 src/main/java/com/nanjing/water/common/jwt/JWTUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/jwt/JWTUtil.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.jwt;
package com.nanjing.water.common.jwt;

import com.auth0.jwt.JWT;
import com.auth0.jwt.JWTCreator;
@@ -6,13 +6,13 @@
import com.auth0.jwt.algorithms.Algorithm;
import com.auth0.jwt.exceptions.TokenExpiredException;
import com.auth0.jwt.interfaces.DecodedJWT;
import com.lunhan.xxx.common.ConstantFactory;
import com.lunhan.xxx.common.config.SysConfig;
import com.lunhan.xxx.common.enums.EResultCode;
import com.lunhan.xxx.common.exceptions.BusinessException;
import com.lunhan.xxx.common.util.LocalDateTimeUtil;
import com.lunhan.xxx.common.util.NumericUtil;
import com.lunhan.xxx.common.util.StringUtil;
import com.nanjing.water.common.ConstantFactory;
import com.nanjing.water.common.config.SysConfig;
import com.nanjing.water.common.enums.EResultCode;
import com.nanjing.water.common.exceptions.BusinessException;
import com.nanjing.water.common.util.LocalDateTimeUtil;
import com.nanjing.water.common.util.NumericUtil;
import com.nanjing.water.common.util.StringUtil;

import java.time.LocalDateTime;
import java.util.Date;

 src/main/java/com/nanjing/water/common/jwt/LoginUserDTO.java

文件名从 src/main/java/com/lunhan/xxx/common/jwt/LoginUserDTO.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.jwt;
package com.nanjing.water.common.jwt;

import java.util.List;


 src/main/java/com/nanjing/water/common/model/ExcelDiscernCell.java

文件名从 src/main/java/com/lunhan/xxx/common/model/ExcelDiscernCell.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.model;
package com.nanjing.water.common.model;

public class ExcelDiscernCell {
    private int cellIndex;

 src/main/java/com/nanjing/water/common/model/ExcelDiscernRow.java

文件名从 src/main/java/com/lunhan/xxx/common/model/ExcelDiscernRow.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.model;
package com.nanjing.water.common.model;

import java.util.List;


 src/main/java/com/nanjing/water/common/model/ResFileUpload.java

文件名从 src/main/java/com/lunhan/xxx/common/model/ResFileUpload.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.model;
package com.nanjing.water.common.model;

/**
 * 文件上传 响应dto

 src/main/java/com/nanjing/water/common/model/Tuple.java

文件名从 src/main/java/com/lunhan/xxx/common/model/Tuple.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.model;
package com.nanjing.water.common.model;

/**
 * 2个泛型参数返回结果

 src/main/java/com/nanjing/water/common/security/Base64Util.java

文件名从 src/main/java/com/lunhan/xxx/common/security/Base64Util.java 修改
@@ -1,6 +1,6 @@
package com.lunhan.xxx.common.security;
package com.nanjing.water.common.security;

import com.lunhan.xxx.common.util.StringUtil;
import com.nanjing.water.common.util.StringUtil;

import java.nio.charset.Charset;
import java.util.Base64;

 src/main/java/com/nanjing/water/common/security/Des3Util.java

文件名从 src/main/java/com/lunhan/xxx/common/security/Des3Util.java 修改
@@ -1,7 +1,7 @@
package com.lunhan.xxx.common.security;
package com.nanjing.water.common.security;

import com.lunhan.xxx.common.enums.ELogger;
import com.lunhan.xxx.common.util.LoggerUtil;
import com.nanjing.water.common.enums.ELogger;
import com.nanjing.water.common.util.LoggerUtil;
import org.slf4j.Logger;

import javax.crypto.Cipher;

 src/main/java/com/nanjing/water/common/security/MD5Util.java

文件名从 src/main/java/com/lunhan/xxx/common/security/MD5Util.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.security;
package com.nanjing.water.common.security;

import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;

 src/main/java/com/nanjing/water/common/serializer/CQCalendarSerializer.java

文件名从 src/main/java/com/lunhan/xxx/common/serializer/CQCalendarSerializer.java 修改
@@ -1,9 +1,9 @@
package com.lunhan.xxx.common.serializer;
package com.nanjing.water.common.serializer;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.lunhan.xxx.common.util.CalendarUtil;
import com.nanjing.water.common.util.CalendarUtil;

import java.io.IOException;
import java.util.Calendar;

 src/main/java/com/nanjing/water/common/serializer/CQDateSerializer.java

文件名从 src/main/java/com/lunhan/xxx/common/serializer/CQDateSerializer.java 修改
@@ -1,9 +1,9 @@
package com.lunhan.xxx.common.serializer;
package com.nanjing.water.common.serializer;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.lunhan.xxx.common.ConstantFactory;
import com.nanjing.water.common.ConstantFactory;

import java.io.IOException;
import java.text.SimpleDateFormat;

 src/main/java/com/nanjing/water/common/serializer/CQLocalDateSerializer.java

文件名从 src/main/java/com/lunhan/xxx/common/serializer/CQLocalDateSerializer.java 修改
@@ -1,9 +1,9 @@
package com.lunhan.xxx.common.serializer;
package com.nanjing.water.common.serializer;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.lunhan.xxx.common.util.LocalDateTimeUtil;
import com.nanjing.water.common.util.LocalDateTimeUtil;

import java.io.IOException;
import java.time.LocalDate;

 src/main/java/com/nanjing/water/common/serializer/CQLocalDateTimeSerializer.java

文件名从 src/main/java/com/lunhan/xxx/common/serializer/CQLocalDateTimeSerializer.java 修改
@@ -1,9 +1,9 @@
package com.lunhan.xxx.common.serializer;
package com.nanjing.water.common.serializer;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.lunhan.xxx.common.util.LocalDateTimeUtil;
import com.nanjing.water.common.util.LocalDateTimeUtil;

import java.io.IOException;
import java.time.LocalDateTime;

 src/main/java/com/nanjing/water/common/serializer/CQTimestampSerializer.java

文件名从 src/main/java/com/lunhan/xxx/common/serializer/CQTimestampSerializer.java 修改
@@ -1,9 +1,9 @@
package com.lunhan.xxx.common.serializer;
package com.nanjing.water.common.serializer;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.lunhan.xxx.common.util.LocalDateTimeUtil;
import com.nanjing.water.common.util.LocalDateTimeUtil;

import java.io.IOException;
import java.sql.Timestamp;

 src/main/java/com/nanjing/water/common/serializer/deserializer/CQCalendarDeSerializer.java

文件名从 src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQCalendarDeSerializer.java 修改
@@ -1,12 +1,12 @@
package com.lunhan.xxx.common.serializer.deserializer;
package com.nanjing.water.common.serializer.deserializer;

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.lunhan.xxx.common.ConstantFactory;
import com.lunhan.xxx.common.util.CalendarUtil;
import com.lunhan.xxx.common.util.NumericUtil;
import com.lunhan.xxx.common.util.StringUtil;
import com.nanjing.water.common.ConstantFactory;
import com.nanjing.water.common.util.CalendarUtil;
import com.nanjing.water.common.util.NumericUtil;
import com.nanjing.water.common.util.StringUtil;

import java.io.IOException;
import java.util.Calendar;

 src/main/java/com/nanjing/water/common/serializer/deserializer/CQDateDeSerializer.java

文件名从 src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQDateDeSerializer.java 修改
@@ -1,11 +1,11 @@
package com.lunhan.xxx.common.serializer.deserializer;
package com.nanjing.water.common.serializer.deserializer;

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.lunhan.xxx.common.ConstantFactory;
import com.lunhan.xxx.common.util.LocalDateTimeUtil;
import com.lunhan.xxx.common.util.StringUtil;
import com.nanjing.water.common.ConstantFactory;
import com.nanjing.water.common.util.LocalDateTimeUtil;
import com.nanjing.water.common.util.StringUtil;

import java.io.IOException;
import java.time.Instant;

 src/main/java/com/nanjing/water/common/serializer/deserializer/CQLocalDateDeSerializer.java

文件名从 src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQLocalDateDeSerializer.java 修改
@@ -1,11 +1,11 @@
package com.lunhan.xxx.common.serializer.deserializer;
package com.nanjing.water.common.serializer.deserializer;

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.lunhan.xxx.common.ConstantFactory;
import com.lunhan.xxx.common.util.LocalDateTimeUtil;
import com.lunhan.xxx.common.util.StringUtil;
import com.nanjing.water.common.ConstantFactory;
import com.nanjing.water.common.util.LocalDateTimeUtil;
import com.nanjing.water.common.util.StringUtil;

import java.io.IOException;
import java.time.LocalDate;

 src/main/java/com/nanjing/water/common/serializer/deserializer/CQLocalDateTimeDeSerializer.java

文件名从 src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQLocalDateTimeDeSerializer.java 修改
@@ -1,12 +1,12 @@
package com.lunhan.xxx.common.serializer.deserializer;
package com.nanjing.water.common.serializer.deserializer;

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.lunhan.xxx.common.ConstantFactory;
import com.lunhan.xxx.common.util.LocalDateTimeUtil;
import com.lunhan.xxx.common.util.NumericUtil;
import com.lunhan.xxx.common.util.StringUtil;
import com.nanjing.water.common.ConstantFactory;
import com.nanjing.water.common.util.LocalDateTimeUtil;
import com.nanjing.water.common.util.NumericUtil;
import com.nanjing.water.common.util.StringUtil;

import java.io.IOException;
import java.time.LocalDateTime;

 src/main/java/com/nanjing/water/common/serializer/deserializer/CQTimestampDeSerializer.java

文件名从 src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQTimestampDeSerializer.java 修改
@@ -1,12 +1,12 @@
package com.lunhan.xxx.common.serializer.deserializer;
package com.nanjing.water.common.serializer.deserializer;

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.lunhan.xxx.common.ConstantFactory;
import com.lunhan.xxx.common.util.LocalDateTimeUtil;
import com.lunhan.xxx.common.util.NumericUtil;
import com.lunhan.xxx.common.util.StringUtil;
import com.nanjing.water.common.ConstantFactory;
import com.nanjing.water.common.util.LocalDateTimeUtil;
import com.nanjing.water.common.util.NumericUtil;
import com.nanjing.water.common.util.StringUtil;

import java.io.IOException;
import java.sql.Timestamp;

 src/main/java/com/nanjing/water/common/util/CalendarUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/util/CalendarUtil.java 修改
@@ -1,6 +1,6 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import com.lunhan.xxx.common.ConstantFactory;
import com.nanjing.water.common.ConstantFactory;

import java.sql.Timestamp;
import java.text.ParseException;

 src/main/java/com/nanjing/water/common/util/CopierUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/util/CopierUtil.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import org.springframework.cglib.beans.BeanCopier;


 src/main/java/com/nanjing/water/common/util/EncryptionUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/util/EncryptionUtil.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;

 src/main/java/com/nanjing/water/common/util/ExceptionUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/util/ExceptionUtil.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import java.io.ByteArrayOutputStream;
import java.io.PrintStream;

 src/main/java/com/nanjing/water/common/util/FileUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/util/FileUtil.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import java.io.*;
import java.nio.charset.Charset;

 src/main/java/com/nanjing/water/common/util/HttpUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/util/HttpUtil.java 修改
@@ -1,6 +1,6 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import com.lunhan.xxx.common.enums.EHttpContentType;
import com.nanjing.water.common.enums.EHttpContentType;
import org.apache.http.HttpEntity;
import org.apache.http.HttpHost;
import org.apache.http.HttpStatus;

 src/main/java/com/nanjing/water/common/util/IPUtils.java

文件名从 src/main/java/com/lunhan/xxx/common/util/IPUtils.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

 src/main/java/com/nanjing/water/common/util/ListUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/util/ListUtil.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import java.math.BigDecimal;
import java.util.*;

 src/main/java/com/nanjing/water/common/util/LocalDateTimeUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/util/LocalDateTimeUtil.java 修改
@@ -1,8 +1,8 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import cn.hutool.core.date.DateTime;
import com.lunhan.xxx.common.ConstantFactory;
import com.lunhan.xxx.common.exceptions.BusinessException;
import com.nanjing.water.common.ConstantFactory;
import com.nanjing.water.common.exceptions.BusinessException;

import java.sql.Timestamp;
import java.text.SimpleDateFormat;
@@ -11,7 +11,6 @@
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAdjusters;
import java.util.Date;

 src/main/java/com/nanjing/water/common/util/LoggerUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/util/LoggerUtil.java 修改
@@ -1,6 +1,6 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import com.lunhan.xxx.common.enums.ELogger;
import com.nanjing.water.common.enums.ELogger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;


 src/main/java/com/nanjing/water/common/util/MailUtils.java

文件名从 src/main/java/com/lunhan/xxx/common/util/MailUtils.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

 src/main/java/com/nanjing/water/common/util/MoneyUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/util/MoneyUtil.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import java.math.BigDecimal;


 src/main/java/com/nanjing/water/common/util/NumericUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/util/NumericUtil.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import java.lang.reflect.Method;
import java.math.BigDecimal;

 src/main/java/com/nanjing/water/common/util/OrderUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/util/OrderUtil.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

public class OrderUtil {


 src/main/java/com/nanjing/water/common/util/ParameterUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/util/ParameterUtil.java 修改
@@ -1,7 +1,7 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import com.lunhan.xxx.common.ConstantFactory;
import com.lunhan.xxx.common.model.Tuple;
import com.nanjing.water.common.ConstantFactory;
import com.nanjing.water.common.model.Tuple;

import java.util.ArrayList;
import java.util.List;

 src/main/java/com/nanjing/water/common/util/PinYinUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/util/PinYinUtil.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import net.sourceforge.pinyin4j.PinyinHelper;
import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;

 src/main/java/com/nanjing/water/common/util/RandVerifyCode.java

文件名从 src/main/java/com/lunhan/xxx/common/util/RandVerifyCode.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import java.util.Random;


 src/main/java/com/nanjing/water/common/util/SM2Util.java

文件名从 src/main/java/com/lunhan/xxx/common/util/SM2Util.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import org.bouncycastle.crypto.CipherParameters;
import org.bouncycastle.crypto.params.ECPrivateKeyParameters;

 src/main/java/com/nanjing/water/common/util/SM4Util.java

文件名从 src/main/java/com/lunhan/xxx/common/util/SM4Util.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;


import org.springframework.util.Base64Utils;

 src/main/java/com/nanjing/water/common/util/SerializeUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/util/SerializeUtil.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.*;
@@ -9,8 +9,10 @@
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.lunhan.xxx.common.serializer.*;
import com.lunhan.xxx.common.serializer.deserializer.*;
import com.nanjing.water.common.serializer.*;
import com.nanjing.water.common.serializer.deserializer.*;
import com.nanjing.water.common.serializer.*;
import com.nanjing.water.common.serializer.deserializer.*;

import java.io.IOException;
import java.sql.Timestamp;

 src/main/java/com/nanjing/water/common/util/SnowFlake.java

文件名从 src/main/java/com/lunhan/xxx/common/util/SnowFlake.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;


/**

 src/main/java/com/nanjing/water/common/util/SnowFlakeUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/util/SnowFlakeUtil.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

public class SnowFlakeUtil {


 src/main/java/com/nanjing/water/common/util/SpringUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/util/SpringUtil.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;

 src/main/java/com/nanjing/water/common/util/StringUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/util/StringUtil.java 修改
@@ -1,7 +1,7 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import com.lunhan.xxx.common.ConstantFactory;
import com.lunhan.xxx.common.security.MD5Util;
import com.nanjing.water.common.ConstantFactory;
import com.nanjing.water.common.security.MD5Util;
import org.apache.commons.lang3.EnumUtils;
import org.apache.commons.lang3.StringUtils;


 src/main/java/com/nanjing/water/common/util/ThreadPoolUtil.java

文件名从 src/main/java/com/lunhan/xxx/common/util/ThreadPoolUtil.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.util;
package com.nanjing.water.common.util;

import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;

 src/main/java/com/nanjing/water/common/validator/EParameterValidateType.java

文件名从 src/main/java/com/lunhan/xxx/common/validator/EParameterValidateType.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.validator;
package com.nanjing.water.common.validator;

import java.util.Arrays;
import java.util.Objects;

 src/main/java/com/nanjing/water/common/validator/ParameterRunnable.java

文件名从 src/main/java/com/lunhan/xxx/common/validator/ParameterRunnable.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.validator;
package com.nanjing.water.common.validator;

public class ParameterRunnable<T> implements Runnable {
    T param;

 src/main/java/com/nanjing/water/common/validator/ParameterValidateItem.java

文件名从 src/main/java/com/lunhan/xxx/common/validator/ParameterValidateItem.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.validator;
package com.nanjing.water.common.validator;

import java.util.function.Function;


 src/main/java/com/nanjing/water/common/validator/ParameterValidateResult.java

文件名从 src/main/java/com/lunhan/xxx/common/validator/ParameterValidateResult.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.common.validator;
package com.nanjing.water.common.validator;

public class ParameterValidateResult {
    private Boolean isSuccess;

 src/main/java/com/nanjing/water/common/validator/ParameterValidator.java

文件名从 src/main/java/com/lunhan/xxx/common/validator/ParameterValidator.java 修改
@@ -1,10 +1,10 @@
package com.lunhan.xxx.common.validator;
package com.nanjing.water.common.validator;

import com.lunhan.xxx.common.ConstantFactory;
import com.lunhan.xxx.common.util.ListUtil;
import com.lunhan.xxx.common.util.LocalDateTimeUtil;
import com.lunhan.xxx.common.util.NumericUtil;
import com.lunhan.xxx.common.util.StringUtil;
import com.nanjing.water.common.ConstantFactory;
import com.nanjing.water.common.util.ListUtil;
import com.nanjing.water.common.util.LocalDateTimeUtil;
import com.nanjing.water.common.util.NumericUtil;
import com.nanjing.water.common.util.StringUtil;

import java.math.BigDecimal;
import java.time.LocalDate;
@@ -277,12 +277,12 @@
    private ParameterValidateResult checkDateTime(ParameterValidateItem item) {
        switch (item.getType()) {
            case MUST_DATE:
                if(!ParameterValidator.checkIsMatch(item.getValue(), item.getType()) || !LocalDateTimeUtil.getDate(item.getValue().toString()).isAfter(LocalDateTimeUtil.DEFAULT_DATE)) {
                if(!checkIsMatch(item.getValue(), item.getType()) || !LocalDateTimeUtil.getDate(item.getValue().toString()).isAfter(LocalDateTimeUtil.DEFAULT_DATE)) {
                    return new ParameterValidateResult(false, item.getFieldName()+item.getType().getDesc());
                }
                break;
            case MUST_DATE_TIME:
                if(!ParameterValidator.checkIsMatch(item.getValue(), item.getType()) || !LocalDateTimeUtil.getDateTime(item.getValue().toString()).isAfter(LocalDateTimeUtil.DEFAULT_DATETIME)) {
                if(!checkIsMatch(item.getValue(), item.getType()) || !LocalDateTimeUtil.getDateTime(item.getValue().toString()).isAfter(LocalDateTimeUtil.DEFAULT_DATETIME)) {
                    return new ParameterValidateResult(false, item.getFieldName()+item.getType().getDesc());
                }
                break;
@@ -318,7 +318,7 @@
            case MUST_MOBILE_NUMBER:
            case MUST_TELEPHONE_NUMBER:
            case MUST_PHONE_NUMBER:
                if(!ParameterValidator.checkIsMatch(item.getValue(), item.getType())) {
                if(!checkIsMatch(item.getValue(), item.getType())) {
                    return new ParameterValidateResult(false, item.getFieldName()+item.getType().getDesc());
                }
                break;

 src/main/java/com/nanjing/water/entity/dto/KeyValueDTO.java

文件名从 src/main/java/com/lunhan/xxx/entity/dto/KeyValueDTO.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.dto;
package com.nanjing.water.entity.dto;

/**
 * 键值对 dto

 src/main/java/com/nanjing/water/entity/dto/NameSortDTO.java

文件名从 src/main/java/com/lunhan/xxx/entity/dto/NameSortDTO.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.dto;
package com.nanjing.water.entity.dto;

public class NameSortDTO {
    /**

 src/main/java/com/nanjing/water/entity/dto/NameSortIdDTO.java

文件名从 src/main/java/com/lunhan/xxx/entity/dto/NameSortIdDTO.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.dto;
package com.nanjing.water.entity.dto;

public class NameSortIdDTO {
    private Long id;

 src/main/java/com/nanjing/water/entity/dto/NameValueDTO.java

文件名从 src/main/java/com/lunhan/xxx/entity/dto/NameValueDTO.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.dto;
package com.nanjing.water.entity.dto;

/**
 * 名称-值 数据对象

 src/main/java/com/nanjing/water/entity/dto/OrderByDTO.java

文件名从 src/main/java/com/lunhan/xxx/entity/dto/OrderByDTO.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.dto;
package com.nanjing.water.entity.dto;

public class OrderByDTO {
    /**

 src/main/java/com/nanjing/water/entity/dto/PagerBasicDTO.java

文件名从 src/main/java/com/lunhan/xxx/entity/dto/PagerBasicDTO.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.dto;
package com.nanjing.water.entity.dto;

/**
 * 分页基本属性 dto

 src/main/java/com/nanjing/water/entity/dto/RequestDTO.java

文件名从 src/main/java/com/lunhan/xxx/entity/dto/RequestDTO.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.dto;
package com.nanjing.water.entity.dto;

import java.util.Map;


 src/main/java/com/nanjing/water/entity/dto/SearchBasicDTO.java

文件名从 src/main/java/com/lunhan/xxx/entity/dto/SearchBasicDTO.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.dto;
package com.nanjing.water.entity.dto;

import java.util.List;


 src/main/java/com/nanjing/water/entity/dto/UserInfoDto.java

文件名从 src/main/java/com/lunhan/xxx/entity/dto/UserInfoDto.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.dto;
package com.nanjing.water.entity.dto;

public class UserInfoDto {
    /**

 src/main/java/com/nanjing/water/entity/enums/EDataChangeType.java

文件名从 src/main/java/com/lunhan/xxx/entity/enums/EDataChangeType.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.enums;
package com.nanjing.water.entity.enums;

import java.util.Arrays;
import java.util.Objects;

 src/main/java/com/nanjing/water/entity/enums/EExecuteType.java

文件名从 src/main/java/com/lunhan/xxx/entity/enums/EExecuteType.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.enums;
package com.nanjing.water.entity.enums;

import java.util.Arrays;
import java.util.Objects;

 src/main/java/com/nanjing/water/entity/enums/EHandleStatus.java

文件名从 src/main/java/com/lunhan/xxx/entity/enums/EHandleStatus.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.enums;
package com.nanjing.water.entity.enums;

import java.util.Arrays;
import java.util.Objects;

 src/main/java/com/nanjing/water/entity/enums/ELockValue.java

文件名从 src/main/java/com/lunhan/xxx/entity/enums/ELockValue.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.enums;
package com.nanjing.water.entity.enums;

public enum ELockValue {
    /**

 src/main/java/com/nanjing/water/entity/enums/EOrderBy.java

文件名从 src/main/java/com/lunhan/xxx/entity/enums/EOrderBy.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.enums;
package com.nanjing.water.entity.enums;

import java.util.Arrays;
import java.util.Objects;

 src/main/java/com/nanjing/water/entity/enums/EParameterType.java

文件名从 src/main/java/com/lunhan/xxx/entity/enums/EParameterType.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.enums;
package com.nanjing.water.entity.enums;

import java.util.Arrays;
import java.util.Objects;

 src/main/java/com/nanjing/water/entity/enums/ESex.java

文件名从 src/main/java/com/lunhan/xxx/entity/enums/ESex.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.enums;
package com.nanjing.water.entity.enums;

import java.util.Arrays;
import java.util.Objects;

 src/main/java/com/nanjing/water/entity/enums/ESortOrderBy.java

文件名从 src/main/java/com/lunhan/xxx/entity/enums/ESortOrderBy.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.enums;
package com.nanjing.water.entity.enums;

import java.util.Arrays;
import java.util.Objects;

 src/main/java/com/nanjing/water/entity/enums/EState.java

文件名从 src/main/java/com/lunhan/xxx/entity/enums/EState.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.enums;
package com.nanjing.water.entity.enums;

import java.util.Arrays;
import java.util.Objects;

 src/main/java/com/nanjing/water/entity/enums/EUserType.java

文件名从 src/main/java/com/lunhan/xxx/entity/enums/EUserType.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.enums;
package com.nanjing.water.entity.enums;

import java.util.Arrays;
import java.util.Objects;

 src/main/java/com/nanjing/water/entity/request/AdminSendMail.java

文件名从 src/main/java/com/lunhan/xxx/entity/request/AdminSendMail.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.request;
package com.nanjing.water.entity.request;

public class AdminSendMail {


 src/main/java/com/nanjing/water/entity/request/ReqChangePassword.java

文件名从 src/main/java/com/lunhan/xxx/entity/request/ReqChangePassword.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.request;
package com.nanjing.water.entity.request;

public class ReqChangePassword {
    /**

 src/main/java/com/nanjing/water/entity/request/ReqListId.java

文件名从 src/main/java/com/lunhan/xxx/entity/request/ReqListId.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.request;
package com.nanjing.water.entity.request;

import java.util.List;


 src/main/java/com/nanjing/water/entity/request/ReqListSetSort.java

文件名从 src/main/java/com/lunhan/xxx/entity/request/ReqListSetSort.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.request;
package com.nanjing.water.entity.request;

import java.util.List;


 src/main/java/com/nanjing/water/entity/request/ReqListStatus.java

文件名从 src/main/java/com/lunhan/xxx/entity/request/ReqListStatus.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.request;
package com.nanjing.water.entity.request;

import java.util.List;


 src/main/java/com/nanjing/water/entity/request/ReqNeedCode.java

文件名从 src/main/java/com/lunhan/xxx/entity/request/ReqNeedCode.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.request;
package com.nanjing.water.entity.request;




 src/main/java/com/nanjing/water/entity/request/ReqNeedId.java

文件名从 src/main/java/com/lunhan/xxx/entity/request/ReqNeedId.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.request;
package com.nanjing.water.entity.request;

public class ReqNeedId {
    /**

 src/main/java/com/nanjing/water/entity/request/ReqOperate.java

文件名从 src/main/java/com/lunhan/xxx/entity/request/ReqOperate.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.request;
package com.nanjing.water.entity.request;

public class ReqOperate {
    /**

 src/main/java/com/nanjing/water/entity/request/ReqSetSort.java

文件名从 src/main/java/com/lunhan/xxx/entity/request/ReqSetSort.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.request;
package com.nanjing.water.entity.request;

public class ReqSetSort {
    /**

 src/main/java/com/nanjing/water/entity/request/ReqUserLogin.java

文件名从 src/main/java/com/lunhan/xxx/entity/request/ReqUserLogin.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.request;
package com.nanjing.water.entity.request;

public class ReqUserLogin {
    /**

 src/main/java/com/nanjing/water/entity/request/quartztaskerror/ReqCreateQuartzTaskError.java

文件名从 src/main/java/com/lunhan/xxx/entity/request/quartztaskerror/ReqCreateQuartzTaskError.java 修改
@@ -20,7 +20,7 @@
#                  神兽保佑
#                  永无BUG！
*/
package com.lunhan.xxx.entity.request.quartztaskerror;
package com.nanjing.water.entity.request.quartztaskerror;

import lombok.Data;


 src/main/java/com/nanjing/water/entity/request/quartztaskerror/ReqModifyQuartzTaskError.java

文件名从 src/main/java/com/lunhan/xxx/entity/request/quartztaskerror/ReqModifyQuartzTaskError.java 修改
@@ -20,7 +20,7 @@
#                  神兽保佑
#                  永无BUG！
*/
package com.lunhan.xxx.entity.request.quartztaskerror;
package com.nanjing.water.entity.request.quartztaskerror;

import lombok.Data;


 src/main/java/com/nanjing/water/entity/request/quartztaskinfo/ReqCreateQuartzTaskInfo.java

文件名从 src/main/java/com/lunhan/xxx/entity/request/quartztaskinfo/ReqCreateQuartzTaskInfo.java 修改
@@ -20,7 +20,7 @@
#                  神兽保佑
#                  永无BUG！
*/
package com.lunhan.xxx.entity.request.quartztaskinfo;
package com.nanjing.water.entity.request.quartztaskinfo;

import lombok.Data;


 src/main/java/com/nanjing/water/entity/request/quartztaskinfo/ReqModifyQuartzTaskInfo.java

文件名从 src/main/java/com/lunhan/xxx/entity/request/quartztaskinfo/ReqModifyQuartzTaskInfo.java 修改
@@ -20,7 +20,7 @@
#                  神兽保佑
#                  永无BUG！
*/
package com.lunhan.xxx.entity.request.quartztaskinfo;
package com.nanjing.water.entity.request.quartztaskinfo;

import lombok.Data;


 src/main/java/com/nanjing/water/entity/request/quartztaskinfo/ReqRunTaskRightNow.java

文件名从 src/main/java/com/lunhan/xxx/entity/request/quartztaskinfo/ReqRunTaskRightNow.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.request.quartztaskinfo;
package com.nanjing.water.entity.request.quartztaskinfo;

import lombok.Data;


 src/main/java/com/nanjing/water/entity/request/quartztaskrecord/ReqCreateQuartzTaskRecord.java

文件名从 src/main/java/com/lunhan/xxx/entity/request/quartztaskrecord/ReqCreateQuartzTaskRecord.java 修改
@@ -20,7 +20,7 @@
#                  神兽保佑
#                  永无BUG！
*/
package com.lunhan.xxx.entity.request.quartztaskrecord;
package com.nanjing.water.entity.request.quartztaskrecord;

import lombok.Data;


 src/main/java/com/nanjing/water/entity/request/quartztaskrecord/ReqModifyQuartzTaskRecord.java

文件名从 src/main/java/com/lunhan/xxx/entity/request/quartztaskrecord/ReqModifyQuartzTaskRecord.java 修改
@@ -20,7 +20,7 @@
#                  神兽保佑
#                  永无BUG！
*/
package com.lunhan.xxx.entity.request.quartztaskrecord;
package com.nanjing.water.entity.request.quartztaskrecord;

import lombok.Data;


 src/main/java/com/nanjing/water/entity/request/test/ReqCreateTestInfo.java

文件名从 src/main/java/com/lunhan/xxx/entity/request/test/ReqCreateTestInfo.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.request.test;
package com.nanjing.water.entity.request.test;

import java.math.BigDecimal;


 src/main/java/com/nanjing/water/entity/request/test/ReqModifyTestInfo.java

文件名从 src/main/java/com/lunhan/xxx/entity/request/test/ReqModifyTestInfo.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.request.test;
package com.nanjing.water.entity.request.test;

import java.math.BigDecimal;


 src/main/java/com/nanjing/water/entity/response/ResNameValue.java

文件名从 src/main/java/com/lunhan/xxx/entity/response/ResNameValue.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.entity.response;
package com.nanjing.water.entity.response;

public class ResNameValue {
    /**

 src/main/java/com/nanjing/water/entity/search/SearchQuartzTaskError.java

文件名从 src/main/java/com/lunhan/xxx/entity/search/SearchQuartzTaskError.java 修改
@@ -1,6 +1,6 @@
package com.lunhan.xxx.entity.search;
package com.nanjing.water.entity.search;

import com.lunhan.xxx.entity.dto.SearchBasicDTO;
import com.nanjing.water.entity.dto.SearchBasicDTO;

/**
 * 定时任务错误信息表

 src/main/java/com/nanjing/water/entity/search/SearchQuartzTaskInfo.java

文件名从 src/main/java/com/lunhan/xxx/entity/search/SearchQuartzTaskInfo.java 修改
@@ -1,6 +1,6 @@
package com.lunhan.xxx.entity.search;
package com.nanjing.water.entity.search;

import com.lunhan.xxx.entity.dto.SearchBasicDTO;
import com.nanjing.water.entity.dto.SearchBasicDTO;
import lombok.Data;

/**

 src/main/java/com/nanjing/water/entity/search/SearchQuartzTaskRecord.java

文件名从 src/main/java/com/lunhan/xxx/entity/search/SearchQuartzTaskRecord.java 修改
@@ -1,6 +1,6 @@
package com.lunhan.xxx.entity.search;
package com.nanjing.water.entity.search;

import com.lunhan.xxx.entity.dto.SearchBasicDTO;
import com.nanjing.water.entity.dto.SearchBasicDTO;
import lombok.Data;

/**

 src/main/java/com/nanjing/water/entity/search/SearchTestInfo.java

文件名从 src/main/java/com/lunhan/xxx/entity/search/SearchTestInfo.java 修改
@@ -1,6 +1,6 @@
package com.lunhan.xxx.entity.search;
package com.nanjing.water.entity.search;

import com.lunhan.xxx.entity.dto.SearchBasicDTO;
import com.nanjing.water.entity.dto.SearchBasicDTO;

/**
 * 测试信息 查询条件dto

 src/main/java/com/nanjing/water/host/ApplicationStarter.java

文件名从 src/main/java/com/lunhan/xxx/host/ApplicationStarter.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.host;
package com.nanjing.water.host;

import com.yomahub.tlog.core.enhance.AspectLogEnhance;
import org.mybatis.spring.annotation.MapperScan;
@@ -9,9 +9,9 @@
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.cache.annotation.EnableCaching;

@SpringBootApplication(scanBasePackages = { "com.lunhan" })
@SpringBootApplication(scanBasePackages = { "com.nanjing" })
@ServletComponentScan
@MapperScan("com.lunhan.xxx.repository.mapper")
@MapperScan("com.nanjing.water.repository.mapper")
// 开启缓存
@EnableCaching
public class ApplicationStarter extends SpringBootServletInitializer {

 src/main/java/com/nanjing/water/host/BasicController.java

文件名从 src/main/java/com/lunhan/xxx/host/BasicController.java 修改
@@ -1,9 +1,9 @@
package com.lunhan.xxx.host;
package com.nanjing.water.host;

import com.lunhan.xxx.common.ExecutedResult;
import com.lunhan.xxx.common.config.SysConfig;
import com.lunhan.xxx.common.jwt.JWTUtil;
import com.lunhan.xxx.common.jwt.LoginUserDTO;
import com.nanjing.water.common.ExecutedResult;
import com.nanjing.water.common.config.SysConfig;
import com.nanjing.water.common.jwt.JWTUtil;
import com.nanjing.water.common.jwt.LoginUserDTO;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;

 src/main/java/com/nanjing/water/host/api/ApiRequestLogDTO.java

文件名从 src/main/java/com/lunhan/xxx/host/api/ApiRequestLogDTO.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.host.api;
package com.nanjing.water.host.api;

public class ApiRequestLogDTO {
    private String requestId;

 src/main/java/com/nanjing/water/host/api/CorsFilterConfig.java

文件名从 src/main/java/com/lunhan/xxx/host/api/CorsFilterConfig.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.host.api;
package com.nanjing.water.host.api;

import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

 src/main/java/com/nanjing/water/host/api/GlobalExceptionHandler.java

文件名从 src/main/java/com/lunhan/xxx/host/api/GlobalExceptionHandler.java 修改
@@ -1,11 +1,14 @@
package com.lunhan.xxx.host.api;
package com.nanjing.water.host.api;

import com.google.common.base.Charsets;
import com.lunhan.xxx.common.enums.ELogger;
import com.lunhan.xxx.common.enums.EResultCode;
import com.lunhan.xxx.common.ExecutedResult;
import com.lunhan.xxx.common.exceptions.BusinessException;
import com.lunhan.xxx.common.util.*;
import com.nanjing.water.common.enums.ELogger;
import com.nanjing.water.common.enums.EResultCode;
import com.nanjing.water.common.ExecutedResult;
import com.nanjing.water.common.exceptions.BusinessException;
import com.nanjing.water.common.util.HttpUtil;
import com.nanjing.water.common.util.LocalDateTimeUtil;
import com.nanjing.water.common.util.LoggerUtil;
import com.nanjing.water.common.util.SerializeUtil;
import org.slf4j.Logger;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;

 src/main/java/com/nanjing/water/host/api/HttpRequestLogPool.java

文件名从 src/main/java/com/lunhan/xxx/host/api/HttpRequestLogPool.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.host.api;
package com.nanjing.water.host.api;

class HttpRequestLogPool {
    private static ThreadLocal<ApiRequestLogDTO> requestThreadLocal = new ThreadLocal<>();

 src/main/java/com/nanjing/water/host/api/MustAdmin.java

文件名从 src/main/java/com/lunhan/xxx/host/api/MustAdmin.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.host.api;
package com.nanjing.water.host.api;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

 src/main/java/com/nanjing/water/host/api/MvcTokenInterceptors.java

文件名从 src/main/java/com/lunhan/xxx/host/api/MvcTokenInterceptors.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.host.api;
package com.nanjing.water.host.api;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;

 src/main/java/com/nanjing/water/host/api/MyBatisPlusConfig.java

文件名从 src/main/java/com/lunhan/xxx/host/api/MyBatisPlusConfig.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.host.api;
package com.nanjing.water.host.api;

import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;

 src/main/java/com/nanjing/water/host/api/NonLogin.java

文件名从 src/main/java/com/lunhan/xxx/host/api/NonLogin.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.host.api;
package com.nanjing.water.host.api;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

 src/main/java/com/nanjing/water/host/api/TokenFilter.java

文件名从 src/main/java/com/lunhan/xxx/host/api/TokenFilter.java 修改
@@ -1,15 +1,15 @@
package com.lunhan.xxx.host.api;
package com.nanjing.water.host.api;

import com.lunhan.xxx.common.config.SysConfig;
import com.lunhan.xxx.common.enums.EResultCode;
import com.lunhan.xxx.common.exceptions.BusinessException;
import com.lunhan.xxx.common.jwt.JWTUtil;
import com.lunhan.xxx.common.jwt.LoginUserDTO;
import com.lunhan.xxx.common.util.IPUtils;
import com.lunhan.xxx.common.util.LocalDateTimeUtil;
import com.lunhan.xxx.common.util.RandVerifyCode;
import com.lunhan.xxx.common.util.StringUtil;
import com.lunhan.xxx.entity.enums.EUserType;
import com.nanjing.water.common.config.SysConfig;
import com.nanjing.water.common.enums.EResultCode;
import com.nanjing.water.common.exceptions.BusinessException;
import com.nanjing.water.common.jwt.JWTUtil;
import com.nanjing.water.common.jwt.LoginUserDTO;
import com.nanjing.water.common.util.IPUtils;
import com.nanjing.water.common.util.LocalDateTimeUtil;
import com.nanjing.water.common.util.RandVerifyCode;
import com.nanjing.water.common.util.StringUtil;
import com.nanjing.water.entity.enums.EUserType;
import org.apache.commons.lang3.BooleanUtils;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.stereotype.Component;

 src/main/java/com/nanjing/water/host/api/WebLogAspect.java

文件名从 src/main/java/com/lunhan/xxx/host/api/WebLogAspect.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.host.api;
package com.nanjing.water.host.api;

import java.lang.reflect.Method;
import java.lang.reflect.Parameter;
@@ -8,8 +8,12 @@
import java.util.Map;
import javax.servlet.http.HttpServletRequest;

import com.lunhan.xxx.common.enums.ELogger;
import com.lunhan.xxx.common.util.*;
import com.nanjing.water.common.enums.ELogger;
import com.nanjing.water.common.util.*;
import com.nanjing.water.common.util.LocalDateTimeUtil;
import com.nanjing.water.common.util.LoggerUtil;
import com.nanjing.water.common.util.SerializeUtil;
import com.nanjing.water.common.util.StringUtil;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.Signature;

 src/main/java/com/nanjing/water/host/controller/TestInfoServiceController.java

文件名从 src/main/java/com/lunhan/xxx/host/controller/TestInfoServiceController.java 修改
@@ -1,22 +1,22 @@
package com.lunhan.xxx.host.controller;
package com.nanjing.water.host.controller;

import com.lunhan.xxx.common.ConstantFactory;
import com.lunhan.xxx.common.ExecutedResult;
import com.lunhan.xxx.common.PagerResult;
import com.lunhan.xxx.common.util.ParameterUtil;
import com.lunhan.xxx.common.validator.ParameterValidateResult;
import com.lunhan.xxx.common.validator.ParameterValidator;
import com.lunhan.xxx.entity.search.SearchTestInfo;
import com.lunhan.xxx.entity.enums.ESex;
import com.lunhan.xxx.entity.request.ReqListId;
import com.lunhan.xxx.entity.request.ReqListSetSort;
import com.lunhan.xxx.entity.request.ReqSetSort;
import com.lunhan.xxx.entity.request.test.ReqCreateTestInfo;
import com.lunhan.xxx.entity.request.test.ReqModifyTestInfo;
import com.lunhan.xxx.host.BasicController;
import com.lunhan.xxx.host.api.NonLogin;
import com.lunhan.xxx.repository.vo.TestInfoVO;
import com.lunhan.xxx.service.TestInfoService;
import com.nanjing.water.common.ConstantFactory;
import com.nanjing.water.common.ExecutedResult;
import com.nanjing.water.common.PagerResult;
import com.nanjing.water.common.util.ParameterUtil;
import com.nanjing.water.common.validator.ParameterValidateResult;
import com.nanjing.water.common.validator.ParameterValidator;
import com.nanjing.water.entity.search.SearchTestInfo;
import com.nanjing.water.entity.enums.ESex;
import com.nanjing.water.entity.request.ReqListId;
import com.nanjing.water.entity.request.ReqListSetSort;
import com.nanjing.water.entity.request.ReqSetSort;
import com.nanjing.water.entity.request.test.ReqCreateTestInfo;
import com.nanjing.water.entity.request.test.ReqModifyTestInfo;
import com.nanjing.water.host.BasicController;
import com.nanjing.water.host.api.NonLogin;
import com.nanjing.water.repository.vo.TestInfoVO;
import com.nanjing.water.service.TestInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;


 src/main/java/com/nanjing/water/host/controller/base/BaseController.java

文件名从 src/main/java/com/lunhan/xxx/host/controller/base/BaseController.java 修改
@@ -1,8 +1,8 @@
package com.lunhan.xxx.host.controller.base;
package com.nanjing.water.host.controller.base;

import com.lunhan.xxx.common.ExecutedResult;
import com.lunhan.xxx.entity.dto.NameValueDTO;
import com.lunhan.xxx.host.api.NonLogin;
import com.nanjing.water.common.ExecutedResult;
import com.nanjing.water.entity.dto.NameValueDTO;
import com.nanjing.water.host.api.NonLogin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,7 +27,7 @@
    @GetMapping("listEnumValue/{enumName}")
    public ExecutedResult<List<NameValueDTO>> listEnumValue(@PathVariable String enumName) {
        try {
            Class<?> enumClass = Class.forName("com.lunhan.xxx.entity.enums." + enumName);
            Class<?> enumClass = Class.forName("com.nanjing.water.entity.enums." + enumName);
            Method valuesMethod = enumClass.getMethod("values");
            Method getValueMethod = enumClass.getMethod("getValue");
            Method getDescMethod = enumClass.getMethod("getDesc");

 src/main/java/com/nanjing/water/host/controller/base/QuartzController.java

文件名从 src/main/java/com/lunhan/xxx/host/controller/base/QuartzController.java 修改
@@ -1,17 +1,17 @@
package com.lunhan.xxx.host.controller.base;
package com.nanjing.water.host.controller.base;

import com.lunhan.xxx.common.ExecutedResult;
import com.lunhan.xxx.common.PagerResult;
import com.lunhan.xxx.entity.request.quartztaskinfo.ReqCreateQuartzTaskInfo;
import com.lunhan.xxx.entity.request.quartztaskinfo.ReqModifyQuartzTaskInfo;
import com.lunhan.xxx.entity.request.quartztaskinfo.ReqRunTaskRightNow;
import com.lunhan.xxx.entity.search.SearchQuartzTaskInfo;
import com.lunhan.xxx.entity.search.SearchQuartzTaskRecord;
import com.lunhan.xxx.host.api.NonLogin;
import com.lunhan.xxx.repository.vo.QuartzTaskErrorVO;
import com.lunhan.xxx.repository.vo.QuartzTaskInfoVO;
import com.lunhan.xxx.repository.vo.QuartzTaskRecordVO;
import com.lunhan.xxx.service.quartz.QuartzService;
import com.nanjing.water.common.ExecutedResult;
import com.nanjing.water.common.PagerResult;
import com.nanjing.water.entity.request.quartztaskinfo.ReqCreateQuartzTaskInfo;
import com.nanjing.water.entity.request.quartztaskinfo.ReqModifyQuartzTaskInfo;
import com.nanjing.water.entity.request.quartztaskinfo.ReqRunTaskRightNow;
import com.nanjing.water.entity.search.SearchQuartzTaskInfo;
import com.nanjing.water.entity.search.SearchQuartzTaskRecord;
import com.nanjing.water.host.api.NonLogin;
import com.nanjing.water.repository.vo.QuartzTaskErrorVO;
import com.nanjing.water.repository.vo.QuartzTaskInfoVO;
import com.nanjing.water.repository.vo.QuartzTaskRecordVO;
import com.nanjing.water.service.quartz.QuartzService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

 src/main/java/com/nanjing/water/repository/BasicMapper.java

文件名从 src/main/java/com/lunhan/xxx/repository/BasicMapper.java 修改
@@ -1,9 +1,9 @@
package com.lunhan.xxx.repository;
package com.nanjing.water.repository;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.lunhan.xxx.common.PagerResult;
import com.lunhan.xxx.entity.dto.SearchBasicDTO;
import com.nanjing.water.common.PagerResult;
import com.nanjing.water.entity.dto.SearchBasicDTO;
import org.apache.ibatis.session.ResultHandler;

import java.io.Serializable;

 src/main/java/com/nanjing/water/repository/BasicMapperImpl.java

文件名从 src/main/java/com/lunhan/xxx/repository/BasicMapperImpl.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.repository;
package com.nanjing.water.repository;

import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.core.batch.BatchSqlSession;
@@ -10,13 +10,13 @@
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.lunhan.xxx.common.PagerResult;
import com.lunhan.xxx.common.enums.ELogger;
import com.lunhan.xxx.common.enums.EResultCode;
import com.lunhan.xxx.common.enums.EYesOrNo;
import com.lunhan.xxx.common.exceptions.BusinessException;
import com.lunhan.xxx.common.util.LoggerUtil;
import com.lunhan.xxx.entity.dto.SearchBasicDTO;
import com.nanjing.water.common.PagerResult;
import com.nanjing.water.common.enums.ELogger;
import com.nanjing.water.common.enums.EResultCode;
import com.nanjing.water.common.enums.EYesOrNo;
import com.nanjing.water.common.exceptions.BusinessException;
import com.nanjing.water.common.util.LoggerUtil;
import com.nanjing.water.entity.dto.SearchBasicDTO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.executor.BatchResult;
import org.apache.ibatis.session.ResultHandler;

 src/main/java/com/nanjing/water/repository/impl/QuartzTaskErrorMapperImpl.java

文件名从 src/main/java/com/lunhan/xxx/repository/impl/QuartzTaskErrorMapperImpl.java 修改
@@ -1,18 +1,18 @@
package com.lunhan.xxx.repository.impl;
package com.nanjing.water.repository.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.lunhan.xxx.common.PagerResult;
import com.lunhan.xxx.common.enums.EYesOrNo;
import com.lunhan.xxx.common.util.ListUtil;
import com.lunhan.xxx.common.util.NumericUtil;
import com.lunhan.xxx.entity.dto.OrderByDTO;
import com.lunhan.xxx.entity.dto.SearchBasicDTO;
import com.lunhan.xxx.entity.enums.EOrderBy;
import com.lunhan.xxx.entity.search.SearchQuartzTaskError;
import com.lunhan.xxx.repository.BasicMapperImpl;
import com.lunhan.xxx.repository.mapper.QuartzTaskErrorMapper;
import com.lunhan.xxx.repository.po.QuartzTaskErrorPO;
import com.nanjing.water.common.PagerResult;
import com.nanjing.water.common.enums.EYesOrNo;
import com.nanjing.water.common.util.ListUtil;
import com.nanjing.water.common.util.NumericUtil;
import com.nanjing.water.entity.dto.OrderByDTO;
import com.nanjing.water.entity.dto.SearchBasicDTO;
import com.nanjing.water.entity.enums.EOrderBy;
import com.nanjing.water.entity.search.SearchQuartzTaskError;
import com.nanjing.water.repository.BasicMapperImpl;
import com.nanjing.water.repository.mapper.QuartzTaskErrorMapper;
import com.nanjing.water.repository.po.QuartzTaskErrorPO;
import org.springframework.stereotype.Repository;

/**

 src/main/java/com/nanjing/water/repository/impl/QuartzTaskInfoMapperImpl.java

文件名从 src/main/java/com/lunhan/xxx/repository/impl/QuartzTaskInfoMapperImpl.java 修改
@@ -1,19 +1,19 @@
package com.lunhan.xxx.repository.impl;
package com.nanjing.water.repository.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.lunhan.xxx.common.PagerResult;
import com.lunhan.xxx.common.enums.EYesOrNo;
import com.lunhan.xxx.common.util.ListUtil;
import com.lunhan.xxx.common.util.NumericUtil;
import com.lunhan.xxx.common.util.StringUtil;
import com.lunhan.xxx.entity.dto.OrderByDTO;
import com.lunhan.xxx.entity.dto.SearchBasicDTO;
import com.lunhan.xxx.entity.enums.EOrderBy;
import com.lunhan.xxx.entity.search.SearchQuartzTaskInfo;
import com.lunhan.xxx.repository.BasicMapperImpl;
import com.lunhan.xxx.repository.mapper.QuartzTaskInfoMapper;
import com.lunhan.xxx.repository.po.QuartzTaskInfoPO;
import com.nanjing.water.common.PagerResult;
import com.nanjing.water.common.enums.EYesOrNo;
import com.nanjing.water.common.util.ListUtil;
import com.nanjing.water.common.util.NumericUtil;
import com.nanjing.water.common.util.StringUtil;
import com.nanjing.water.entity.dto.OrderByDTO;
import com.nanjing.water.entity.dto.SearchBasicDTO;
import com.nanjing.water.entity.enums.EOrderBy;
import com.nanjing.water.entity.search.SearchQuartzTaskInfo;
import com.nanjing.water.repository.BasicMapperImpl;
import com.nanjing.water.repository.mapper.QuartzTaskInfoMapper;
import com.nanjing.water.repository.po.QuartzTaskInfoPO;
import org.springframework.stereotype.Repository;

import java.util.List;

 src/main/java/com/nanjing/water/repository/impl/QuartzTaskRecordMapperImpl.java

文件名从 src/main/java/com/lunhan/xxx/repository/impl/QuartzTaskRecordMapperImpl.java 修改
@@ -1,19 +1,19 @@
package com.lunhan.xxx.repository.impl;
package com.nanjing.water.repository.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.lunhan.xxx.common.PagerResult;
import com.lunhan.xxx.common.enums.EYesOrNo;
import com.lunhan.xxx.common.util.ListUtil;
import com.lunhan.xxx.common.util.NumericUtil;
import com.lunhan.xxx.common.util.StringUtil;
import com.lunhan.xxx.entity.dto.OrderByDTO;
import com.lunhan.xxx.entity.dto.SearchBasicDTO;
import com.lunhan.xxx.entity.enums.EOrderBy;
import com.lunhan.xxx.entity.search.SearchQuartzTaskRecord;
import com.lunhan.xxx.repository.BasicMapperImpl;
import com.lunhan.xxx.repository.mapper.QuartzTaskRecordMapper;
import com.lunhan.xxx.repository.po.QuartzTaskRecordPO;
import com.nanjing.water.common.PagerResult;
import com.nanjing.water.common.enums.EYesOrNo;
import com.nanjing.water.common.util.ListUtil;
import com.nanjing.water.common.util.NumericUtil;
import com.nanjing.water.common.util.StringUtil;
import com.nanjing.water.entity.dto.OrderByDTO;
import com.nanjing.water.entity.dto.SearchBasicDTO;
import com.nanjing.water.entity.enums.EOrderBy;
import com.nanjing.water.entity.search.SearchQuartzTaskRecord;
import com.nanjing.water.repository.BasicMapperImpl;
import com.nanjing.water.repository.mapper.QuartzTaskRecordMapper;
import com.nanjing.water.repository.po.QuartzTaskRecordPO;
import org.springframework.stereotype.Repository;

/**

 src/main/java/com/nanjing/water/repository/impl/TestInfoMapperImpl.java

文件名从 src/main/java/com/lunhan/xxx/repository/impl/TestInfoMapperImpl.java 修改
@@ -20,22 +20,22 @@
#                  神兽保佑
#                  永无BUG！
*/
package com.lunhan.xxx.repository.impl;
package com.nanjing.water.repository.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.lunhan.xxx.common.PagerResult;
import com.lunhan.xxx.common.enums.EYesOrNo;
import com.lunhan.xxx.common.util.ListUtil;
import com.lunhan.xxx.common.util.NumericUtil;
import com.lunhan.xxx.common.util.StringUtil;
import com.lunhan.xxx.entity.dto.OrderByDTO;
import com.lunhan.xxx.entity.dto.SearchBasicDTO;
import com.lunhan.xxx.entity.search.SearchTestInfo;
import com.lunhan.xxx.entity.enums.EOrderBy;
import com.lunhan.xxx.repository.BasicMapperImpl;
import com.lunhan.xxx.repository.mapper.TestInfoMapper;
import com.lunhan.xxx.repository.po.TestInfoPO;
import com.nanjing.water.common.PagerResult;
import com.nanjing.water.common.enums.EYesOrNo;
import com.nanjing.water.common.util.ListUtil;
import com.nanjing.water.common.util.NumericUtil;
import com.nanjing.water.common.util.StringUtil;
import com.nanjing.water.entity.dto.OrderByDTO;
import com.nanjing.water.entity.dto.SearchBasicDTO;
import com.nanjing.water.entity.search.SearchTestInfo;
import com.nanjing.water.entity.enums.EOrderBy;
import com.nanjing.water.repository.BasicMapperImpl;
import com.nanjing.water.repository.mapper.TestInfoMapper;
import com.nanjing.water.repository.po.TestInfoPO;
import org.springframework.stereotype.Repository;

import java.util.List;

 src/main/java/com/nanjing/water/repository/mapper/QuartzTaskErrorMapper.java

对比新文件
@@ -0,0 +1,12 @@
package com.nanjing.water.repository.mapper;

import com.nanjing.water.repository.BasicMapper;
import com.nanjing.water.repository.po.QuartzTaskErrorPO;

/**
 * 定时任务错误信息 mapper
 * @author lin.liu
 * @description 定时任务错误信息 mapper
 */
public interface QuartzTaskErrorMapper extends BasicMapper<QuartzTaskErrorPO> {
}

 src/main/java/com/nanjing/water/repository/mapper/QuartzTaskInfoMapper.java

对比新文件
@@ -0,0 +1,12 @@
package com.nanjing.water.repository.mapper;

import com.nanjing.water.repository.BasicMapper;
import com.nanjing.water.repository.po.QuartzTaskInfoPO;

/**
 * 定时任务信息 mapper
 * @author lin.liu
 * @description 定时任务信息 mapper
 */
public interface QuartzTaskInfoMapper extends BasicMapper<QuartzTaskInfoPO> {
}

 src/main/java/com/nanjing/water/repository/mapper/QuartzTaskRecordMapper.java

对比新文件
@@ -0,0 +1,12 @@
package com.nanjing.water.repository.mapper;

import com.nanjing.water.repository.BasicMapper;
import com.nanjing.water.repository.po.QuartzTaskRecordPO;

/**
 * 定时任务执行记录 mapper
 * @author lin.liu
 * @description 定时任务执行记录 mapper
 */
public interface QuartzTaskRecordMapper extends BasicMapper<QuartzTaskRecordPO> {
}

 src/main/java/com/nanjing/water/repository/mapper/TestInfoMapper.java

文件名从 src/main/java/com/lunhan/xxx/repository/mapper/TestInfoMapper.java 修改
@@ -1,9 +1,9 @@
package com.lunhan.xxx.repository.mapper;
package com.nanjing.water.repository.mapper;

import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.lunhan.xxx.entity.search.SearchTestInfo;
import com.lunhan.xxx.repository.BasicMapper;
import com.lunhan.xxx.repository.po.TestInfoPO;
import com.nanjing.water.entity.search.SearchTestInfo;
import com.nanjing.water.repository.BasicMapper;
import com.nanjing.water.repository.po.TestInfoPO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

 src/main/java/com/nanjing/water/repository/po/QuartzTaskErrorPO.java

文件名从 src/main/java/com/lunhan/xxx/repository/po/QuartzTaskErrorPO.java 修改
@@ -20,7 +20,7 @@
#                  神兽保佑
#                  永无BUG！
*/
package com.lunhan.xxx.repository.po;
package com.nanjing.water.repository.po;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;

 src/main/java/com/nanjing/water/repository/po/QuartzTaskInfoPO.java

文件名从 src/main/java/com/lunhan/xxx/repository/po/QuartzTaskInfoPO.java 修改
@@ -20,7 +20,7 @@
#                  神兽保佑
#                  永无BUG！
*/
package com.lunhan.xxx.repository.po;
package com.nanjing.water.repository.po;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;

 src/main/java/com/nanjing/water/repository/po/QuartzTaskRecordPO.java

文件名从 src/main/java/com/lunhan/xxx/repository/po/QuartzTaskRecordPO.java 修改
@@ -20,7 +20,7 @@
#                  神兽保佑
#                  永无BUG！
*/
package com.lunhan.xxx.repository.po;
package com.nanjing.water.repository.po;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;

 src/main/java/com/nanjing/water/repository/po/TestInfoPO.java

文件名从 src/main/java/com/lunhan/xxx/repository/po/TestInfoPO.java 修改
@@ -20,7 +20,7 @@
#                  神兽保佑
#                  永无BUG！
*/
package com.lunhan.xxx.repository.po;
package com.nanjing.water.repository.po;

import com.baomidou.mybatisplus.annotation.*;


 src/main/java/com/nanjing/water/repository/vo/BasicVO.java

文件名从 src/main/java/com/lunhan/xxx/repository/vo/BasicVO.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.repository.vo;
package com.nanjing.water.repository.vo;


public interface BasicVO {

 src/main/java/com/nanjing/water/repository/vo/QuartzTaskErrorVO.java

文件名从 src/main/java/com/lunhan/xxx/repository/vo/QuartzTaskErrorVO.java 修改
@@ -20,11 +20,11 @@
#                  神兽保佑
#                  永无BUG！
*/
package com.lunhan.xxx.repository.vo;
package com.nanjing.water.repository.vo;

import com.lunhan.xxx.common.util.LocalDateTimeUtil;
import com.lunhan.xxx.common.util.NumericUtil;
import com.lunhan.xxx.repository.po.QuartzTaskErrorPO;
import com.nanjing.water.common.util.LocalDateTimeUtil;
import com.nanjing.water.common.util.NumericUtil;
import com.nanjing.water.repository.po.QuartzTaskErrorPO;
import lombok.Data;

import java.util.Objects;

 src/main/java/com/nanjing/water/repository/vo/QuartzTaskInfoVO.java

文件名从 src/main/java/com/lunhan/xxx/repository/vo/QuartzTaskInfoVO.java 修改
@@ -20,11 +20,11 @@
#                  神兽保佑
#                  永无BUG！
*/
package com.lunhan.xxx.repository.vo;
package com.nanjing.water.repository.vo;

import com.lunhan.xxx.common.util.LocalDateTimeUtil;
import com.lunhan.xxx.common.util.NumericUtil;
import com.lunhan.xxx.repository.po.QuartzTaskInfoPO;
import com.nanjing.water.common.util.LocalDateTimeUtil;
import com.nanjing.water.common.util.NumericUtil;
import com.nanjing.water.repository.po.QuartzTaskInfoPO;
import lombok.Data;

import java.util.Objects;

 src/main/java/com/nanjing/water/repository/vo/QuartzTaskRecordVO.java

文件名从 src/main/java/com/lunhan/xxx/repository/vo/QuartzTaskRecordVO.java 修改
@@ -20,11 +20,11 @@
#                  神兽保佑
#                  永无BUG！
*/
package com.lunhan.xxx.repository.vo;
package com.nanjing.water.repository.vo;

import com.lunhan.xxx.common.util.LocalDateTimeUtil;
import com.lunhan.xxx.common.util.NumericUtil;
import com.lunhan.xxx.repository.po.QuartzTaskRecordPO;
import com.nanjing.water.common.util.LocalDateTimeUtil;
import com.nanjing.water.common.util.NumericUtil;
import com.nanjing.water.repository.po.QuartzTaskRecordPO;
import lombok.Data;

import java.util.Objects;

 src/main/java/com/nanjing/water/repository/vo/TestInfoVO.java

文件名从 src/main/java/com/lunhan/xxx/repository/vo/TestInfoVO.java 修改
@@ -1,8 +1,8 @@
package com.lunhan.xxx.repository.vo;
package com.nanjing.water.repository.vo;

import com.lunhan.xxx.common.util.LocalDateTimeUtil;
import com.lunhan.xxx.common.util.NumericUtil;
import com.lunhan.xxx.repository.po.TestInfoPO;
import com.nanjing.water.common.util.LocalDateTimeUtil;
import com.nanjing.water.common.util.NumericUtil;
import com.nanjing.water.repository.po.TestInfoPO;

import java.util.Objects;


 src/main/java/com/nanjing/water/service/BaseService.java

文件名从 src/main/java/com/lunhan/xxx/service/BaseService.java 修改
@@ -1,8 +1,8 @@
package com.lunhan.xxx.service;
package com.nanjing.water.service;

import com.lunhan.xxx.common.ConstantFactory;
import com.lunhan.xxx.common.util.NumericUtil;
import com.lunhan.xxx.entity.dto.SearchBasicDTO;
import com.nanjing.water.common.ConstantFactory;
import com.nanjing.water.common.util.NumericUtil;
import com.nanjing.water.entity.dto.SearchBasicDTO;

public class BaseService {
    public void dealPager(SearchBasicDTO search) {

 src/main/java/com/nanjing/water/service/TestInfoService.java

文件名从 src/main/java/com/lunhan/xxx/service/TestInfoService.java 修改
@@ -1,20 +1,21 @@
package com.lunhan.xxx.service;
package com.nanjing.water.service;

import com.lunhan.xxx.common.ExecutedResult;
import com.lunhan.xxx.common.PagerResult;
import com.lunhan.xxx.common.enums.EYesOrNo;
import com.lunhan.xxx.common.model.Tuple;
import com.lunhan.xxx.common.util.*;
import com.lunhan.xxx.entity.search.SearchTestInfo;
import com.lunhan.xxx.entity.enums.EState;
import com.lunhan.xxx.entity.request.ReqListSetSort;
import com.lunhan.xxx.entity.request.ReqSetSort;
import com.lunhan.xxx.entity.request.test.ReqCreateTestInfo;
import com.lunhan.xxx.entity.request.test.ReqModifyTestInfo;
import com.lunhan.xxx.repository.impl.TestInfoMapperImpl;
import com.lunhan.xxx.repository.po.TestInfoPO;
import com.lunhan.xxx.repository.vo.TestInfoVO;
import com.lunhan.xxx.service.convert.TestInfoConvert;
import com.nanjing.water.common.ExecutedResult;
import com.nanjing.water.common.PagerResult;
import com.nanjing.water.common.enums.EYesOrNo;
import com.nanjing.water.common.model.Tuple;
import com.nanjing.water.common.util.*;
import com.nanjing.water.entity.search.SearchTestInfo;
import com.nanjing.water.entity.enums.EState;
import com.nanjing.water.entity.request.ReqListSetSort;
import com.nanjing.water.entity.request.ReqSetSort;
import com.nanjing.water.entity.request.test.ReqCreateTestInfo;
import com.nanjing.water.entity.request.test.ReqModifyTestInfo;
import com.nanjing.water.repository.impl.TestInfoMapperImpl;
import com.nanjing.water.repository.po.TestInfoPO;
import com.nanjing.water.repository.vo.TestInfoVO;
import com.nanjing.water.service.convert.TestInfoConvert;
import com.nanjing.water.common.util.*;
import org.apache.commons.lang3.BooleanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

 src/main/java/com/nanjing/water/service/convert/QuartzTaskErrorConvert.java

文件名从 src/main/java/com/lunhan/xxx/service/convert/QuartzTaskErrorConvert.java 修改
@@ -20,12 +20,12 @@
#                  神兽保佑
#                  永无BUG！
*/
package com.lunhan.xxx.service.convert;
package com.nanjing.water.service.convert;

import com.lunhan.xxx.entity.request.quartztaskerror.ReqCreateQuartzTaskError;
import com.lunhan.xxx.entity.request.quartztaskerror.ReqModifyQuartzTaskError;
import com.lunhan.xxx.repository.po.QuartzTaskErrorPO;
import com.lunhan.xxx.repository.vo.QuartzTaskErrorVO;
import com.nanjing.water.entity.request.quartztaskerror.ReqCreateQuartzTaskError;
import com.nanjing.water.entity.request.quartztaskerror.ReqModifyQuartzTaskError;
import com.nanjing.water.repository.po.QuartzTaskErrorPO;
import com.nanjing.water.repository.vo.QuartzTaskErrorVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;


 src/main/java/com/nanjing/water/service/convert/QuartzTaskInfoConvert.java

文件名从 src/main/java/com/lunhan/xxx/service/convert/QuartzTaskInfoConvert.java 修改
@@ -20,12 +20,12 @@
#                  神兽保佑
#                  永无BUG！
*/
package com.lunhan.xxx.service.convert;
package com.nanjing.water.service.convert;

import com.lunhan.xxx.entity.request.quartztaskinfo.ReqCreateQuartzTaskInfo;
import com.lunhan.xxx.entity.request.quartztaskinfo.ReqModifyQuartzTaskInfo;
import com.lunhan.xxx.repository.po.QuartzTaskInfoPO;
import com.lunhan.xxx.repository.vo.QuartzTaskInfoVO;
import com.nanjing.water.entity.request.quartztaskinfo.ReqCreateQuartzTaskInfo;
import com.nanjing.water.entity.request.quartztaskinfo.ReqModifyQuartzTaskInfo;
import com.nanjing.water.repository.po.QuartzTaskInfoPO;
import com.nanjing.water.repository.vo.QuartzTaskInfoVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;


 src/main/java/com/nanjing/water/service/convert/QuartzTaskRecordConvert.java

文件名从 src/main/java/com/lunhan/xxx/service/convert/QuartzTaskRecordConvert.java 修改
@@ -20,12 +20,12 @@
#                  神兽保佑
#                  永无BUG！
*/
package com.lunhan.xxx.service.convert;
package com.nanjing.water.service.convert;

import com.lunhan.xxx.entity.request.quartztaskrecord.ReqCreateQuartzTaskRecord;
import com.lunhan.xxx.entity.request.quartztaskrecord.ReqModifyQuartzTaskRecord;
import com.lunhan.xxx.repository.po.QuartzTaskRecordPO;
import com.lunhan.xxx.repository.vo.QuartzTaskRecordVO;
import com.nanjing.water.entity.request.quartztaskrecord.ReqCreateQuartzTaskRecord;
import com.nanjing.water.entity.request.quartztaskrecord.ReqModifyQuartzTaskRecord;
import com.nanjing.water.repository.po.QuartzTaskRecordPO;
import com.nanjing.water.repository.vo.QuartzTaskRecordVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;


 src/main/java/com/nanjing/water/service/convert/TestInfoConvert.java

文件名从 src/main/java/com/lunhan/xxx/service/convert/TestInfoConvert.java 修改
@@ -20,12 +20,12 @@
#                  神兽保佑
#                  永无BUG！
*/
package com.lunhan.xxx.service.convert;
package com.nanjing.water.service.convert;

import com.lunhan.xxx.entity.request.test.ReqCreateTestInfo;
import com.lunhan.xxx.entity.request.test.ReqModifyTestInfo;
import com.lunhan.xxx.repository.po.TestInfoPO;
import com.lunhan.xxx.repository.vo.TestInfoVO;
import com.nanjing.water.entity.request.test.ReqCreateTestInfo;
import com.nanjing.water.entity.request.test.ReqModifyTestInfo;
import com.nanjing.water.repository.po.TestInfoPO;
import com.nanjing.water.repository.vo.TestInfoVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;


 src/main/java/com/nanjing/water/service/quartz/QuartzExecutor.java

文件名从 src/main/java/com/lunhan/xxx/service/quartz/QuartzExecutor.java 修改
@@ -1,15 +1,15 @@
package com.lunhan.xxx.service.quartz;
package com.nanjing.water.service.quartz;

import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.lunhan.xxx.common.ConstantFactory;
import com.lunhan.xxx.common.ExecutedResult;
import com.lunhan.xxx.common.util.LocalDateTimeUtil;
import com.lunhan.xxx.common.util.NumericUtil;
import com.lunhan.xxx.common.util.StringUtil;
import com.lunhan.xxx.repository.impl.QuartzTaskErrorMapperImpl;
import com.lunhan.xxx.repository.impl.QuartzTaskRecordMapperImpl;
import com.nanjing.water.common.ConstantFactory;
import com.nanjing.water.common.ExecutedResult;
import com.nanjing.water.common.util.LocalDateTimeUtil;
import com.nanjing.water.common.util.NumericUtil;
import com.nanjing.water.common.util.StringUtil;
import com.nanjing.water.repository.impl.QuartzTaskErrorMapperImpl;
import com.nanjing.water.repository.impl.QuartzTaskRecordMapperImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

 src/main/java/com/nanjing/water/service/quartz/QuartzMainJobFactory.java

文件名从 src/main/java/com/lunhan/xxx/service/quartz/QuartzMainJobFactory.java 修改
@@ -1,12 +1,12 @@
package com.lunhan.xxx.service.quartz;
package com.nanjing.water.service.quartz;

import com.lunhan.xxx.common.ExecutedResult;
import com.lunhan.xxx.common.util.ExceptionUtil;
import com.lunhan.xxx.common.util.SerializeUtil;
import com.lunhan.xxx.entity.enums.EHandleStatus;
import com.lunhan.xxx.entity.enums.EState;
import com.lunhan.xxx.repository.po.QuartzTaskInfoPO;
import com.lunhan.xxx.repository.po.QuartzTaskRecordPO;
import com.nanjing.water.common.ExecutedResult;
import com.nanjing.water.common.util.ExceptionUtil;
import com.nanjing.water.common.util.SerializeUtil;
import com.nanjing.water.entity.enums.EHandleStatus;
import com.nanjing.water.entity.enums.EState;
import com.nanjing.water.repository.po.QuartzTaskInfoPO;
import com.nanjing.water.repository.po.QuartzTaskRecordPO;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.Job;
import org.quartz.JobDataMap;

 src/main/java/com/nanjing/water/service/quartz/QuartzService.java

文件名从 src/main/java/com/lunhan/xxx/service/quartz/QuartzService.java 修改
@@ -1,27 +1,28 @@
package com.lunhan.xxx.service.quartz;
package com.nanjing.water.service.quartz;

import com.lunhan.xxx.common.ExecutedResult;
import com.lunhan.xxx.common.PagerResult;
import com.lunhan.xxx.common.enums.EYesOrNo;
import com.lunhan.xxx.common.model.Tuple;
import com.lunhan.xxx.common.util.*;
import com.lunhan.xxx.entity.enums.EHandleStatus;
import com.lunhan.xxx.entity.enums.EState;
import com.lunhan.xxx.entity.request.quartztaskinfo.ReqCreateQuartzTaskInfo;
import com.lunhan.xxx.entity.request.quartztaskinfo.ReqModifyQuartzTaskInfo;
import com.lunhan.xxx.entity.request.quartztaskinfo.ReqRunTaskRightNow;
import com.lunhan.xxx.entity.search.SearchQuartzTaskInfo;
import com.lunhan.xxx.entity.search.SearchQuartzTaskRecord;
import com.lunhan.xxx.repository.impl.QuartzTaskErrorMapperImpl;
import com.lunhan.xxx.repository.impl.QuartzTaskInfoMapperImpl;
import com.lunhan.xxx.repository.impl.QuartzTaskRecordMapperImpl;
import com.lunhan.xxx.repository.po.QuartzTaskErrorPO;
import com.lunhan.xxx.repository.po.QuartzTaskInfoPO;
import com.lunhan.xxx.repository.po.QuartzTaskRecordPO;
import com.lunhan.xxx.repository.vo.QuartzTaskErrorVO;
import com.lunhan.xxx.repository.vo.QuartzTaskInfoVO;
import com.lunhan.xxx.repository.vo.QuartzTaskRecordVO;
import com.lunhan.xxx.service.convert.QuartzTaskInfoConvert;
import com.nanjing.water.common.ExecutedResult;
import com.nanjing.water.common.PagerResult;
import com.nanjing.water.common.enums.EYesOrNo;
import com.nanjing.water.common.model.Tuple;
import com.nanjing.water.common.util.*;
import com.nanjing.water.entity.enums.EHandleStatus;
import com.nanjing.water.entity.enums.EState;
import com.nanjing.water.entity.request.quartztaskinfo.ReqCreateQuartzTaskInfo;
import com.nanjing.water.entity.request.quartztaskinfo.ReqModifyQuartzTaskInfo;
import com.nanjing.water.entity.request.quartztaskinfo.ReqRunTaskRightNow;
import com.nanjing.water.entity.search.SearchQuartzTaskInfo;
import com.nanjing.water.entity.search.SearchQuartzTaskRecord;
import com.nanjing.water.repository.impl.QuartzTaskErrorMapperImpl;
import com.nanjing.water.repository.impl.QuartzTaskInfoMapperImpl;
import com.nanjing.water.repository.impl.QuartzTaskRecordMapperImpl;
import com.nanjing.water.repository.po.QuartzTaskErrorPO;
import com.nanjing.water.repository.po.QuartzTaskInfoPO;
import com.nanjing.water.repository.po.QuartzTaskRecordPO;
import com.nanjing.water.repository.vo.QuartzTaskErrorVO;
import com.nanjing.water.repository.vo.QuartzTaskInfoVO;
import com.nanjing.water.repository.vo.QuartzTaskRecordVO;
import com.nanjing.water.service.convert.QuartzTaskInfoConvert;
import com.nanjing.water.common.util.*;
import org.quartz.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

 src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
server:
  port: 8027
  port: 8038

spring:
  jackson:
@@ -34,14 +34,30 @@
    path: ./logs
  level:
    root: info
    com.lunhan.xxx: info
    com.nanjing.water: info

# mybatis-plus 配置：
mybatis-plus:
  configuration:
    ### 开启打印sql配置
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

mqtt:
  # 是否启用
  enable: false
  host: 113.250.189.120
  port: 1885
  user: admin
  password: public
  # 订阅主题
  topic: nanjing/#
  # 订阅消息的客户端id
  clientId: nanjing-station-dev
  # 连接超时时间
  connectionTimeout: 10
  # 心跳
  keepAliveInterval: 20
  # 发送消息的客户端id
  serverClientId: nanjing-station-publish-dev
# quartz定时任务配置
quartz:
  # 是否启用

 src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
server:
  port: 9009
  port: 9038

spring:
  jackson:
@@ -34,8 +34,24 @@
    path: ./logs
  level:
    root: info
    com.lunhan.xxx.host: debug

    com.nanjing.water.host: debug
mqtt:
  # 是否启用
  enable: true
  host: 113.250.189.120
  port: 1883
  user: admin
  password: public
  # 订阅主题
  topic: nanjing/#
  # 订阅消息的客户端id
  clientId: nanjing-station-prod
  # 连接超时时间
  connectionTimeout: 10
  # 心跳
  keepAliveInterval: 20
  # 发送消息的客户端id
  serverClientId: nanjing-station-publish-prod
# quartz定时任务配置
quartz:
  # 是否启用

 src/main/resources/application-test.yml

@@ -34,8 +34,8 @@
    path: ./logs
  level:
    root: info
    com.lunhan.xxx.host: DEBUG
    com.lunhan.xxx.service: DEBUG
    com.nanjing.water.host: DEBUG
    com.nanjing.water.service: DEBUG

# quartz定时任务配置
quartz:

 src/main/resources/smart-doc.json

@@ -5,7 +5,7 @@
  "allInOneDocFileName":"index.html",//自定义设置输出文档名称, @since 1.9.0
  "style": "vs2015",
  "createDebugPage": true, //@since 2.0.0 smart-doc支持创建可以测试的html页面，仅在AllInOne模式中起作用。
  "packageFilters": "com.lunhan.xxx.host.controller.*,com.lunhan.xxx.host.admin.*,com.lunhan.xxx.host.controller.pay.*",//controller包过滤，多个包用英文逗号隔开，2.2.2开始需要采用正则：com.test.controller.*
  "packageFilters": "com.nanjing.water.host.controller.*,com.nanjing.water.host.admin.*,com.nanjing.water.host.controller.pay.*",//controller包过滤，多个包用英文逗号隔开，2.2.2开始需要采用正则：com.test.controller.*
  "requestExample":"true",//是否将请求示例展示在文档中，默认true，@since 1.9.0
  "responseExample":"true",//是否将响应示例展示在文档中，默认为true，@since 1.9.0
//  "requestHeaders": [{ //设置请求头，没有需求可以不设置
@@ -20,27 +20,27 @@
//  }],
  "dataDictionaries": [{
    "title": "EResultCode - 请求响应状态码",
    "enumClassName": "com.lunhan.xxx.common.enums.EResultCode",
    "enumClassName": "com.nanjing.water.common.enums.EResultCode",
    "codeField": "code",
    "descField": "message"
  },{
    "title": "ESex - 性别",
    "enumClassName": "com.lunhan.xxx.entity.enums.ESex",
    "enumClassName": "com.nanjing.water.entity.enums.ESex",
    "codeField": "value",
    "descField": "desc"
  }, {
    "title": "EState - 状态",
    "enumClassName": "com.lunhan.xxx.entity.enums.EState",
    "enumClassName": "com.nanjing.water.entity.enums.EState",
    "codeField": "value",
    "descField": "desc"
  }, {
    "title": "EParameterType - 参数类型",
    "enumClassName": "com.lunhan.xxx.entity.enums.EParameterType",
    "enumClassName": "com.nanjing.water.entity.enums.EParameterType",
    "codeField": "value",
    "descField": "desc"
  }, {
    "title": "EUserType - 用户类型",
    "enumClassName": "com.lunhan.xxx.entity.enums.EUserType",
    "enumClassName": "com.nanjing.water.entity.enums.EUserType",
    "codeField": "value",
    "descField": "desc"
  },
@@ -50,12 +50,12 @@
   // 排序的枚举，为了便于阅读请放在字典列表的最后。业务枚举放在前面
    {
    "title": "EOrderBy - 通用查询-排序支持的字段枚举",
    "enumClassName": "com.lunhan.xxx.entity.enums.EOrderBy",
    "enumClassName": "com.nanjing.water.entity.enums.EOrderBy",
    "codeField": "value",
    "descField": "desc"
  }, {
      "title": "ESortOrderBy - 排序类型带排序值字段",
      "enumClassName": "com.lunhan.xxx.entity.enums.ESortOrderBy",
      "enumClassName": "com.nanjing.water.entity.enums.ESortOrderBy",
      "codeField": "value",
      "descField": "desc"
    }

 src/test/java/com/lunhan/xxx/repository/mapper/UserMapper.java

文件已删除

 src/test/java/com/lunhan/xxx/repository/test123.java

文件已删除

 src/test/java/com/nanjing/water/BasicServiceApplicationTests.java

文件名从 src/test/java/com/lunhan/xxx/BasicServiceApplicationTests.java 修改
@@ -1,8 +1,8 @@
package com.lunhan.xxx;
package com.nanjing.water;

import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.lunhan.xxx.po.UserPO;
import com.lunhan.xxx.repository.mapper.UserMapper;
import com.nanjing.water.po.UserPO;
import com.nanjing.water.repository.mapper.UserMapper;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;

 src/test/java/com/nanjing/water/DateTimeTest.java

文件名从 src/test/java/com/lunhan/xxx/DateTimeTest.java 修改
@@ -1,6 +1,6 @@
package com.lunhan.xxx;
package com.nanjing.water;

import com.lunhan.xxx.common.util.LocalDateTimeUtil;
import com.nanjing.water.common.util.LocalDateTimeUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

 src/test/java/com/nanjing/water/DemoTest.java

文件名从 src/test/java/com/lunhan/xxx/DemoTest.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx;
package com.nanjing.water;

import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;

 src/test/java/com/nanjing/water/Gauss2Gauss.java

文件名从 src/test/java/com/lunhan/xxx/Gauss2Gauss.java 修改
@@ -1,7 +1,7 @@
package com.lunhan.xxx;
package com.nanjing.water;

import com.lunhan.xxx.common.util.ListUtil;
import com.lunhan.xxx.common.util.StringUtil;
import com.nanjing.water.common.util.ListUtil;
import com.nanjing.water.common.util.StringUtil;

import java.sql.Connection;
import java.sql.DriverManager;

 src/test/java/com/nanjing/water/GaussExportTest.java

文件名从 src/test/java/com/lunhan/xxx/GaussExportTest.java 修改
@@ -1,6 +1,6 @@
package com.lunhan.xxx;
package com.nanjing.water;

import com.lunhan.xxx.common.util.StringUtil;
import com.nanjing.water.common.util.StringUtil;

import java.sql.Connection;
import java.sql.DriverManager;

 src/test/java/com/nanjing/water/GenCodeGauss.java

文件名从 src/test/java/com/lunhan/xxx/GenCodeGauss.java 修改
@@ -1,7 +1,8 @@
package com.lunhan.xxx;
package com.nanjing.water;

import com.lunhan.xxx.common.ConstantFactory;
import com.lunhan.xxx.common.util.*;
import com.nanjing.water.common.ConstantFactory;
import com.nanjing.water.common.util.*;
import com.nanjing.water.common.util.*;
import org.apache.commons.lang3.BooleanUtils;

import java.io.File;
@@ -44,16 +45,16 @@

    //region 架包路径设置
    class PackageSet {
        public static final String PO = "com.lunhan.xxx.repository.po";
        public static final String VO = "com.lunhan.xxx.repository.vo";
        public static final String CONVERT_MAPPER = "com.lunhan.xxx.service.convert";
        public static final String MAPPER_IMPL = "com.lunhan.xxx.repository.impl";
        public static final String MAPPER = "com.lunhan.xxx.repository.mapper";
        public static final String SERVICE = "com.lunhan.xxx.service";
        public static final String Controller = "com.lunhan.xxx.host.controller";
        public static final String SEARCH = "com.lunhan.xxx.entity.search";
        public static final String Request = "com.lunhan.xxx.entity.request";
        public static final String Response = "com.lunhan.xxx.entity.response";
        public static final String PO = "com.nanjing.water.repository.po";
        public static final String VO = "com.nanjing.water.repository.vo";
        public static final String CONVERT_MAPPER = "com.nanjing.water.service.convert";
        public static final String MAPPER_IMPL = "com.nanjing.water.repository.impl";
        public static final String MAPPER = "com.nanjing.water.repository.mapper";
        public static final String SERVICE = "com.nanjing.water.service";
        public static final String Controller = "com.nanjing.water.host.controller";
        public static final String SEARCH = "com.nanjing.water.entity.search";
        public static final String Request = "com.nanjing.water.entity.request";
        public static final String Response = "com.nanjing.water.entity.response";
    }
    //endregion

@@ -119,8 +120,8 @@

    //region vo类 import 内容设置
    private static final String[] SET_VO_IMPORT = new String[]{
            "import com.lunhan.xxx.common.util.LocalDateTimeUtil;",
            "import com.lunhan.xxx.common.util.NumericUtil;",
            "import com.nanjing.water.common.util.LocalDateTimeUtil;",
            "import com.nanjing.water.common.util.NumericUtil;",
            "import java.util.Objects;"
    };
    //endregion
@@ -138,12 +139,12 @@
    private static final String[] SET_MAPPER_IMPL_IMPORT = new String[]{
            "import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;",
            "import com.baomidou.mybatisplus.extension.plugins.pagination.Page;",
            "import com.lunhan.xxx.common.PagerResult;",
            "import com.lunhan.xxx.common.enums.EYesOrNo;",
            "import com.lunhan.xxx.common.util.*;",
            "import com.lunhan.xxx.entity.dto.*;",
            "import com.lunhan.xxx.entity.enums.*;",
            "import com.lunhan.xxx.repository.BasicMapperImpl;",
            "import com.nanjing.water.common.PagerResult;",
            "import com.nanjing.water.common.enums.EYesOrNo;",
            "import com.nanjing.water.common.util.*;",
            "import com.nanjing.water.entity.dto.*;",
            "import com.nanjing.water.entity.enums.*;",
            "import com.nanjing.water.repository.BasicMapperImpl;",
            "import org.springframework.stereotype.Repository;",
            "",
            "import java.util.List;"
@@ -152,10 +153,10 @@

    //region service类 import 内容设置
    private static final String[] SET_Service_IMPORT = new String[]{
            "import com.lunhan.xxx.common.*;",
            "import com.lunhan.xxx.common.enums.*;",
            "import com.lunhan.xxx.common.model.Tuple;",
            "import com.lunhan.xxx.common.util.*;",
            "import com.nanjing.water.common.*;",
            "import com.nanjing.water.common.enums.*;",
            "import com.nanjing.water.common.model.Tuple;",
            "import com.nanjing.water.common.util.*;",
            "import org.apache.commons.lang3.BooleanUtils;",
            "import org.springframework.beans.factory.annotation.Autowired;",
            "import org.springframework.stereotype.Service;",
@@ -166,13 +167,13 @@

    //region Controller类 import 内容设置
    private static final String[] SET_Controller_IMPORT = new String[]{
            "import com.lunhan.xxx.common.ExecutedResult;",
            "import com.lunhan.xxx.common.PagerResult;",
            "import com.lunhan.xxx.common.util.ParameterUtil;",
            "import com.lunhan.xxx.common.validator.ParameterValidateResult;",
            "import com.lunhan.xxx.common.validator.ParameterValidator;",
            "import com.lunhan.xxx.entity.request.ReqListId;",
            "import com.lunhan.xxx.host.BasicController;",
            "import com.nanjing.water.common.ExecutedResult;",
            "import com.nanjing.water.common.PagerResult;",
            "import com.nanjing.water.common.util.ParameterUtil;",
            "import com.nanjing.water.common.validator.ParameterValidateResult;",
            "import com.nanjing.water.common.validator.ParameterValidator;",
            "import com.nanjing.water.entity.request.ReqListId;",
            "import com.nanjing.water.host.BasicController;",
            "import org.springframework.beans.factory.annotation.Autowired;",
            "import org.springframework.web.bind.annotation.*;",
            "import java.util.List;"

 src/test/java/com/nanjing/water/GenCodeMysql.java

文件名从 src/test/java/com/lunhan/xxx/GenCodeMysql.java 修改
@@ -1,7 +1,8 @@
package com.lunhan.xxx;
package com.nanjing.water;

import com.lunhan.xxx.common.ConstantFactory;
import com.lunhan.xxx.common.util.*;
import com.nanjing.water.common.ConstantFactory;
import com.nanjing.water.common.util.*;
import com.nanjing.water.common.util.*;
import org.apache.commons.lang3.BooleanUtils;

import java.io.File;

 src/test/java/com/nanjing/water/JenkinsTest.java

文件名从 src/test/java/com/lunhan/xxx/JenkinsTest.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx;
package com.nanjing.water;

import com.cdancy.jenkins.rest.JenkinsClient;
import com.cdancy.jenkins.rest.domain.job.Job;

 src/test/java/com/nanjing/water/MySqlExportTest.java

文件名从 src/test/java/com/lunhan/xxx/MySqlExportTest.java 修改
@@ -1,6 +1,6 @@
package com.lunhan.xxx;
package com.nanjing.water;

import com.lunhan.xxx.common.util.StringUtil;
import com.nanjing.water.common.util.StringUtil;

import java.sql.Connection;
import java.sql.DriverManager;

 src/test/java/com/nanjing/water/Mysql2Gauss.java

文件名从 src/test/java/com/lunhan/xxx/Mysql2Gauss.java 修改
@@ -1,6 +1,6 @@
package com.lunhan.xxx;
package com.nanjing.water;

import com.lunhan.xxx.common.util.ListUtil;
import com.nanjing.water.common.util.ListUtil;

import java.sql.Connection;
import java.sql.DriverManager;

 src/test/java/com/nanjing/water/SpringConfig.java

文件名从 src/test/java/com/lunhan/xxx/SpringConfig.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx;
package com.nanjing.water;

import org.springframework.context.annotation.ComponentScan;


 src/test/java/com/nanjing/water/StringUtilTest.java

文件名从 src/test/java/com/lunhan/xxx/StringUtilTest.java 修改
@@ -1,7 +1,7 @@
package com.lunhan.xxx;
package com.nanjing.water;

import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.lunhan.xxx.repository.po.TestInfoPO;
import com.nanjing.water.repository.po.TestInfoPO;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

 src/test/java/com/nanjing/water/po/UserPO.java

文件名从 src/test/java/com/lunhan/xxx/po/UserPO.java 修改
@@ -1,4 +1,4 @@
package com.lunhan.xxx.po;
package com.nanjing.water.po;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

 src/test/java/com/nanjing/water/repository/mapper/UserMapper.java

对比新文件
@@ -0,0 +1,9 @@
package com.nanjing.water.repository.mapper;

import com.nanjing.water.po.UserPO;
import com.nanjing.water.repository.BasicMapper;
import org.apache.ibatis.annotations.Mapper;

@Mapper
public interface UserMapper extends BasicMapper<UserPO> {
}

 src/test/java/com/nanjing/water/repository/test123.java

对比新文件
@@ -0,0 +1,4 @@
package com.nanjing.water.repository;

public class test123 {
}

 src/test/resources/application-dev.yml

@@ -46,7 +46,7 @@
    path: ./logs
  level:
    root: info
    com.lunhan.xxx: info
    com.nanjing.water: info

# mybatis-plus 配置：
mybatis-plus: