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/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/configuration/GardsDetectors.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsDetectors.java index 62326202..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 @@ -6,8 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.jeecg.config.valid.InsertGroup; +import org.jeecg.config.valid.UpdateGroup; import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.time.LocalDateTime; import java.util.Date; @Data @@ -17,7 +23,7 @@ public class GardsDetectors implements Serializable { /** * 探测器id */ - @TableId(type = IdType.INPUT) + @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 a0d89fcd..f3b708fc 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 6e9f2ac7..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 @@ -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; @@ -22,7 +19,7 @@ public class GardsAlertData implements Serializable { @TableField(value = "STATION_CODE") private String stationCode; - @TableId(type = IdType.AUTO) + @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 fe9fa21b..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 @@ -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; @@ -32,7 +29,7 @@ public class GardsDOSData implements Serializable { /** * 报警ID号 */ - @TableId(value = "DOS_ID",type = IdType.AUTO) + @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 1dc30618..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 @@ -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.springframework.format.annotation.DateTimeFormat; @@ -13,6 +10,7 @@ import java.util.Date; @Data @TableName("ORIGINAL.GARDS_GPS_DATA") +@KeySequence("original.gards_gps_data_seq") public class GardsGPSData implements Serializable { @TableField(value = "STATION_ID") @@ -21,7 +19,7 @@ public class GardsGPSData implements Serializable { @TableField(value = "STATION_CODE") private String stationCode; - @TableId(type = IdType.AUTO) + @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 7b43eb29..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 @@ -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; @@ -31,7 +28,7 @@ public class GardsMetData implements Serializable { /** * 气象数据id */ - @TableId(type = IdType.AUTO) + @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 3fcf91b7..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 @@ -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; @@ -27,7 +24,7 @@ public class GardsSampleData implements Serializable { * 样品id */ - @TableId(type = IdType.AUTO) + @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 5ea7f678..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 @@ -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; @@ -31,7 +28,7 @@ public class GardsSohData implements Serializable { /** * 报警ID号 */ - @TableId(type = IdType.AUTO) + @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 c2e3b102..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 @@ -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; @@ -21,7 +18,7 @@ public class GardsAnalyses implements Serializable { /** * 分析ID号 */ - @TableId(value = "idanalysis",type = IdType.AUTO) + @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 5d79fee4..33f060fb 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,6 +14,7 @@ public class GardsAnalysisRoi { private Integer sampleId; + @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 9fef1880..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 @@ -22,7 +22,7 @@ public class GardsAnalyses implements Serializable { /** * 分析ID号 */ - @TableId(value = "idanalysis",type = IdType.AUTO) + @TableId(value = "idanalysis",type= IdType.AUTO) 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 4923887a..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 @@ -31,6 +31,32 @@ #{calibration.moddate}) + + insert into RNAUTO.GARDS_CALIBRATION( + SAMPLE_ID, + IDANALYSIS, + SAMPLE_TYPE, + CALTYPE, + FUNCTION, + FUNCTIONDEF, + STARTOFRANGE, + ENDOFRANGE, + COEFF_STRING, + moddate) + values + + (#{calibration.sampleId}, + #{calibration.idAnalysis}, + #{calibration.sampleType}, + #{calibration.calType}, + #{calibration.function}, + #{calibration.functionDef}, + #{calibration.startOfRange}, + #{calibration.endOfRange}, + #{calibration.coeffString}, + #{calibration.moddate}) + + \ No newline at end of file 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 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 2d9957b7..bc41f947 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 @@ -521,7 +521,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 substr(sta.station_code, 3,1)='X' - and sta.EFFIC_CALCUL_TYPE='SAUNA' - and sdata.spectral_qualifie='FULL' and sdata.SAMPLE_TYPE='B' - and sdata.station_id = #{stationId} - and to_char(sdata.ACQUISITION_START,'YYYY-MM-DD hh24:mi:ss') BETWEEN #{pretime} and #{curDateTime} - - - - 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 substr( sta.station_code, 3,1)='X' - and sta.EFFIC_CALCUL_TYPE='SAUNA' - and SDATA.SAMPLE_TYPE='B' - and sdata.station_id= #{stationId} - and to_char(sdata.ACQUISITION_START,'YYYY-MM-DD hh24:mi:ss') BETWEEN #{pretime} and #{curDateTime} - - - - 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 sdata.quantity> ${quantity} and xe.MDC> ${mdc} + 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} + 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 (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 LEFT JOIN CONFIGURATION.GARDS_STATIONS sta on sta.station_id = sdata.station_id substr( sta.station_code, 3,1)='X' and SDATA.SAMPLE_TYPE='B' - and sta.EFFIC_CALCUL_TYPE='SAUNA' - and sdata.station_id = #{stationId} - and to_char(sdata.ACQUISITION_START,'YYYY-MM-DD hh24:mi:ss') BETWEEN #{pretime} and #{curDateTime} - - - - 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}' @@ -176,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} @@ -233,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 LEFT JOIN CONFIGURATION.GARDS_STATIONS sta on sta.station_id = sdata.station_id - sta.EFFIC_CALCUL_TYPE='SPALAX' - and SDATA.SAMPLE_TYPE='G' - and substr( sta.station_code, 3,1)='X' - and sdata.station_id=#{stationId} - and to_char(sdata.ACQUISITION_START,'YYYY-MM-DD hh24:mi:ss') BETWEEN #{pretime} and #{curDateTime} - - - 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 substr( sta.station_code, 3,1)='X' and SDATA.SAMPLE_TYPE='G' - and sta.EFFIC_CALCUL_TYPE='SPALAX' - and sdata.station_id= #{stationId} - and to_char(sdata.ACQUISITION_START,'YYYY-MM-DD hh24:mi:ss') BETWEEN #{pretime} and #{curDateTime} - - - 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 - sta.EFFIC_CALCUL_TYPE='SPALAX' + sta.type='SPALAX' and SDATA.SAMPLE_TYPE='G' and substr( sta.station_code, 3,1)='X' and sdata.station_id= #{stationId} @@ -330,29 +229,9 @@ - - - - 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} @@ -392,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 @@ -415,9 +294,9 @@ - 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 @@ -428,52 +307,16 @@ 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} - - 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 @@ -495,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} @@ -504,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} @@ -544,7 +387,7 @@ SELECT DETECTOR_ID FROM CONFIGURATION.GARDS_DETECTORS WHERE STATION_ID = #{stationId} AND STATUS = 'Operating' + \ No newline at end of file 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 8bda1c74..dc12ee33 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,7 +65,6 @@ 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"); 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 fa790345..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: armd-nacos: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 d0113b13..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 WebStatistics 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 5e7bba0c..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