From b04822eecb2993d808edc58d1a217e177dde8057 Mon Sep 17 00:00:00 2001 From: panbaolin <13071138970@163.com> Date: Tue, 10 Jun 2025 10:31:58 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=90=84=E4=B8=AA=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=E6=97=A0=E6=95=88=E5=BC=95=E7=94=A82.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9gps=E8=B0=B1=E8=A7=A3=E6=9E=90=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/entity/configuration/GardsDetectors.java | 6 ------ .../base/entity/configuration/GardsNuclLinesLib.java | 1 - .../modules/base/entity/postgre/AlarmAnalysisLog.java | 8 -------- .../base/entity/postgre/AlarmAnalysisNuclideParam.java | 10 ---------- .../modules/base/entity/postgre/AlarmContactGroup.java | 2 -- .../jeecg/modules/base/entity/postgre/AlarmItemDe.java | 3 --- .../jeecg/modules/base/entity/postgre/SysDatabase.java | 1 - .../jeecg/modules/base/entity/postgre/SysEmail.java | 2 -- .../modules/base/entity/rnauto/GardsAnalysisRoi.java | 8 -------- .../jeecg/modules/base/entity/rnauto/GardsQcCheck.java | 2 -- .../modules/base/entity/rnman/GardsAnalysisRoi.java | 1 - .../java/org/jeecg/modules/common/SpectrumUtils.java | 2 +- .../modules/service/impl/GardsGPSDataServiceImpl.java | 4 +++- 13 files changed, 4 insertions(+), 46 deletions(-) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsDetectors.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsDetectors.java index 808a742c..62326202 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsDetectors.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsDetectors.java @@ -6,14 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import org.jeecg.config.valid.InsertGroup; -import org.jeecg.config.valid.UpdateGroup; import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; -import java.time.LocalDateTime; import java.util.Date; @Data diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclLinesLib.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclLinesLib.java index 7e472f3d..3c4cf1b2 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclLinesLib.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclLinesLib.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisLog.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisLog.java index f91c0e94..3486cc9d 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisLog.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisLog.java @@ -2,16 +2,9 @@ package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; import java.time.LocalDateTime; -import java.util.Date; import java.util.List; - -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 javafx.util.converter.LocalDateTimeStringConverter; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -19,7 +12,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.jeecg.common.system.base.entity.JeecgEntity; import org.jeecg.modules.base.dto.NuclideInfo; import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; @Data @TableName("alarm_analysis_log") diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisNuclideParam.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisNuclideParam.java index eb739bf0..5e1a0dc9 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisNuclideParam.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisNuclideParam.java @@ -1,21 +1,11 @@ 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 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.jeecg.common.system.base.entity.JeecgEntity; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; @Data @TableName("alarm_analysis_nuclide_param") diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmContactGroup.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmContactGroup.java index e8b0fc30..dfad4803 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmContactGroup.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmContactGroup.java @@ -8,9 +8,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.jeecg.common.constant.DateConstant; import org.springframework.format.annotation.DateTimeFormat; - import java.io.Serializable; -import java.time.LocalDate; import java.time.LocalDateTime; @Data diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmItemDe.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmItemDe.java index 7c1417f4..0c9229a4 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmItemDe.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmItemDe.java @@ -5,10 +5,7 @@ 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.ApiModelProperty; import lombok.Data; -import org.jeecg.common.system.base.entity.JeecgEntity; -import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; @Data diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDatabase.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDatabase.java index c1be21bc..1fbd1995 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDatabase.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDatabase.java @@ -9,7 +9,6 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.time.LocalDate; import java.util.Date; @Data diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmail.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmail.java index 055f5090..110e3b7b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmail.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmail.java @@ -7,9 +7,7 @@ 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.time.LocalDate; import java.util.Date; /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalysisRoi.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalysisRoi.java index 4961a62f..5d79fee4 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalysisRoi.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalysisRoi.java @@ -1,16 +1,8 @@ package org.jeecg.modules.base.entity.rnauto; -import java.io.Serializable; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModel; - import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; @Data @TableName("RNAUTO.GARDS_ANALYSIS_ROI") diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsQcCheck.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsQcCheck.java index 6f4a52f6..5a75904f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsQcCheck.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsQcCheck.java @@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import sun.security.krb5.internal.PAData; - import java.io.Serializable; import java.util.Date; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsAnalysisRoi.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsAnalysisRoi.java index 328dca20..ee21b0a1 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsAnalysisRoi.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsAnalysisRoi.java @@ -1,7 +1,6 @@ package org.jeecg.modules.base.entity.rnman; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.experimental.Accessors; diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/common/SpectrumUtils.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/common/SpectrumUtils.java index 11667cf7..8f0c175e 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/common/SpectrumUtils.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/common/SpectrumUtils.java @@ -65,8 +65,8 @@ public class SpectrumUtils { String[] contentArr = line.split("\\|"); String checkStr = contentArr[1]+"|"+contentArr[2]+"|"+contentArr[3]; String checkStrMd5 = Md5Util.md5Encode(checkStr, "utf-8"); - //处理下.eml文件中字符 String sourceMd5 = contentArr[0]; + //处理下.eml文件中字符 if (sourceMd5.startsWith("\uFEFF")){ sourceMd5 = sourceMd5.substring(1); } diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsGPSDataServiceImpl.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsGPSDataServiceImpl.java index 4ec1fffb..94f01673 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsGPSDataServiceImpl.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsGPSDataServiceImpl.java @@ -58,7 +58,9 @@ public class GardsGPSDataServiceImpl extends ServiceImpl