From ef2e64cef32622943eb082087e7c1ab7eed4212c Mon Sep 17 00:00:00 2001
From: xiaoguangbin <xiaoguangbin>
Date: Fri, 20 Dec 2024 17:12:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201.oracle=E5=88=87=E6=8D=A2=E8=87=B3pgsql?=
=?UTF-8?q?=E4=B9=8B=E5=90=8E=20=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../jeecg/modules/base/entity/original/GardsAlertData.java | 1 -
.../org/jeecg/modules/base/entity/original/GardsDOSData.java | 1 -
.../org/jeecg/modules/base/entity/original/GardsGPSData.java | 4 +++-
.../org/jeecg/modules/base/entity/original/GardsMetData.java | 1 -
.../jeecg/modules/base/entity/original/GardsSampleData.java | 1 -
.../org/jeecg/modules/base/entity/original/GardsSohData.java | 1 -
.../org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml | 4 ++--
7 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsAlertData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsAlertData.java
index b9976a9e..f1409ac3 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsAlertData.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsAlertData.java
@@ -10,7 +10,6 @@ import java.util.Date;
@Data
@TableName("ORIGINAL.GARDS_ALERT_DATA")
-@KeySequence(value = "original.gards_alert_data_seq", dbType = DbType.POSTGRE_SQL)
public class GardsAlertData implements Serializable {
@TableField(value = "STATION_ID")
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsDOSData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsDOSData.java
index 8e115234..0b61734e 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsDOSData.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsDOSData.java
@@ -11,7 +11,6 @@ import java.util.Date;
@Data
@TableName(value = "ORIGINAL.GARDS_DOS_DATA")
-@KeySequence(value = "original.gards_dos_data_seq", dbType = DbType.POSTGRE_SQL)
public class GardsDOSData implements Serializable {
/**
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsGPSData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsGPSData.java
index 9d791634..97c64e4c 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsGPSData.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsGPSData.java
@@ -1,6 +1,8 @@
package org.jeecg.modules.base.entity.original;
+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;
@@ -19,7 +21,7 @@ public class GardsGPSData implements Serializable {
@TableField(value = "STATION_CODE")
private String stationCode;
- @TableField(value = "GPS_ID")
+ @TableId(value = "GPS_ID",type = IdType.INPUT)
private Integer gpsId;
@TableField(value = "LON")
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsMetData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsMetData.java
index 6d63c174..d50f733f 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsMetData.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsMetData.java
@@ -11,7 +11,6 @@ import java.util.Date;
@Data
@TableName(value = "ORIGINAL.GARDS_MET_DATA")
-@KeySequence(value = "original.gards_met_data_seq", dbType = DbType.POSTGRE_SQL)
public class GardsMetData implements Serializable {
/**
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleData.java
index 471750de..3c1cc36d 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleData.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleData.java
@@ -11,7 +11,6 @@ import java.util.Date;
@Data
@TableName("ORIGINAL.GARDS_SAMPLE_DATA")
-@KeySequence(value = "original.gards_sample_data_seq", dbType = DbType.POSTGRE_SQL)
public class GardsSampleData implements Serializable {
/**
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSohData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSohData.java
index 50845af9..ba977b99 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSohData.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSohData.java
@@ -10,7 +10,6 @@ import java.util.Date;
@Data
@TableName(value = "ORIGINAL.GARDS_SOH_DATA")
-@KeySequence(value = "original.gards_soh_data_seq", dbType = DbType.POSTGRE_SQL)
public class GardsSohData implements Serializable {
/**
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml
index 42cb2d02..a2c36fc3 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml
@@ -452,7 +452,7 @@
<select id="getAnalysis" resultType="org.jeecg.modules.entity.GardsAnalysesSpectrum">
SELECT
IDANALYSIS idAnalysis,
- COMMENTS comments,
+ COMMENTS as comments,
SEARCHSTARTCHANNEL searchStartChannel,
SEARCHENDCHANNEL searchEndChannel,
SEARCHTHRESHOLD searchThreshold,
@@ -999,7 +999,7 @@
</select>
<update id="updateAnalysesStatus">
- UPDATE ORIGINAL.GARDS_SAMPLE_DATA A SET A.STATUS='R' WHERE INPUT_FILE_NAME=#{filePathName}
+ UPDATE ORIGINAL.GARDS_SAMPLE_DATA SET STATUS='R' WHERE INPUT_FILE_NAME=#{filePathName}
</update>
<select id="getStationId" resultType="java.lang.Integer">