Merge remote-tracking branch 'origin/station' into station

# Conflicts:
#	jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsMetDataMapper.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSohDataMapper.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsMetDataServiceImpl.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/ReviewedServiceImpl.java

jeecg-boot-base-core/src/main/java/org/jeecg/common/Excel/ImportExcel.java

@@ -14,7 +14,6 @@ import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.text.NumberFormat;
 import java.text.ParseException;
-import java.time.LocalDateTime;
 import java.util.*;
 
 /**

jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java

@@ -1,6 +1,8 @@
 package org.jeecg.common.api.dto;
+
 import lombok.Data;
 import org.jeecg.common.system.vo.LoginUser;
+
 import java.io.Serializable;
 import java.util.Date;
 

jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateMessageDTO.java

@@ -1,6 +1,7 @@
 package org.jeecg.common.api.dto.message;
 
 import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Map;
 

jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java

@@ -15,15 +15,16 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.enums.ModuleType;
 import org.jeecg.common.constant.enums.OperateTypeEnum;
-import org.jeecg.modules.base.service.BaseCommonService;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.IpUtils;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.base.service.BaseCommonService;
 import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.multipart.MultipartFile;
+
 import javax.annotation.Resource;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;

jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLowApp.java

@@ -1,9 +1,9 @@
 package org.jeecg.common.aspect.annotation;
 
-import java.lang.annotation.*;
-
 import org.jeecg.common.constant.enums.LowAppAopEnum;
 
+import java.lang.annotation.*;
+
 /**
  * 自动注入low_app_id
  * 

jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java

@@ -1,10 +1,6 @@
 package org.jeecg.common.aspect.annotation;
 
-import java.lang.annotation.Documented;
+import java.lang.annotation.*;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 
 /**
   *  数据权限注解

jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java

@@ -2,16 +2,12 @@ package org.jeecg.common.constant;
 
 import com.alibaba.fastjson.JSONObject;
 import org.jeecg.common.util.oConvertUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Scanner;
-import java.util.Set;
 import java.util.List;
+import java.util.Scanner;
 
 /**
  * @Description: 省市区

jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java

@@ -1,6 +1,7 @@
 package org.jeecg.common.exception;
 
 import cn.hutool.core.util.ObjectUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.AuthorizationException;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.jeecg.common.api.vo.Result;
@@ -16,8 +17,6 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.multipart.MaxUploadSizeExceededException;
 import org.springframework.web.servlet.NoHandlerFoundException;
 
-import lombok.extern.slf4j.Slf4j;
-
 /**
  * 异常处理器
  * 

jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java

@@ -27,7 +27,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @Description: Controller基类

jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java

@@ -1,18 +1,16 @@
 package org.jeecg.common.system.base.entity;
 
-import java.io.Serializable;
-
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
 
 /**
  * @Description: Entity基类

jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java

@@ -1,11 +1,10 @@
 package org.jeecg.common.system.base.service.impl;
 
-import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.jeecg.common.system.base.service.JeecgService;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecg.common.system.base.service.JeecgService;
 
 /**
  * @Description: ServiceImpl基类

jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java

@@ -1,17 +1,9 @@
 package org.jeecg.common.system.query;
 
-import java.beans.PropertyDescriptor;
+import com.alibaba.fastjson.JSON;
-import java.io.UnsupportedEncodingException;
+import com.baomidou.mybatisplus.annotation.TableField;
-import java.lang.reflect.Field;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import java.math.BigDecimal;
+import lombok.extern.slf4j.Slf4j;
-import java.net.URLDecoder;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
 import org.apache.commons.beanutils.PropertyUtils;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.DataBaseConstant;
@@ -26,11 +18,17 @@ import org.jeecg.common.util.SqlInjectionUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.springframework.util.NumberUtils;
 
-import com.alibaba.fastjson.JSON;
+import java.beans.PropertyDescriptor;
-import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.UnsupportedEncodingException;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.lang.reflect.Field;
-
+import java.math.BigDecimal;
-import lombok.extern.slf4j.Slf4j;
+import java.net.URLDecoder;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 查询生成器

jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java

@@ -7,15 +7,6 @@ import com.auth0.jwt.exceptions.JWTDecodeException;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Joiner;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Date;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
@@ -29,6 +20,14 @@ import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.oConvertUtils;
 
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Date;
+
 /**
  * @Author Scott
  * @Date 2018-07-12 14:23

jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModel.java

@@ -1,13 +1,12 @@
 package org.jeecg.common.system.vo;
 
-import java.io.Serializable;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * @Description: 字典类
  * @author: jeecg-boot

jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java

@@ -1,15 +1,13 @@
 package org.jeecg.common.system.vo;
 
-import java.util.Date;
-
-import org.jeecg.common.desensitization.annotation.SensitiveField;
-import org.springframework.format.annotation.DateTimeFormat;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.desensitization.annotation.SensitiveField;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * <p>

jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java

@@ -1,7 +1,5 @@
 package org.jeecg.common.system.vo;
 
-import org.jeecgframework.poi.excel.annotation.Excel;
-
 /**
  * @Author qinfeng
  * @Date 2020/2/19 12:01

jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java

@@ -1,12 +1,5 @@
 package org.jeecg.common.system.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
 import java.util.Date;
 
 /**

jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java

@@ -1,9 +1,9 @@
 package org.jeecg.common.system.vo;
 
-import java.util.List;
-
 import org.jeecg.common.util.DateUtils;
 
+import java.util.List;
+
 /**
  * @Description: 用户缓存信息
  * @author: jeecg-boot

jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java

@@ -1,12 +1,11 @@
 package org.jeecg.common.util;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * 
  * @Author 张代浩

jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java

@@ -1,9 +1,5 @@
 package org.jeecg.common.util;
 
-import org.jeecg.config.StaticConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.IAcsClient;
@@ -12,6 +8,9 @@ import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.profile.IClientProfile;
+import org.jeecg.config.StaticConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Created on 17/6/7.

jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ExportUtil.java

@@ -1,16 +1,11 @@
 package org.jeecg.common.util;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.util.CharsetUtil;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 
-import static com.google.common.net.MediaType.OCTET_STREAM;
-
 public class ExportUtil {
 
     private static final String UTF_8 = StandardCharsets.UTF_8.name();

jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java

@@ -12,7 +12,8 @@ import org.springframework.stereotype.Component;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;

jeecg-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java

@@ -1,12 +1,12 @@
 package org.jeecg.common.util;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.constant.CommonConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * IP地址
  * 

jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java

@@ -1,12 +1,12 @@
 package org.jeecg.common.util;
 
-import java.security.Key;
-import java.security.SecureRandom;
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.PBEKeySpec;
 import javax.crypto.spec.PBEParameterSpec;
+import java.security.Key;
+import java.security.SecureRandom;
 
 /**
  * @Description: 密码工具类

jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java

@@ -1,8 +1,5 @@
 package org.jeecg.common.util;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.ServiceNameConstants;
 import org.springframework.beans.BeansException;
@@ -12,6 +9,9 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * @Description: spring上下文工具类
  * @author: jeecg-boot

jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java

@@ -3,6 +3,7 @@ package org.jeecg.common.util;
 import cn.hutool.crypto.SecureUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.exception.JeecgBootException;
+
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Field;
 import java.util.Set;

jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java

@@ -6,6 +6,7 @@ import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.system.vo.DynamicDataSourceModel;
 import org.jeecg.common.util.SpringContextUtils;
 import org.springframework.data.redis.core.RedisTemplate;
+
 import java.util.HashMap;
 import java.util.Map;
 

jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java

@@ -4,14 +4,12 @@ import com.alibaba.druid.pool.DruidDataSource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.DynamicDataSourceModel;
 import org.jeecg.common.util.ReflectHelper;
 import org.jeecg.common.util.oConvertUtils;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 
-import javax.sql.DataSource;
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.List;

jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java

@@ -20,7 +20,6 @@ import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.net.URLDecoder;
 import java.util.Date;
 import java.util.UUID;
 

jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/SecurityTools.java

@@ -8,8 +8,9 @@ import cn.hutool.crypto.asymmetric.RSA;
 import cn.hutool.crypto.asymmetric.Sign;
 import cn.hutool.crypto.asymmetric.SignAlgorithm;
 import cn.hutool.crypto.symmetric.AES;
-import org.jeecg.common.util.security.entity.*;
 import com.alibaba.fastjson.JSONObject;
+import org.jeecg.common.util.security.entity.*;
+
 import javax.crypto.SecretKey;
 import java.security.KeyPair;
 

jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java

@@ -1,10 +1,6 @@
 package org.jeecg.config;
 
-import java.util.ArrayList;
+import lombok.extern.slf4j.Slf4j;
-import java.util.List;
-
-import javax.annotation.Resource;
-
 import org.jeecg.common.api.CommonAPI;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.util.oConvertUtils;
@@ -12,7 +8,9 @@ import org.jeecgframework.dict.service.AutoPoiDictServiceI;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
-import lombok.extern.slf4j.Slf4j;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 描述：AutoPoi Excel注解支持字典参数设置

jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java

@@ -1,9 +1,8 @@
 package org.jeecg.config;
 
-import java.io.IOException;
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
-
+import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
-import javax.servlet.*;
+import com.alibaba.druid.util.Utils;
-
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
@@ -11,9 +10,8 @@ import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
+import javax.servlet.*;
-import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
+import java.io.IOException;
-import com.alibaba.druid.util.Utils;
 
 /**
  * @Description: DruidConfig配置类

jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java

@@ -19,7 +19,6 @@ import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.ParameterBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.oas.annotations.EnableOpenApi;
 import springfox.documentation.schema.ModelRef;
 import springfox.documentation.service.*;
 import springfox.documentation.spi.DocumentationType;

jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java

@@ -1,11 +1,14 @@
 package org.jeecg.config.mybatis;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
 import com.baomidou.mybatisplus.extension.plugins.inner.DynamicTableNameInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.LongValue;
 import org.jeecg.common.config.TenantContext;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.TenantConstant;
@@ -16,13 +19,8 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import java.util.ArrayList;
-import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
+import java.util.List;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
-
-import net.sf.jsqlparser.expression.Expression;
-import net.sf.jsqlparser.expression.LongValue;
 
 /**
  * 单数据源配置（jeecg.datasource.open = false时生效）

jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/ThreadLocalDataHelper.java

@@ -2,6 +2,7 @@ package org.jeecg.config.mybatis;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+
 import java.util.concurrent.ConcurrentHashMap;
 
 

jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -20,7 +20,6 @@ import org.jeecg.config.shiro.filters.CustomShiroFilterFactoryBean;
 import org.jeecg.config.shiro.filters.JwtFilter;
 import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;

jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java

@@ -1,6 +1,7 @@
 package org.jeecg.config.shiro.filters;
 
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.mgt.SecurityManager;
 import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
 import org.apache.shiro.web.filter.InvalidRequestFilter;
 import org.apache.shiro.web.filter.mgt.DefaultFilter;
@@ -9,7 +10,6 @@ import org.apache.shiro.web.filter.mgt.FilterChainResolver;
 import org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver;
 import org.apache.shiro.web.mgt.WebSecurityManager;
 import org.apache.shiro.web.servlet.AbstractShiroFilter;
-import org.apache.shiro.mgt.SecurityManager;
 import org.springframework.beans.factory.BeanInitializationException;
 
 import javax.servlet.Filter;

jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java

@@ -1,12 +1,13 @@
 package org.jeecg.config.shiro.filters;
 
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.web.filter.AccessControlFilter;
+
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.web.filter.AccessControlFilter;
-import lombok.extern.slf4j.Slf4j;
 
 /**
  * @Author Scott

jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java

@@ -1,12 +1,8 @@
 package org.jeecg.config.sign.interceptor;
 
 
-import java.io.PrintWriter;
+import com.alibaba.fastjson.JSON;
-import java.util.SortedMap;
+import lombok.extern.slf4j.Slf4j;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.DateUtils;
@@ -16,9 +12,10 @@ import org.jeecg.config.sign.util.HttpUtils;
 import org.jeecg.config.sign.util.SignUtil;
 import org.springframework.web.servlet.HandlerInterceptor;
 
-import com.alibaba.fastjson.JSON;
+import javax.servlet.http.HttpServletRequest;
-
+import javax.servlet.http.HttpServletResponse;
-import lombok.extern.slf4j.Slf4j;
+import java.io.PrintWriter;
+import java.util.SortedMap;
 
 /**
  * 签名拦截器

jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java

@@ -1,5 +1,12 @@
 package org.jeecg.config.sign.util;
 
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.constant.SymbolConstant;
+import org.jeecg.common.util.oConvertUtils;
+import org.springframework.http.HttpMethod;
+
+import javax.servlet.http.HttpServletRequest;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -10,15 +17,6 @@ import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import javax.servlet.http.HttpServletRequest;
-
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.constant.SymbolConstant;
-import org.jeecg.common.util.oConvertUtils;
-import org.springframework.http.HttpMethod;
-
-import com.alibaba.fastjson.JSONObject;
-
 /**
  * http 工具类 获取请求中的参数
  *

jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/Path.java

@@ -1,7 +1,5 @@
 package org.jeecg.config.vo;
 
-import javax.print.DocFlavor;
-
 /**
  *
  * @author: scott

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmRuleDto.java

@@ -1,16 +1,8 @@
 package org.jeecg.modules.base.dto;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.jeecg.modules.base.entity.Rule;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
-import java.util.Date;
 
 @Data
 public class AlarmRuleDto implements Serializable {

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmRuleInfo.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.base.dto;
 
 import lombok.Data;
+
 import java.io.Serializable;
 
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/SourceDto.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.base.dto;
 
 import lombok.Data;
+
 import java.io.Serializable;
 
 @Data

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsDetectors.java

@@ -109,10 +109,4 @@ public class GardsDetectors implements Serializable {
     @TableField(value = "STATION_ID")
     private Integer stationId;
 
-    /**
-     *  台站名称
-     */
-    @TableField(exist = false)
-    private String stationName;
-
 }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsStations.java

@@ -1,6 +1,5 @@
 package org.jeecg.modules.base.entity.configuration;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -11,9 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
 import java.io.Serializable;
-import java.sql.Timestamp;
 import java.util.Date;
 
 @Data

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/monitor/Host.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.base.entity.monitor;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Map;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/monitor/ItemHistory.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/monitor/Servers.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.base.entity.monitor;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
+
 import java.io.Serializable;
 import java.util.List;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsAlertData.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.entity;
+package org.jeecg.modules.base.entity.original;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -41,7 +41,4 @@ public class GardsAlertData implements Serializable {
     @TableField(value = "INPUT_FILE_NAME")
     private String inputFileName;
 
-    @Excel(name = "NO",orderNum = "1")
-    @TableField(exist = false)
-    private Integer no;
 }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsBgEfficiencyPairs.java

@@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.original;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 存储β-γ符合谱中#b_ gefficiency 数据块中的探测器符合效率刻度点。
@@ -40,5 +43,7 @@ public class GardsBgEfficiencyPairs implements Serializable {
     private Double bgEfficError;
 
     @TableField(value = "MODDATE")
-    private Long moddate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date moddate;
 }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsHistogram.java

@@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.original;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 存储β-γ符合谱中#histogram数据块中的数据。
@@ -45,5 +48,7 @@ public class GardsHistogram implements Serializable {
     private Integer bEnergySpan;
 
     @TableField(value = "MODDATE")
-    private Long moddate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date moddate;
 }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsMetData.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.Email;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -102,12 +101,8 @@ public class GardsMetData implements Serializable {
      *  操作时间
      */
     @TableField(value = "MODDATE")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date moddate;
 
-    @TableField(exist = false)
-    @Excel(name = "NO",orderNum = "1")
-    private Integer no;
-
 }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsRoiLimits.java

@@ -2,8 +2,12 @@ package org.jeecg.modules.base.entity.original;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 存储β-γ符合谱中#ROI_LMITS 数据块中的感兴趣区能量边界数据。
@@ -44,5 +48,7 @@ public class GardsRoiLimits implements Serializable {
     private Double gEnergyStop;
 
     @TableField(value = "MODDATE")
-    private Long moddate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date moddate;
 }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleAux.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.base.entity.original;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCert.java

@@ -31,4 +31,11 @@ public class GardsSampleCert implements Serializable {
      */
     @TableField(value = "ASSAY_DATE")
     private Date assayDate;
+
+    /**
+     *  单位
+     */
+    @TableField(value = "UNIT")
+    private String unit;
+
 }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCertLine.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.base.entity.original;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -56,7 +57,7 @@ public class GardsSampleCertLine implements Serializable {
      * β能量
      */
     @TableField(value = "B_ENERGY")
-    private Double b_energy;
+    private Double bEnergy;
     /**
      * 衰变模式
      */

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleData.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecgframework.poi.excel.annotation.ExcelIgnore;
-import org.jeecgframework.poi.excel.annotation.ExcelTarget;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -160,32 +158,9 @@ public class GardsSampleData implements Serializable {
      *  操作时间
      */
     @TableField(value = "MODDATE")
-    
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date moddate;
 
-    /**
-     *  台站名称
-     */
-    @TableField(exist = false)
-    @Excel(name = "STATION" ,orderNum = "2")
-    private String stationName;
 
-    /**
-     *  探测器名称
-     */
-    @TableField(exist = false)
-    private String detectorsName;
-
-
-    @TableField(exist = false)
-    @Excel(name = "CALIB REPORTS" ,orderNum = "7")
-    private String calibReports;
-
-    @TableField(exist = false)
-    private String dbName;
-
-    @TableField(exist = false)
-    @Excel(name = "NO" ,orderNum = "1")
-    private Integer no;
 }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleDescription.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.base.entity.original;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+
 import java.io.Serializable;
 
 /**

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleRatios.java

@@ -2,8 +2,12 @@ package org.jeecg.modules.base.entity.original;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  *  存储β-γ符合谱中# Ratios 数据块中的感兴趣区相应核素的计数比率。
@@ -36,5 +40,7 @@ public class GardsSampleRatios implements Serializable {
     private Double countRatioErr;
 
     @TableField(value = "MODDATE")
-    private Long moddate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date moddate;
 }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSohData.java

@@ -81,22 +81,4 @@ public class GardsSohData implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date moddate;
 
-    /**
-     *  探测器名称
-     */
-    @TableField(exist = false)
-    private String detectorName;
-
-    /**
-     *  结束时间
-     */
-    @TableField(exist = false)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "START TIME",orderNum = "4",width = 30,format = "yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
-
-    @TableField(exist = false)
-    @Excel(name = "NO",orderNum = "1")
-    private Integer no;
 }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSpectrum.java

@@ -2,8 +2,12 @@ package org.jeecg.modules.base.entity.original;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 存储所有能谱中#G_Spectrum和#B_Spectrum数据块中的数据。
@@ -44,5 +48,7 @@ public class GardsSpectrum implements Serializable {
     private Integer startChannel;
 
     @TableField(value = "MODDATE")
-    private Long moddate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date moddate;
 }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsTotalEfficiencyPairs.java

@@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.original;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 存储所有谱中#TotalEff 数据块中的探测器总效率刻度点，此数据块是可选项。
@@ -36,5 +39,7 @@ public class GardsTotalEfficiencyPairs implements Serializable {
     private Double totalEfficError;
 
     @TableField(value = "MODDATE")
-    private Long moddate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date moddate;
 }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmContactGroup.java

@@ -10,7 +10,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.time.LocalDate;
-import java.util.List;
 
 @Data
 @TableName(value = "alarm_contact_group")
@@ -62,22 +61,4 @@ public class AlarmContactGroup implements Serializable {
     @TableField(value = "update_by")
     private String updateBy;
 
-    /**
-     *  联系人组关联的用户id
-     */
-    @TableField(exist = false)
-    List<String> userIds;
-
-    /**
-     *  联系人组关联的用户集合
-     */
-    @TableField(exist = false)
-    List<SysUser> users;
-
-    /**
-     *  当前联系人组人员数量
-     */
-    @TableField(exist = false)
-    Integer personNumber;
-
 }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmRule.java

@@ -6,11 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.jeecg.modules.base.entity.Rule;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.util.Date;
 
 @Data
@@ -105,9 +103,4 @@ public class AlarmRule implements Serializable {
     @TableField(value = "update_by")
     private String updateBy;
 
-    /**
-     * 用于新增报警规则
-     */
-    @TableField(exist = false)
-    private Rule rule;
 }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/StationReceivingConfig.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 @Data
 @TableName(value = "station_receiving_config")
@@ -49,10 +48,4 @@ public class StationReceivingConfig implements Serializable {
     @TableField(value = "update_interval_time")
     private Double updateIntervalTime;
 
-    /**
-     *  用户关注台站信息
-     */
-    @TableField(exist = false)
-    List<SysUserFocusStation> sysUserFocusStations;
-
 }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysAnnouncementSend.java

@@ -1,14 +1,14 @@
 package org.jeecg.modules.base.entity.postgre;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
+
 /**
  * @Description: 用户通告阅读标记表
  * @Author: jeecg-boot

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDataLog.java

@@ -1,17 +1,15 @@
 package org.jeecg.modules.base.entity.postgre;
 
-import java.io.Serializable;
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description: 系统数据日志

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartPermission.java

@@ -1,18 +1,13 @@
 package org.jeecg.modules.base.entity.postgre;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 /**

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRole.java

@@ -1,20 +1,17 @@
 package org.jeecg.modules.base.entity.postgre;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.jeecg.common.aspect.annotation.Dict;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @Description: 部门角色

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRolePermission.java

@@ -1,19 +1,16 @@
 package org.jeecg.modules.base.entity.postgre;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @Description: 部门角色权限

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRoleUser.java

@@ -1,18 +1,13 @@
 package org.jeecg.modules.base.entity.postgre;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 /**

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDict.java

@@ -1,16 +1,15 @@
 package org.jeecg.modules.base.entity.postgre;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 字典表

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDictItem.java

@@ -1,18 +1,16 @@
 package org.jeecg.modules.base.entity.postgre;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  *

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmail.java

@@ -10,7 +10,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.time.LocalDate;
-import java.util.Date;
 
 /**
  * 邮件管理数据表

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmailLog.java

@@ -9,7 +9,6 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysFiles.java

@@ -13,6 +13,7 @@ import lombok.experimental.Accessors;
 import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.util.Date;
 
 /**

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysFormFile.java

@@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.util.Date;
 
 /**

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysLog.java

@@ -1,16 +1,16 @@
 package org.jeecg.modules.base.entity.postgre;
 
-import java.util.Date;
-
-import org.jeecg.common.aspect.annotation.Dict;
-import org.springframework.format.annotation.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPackPermission.java

@@ -1,18 +1,19 @@
 package org.jeecg.modules.base.entity.postgre;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description: 产品包菜单关系表

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPermission.java

@@ -1,7 +1,5 @@
 package org.jeecg.modules.base.entity.postgre;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,7 +7,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPermissionDataRule.java

@@ -1,15 +1,14 @@
 package org.jeecg.modules.base.entity.postgre;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 菜单权限规则表

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysRoleIndex.java

@@ -1,19 +1,17 @@
 package org.jeecg.modules.base.entity.postgre;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @Description: 角色首页配置

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysRolePermission.java

@@ -1,17 +1,16 @@
 package org.jeecg.modules.base.entity.postgre;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 角色权限表

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTask.java

@@ -13,7 +13,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 @Data
 @TableName("sys_task")
@@ -48,10 +47,4 @@ public class SysTask implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
-    @TableField(exist = false)
-    private String userName;
-
-    @TableField(exist = false)
-    private List<SysTaskStation> stationList;
-
 }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTaskStation.java

@@ -42,7 +42,4 @@ public class SysTaskStation implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
-    @TableField(exist = false)
-    private String stationName;
-
 }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTenant.java

@@ -1,12 +1,12 @@
 package org.jeecg.modules.base.entity.postgre;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.jeecg.common.aspect.annotation.Dict;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTenantPack.java

@@ -1,18 +1,21 @@
 package org.jeecg.modules.base.entity.postgre;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
 /**
  * @Description: 租户产品包
  * @Author: jeecg-boot

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserAgent.java

@@ -1,14 +1,14 @@
 package org.jeecg.modules.base.entity.postgre;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
 
 /**
  * @Description: 用户代理人设置

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserDepart.java

@@ -1,13 +1,12 @@
 package org.jeecg.modules.base.entity.postgre;
 
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description: 用户部门
  * @author: jeecg-boot

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserFocusStation.java

@@ -11,11 +11,8 @@ import org.jeecg.config.valid.UpdateGroup;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.util.Date;
 
 @Data
 @TableName("sys_user_focus_station")
@@ -62,34 +59,4 @@ public class SysUserFocusStation implements Serializable {
     @TableField(value = "create_by")
     private String createBy;
 
-    /**
-     *  经度
-     */
-    @TableField(exist = false)
-    private Double lon;
-
-    /**
-     *  纬度
-     */
-    @TableField(exist = false)
-    private Double lat;
-
-    /**
-     *  海拔
-     */
-    @TableField(exist = false)
-    private String altitude;
-
-    /**
-     *  状态
-     */
-    @TableField(exist = false)
-    private String status;
-
-    /**
-     *  台站编码
-     */
-    @TableField(exist = false)
-    private String stationCode;
-
 }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserRole.java

@@ -1,14 +1,13 @@
 package org.jeecg.modules.base.entity.postgre;
 
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 用户角色表

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserTenant.java

@@ -1,18 +1,19 @@
 package org.jeecg.modules.base.entity.postgre;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description: sys_user_tenant_relation

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalyses.java

@@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.rnauto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * gards_analyses数据表存储谱数据分析的基本信息，包括:
@@ -116,7 +119,9 @@ public class GardsAnalyses implements Serializable {
     private String comments;
 
     @TableField(value = "MODDATE")
-    private Long moddate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date moddate;
 
     @TableField(value = "USEDGASPHD")
     private String usedgasphd;

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibration.java

@@ -2,8 +2,12 @@ package org.jeecg.modules.base.entity.rnauto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 存储数据分析过程中能量、分辨率和效率刻度的拟合结果。
@@ -101,7 +105,9 @@ public class GardsCalibration implements Serializable {
     private Double coeff9;
 
     @TableField(value = "MODDATE")
-    private Long moddate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date moddate;
 
     @TableField(value = "COEFF_STRING")
     private String coeffString;

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibrationPairs.java

@@ -2,8 +2,12 @@ package org.jeecg.modules.base.entity.rnauto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 存储数据分析过程中能量、分辨率和效率刻度实际使用的刻度点数据。
@@ -60,5 +64,7 @@ public class GardsCalibrationPairs implements Serializable {
     private String uncYValue;
 
     @TableField(value = "MODDATE")
-    private Long moddate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date moddate;
 }

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclIded.java

@@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.rnauto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  *  存储gamma谱中识别到的核素计算结果。
@@ -96,7 +99,9 @@ public class GardsNuclIded implements Serializable {
     private Integer cscModFlag;
 
     @TableField(value = "MODDATE")
-    private Long moddate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date moddate;
 
     @TableField(value = "MDC")
     private String mdc;

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclLinesIded.java

@@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.rnauto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 存储gamma谱中识别到的峰计算结果。
@@ -36,7 +39,9 @@ public class GardsNuclLinesIded implements Serializable {
     private String nuclideName;
 
     @TableField(value = "MODDATE")
-    private Long moddate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date moddate;
 
     /**
      * 核素库中核素对应峰的能量（keV）

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsPeaks.java

@@ -2,8 +2,13 @@ package org.jeecg.modules.base.entity.rnauto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
+import java.util.Date;
+
 /**
  *  存储gamma谱的寻峰结果
  */
@@ -28,7 +33,9 @@ public class GardsPeaks implements Serializable {
     private Integer idAnalysis;
 
     @TableField(value = "MODDATE")
-    private Long moddate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date moddate;
 
     /**
      * 峰中心道（道址）

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiChannels.java

@@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.rnauto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 存储β-γ符合谱中感兴趣区道址边界数据。
@@ -50,5 +53,7 @@ public class GardsRoiChannels implements Serializable {
     private Integer gChanStop;
 
     @TableField(value = "MODDATE")
-    private Long moddate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date moddate;
 }