diff --git a/jeecg-boot-base-core/pom.xml b/jeecg-boot-base-core/pom.xml index 1e5181eb..81364887 100644 --- a/jeecg-boot-base-core/pom.xml +++ b/jeecg-boot-base-core/pom.xml @@ -124,13 +124,6 @@ ${mysql-connector-java.version} runtime - - - com.microsoft.sqlserver - sqljdbc4 - ${sqljdbc4.version} - runtime - com.oracle 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 deleted file mode 100644 index 416a954b..00000000 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusKeyGenerator.java +++ /dev/null @@ -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(); - } -} 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 32d317ed..49935de5 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 @@ -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; /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsStations.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsStations.java index 1787c66a..6e81692b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsStations.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsStations.java @@ -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; 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 fd3ec81f..ad1bd455 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("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") 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 3f96f896..7a980361 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("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; 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 da619360..093cc23e 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 @@ -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") 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 82b170cc..52208b68 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("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; /** 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 3213c577..90dbc332 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("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; /** 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 c96a4703..fc806c93 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("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; 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 a0ef79c7..454c387d 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 @@ -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 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 6b8c9149..b06eb0c4 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 @@ -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; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsAnalyses.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsAnalyses.java index 3bd28574..4108d3b2 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsAnalyses.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsAnalyses.java @@ -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 diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/calCulStationInfoMapper.xml b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/calCulStationInfoMapper.xml index 52081c98..1a2dfa77 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/calCulStationInfoMapper.xml +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/calCulStationInfoMapper.xml @@ -22,7 +22,7 @@ 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 @@ -89,15 +89,15 @@ 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}' @@ -122,7 +122,7 @@ 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 SOH.STATION_ID = #{stationId} @@ -165,7 +165,7 @@ 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 (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 @@ -231,7 +231,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} @@ -271,7 +271,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 @@ -296,7 +296,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 @@ -330,7 +330,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)* ${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}' @@ -357,7 +357,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} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsAlertDataMapper.xml b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsAlertDataMapper.xml index 313291df..50341681 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsAlertDataMapper.xml +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsAlertDataMapper.xml @@ -15,7 +15,7 @@ #{stationId} - 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') ORDER BY d.TIME DESC 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