xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改entity和sql相关，使SelfStation-pgsql分支适配postgresql

Browse Source
This commit is contained in:
panbaolin 2025-04-16 15:40:24 +08:00
parent 4d72cab793
commit c899392928
22 changed files with 56 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jeecg-boot-base-core/pom.xml
View File

@ -124,13 +124,6 @@
<version>${mysql-connector-java.version}</version>
<scope>runtime</scope>
</dependency>
<!-- sqlserver-->
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>sqljdbc4</artifactId>
<version>${sqljdbc4.version}</version>
<scope>runtime</scope>
</dependency>
<!-- oracle驱动 -->
<dependency>
<groupId>com.oracle</groupId>

13
jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusKeyGenerator.java
View File

@ -1,13 +0,0 @@
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();
}
}

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

@ -1,5 +1,6 @@
package org.jeecg.modules.base.entity.configuration;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@ -22,7 +23,7 @@ public class GardsDetectors implements Serializable {
/**
* 探测器id
*/
@TableId(value = "DETECTOR_ID")
@TableId(value="detector_id",type = IdType.INPUT)
private Integer detectorId;
/**

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

@ -1,5 +1,6 @@
package org.jeecg.modules.base.entity.configuration;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@ -21,7 +22,7 @@ public class GardsStations implements Serializable {
/**
* 台站id
*/
@TableId("STATION_ID")
@TableId(value = "station_id",type = IdType.INPUT)
@NotNull(message = "不能为空", groups = {InsertGroup.class, UpdateGroup.class})
private Integer stationId;

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

@ -10,7 +10,6 @@ import java.util.Date;
@Data
@TableName("ORIGINAL.GARDS_ALERT_DATA")
@KeySequence("original.gards_alert_data_seq")
public class GardsAlertData implements Serializable {
@TableField(value = "STATION_ID")
@ -20,7 +19,7 @@ public class GardsAlertData implements Serializable {
@TableField(value = "STATION_CODE")
private String stationCode;
@TableId(value = "ALERT_ID",type = IdType.INPUT)
@TableId(value="alert_id",type = IdType.AUTO)
private Integer alertId;
@TableField(value = "TIME")

3
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsDOSData.java
View File

@ -11,7 +11,6 @@ import java.util.Date;
@Data
@TableName(value = "ORIGINAL.GARDS_DOS_DATA")
@KeySequence("original.gards_dos_data_seq")
public class GardsDOSData implements Serializable {
/**
@ -30,7 +29,7 @@ public class GardsDOSData implements Serializable {
/**
* 报警ID号
*/
@TableId(value = "DOS_ID",type = IdType.INPUT)
@TableId(value="dos_id",type = IdType.AUTO)
@Excel(name = "SID",orderNum = "5")
private Integer dosId;

2
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsGPSData.java
View File

@ -19,7 +19,7 @@ public class GardsGPSData implements Serializable {
@TableField(value = "STATION_CODE")
private String stationCode;
@TableId(value = "GPS_ID",type = IdType.INPUT)
@TableId(value="gps_id",type = IdType.AUTO)
private Integer gpsId;
@TableField(value = "LON")

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

@ -11,7 +11,6 @@ import java.util.Date;
@Data
@TableName(value = "ORIGINAL.GARDS_MET_DATA")
@KeySequence("original.gards_met_data_seq")
public class GardsMetData implements Serializable {
/**
@ -29,7 +28,7 @@ public class GardsMetData implements Serializable {
/**
* 气象数据id
*/
@TableId(value = "MET_ID",type = IdType.INPUT)
@TableId(value="met_id",type = IdType.AUTO)
private Integer metId;
/**

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

@ -11,7 +11,6 @@ import java.util.Date;
@Data
@TableName("ORIGINAL.GARDS_SAMPLE_DATA")
@KeySequence("original.gards_sample_data_seq")
public class GardsSampleData implements Serializable {
/**
@ -25,7 +24,7 @@ public class GardsSampleData implements Serializable {
* 样品id
*/
@TableId(value = "SAMPLE_ID",type = IdType.INPUT)
@TableId(value = "sample_id",type = IdType.AUTO)
private Integer sampleId;
/**

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

@ -10,7 +10,6 @@ import java.util.Date;
@Data
@TableName(value = "ORIGINAL.GARDS_SOH_DATA")
@KeySequence("original.gards_soh_data_seq")
public class GardsSohData implements Serializable {
/**
@ -29,7 +28,7 @@ public class GardsSohData implements Serializable {
/**
* 报警ID号
*/
@TableId(value = "SOH_ID",type = IdType.INPUT)
@TableId(value = "soh_id",type = IdType.AUTO)
@Excel(name = "SID",orderNum = "5")
private Integer sohId;

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

@ -13,13 +13,12 @@ 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.INPUT)
@TableId(value="idanalysis",type = IdType.AUTO)
private Integer idAnalysis;
/**
* 样品id

3
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalysisRoi.java
View File

@ -14,7 +14,6 @@ import org.springframework.format.annotation.DateTimeFormat;
@Data
@TableName("RNAUTO.GARDS_ANALYSIS_ROI")
@KeySequence(value = "rnauto.gards_analyses_roi_seq", dbType = DbType.POSTGRE_SQL)
@Accessors(chain = true)
public class GardsAnalysisRoi {
@ -23,7 +22,7 @@ public class GardsAnalysisRoi {
private Integer sampleId;
@TableId(value = "ROI_ID",type = IdType.INPUT)
@TableId(value="roi_id",type = IdType.INPUT)
private Integer roiId;
private Integer roiNum;

4
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsAnalyses.java
View File

@ -1,6 +1,8 @@
package org.jeecg.modules.base.entity.rnman;
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;
@ -20,7 +22,7 @@ public class GardsAnalyses implements Serializable {
/**
* 分析ID号
*/
@TableField(value = "IDANALYSIS")
@TableId(value = "idanalysis",type= IdType.AUTO)
private Integer idAnalysis;
/**
* 样品id

60
jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/calCulStationInfoMapper.xml
View File

@ -22,7 +22,7 @@
<select id="findPhdfProvisionRateSauna" resultType="org.jeecg.modules.entity.data.ProvisionData">
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
<where>
@ -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 id="findPhdProvisionRateSauna" resultType="org.jeecg.modules.entity.data.ProvisionData">
select
(sum(case when SDATA.DATA_TYPE='S' then 1 else 0 end)+sum(case when SDATA.DATA_TYPE='G' then 1 else 0 end)+sum(case when SDATA.DATA_TYPE='Q' and SDATA.SPECTRAL_QUALIFIE='FULL' then 1 else 0 end)) 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
<where>
@ -89,15 +89,15 @@
<select id="findPhdProvisionEfficiencySauna" resultType="org.jeecg.modules.entity.data.ProvisionData">
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 id="findMetProvisionSauna" resultType="org.jeecg.modules.entity.data.ProvisionData">
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
<where>
STATION_ID = '${stationId}'
@ -122,7 +122,7 @@
<select id="findSohProvisionSauna" resultType="org.jeecg.modules.entity.data.ProvisionData">
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
<where>
STATION_ID = #{stationId}
@ -155,7 +155,7 @@
<select id="findSphdMetSohProvisionSauna" resultType="org.jeecg.modules.entity.data.ProvisionData">
SELECT count(SOH.STATION_ID) + ${SPHD_NUM} + ${MET_NUM} dataNumber,
round((count(SOH.STATION_ID)+2507)/(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)+2507)/((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
<where>
SOH.STATION_ID = #{stationId}
@ -165,7 +165,7 @@
<select id="findPhdfProvisionRateSpalax" resultType="org.jeecg.modules.entity.data.ProvisionData">
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
<where>
@ -179,11 +179,11 @@
<select id="findPhdfProvisionEfficiencySpalax" resultType="org.jeecg.modules.entity.data.ProvisionData">
select (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 sdata.data_type='S' 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 sdata.quantity>${quantity} then 1 else 0 end)) dataNumber,
and (ROUND(EXTRACT(EPOCH FROM (SDATA.COLLECT_STOP - SDATA.COLLECT_START ))/86400,1)*24) BETWEEN ${collectLow} and ${collectHigh} and sdata.quantity>${quantity} then 1 else 0 end)) dataNumber,
ROUND((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 sdata.data_type='S' 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 sdata.quantity>${quantity} 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 (ROUND(EXTRACT(EPOCH FROM (SDATA.COLLECT_STOP - SDATA.COLLECT_START ))/86400,1)*24) BETWEEN ${collectLow} and ${collectHigh}
and sdata.quantity>${quantity} 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
@ -200,7 +200,7 @@
<select id="findPhdProvisionRateSpalax" resultType="org.jeecg.modules.entity.data.ProvisionData">
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
<where>
@ -214,10 +214,10 @@
<select id="findPhdProvisionEfficiencySpalax" resultType="org.jeecg.modules.entity.data.ProvisionData">
select (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 sdata.data_type='S' 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 sdata.quantity>${quantity} then 1 else 0 end)) dataNumber,
and (ROUND(EXTRACT(EPOCH FROM (SDATA.COLLECT_STOP - SDATA.COLLECT_START ))/86400,1)*24) BETWEEN ${collectLow} and ${collectHigh} and sdata.quantity>${quantity} then 1 else 0 end)) dataNumber,
ROUND((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 sdata.data_type='S' 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 sdata.quantity>${quantity} 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 (ROUND(EXTRACT(EPOCH FROM (SDATA.COLLECT_STOP - SDATA.COLLECT_START ))/86400,1)*24) BETWEEN ${collectLow} and ${collectHigh} and sdata.quantity>${quantity} 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 CONFIGURATION.GARDS_STATIONS sta on sta.station_id = sdata.station_id
<where>
@ -231,7 +231,7 @@
<select id="findMetProvisionSpalax" resultType="org.jeecg.modules.entity.data.ProvisionData">
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
<where>
STATION_ID = '${stationId}'
@ -241,7 +241,7 @@
<select id="findSohProvisionSpalax" resultType="org.jeecg.modules.entity.data.ProvisionData">
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
<where>
STATION_ID = #{stationId}
@ -271,7 +271,7 @@
<select id="findSphdMetSohProvisionSpalax" resultType="org.jeecg.modules.entity.data.ProvisionData">
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
<where>
SOH.STATION_ID = #{stationId}
@ -282,7 +282,7 @@
<select id="findPhdfProvisionRateParticulate" resultType="org.jeecg.modules.entity.data.ProvisionData">
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
<where>
@ -296,7 +296,7 @@
<select id="findPhdfProvisionEfficiencyParticulate" resultType="org.jeecg.modules.entity.data.ProvisionData">
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 id="findPhdProvisionRateParticulate" resultType="org.jeecg.modules.entity.data.ProvisionData">
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
<where>
@ -330,7 +330,7 @@
<select id="findPhdProvisionEfficiencyParticulate" resultType="org.jeecg.modules.entity.data.ProvisionData">
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
<where>
@ -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 id="findMetProvisionParticulate" resultType="org.jeecg.modules.entity.data.ProvisionData">
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
<where>
STATION_ID = '${stationId}'
@ -357,7 +357,7 @@
<select id="findSohProvisionParticulate" resultType="org.jeecg.modules.entity.data.ProvisionData">
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
<where>
STATION_ID = #{stationId}
@ -387,7 +387,7 @@
<select id="findSphdMetSohProvisionParticulate" resultType="org.jeecg.modules.entity.data.ProvisionData">
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
<where>
SOH.STATION_ID = #{stationId}

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsAlertDataMapper.xml
View File

@ -15,7 +15,7 @@
#{stationId}
</foreach>
</if>
AND d.TIME BETWEEN TO_DATE(#{params.startTime}, 'YYYY-MM-DD HH24:MI:SS') AND TO_DATE(#{params.endTime}, 'YYYY-MM-DD HH24:MI:SS')
AND d.TIME BETWEEN to_timestamp(#{params.startTime}, 'YYYY-MM-DD HH24:MI:SS') AND to_timestamp(#{params.endTime}, 'YYYY-MM-DD HH24:MI:SS')
</where>
ORDER BY d.TIME DESC
</select>

3
jeecg-server-cloud/armd-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java
View File

@ -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" +

2
jeecg-server-cloud/armd-cloud-gateway/src/main/resources/application.yml
View File

@ -32,7 +32,7 @@ spring:
#Sentinel配置
sentinel:
transport:
dashboard: jeecg-boot-sentinel:9000
dashboard: armd-sentinel:9000
# 支持链路限流
web-context-unify: false
filter:

4
jeecg-server-cloud/armd-cloud-nacos/Dockerfile
View File

@ -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"

8
jeecg-server-cloud/armd-cloud-nacos/pom.xml
View File

@ -71,14 +71,8 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.25</version>
<version>42.7.3</version>
</dependency>
<!-- pgsql 数据源插件,nacos2.1之后才支持 -->
<!-- <dependency>-->
<!-- <groupId>com.alibaba.nacos</groupId>-->
<!-- <artifactId>nacos-postgresql-datasource-plugin-ext</artifactId>-->
<!-- <version>1.0.0-SNAPSHOT</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.pig4cloud.plugin</groupId>
<artifactId>nacos-datasource-plugin-pg</artifactId>

2
jeecg-server-cloud/armd-cloud-nacos/src/main/resources/application.yml
View File

@ -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

3
jeecg-server-cloud/armd-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java
View File

@ -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" +

6
pom.xml
View File

@ -42,7 +42,7 @@
<knife4j-spring-boot-starter.version>3.0.3</knife4j-spring-boot-starter.version>
<knife4j-spring-ui.version>2.0.9</knife4j-spring-ui.version>
<!-- 数据库驱动 -->
<postgresql.version>42.2.25</postgresql.version>
<postgresql.version>42.7.3</postgresql.version>
<ojdbc6.version>11.2.0.3</ojdbc6.version>
<sqljdbc4.version>4.0</sqljdbc4.version>
<mysql-connector-java.version>8.0.27</mysql-connector-java.version>
@ -476,7 +476,7 @@
<!--当前环境-->
<profile.name>dev</profile.name>
<!--Nacos服务地址-->
<config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
<config.server-addr>armd-nacos:8848</config.server-addr>
<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
<config.namespace></config.namespace>
<!--Nacos配置分组名称-->
@ -490,7 +490,7 @@
<!--当前环境-->
<profile.name>test</profile.name>
<!--Nacos服务地址-->
<config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
<config.server-addr>armd-nacos:8848</config.server-addr>
<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
<config.namespace></config.namespace>
<!--Nacos配置分组名称-->