From 33b6031031a29910c444252bca6bcd45d5849d09 Mon Sep 17 00:00:00 2001 From: xiaoguangbin Date: Fri, 20 Dec 2024 10:02:38 +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=E8=87=AA=E5=8A=A8=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=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 --- .../org/jeecg/config/mybatis/MybatisInterceptor.java | 10 ++++++++++ .../modules/base/entity/original/GardsAlertData.java | 8 +++----- .../modules/base/entity/original/GardsDOSData.java | 8 +++----- .../modules/base/entity/original/GardsMetData.java | 8 +++----- .../modules/base/entity/original/GardsSampleData.java | 8 +++----- .../modules/base/entity/original/GardsSohData.java | 8 +++----- .../modules/base/entity/rnauto/GardsAnalyses.java | 8 +++----- .../modules/mapper/xml/GardsCalibrationMapper.xml | 4 +--- .../org/jeecg/modules/mapper/xml/StatReportMapper.xml | 4 +++- 9 files changed, 32 insertions(+), 34 deletions(-) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java index 90cca20b..67f143f1 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java @@ -70,6 +70,16 @@ public class MybatisInterceptor implements Interceptor { field.setAccessible(false); } } + if ("moddate".equalsIgnoreCase(field.getName())) { + field.setAccessible(true); + Object localCreateDate = field.get(parameter); + field.setAccessible(false); + if (localCreateDate == null || "".equals(localCreateDate)) { + field.setAccessible(true); + field.set(parameter, new Date()); + field.setAccessible(false); + } + } //注入部门编码 if ("sysOrgCode".equals(field.getName())) { field.setAccessible(true); 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 c6b4bd04..b9976a9e 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 @@ -1,9 +1,6 @@ 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.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; @@ -13,6 +10,7 @@ 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") @@ -22,7 +20,7 @@ public class GardsAlertData implements Serializable { @TableField(value = "STATION_CODE") private String stationCode; - @TableId(value = "ALERT_ID",type = IdType.AUTO) + @TableId(value = "ALERT_ID",type = IdType.INPUT) private Integer alertId; @TableField(value = "TIME") 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 fe9fa21b..8e115234 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 @@ -1,9 +1,6 @@ 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.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; @@ -14,6 +11,7 @@ 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 { /** @@ -32,7 +30,7 @@ public class GardsDOSData implements Serializable { /** * 报警ID号 */ - @TableId(value = "DOS_ID",type = IdType.AUTO) + @TableId(value = "DOS_ID",type = IdType.INPUT) @Excel(name = "SID",orderNum = "5") private Integer dosId; 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 18db6daf..6d63c174 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 @@ -1,9 +1,6 @@ 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.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; @@ -14,6 +11,7 @@ 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 { /** @@ -31,7 +29,7 @@ public class GardsMetData implements Serializable { /** * 气象数据id */ - @TableId(value = "MET_ID",type = IdType.AUTO) + @TableId(value = "MET_ID",type = IdType.INPUT) private Integer metId; /** 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 9f58693d..471750de 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 @@ -1,9 +1,6 @@ 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.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; @@ -14,6 +11,7 @@ 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 { /** @@ -27,7 +25,7 @@ public class GardsSampleData implements Serializable { * 样品id */ - @TableId(value = "SAMPLE_ID",type = IdType.AUTO) + @TableId(value = "SAMPLE_ID",type = IdType.INPUT) private Integer sampleId; /** 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 c5747b8d..50845af9 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 @@ -1,9 +1,6 @@ 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.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; @@ -13,6 +10,7 @@ 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 { /** @@ -31,7 +29,7 @@ public class GardsSohData implements Serializable { /** * 报警ID号 */ - @TableId(value = "SOH_ID",type = IdType.AUTO) + @TableId(value = "SOH_ID",type = IdType.INPUT) @Excel(name = "SID",orderNum = "5") private Integer sohId; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalyses.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalyses.java index 025d2fcf..a0ef79c7 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalyses.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalyses.java @@ -1,9 +1,6 @@ package org.jeecg.modules.base.entity.rnauto; -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.*; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -16,12 +13,13 @@ import java.util.Date; */ @Data @TableName("RNAUTO.GARDS_ANALYSES") +@KeySequence(value = "rnauto.gards_analyses_seq", dbType = DbType.POSTGRE_SQL) public class GardsAnalyses implements Serializable { /** * 分析ID号 */ - @TableId(value = "IDANALYSIS",type = IdType.AUTO) + @TableId(value = "IDANALYSIS",type = IdType.INPUT) private Integer idAnalysis; /** * 样品id diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/xml/GardsCalibrationMapper.xml b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/xml/GardsCalibrationMapper.xml index 47a10641..4a2923d4 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/xml/GardsCalibrationMapper.xml +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/xml/GardsCalibrationMapper.xml @@ -32,8 +32,6 @@ - begin - insert into RNAUTO.GARDS_CALIBRATION( SAMPLE_ID, IDANALYSIS, @@ -46,6 +44,7 @@ COEFF_STRING, moddate) values + (#{calibration.sampleId}, #{calibration.idAnalysis}, #{calibration.sampleType}, @@ -57,7 +56,6 @@ #{calibration.coeffString}, #{calibration.moddate}) - end; diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/xml/StatReportMapper.xml b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/xml/StatReportMapper.xml index db1b942c..ec3e8ea6 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/xml/StatReportMapper.xml +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/xml/StatReportMapper.xml @@ -19,7 +19,9 @@ substr(t.site_det_code,1,5) as station_name, t.data_type, 1 as original_data_number, - nvl2((select t.sample_id from rnauto.GARDS_ANALYSES ga where ga.sample_id = t.sample_id),1,0) as anlyse_data_number + -- oracle 转 postgresql + -- nvl2((select t.sample_id from rnauto.GARDS_ANALYSES ga where ga.sample_id = t.sample_id),1,0) as anlyse_data_number + (select CASE WHEN t.sample_id is not null THEN 1 ELSE 0 END from rnauto.GARDS_ANALYSES ga where ga.sample_id = t.sample_id ) as anlyse_data_number from original.GARDS_SAMPLE_DATA t where t.moddate between #{beginDate} and #{endDate} ) r