From 33b6031031a29910c444252bca6bcd45d5849d09 Mon Sep 17 00:00:00 2001 From: xiaoguangbin Date: Fri, 20 Dec 2024 10:02:38 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix:=201.oracle=E5=88=87=E6=8D=A2=E8=87=B3p?= =?UTF-8?q?gsql=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 From 7df755d8c978b5ea80f41ddf5be68aeb6c2f5d39 Mon Sep 17 00:00:00 2001 From: xiaoguangbin Date: Fri, 20 Dec 2024 10:02:48 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix:=201.oracle=E5=88=87=E6=8D=A2=E8=87=B3p?= =?UTF-8?q?gsql=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 --- .../config/mybatis/MybatisPlusKeyGenerator.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusKeyGenerator.java diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusKeyGenerator.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusKeyGenerator.java new file mode 100644 index 00000000..416a954b --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusKeyGenerator.java @@ -0,0 +1,13 @@ +package org.jeecg.config.mybatis; + +import com.baomidou.mybatisplus.extension.incrementer.PostgreKeyGenerator; +import org.springframework.context.annotation.Bean; +import org.springframework.stereotype.Component; + +@Component("MybatisPlusKeyGenerator") +public class MybatisPlusKeyGenerator { + @Bean + public PostgreKeyGenerator postgreKeyGenerator(){ + return new PostgreKeyGenerator(); + } +} From ef2e64cef32622943eb082087e7c1ab7eed4212c Mon Sep 17 00:00:00 2001 From: xiaoguangbin Date: Fri, 20 Dec 2024 17:12:57 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix:=201.oracle=E5=88=87=E6=8D=A2=E8=87=B3p?= =?UTF-8?q?gsql=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 @@ - 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} select count(sdata.station_id) dataNumber, - ROUND(count(sdata.station_id)/(to_number(TO_DATE('${curDateTime}','YYYY-MM-DD hh24:mi:ss')-TO_DATE('${pretime}','YYYY-MM-DD hh24:mi:ss'))*${number})*100,2) dataRate + ROUND(count(sdata.station_id)/(ROUND(EXTRACT(EPOCH FROM (to_timestamp('${curDateTime}', 'yyyy-MM-dd HH24:mi:ss')-to_timestamp('${pretime}', 'yyyy-MM-dd HH24:mi:ss'))) / 86400,1)*${number})*100,2) dataRate from ORIGINAL.GARDS_SAMPLE_DATA sdata LEFT JOIN CONFIGURATION.GARDS_STATIONS sta on sta.station_id = sdata.station_id @@ -39,7 +39,7 @@ (sum(CASE WHEN ROUND( sdata.acquisition_live_sec / 60 / 60.00 ) BETWEEN ${liveLow} AND ${liveHigh} AND sdata.quantity > ${quantity} AND xe.MDC > ${mdc} - AND ( to_number( SDATA.COLLECT_STOP - SDATA.COLLECT_START ) * 24 ) BETWEEN ${collectLow} AND ${collectHigh} + AND ( ROUND(EXTRACT(EPOCH FROM (SDATA.COLLECT_STOP - SDATA.COLLECT_START ))/86400,1) * 24 ) BETWEEN ${collectLow} AND ${collectHigh} AND aux.xe_volume > ${xeVolume} AND xe.nuclide_name = '${nuclideName}' AND sdata.data_type = 'S' THEN 1 ELSE 0 @@ -50,13 +50,13 @@ ROUND((sum(CASE WHEN ROUND( sdata.acquisition_live_sec / 60 / 60.00 ) BETWEEN ${liveLow} AND ${liveHigh} AND sdata.quantity > ${quantity} AND xe.MDC > ${mdc} - AND ( to_number( SDATA.COLLECT_STOP - SDATA.COLLECT_START ) * 24 ) BETWEEN ${collectLow} AND ${collectHigh} + AND ( ROUND(EXTRACT(EPOCH FROM (SDATA.COLLECT_STOP - SDATA.COLLECT_START ))/86400,1) * 24 ) BETWEEN ${collectLow} AND ${collectHigh} AND aux.xe_volume > ${xeVolume} AND xe.nuclide_name = '${nuclideName}' AND sdata.data_type = 'S' THEN 1 ELSE 0 END ) + sum( CASE WHEN sdata.acquisition_live_sec > ${liveQc} AND sdata.data_type = 'Q' THEN 1 ELSE 0 END ) + sum( CASE WHEN ROUND( sdata.acquisition_live_sec / 60 / 60.00, 2 ) BETWEEN ${liveLow} AND ${liveHigh} - AND sdata.data_type = 'G' THEN 1 ELSE 0 END)) / ( to_number( TO_DATE( '${curDateTime}', 'YYYY-MM-DD hh24:mi:ss' ) - TO_DATE( '${pretime}', 'YYYY-MM-DD hh24:mi:ss' ) + 1 ) * ${number} ) * 100,2) dataEfficiency + AND sdata.data_type = 'G' THEN 1 ELSE 0 END)) / ( (ROUND(EXTRACT(EPOCH FROM (to_timestamp('${curDateTime}', 'yyyy-MM-dd HH24:mi:ss')-to_timestamp('${pretime}', 'yyyy-MM-dd HH24:mi:ss'))) / 86400,1)+1) * ${number} ) * 100,2) dataEfficiency FROM ORIGINAL.GARDS_SAMPLE_DATA sdata LEFT JOIN RNAUTO.GARDS_XE_RESULTS xe ON xe.sample_id = sdata.sample_id @@ -74,7 +74,7 @@ select (sum(case when ROUND(sdata.acquisition_live_sec/60/60.00) BETWEEN ${liveLow} and ${liveHigh} and sdata.quantity> ${quantity} and xe.MDC> ${mdc} - and (to_number(SDATA.COLLECT_STOP - SDATA.COLLECT_START)*24) BETWEEN ${collectLow} and ${collectHigh} + and (ROUND(EXTRACT(EPOCH FROM (SDATA.COLLECT_STOP - SDATA.COLLECT_START ))/86400,1)*24) BETWEEN ${collectLow} and ${collectHigh} and aux.xe_volume> ${xeVolume} and xe.nuclide_name= '${nuclideName}' and sdata.data_type='S' then 1 else 0 end) + sum(case when sdata.acquisition_live_sec> ${liveQc} and sdata.data_type='Q' and sdata.spectral_qualifie='FULL' then 1 else 0 end) + sum(case when ROUND(sdata.acquisition_live_sec/60/60.00,2) BETWEEN ${liveLow} and ${liveHigh} and sdata.data_type='G' then 1 else 0 end)) dataNumber, ROUND((sum(case when ROUND(sdata.acquisition_live_sec/60/60.00) BETWEEN ${liveLow} and ${liveHigh} and sdata.quantity>${quantity} and xe.MDC> ${mdc} - and (to_number(SDATA.COLLECT_STOP - SDATA.COLLECT_START)*24) BETWEEN ${collectLow} and ${collectHigh} + and (ROUND(EXTRACT(EPOCH FROM (SDATA.COLLECT_STOP - SDATA.COLLECT_START ))/86400,1)*24) BETWEEN ${collectLow} and ${collectHigh} and aux.xe_volume> ${xeVolume} and xe.nuclide_name= '${nuclideName}' and sdata.data_type='S' then 1 else 0 end) + sum(case when sdata.acquisition_live_sec> ${liveQc} and sdata.data_type='Q' and sdata.spectral_qualifie='FULL' then 1 else 0 end) - + sum(case when ROUND(sdata.acquisition_live_sec/60/60.00,2) BETWEEN ${liveLow} and ${liveHigh} and sdata.data_type='G' then 1 else 0 end))/(to_number(TO_DATE('${curDateTime}','YYYY-MM-DD hh24:mi:ss')-TO_DATE('${pretime}','YYYY-MM-DD hh24:mi:ss')+1)* ${number})*100,2) dataEfficiency + + sum(case when ROUND(sdata.acquisition_live_sec/60/60.00,2) BETWEEN ${liveLow} and ${liveHigh} and sdata.data_type='G' then 1 else 0 end))/((ROUND(EXTRACT(EPOCH FROM (to_timestamp('${curDateTime}', 'yyyy-MM-dd HH24:mi:ss')-to_timestamp('${pretime}', 'yyyy-MM-dd HH24:mi:ss'))) / 86400,1)+1)* ${number})*100,2) dataEfficiency from ORIGINAL.GARDS_SAMPLE_DATA sdata LEFT JOIN RNAUTO.GARDS_XE_RESULTS xe on xe.sample_id = sdata.sample_id LEFT JOIN ORIGINAL.GARDS_SAMPLE_AUX aux on aux.sample_id = sdata.sample_id @@ -112,7 +112,7 @@ SELECT COUNT(STATION_ID) dataNumber, - ROUND(COUNT(STATION_ID)/(to_number(TO_DATE('${curDateTime}','YYYY-MM-DD hh24:mi:ss')-TO_DATE('${pretime}','YYYY-MM-DD hh24:mi:ss')+1)* ${soh})*100,2)dataRate + ROUND(COUNT(STATION_ID)/((ROUND(EXTRACT(EPOCH FROM (to_timestamp('${curDateTime}', 'yyyy-MM-dd HH24:mi:ss')-to_timestamp('${pretime}', 'yyyy-MM-dd HH24:mi:ss'))) / 86400,1)+1)* ${soh})*100,2)dataRate FROM ORIGINAL.GARDS_SOH_DATA mdata STATION_ID = #{stationId} @@ -155,7 +155,7 @@ select count(sdata.station_id) dataNumber, - ROUND(count(sdata.station_id)/(to_number(TO_DATE('${curDateTime}','YYYY-MM-DD hh24:mi:ss')-TO_DATE('${pretime}','YYYY-MM-DD hh24:mi:ss')+1)*${number})*100,2) dataRate + ROUND(count(sdata.station_id)/((ROUND(EXTRACT(EPOCH FROM (to_timestamp('${curDateTime}', 'yyyy-MM-dd HH24:mi:ss')-to_timestamp('${pretime}', 'yyyy-MM-dd HH24:mi:ss'))) / 86400,1)+1)*${number})*100,2) dataRate from ORIGINAL.GARDS_SAMPLE_DATA sdata LEFT JOIN CONFIGURATION.GARDS_STATIONS sta on sta.station_id = sdata.station_id @@ -179,11 +179,11 @@ select (sum(case when SDATA.DATA_TYPE='S' then 1 else 0 end)+sum(case when SDATA.DATA_TYPE='Q' and SDATA.SPECTRAL_QUALIFIE='FULL' then 1 else 0 end)) dataNumber, ROUND((sum(case when SDATA.DATA_TYPE='S' then 1 else 0 end) - +sum(case when SDATA.DATA_TYPE='Q' and SDATA.SPECTRAL_QUALIFIE='FULL' then 1 else 0 end))/(to_number(TO_DATE('${curDateTime}','YYYY-MM-DD hh24:mi:ss')-TO_DATE('${pretime}','YYYY-MM-DD hh24:mi:ss')+1)* ${number})*100,2) dataRate + +sum(case when SDATA.DATA_TYPE='Q' and SDATA.SPECTRAL_QUALIFIE='FULL' then 1 else 0 end))/((ROUND(EXTRACT(EPOCH FROM (to_timestamp('${curDateTime}', 'yyyy-MM-dd HH24:mi:ss')-to_timestamp('${pretime}', 'yyyy-MM-dd HH24:mi:ss'))) / 86400,1)+1)* ${number})*100,2) dataRate from ORIGINAL.GARDS_SAMPLE_DATA sdata LEFT JOIN CONFIGURATION.GARDS_STATIONS sta on sta.station_id = sdata.station_id @@ -214,10 +214,10 @@ SELECT COUNT(STATION_ID) dataNumber, - ROUND(COUNT(STATION_ID)/(to_number(TO_DATE('${curDateTime}','YYYY-MM-DD hh24:mi:ss')-TO_DATE('${pretime}','YYYY-MM-DD hh24:mi:ss')+1)* ${met})*100,2)dataRate + ROUND(COUNT(STATION_ID)/((ROUND(EXTRACT(EPOCH FROM (to_timestamp('${curDateTime}', 'yyyy-MM-dd HH24:mi:ss')-to_timestamp('${pretime}', 'yyyy-MM-dd HH24:mi:ss'))) / 86400,1)+1)* ${met})*100,2)dataRate FROM ORIGINAL.GARDS_MET_DATA mdata STATION_ID = '${stationId}' @@ -241,7 +241,7 @@ SELECT count(SOH.STATION_ID)+ ${SPHD_NUM} + ${MET_NUM} dataNumber, - round((count(SOH.STATION_ID)+ ${SPHD_NUM} + ${MET_NUM} )/(to_number(TO_DATE('${curDateTime}','YYYY-MM-DD hh24:mi:ss')-TO_DATE('${pretime}','YYYY-MM-DD hh24:mi:ss')+1)* ${sphdMetSoh})*100,2) dataRate + round((count(SOH.STATION_ID)+ ${SPHD_NUM} + ${MET_NUM} )/((ROUND(EXTRACT(EPOCH FROM (to_timestamp('${curDateTime}', 'yyyy-MM-dd HH24:mi:ss')-to_timestamp('${pretime}', 'yyyy-MM-dd HH24:mi:ss'))) / 86400,1)+1)* ${sphdMetSoh})*100,2) dataRate FROM ORIGINAL.GARDS_SOH_DATA soh SOH.STATION_ID = #{stationId} @@ -282,7 +282,7 @@ select count(sdata.station_id) dataNumber, - ROUND(count(sdata.station_id)/(to_number(TO_DATE('${curDateTime}' ,'YYYY-MM-DD hh24:mi:ss')-TO_DATE('${pretime}','YYYY-MM-DD hh24:mi:ss')+1)*${number})*100,2) dataEfficiency + ROUND(count(sdata.station_id)/((ROUND(EXTRACT(EPOCH FROM (to_timestamp('${curDateTime}', 'yyyy-MM-dd HH24:mi:ss')-to_timestamp('${pretime}', 'yyyy-MM-dd HH24:mi:ss'))) / 86400,1)+1)*${number})*100,2) dataEfficiency from ORIGINAL.GARDS_SAMPLE_DATA sdata LEFT JOIN RNAUTO.GARDS_XE_RESULTS xe on xe.sample_id = sdata.sample_id LEFT JOIN ORIGINAL.GARDS_SAMPLE_AUX aux on aux.sample_id = sdata.sample_id @@ -307,7 +307,7 @@ and sdata.spectral_qualifie='FULL' and substr( sta.station_code, 3,1)='P' and (sdata. acquisition_live_sec/60/60.00) BETWEEN #{liveLow} and #{liveHigh} - and (to_number(sdata.COLLECT_STOP - sdata.COLLECT_START)*24) BETWEEN #{collectLow} and #{collectHigh} + and (ROUND(EXTRACT(EPOCH FROM (SDATA.COLLECT_STOP - SDATA.COLLECT_START ))/86400,1)*24) BETWEEN #{collectLow} and #{collectHigh} and sdata.quantity> #{quantity} and sdata.station_id= #{stationId} and to_char(sdata.ACQUISITION_START,'YYYY-MM-DD hh24:mi:ss') BETWEEN #{pretime} and #{curDateTime} @@ -316,7 +316,7 @@ select count(sdata.station_id) dataNumber, - ROUND(count(sdata.station_id)/(to_number(TO_DATE('${curDateTime}','YYYY-MM-DD hh24:mi:ss')-TO_DATE('${pretime}','YYYY-MM-DD hh24:mi:ss')+1)* ${number})*100,2) dataEfficiency + ROUND(count(sdata.station_id)/((ROUND(EXTRACT(EPOCH FROM (to_timestamp('${curDateTime}', 'yyyy-MM-dd HH24:mi:ss')-to_timestamp('${pretime}', 'yyyy-MM-dd HH24:mi:ss'))) / 86400,1)+1)* ${number})*100,2) dataEfficiency from ORIGINAL.GARDS_SAMPLE_DATA sdata LEFT JOIN CONFIGURATION.GARDS_STATIONS sta on sta.station_id = sdata.station_id @@ -338,7 +338,7 @@ and SDATA.SAMPLE_TYPE='P' and substr( sta.station_code, 3,1)='P' and (sdata. acquisition_live_sec/60/60.00) BETWEEN #{liveLow} and #{liveHigh} - and (to_number(sdata.COLLECT_STOP - sdata.COLLECT_START)*24) BETWEEN #{collectLow} and #{collectHigh} + and (ROUND(EXTRACT(EPOCH FROM (SDATA.COLLECT_STOP - SDATA.COLLECT_START ))/86400,1)*24) BETWEEN #{collectLow} and #{collectHigh} and sdata.quantity> #{quantity} and sdata.station_id= #{stationId} and to_char(sdata.ACQUISITION_START,'YYYY-MM-DD hh24:mi:ss') BETWEEN #{pretime} and #{curDateTime} @@ -347,7 +347,7 @@ SELECT COUNT(STATION_ID) dataNumber, - ROUND(COUNT(STATION_ID)/(to_number(TO_DATE('${curDateTime}','YYYY-MM-DD hh24:mi:ss')-TO_DATE('${pretime}','YYYY-MM-DD hh24:mi:ss')+1)* ${soh})*100,2)dataRate + ROUND(COUNT(STATION_ID)/((ROUND(EXTRACT(EPOCH FROM (to_timestamp('${curDateTime}', 'yyyy-MM-dd HH24:mi:ss')-to_timestamp('${pretime}', 'yyyy-MM-dd HH24:mi:ss'))) / 86400,1)+1)* ${soh})*100,2)dataRate FROM ORIGINAL.GARDS_SOH_DATA mdata STATION_ID = #{stationId} @@ -387,7 +387,7 @@ diff --git a/jeecg-server-cloud/armd-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java b/jeecg-server-cloud/armd-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java index f1883692..e1f48ff6 100644 --- a/jeecg-server-cloud/armd-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java +++ b/jeecg-server-cloud/armd-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java @@ -65,13 +65,12 @@ public class JeecgAutoProcessApplication extends SpringBootServletInitializer im System.exit(exitCode); } - // ConfigurableApplicationContext application = SpringApplication.run(JeecgAutoProcessApplication.class, args); Environment env = application.getEnvironment(); String ip = InetAddress.getLocalHost().getHostAddress(); String port = env.getProperty("server.port"); String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path")); log.info("\n----------------------------------------------------------\n\t" + - "Application Jeecg-Boot is running! Access URLs:\n\t" + + "Application AutoProcess is running! Access URLs:\n\t" + "Local: \t\thttp://localhost:" + port + path + "/doc.html\n" + "External: \thttp://" + ip + ":" + port + path + "/doc.html\n" + "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" + diff --git a/jeecg-server-cloud/armd-cloud-gateway/src/main/resources/application.yml b/jeecg-server-cloud/armd-cloud-gateway/src/main/resources/application.yml index d2dc6114..fe31b3c0 100644 --- a/jeecg-server-cloud/armd-cloud-gateway/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-cloud-gateway/src/main/resources/application.yml @@ -32,7 +32,7 @@ spring: #Sentinel配置 sentinel: transport: - dashboard: jeecg-boot-sentinel:9000 + dashboard: armd-sentinel:9000 # 支持链路限流 web-context-unify: false filter: diff --git a/jeecg-server-cloud/armd-cloud-nacos/Dockerfile b/jeecg-server-cloud/armd-cloud-nacos/Dockerfile index eaa54267..b8756430 100644 --- a/jeecg-server-cloud/armd-cloud-nacos/Dockerfile +++ b/jeecg-server-cloud/armd-cloud-nacos/Dockerfile @@ -10,9 +10,9 @@ WORKDIR /armd-cloud-nacos EXPOSE 8848 -ENV DB_URL="jdbc:postgresql://192.168.8.103:5432/nacos" +ENV DB_URL="jdbc:postgresql://172.21.170.142:5432/nacos" ENV DB_USER="postgres" -ENV DB_PASSWORD="123456" +ENV DB_PASSWORD="postgres" ENV DB_PLATFORM="postgresql" ENV SERVER_PORT="8848" diff --git a/jeecg-server-cloud/armd-cloud-nacos/pom.xml b/jeecg-server-cloud/armd-cloud-nacos/pom.xml index 7026ffe7..88e86165 100644 --- a/jeecg-server-cloud/armd-cloud-nacos/pom.xml +++ b/jeecg-server-cloud/armd-cloud-nacos/pom.xml @@ -71,14 +71,8 @@ org.postgresql postgresql - 42.2.25 + 42.7.3 - - - - - - com.pig4cloud.plugin nacos-datasource-plugin-pg diff --git a/jeecg-server-cloud/armd-cloud-nacos/src/main/resources/application.yml b/jeecg-server-cloud/armd-cloud-nacos/src/main/resources/application.yml index 316cb2e9..997819db 100644 --- a/jeecg-server-cloud/armd-cloud-nacos/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-cloud-nacos/src/main/resources/application.yml @@ -13,7 +13,7 @@ spring: db: num: 1 password: - '0': ${MYSQL-PWD:123456} + '0': ${MYSQL-PWD:postgres} url: '0': jdbc:postgresql://${MYSQL-HOST:127.0.0.1}:${MYSQL-PORT:5432}/${MYSQL-DB:nacos}?tcpKeepAlive=true&reWriteBatchedInserts=true&ApplicationName=nacos_java #'0': jdbc:postgresql://${MYSQL-HOST:172.21.50.118}:${MYSQL-PORT:5432}/${MYSQL-DB:nacos}?tcpKeepAlive=true&reWriteBatchedInserts=true&ApplicationName=nacos_java diff --git a/jeecg-server-cloud/armd-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java b/jeecg-server-cloud/armd-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java index f227a7c5..80c4c164 100644 --- a/jeecg-server-cloud/armd-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java +++ b/jeecg-server-cloud/armd-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java @@ -38,13 +38,12 @@ public class JeecgWebStatisticsApplication extends SpringBootServletInitializer System.exit(exitCode); } - // ConfigurableApplicationContext application = SpringApplication.run(JeecgWebStatisticsApplication.class, args); Environment env = application.getEnvironment(); String ip = InetAddress.getLocalHost().getHostAddress(); String port = env.getProperty("server.port"); String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path")); log.info("\n----------------------------------------------------------\n\t" + - "Application Jeecg-Boot is running! Access URLs:\n\t" + + "Application ArmdWebStatistics is running! Access URLs:\n\t" + "Local: \t\thttp://localhost:" + port + path + "/doc.html\n" + "External: \thttp://" + ip + ":" + port + path + "/doc.html\n" + "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" + diff --git a/pom.xml b/pom.xml index 1e8a9549..71aa3e85 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 3.0.3 2.0.9 - 42.2.25 + 42.7.3 11.2.0.3 4.0 8.0.27 @@ -476,7 +476,7 @@ dev - jeecg-boot-nacos:8848 + armd-nacos:8848 @@ -490,7 +490,7 @@ test - jeecg-boot-nacos:8848 + armd-nacos:8848