From 2d8b68e25a8bac9d21a13190fafb2b2c58816698 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Tue, 1 Aug 2023 08:58:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?web-statistics=E6=A8=A1=E5=9D=97=E4=B8=8B?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E7=A7=BB=E5=8A=A8=E5=88=B0base-core?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/entity/original}/GardsAlertData.java | 2 +- .../original/GardsBgEfficiencyPairs.java | 7 +- .../base/entity/original/GardsHistogram.java | 7 +- .../base/entity/original/GardsRoiLimits.java | 8 +- .../base/entity/original/GardsSampleCert.java | 7 + .../entity/original/GardsSampleCertLine.java | 2 +- .../entity/original/GardsSampleRatios.java | 8 +- .../base/entity/original/GardsSpectrum.java | 8 +- .../original/GardsTotalEfficiencyPairs.java | 7 +- .../org/jeecg/common/util/ReadLineUtil.java | 2 - .../controller/RadionuclideController.java | 1 + .../controller/WebStatisticsController.java | 12 +- .../modules/entity/GardsAnalysesAuto.java | 175 ------------------ .../modules/entity/GardsAnalysesMan.java | 175 ------------------ .../entity/GardsBgEfficiencyPairs.java | 36 ---- .../entity/GardsCalibrationPairsOrig.java | 68 ------- .../jeecg/modules/entity/GardsHistogram.java | 39 ---- .../jeecg/modules/entity/GardsRoiLimits.java | 39 ---- .../jeecg/modules/entity/GardsSampleAux.java | 102 ---------- .../jeecg/modules/entity/GardsSampleCert.java | 42 ----- .../modules/entity/GardsSampleCertLine.java | 79 -------- .../entity/GardsSampleDescription.java | 19 -- .../modules/entity/GardsSampleRatios.java | 39 ---- .../jeecg/modules/entity/GardsSpectrum.java | 39 ---- .../org/jeecg/modules/entity/SysDict.java | 50 ----- .../org/jeecg/modules/entity/SysDictItem.java | 80 -------- .../modules/mapper/GardsAlertDataMapper.java | 2 +- .../mapper/GardsAnalysesAutoMapper.java | 4 +- .../mapper/GardsAnalysesManMapper.java | 4 +- .../mapper/GardsBgEfficiencyPairsMapper.java | 2 +- .../GardsCalibrationPairsOrigMapper.java | 2 +- .../modules/mapper/GardsHistogramMapper.java | 2 +- .../modules/mapper/GardsMetDataMapper.java | 2 +- .../modules/mapper/GardsRoiLimitsMapper.java | 2 +- .../modules/mapper/GardsSampleAuxMapper.java | 2 +- .../mapper/GardsSampleCertLineMapper.java | 2 +- .../modules/mapper/GardsSampleCertMapper.java | 2 +- .../mapper/GardsSampleDataWebMapper.java | 3 +- .../mapper/GardsSampleDescriptionMapper.java | 2 +- .../mapper/GardsSampleRatiosMapper.java | 2 +- .../modules/mapper/GardsSohDataMapper.java | 2 +- .../modules/mapper/GardsSpectrumMapper.java | 2 +- .../mapper/xml/GardsSampleDataWebMapper.xml | 4 +- .../jeecg/modules/service/IAutoService.java | 7 +- .../service/IGardsAlertDataService.java | 7 +- .../modules/service/IGardsMetDataService.java | 3 +- .../service/IGardsSampleCertService.java | 2 +- .../service/IGardsSampleDataWebService.java | 2 +- .../modules/service/IGardsSohDataService.java | 4 +- .../modules/service/IMenuNameService.java | 2 +- .../modules/service/IReviewedService.java | 6 +- .../modules/service/impl/AutoServiceImpl.java | 24 +-- .../impl/GardsAlertDataServiceImpl.java | 19 +- .../service/impl/GardsMetDataServiceImpl.java | 3 +- .../impl/GardsSampleCertServiceImpl.java | 4 +- .../impl/GardsSampleDataWebServiceImpl.java | 68 +++---- .../service/impl/GardsSohDataServiceImpl.java | 6 +- .../service/impl/ReviewedServiceImpl.java | 22 +-- .../modules/system/entity/GardsDetectors.java | 69 ------- .../modules/system/entity/GardsStations.java | 58 ------ 60 files changed, 141 insertions(+), 1259 deletions(-) rename {jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original}/GardsAlertData.java (96%) delete mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAnalysesAuto.java delete mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAnalysesMan.java delete mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsBgEfficiencyPairs.java delete mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsCalibrationPairsOrig.java delete mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsHistogram.java delete mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsRoiLimits.java delete mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleAux.java delete mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleCert.java delete mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleCertLine.java delete mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleDescription.java delete mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleRatios.java delete mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSpectrum.java delete mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/SysDict.java delete mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/SysDictItem.java delete mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/system/entity/GardsDetectors.java delete mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/system/entity/GardsStations.java diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAlertData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsAlertData.java similarity index 96% rename from jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAlertData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsAlertData.java index 04164372..2024f889 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAlertData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsAlertData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.entity; +package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsBgEfficiencyPairs.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsBgEfficiencyPairs.java index 68d8b493..bb1f9a16 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsBgEfficiencyPairs.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsBgEfficiencyPairs.java @@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * 存储β-γ符合谱中#b_ gefficiency 数据块中的探测器符合效率刻度点。 @@ -40,5 +43,7 @@ public class GardsBgEfficiencyPairs implements Serializable { private Double bgEfficError; @TableField(value = "MODDATE") - private Long moddate; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsHistogram.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsHistogram.java index c67ef1d7..11200918 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsHistogram.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsHistogram.java @@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * 存储β-γ符合谱中#histogram数据块中的数据。 @@ -45,5 +48,7 @@ public class GardsHistogram implements Serializable { private Integer bEnergySpan; @TableField(value = "MODDATE") - private Long moddate; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsRoiLimits.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsRoiLimits.java index f56403ce..5b573d73 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsRoiLimits.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsRoiLimits.java @@ -2,8 +2,12 @@ package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + import java.io.Serializable; +import java.util.Date; /** * 存储β-γ符合谱中#ROI_LMITS 数据块中的感兴趣区能量边界数据。 @@ -44,5 +48,7 @@ public class GardsRoiLimits implements Serializable { private Double gEnergyStop; @TableField(value = "MODDATE") - private Long moddate; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCert.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCert.java index c1b69299..3f6abf08 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCert.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCert.java @@ -31,4 +31,11 @@ public class GardsSampleCert implements Serializable { */ @TableField(value = "ASSAY_DATE") private Date assayDate; + + /** + * 单位 + */ + @TableField(value = "UNIT") + private String unit; + } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCertLine.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCertLine.java index 0e66b5be..e2fa955e 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCertLine.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCertLine.java @@ -56,7 +56,7 @@ public class GardsSampleCertLine implements Serializable { * β能量 */ @TableField(value = "B_ENERGY") - private Double b_energy; + private Double bEnergy; /** * 衰变模式 */ diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleRatios.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleRatios.java index 62d2880c..c6f46350 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleRatios.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleRatios.java @@ -2,8 +2,12 @@ package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + import java.io.Serializable; +import java.util.Date; /** * 存储β-γ符合谱中# Ratios 数据块中的感兴趣区相应核素的计数比率。 @@ -36,5 +40,7 @@ public class GardsSampleRatios implements Serializable { private Double countRatioErr; @TableField(value = "MODDATE") - private Long moddate; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSpectrum.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSpectrum.java index 8ba6b57a..b249c2f3 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSpectrum.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSpectrum.java @@ -2,8 +2,12 @@ package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + import java.io.Serializable; +import java.util.Date; /** * 存储所有能谱中#G_Spectrum和#B_Spectrum数据块中的数据。 @@ -44,5 +48,7 @@ public class GardsSpectrum implements Serializable { private Integer startChannel; @TableField(value = "MODDATE") - private Long moddate; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsTotalEfficiencyPairs.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsTotalEfficiencyPairs.java index f40c5f64..f4599dd9 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsTotalEfficiencyPairs.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsTotalEfficiencyPairs.java @@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * 存储所有谱中#TotalEff 数据块中的探测器总效率刻度点，此数据块是可选项。 @@ -36,5 +39,7 @@ public class GardsTotalEfficiencyPairs implements Serializable { private Double totalEfficError; @TableField(value = "MODDATE") - private Long moddate; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/common/util/ReadLineUtil.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/common/util/ReadLineUtil.java index 4f081ac2..2cc8de34 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/common/util/ReadLineUtil.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/common/util/ReadLineUtil.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; -import org.apache.commons.net.ftp.FTP; import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPFile; import org.jeecg.common.api.vo.Result; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.util.*; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/RadionuclideController.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/RadionuclideController.java index 2c824c0e..9479576c 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/RadionuclideController.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/RadionuclideController.java @@ -10,6 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + import java.util.Date; @RestController diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java index 8f6ed90c..6ef8c9c3 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java @@ -1,22 +1,17 @@ package org.jeecg.modules.controller; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.Prompt; import org.jeecg.common.util.ReadLineUtil; -import org.jeecg.modules.base.entity.GardsSampleData; -import org.jeecg.modules.base.entity.GardsSohData; +import org.jeecg.modules.base.entity.configuration.GardsStations; +import org.jeecg.modules.base.entity.original.GardsSampleData; +import org.jeecg.modules.base.entity.original.GardsSohData; import org.jeecg.modules.base.enums.PageType; -import org.jeecg.modules.entity.GardsAnalysesAuto; -import org.jeecg.modules.entity.GardsAnalysesMan; import org.jeecg.modules.service.*; -import org.jeecg.modules.system.entity.GardsStations; -import org.jeecgframework.poi.excel.ExcelExportUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.GetMapping; @@ -27,7 +22,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.util.Date; import java.util.List; -import java.util.Optional; @RestController @RequestMapping("webStatistics") diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAnalysesAuto.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAnalysesAuto.java deleted file mode 100644 index d05eda92..00000000 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAnalysesAuto.java +++ /dev/null @@ -1,175 +0,0 @@ -package org.jeecg.modules.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -@Data -@TableName(value = "RNAUTO.GARDS_ANALYSES") -public class GardsAnalysesAuto implements Serializable { - - /** - * 分析ID号 - */ - @TableField(value = "IDANALYSIS") - private Integer idAnalysis; - - /** - * 样品id - */ - @TableField(value = "SAMPLE_ID") - private Integer sampleId; - - /** - * 分析开始时间 - */ - @TableField(value = "ANALYSISBEGIN") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date analysisBegin; - - /** - * 分析结束时间 - */ - @TableField(value = "ANALYSISEND") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date analysisEnd; - - /** - * Reviewed:交互； - */ - @TableField(value = "TYPE") - private String type; - - /** - * 使用的软件名称 - */ - @TableField(value = "SOFTWARE") - private String software; - - /** - * 软件版本号 - */ - @TableField(value = "SWVERSION") - private String swVersion; - - /** - * 分析员名称 - */ - @TableField(value = "ANALYST") - private String analyst; - - /** - * 基线计数方法描述 - */ - @TableField(value = "BASELINEMETHOD") - private String baseLineMethod; - - /** - * 寻峰方法描述 - */ - @TableField(value = "PEAKSMETHOD") - private String peaksMethod; - - /** - * 核素识别方法描述 - */ - @TableField(value = "NUCLIDEMETHOD") - private String nuclideMethod; - - /** - * 不确定度计算描述 - */ - @TableField(value = "UNCCALCMETHOD") - private String unccalcMethod; - - /** - * Lc计算方法描述 - */ - @TableField(value = "LCMETHOD") - private String lcMethod; - - /** - * 寻峰起始道 - */ - @TableField(value = "SEARCHSTARTCHANNEL") - private Integer searchStartChannel; - - /** - * 寻峰结束道 - */ - @TableField(value = "SEARCHENDCHANNEL") - private Integer searchEndChannel; - - /** - * 寻峰阈值（能窗宽度） - */ - @TableField(value = "SEARCHTHRESHOLD") - private Double searchThreshold; - - /** - * 峰数目 - */ - @TableField(value = "NUMBEROFPEAKS") - private Integer numberOfPeaks; - - /** - * 总计数 - */ - @TableField(value = "TOTALCOUNTS") - private Double totalCounts; - - /** - * 分级结果 - */ - @TableField(value = "CATEGORY") - private Integer cateGory; - - /** - * 注释 - */ - @TableField(value = "COMMENTS") - private String comments; - - /** - * 操作时间 - */ - @TableField(value = "MODDATE") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date moddate; - - @TableField(value = "USEDGASPHD") - private String usedGasPhd; - - @TableField(value = "USEDDETPHD") - private String usedDetPhd; - - @TableField(value = "USEDGASPHD_ID") - private Integer usedGasPhdId; - - @TableField(value = "USEDDETPHD_ID") - private Integer usedDetPhdId; - - @TableField(value = "BASELINE_PATH") - private String baseLinePath; - - @TableField(value = "LC_PATH") - private String lcPath; - - @TableField(value = "SCAC_PATH") - private String scacPath; - - @TableField(value = "LOG_PATH") - private String logPath; - - @TableField(value = "REPORT_PAHT") - private String reportPath; - -} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAnalysesMan.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAnalysesMan.java deleted file mode 100644 index cac28c17..00000000 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAnalysesMan.java +++ /dev/null @@ -1,175 +0,0 @@ -package org.jeecg.modules.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -@Data -@TableName(value = "RNMAN.GARDS_ANALYSES") -public class GardsAnalysesMan implements Serializable { - - /** - * 分析ID号 - */ - @TableField(value = "IDANALYSIS") - private Integer idAnalysis; - - /** - * 样品id - */ - @TableField(value = "SAMPLE_ID") - private Integer sampleId; - - /** - * 分析开始时间 - */ - @TableField(value = "ANALYSISBEGIN") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date analysisBegin; - - /** - * 分析结束时间 - */ - @TableField(value = "ANALYSISEND") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date analysisEnd; - - /** - * Reviewed:交互； - */ - @TableField(value = "TYPE") - private String type; - - /** - * 使用的软件名称 - */ - @TableField(value = "SOFTWARE") - private String software; - - /** - * 软件版本号 - */ - @TableField(value = "SWVERSION") - private String swVersion; - - /** - * 分析员名称 - */ - @TableField(value = "ANALYST") - private String analyst; - - /** - * 基线计数方法描述 - */ - @TableField(value = "BASELINEMETHOD") - private String baseLineMethod; - - /** - * 寻峰方法描述 - */ - @TableField(value = "PEAKSMETHOD") - private String peaksMethod; - - /** - * 核素识别方法描述 - */ - @TableField(value = "NUCLIDEMETHOD") - private String nuclideMethod; - - /** - * 不确定度计算描述 - */ - @TableField(value = "UNCCALCMETHOD") - private String unccalcMethod; - - /** - * Lc计算方法描述 - */ - @TableField(value = "LCMETHOD") - private String lcMethod; - - /** - * 寻峰起始道 - */ - @TableField(value = "SEARCHSTARTCHANNEL") - private Integer searchStartChannel; - - /** - * 寻峰结束道 - */ - @TableField(value = "SEARCHENDCHANNEL") - private Integer searchEndChannel; - - /** - * 寻峰阈值（能窗宽度） - */ - @TableField(value = "SEARCHTHRESHOLD") - private Double searchThreshold; - - /** - * 峰数目 - */ - @TableField(value = "NUMBEROFPEAKS") - private Integer numberOfPeaks; - - /** - * 总计数 - */ - @TableField(value = "TOTALCOUNTS") - private Double totalCounts; - - /** - * 分级结果 - */ - @TableField(value = "CATEGORY") - private Integer cateGory; - - /** - * 注释 - */ - @TableField(value = "COMMENTS") - private String comments; - - /** - * 操作时间 - */ - @TableField(value = "MODDATE") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date moddate; - - @TableField(value = "USEDGASPHD") - private String usedGasPhd; - - @TableField(value = "USEDDETPHD") - private String usedDetPhd; - - @TableField(value = "USEDGASPHD_ID") - private Integer usedGasPhdId; - - @TableField(value = "USEDDETPHD_ID") - private Integer usedDetPhdId; - - @TableField(value = "BASELINE_PATH") - private String baseLinePath; - - @TableField(value = "LC_PATH") - private String lcPath; - - @TableField(value = "SCAC_PATH") - private String scacPath; - - @TableField(value = "LOG_PATH") - private String logPath; - - @TableField(value = "REPORT_PAHT") - private String reportPath; - -} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsBgEfficiencyPairs.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsBgEfficiencyPairs.java deleted file mode 100644 index cd1b0baa..00000000 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsBgEfficiencyPairs.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.jeecg.modules.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -@Data -@TableName(value = "ORIGINAL.GARDS_BG_EFFICIENCY_PAIRS") -public class GardsBgEfficiencyPairs implements Serializable { - - @TableField(value = "SAMPLE_ID") - private Integer sampleId; - - @TableField(value = "ROI") - private Integer roi; - - @TableField(value = "NUCLIDE_NAME") - private String nuclideName; - - @TableField(value = "BG_EFFICIENCY") - private Double bgEfficiency; - - @TableField(value = "BG_EFFIC_ERROR") - private Double bgEfficError; - - @TableField(value = "MODDATE") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date moddate; - -} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsCalibrationPairsOrig.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsCalibrationPairsOrig.java deleted file mode 100644 index e737cb35..00000000 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsCalibrationPairsOrig.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.jeecg.modules.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName(value = "ORIGINAL.GARDS_CALIBRATION_PAIRS_ORIG") -public class GardsCalibrationPairsOrig implements Serializable { - - /** - * 样品ID号 - */ - @TableField(value = "SAMPLE_ID") - private Integer sampleId; - - /** - * 系统类型 G：gamma探测器的数据，#g_；B：beta探测器的数据,#b_ - */ - @TableField(value = "SAMPLE_TYPE") - private String sampleType; - - /** - * 刻度类型 energy：能量刻度；efficiency：效率刻度； - * Resolution：分辨率刻度 - */ - @TableField(value = "CALTYPE") - private String caltype; - - /** - * 来源 PHD：代表数据来自PHD文件；External：代表数据来自外部，如刻度工具、其它文件等 - */ - @TableField(value = "INPUT") - private String input; - - /** - * 刻度点ID号 - */ - @TableField(value = "IDCALPOINT") - private Integer idcalpoint; - - /** - * x轴数值 - */ - @TableField(value = "XVALUE") - private Double xvalue; - - /** - * y轴数值 - */ - @TableField(value = "YVALUE") - private Double yvalue; - - /** - * y值不确定度 - */ - @TableField(value = "UNCYVALUE") - private Double uncyvalue; - - /** - * 衰变模式 - */ - @TableField(value = "DECAY_MODE") - private String decayMode; - -} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsHistogram.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsHistogram.java deleted file mode 100644 index 8bef0319..00000000 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsHistogram.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.jeecg.modules.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -@Data -@TableName(value = "ORIGINAL.GARDS_HISTOGRAM") -public class GardsHistogram implements Serializable { - - @TableField(value = "SAMPLE_ID") - private Integer sampleId; - - @TableField(value = "FILENAME") - private String fileName; - - @TableField(value = "G_CHANNELS") - private Integer GChannels; - - @TableField(value = "B_CHANNELS") - private Integer BChannels; - - @TableField(value = "G_ENERGY_SPAN") - private Integer GEnergySpan; - - @TableField(value = "B_ENERGY_SPAN") - private Integer BEnergySpan; - - @TableField(value = "MODDATE") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date moddate; - -} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsRoiLimits.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsRoiLimits.java deleted file mode 100644 index 36fa67d3..00000000 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsRoiLimits.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.jeecg.modules.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -@Data -@TableName(value = "ORIGINAL.GARDS_ROI_LIMITS") -public class GardsRoiLimits implements Serializable { - - @TableField(value = "SAMPLE_ID") - private Integer sampleId; - - @TableField(value = "ROI") - private Integer roi; - - @TableField(value = "B_ENERGY_START") - private Double BEnergyStart; - - @TableField(value = "B_ENERGY_STOP") - private Double BEnergyStop; - - @TableField(value = "G_ENERGY_START") - private Double GEnergyStart; - - @TableField(value = "G_ENERGY_STOP") - private Double GEnergyStop; - - @TableField(value = "MODDATE") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date moddate; - -} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleAux.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleAux.java deleted file mode 100644 index d4e2699a..00000000 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleAux.java +++ /dev/null @@ -1,102 +0,0 @@ -package org.jeecg.modules.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -@Data -@TableName(value = "ORIGINAL.GARDS_SAMPLE_AUX") -public class GardsSampleAux implements Serializable { - - /** - * 样品ID号 - */ - @TableField(value = "SAMPLE_ID") - private Integer sampleId; - - /** - * 样品参考ID - */ - @TableField(value = "SAMPLE_REF_ID") - private String sampleRefId; - - /** - * 样品测量ID - */ - @TableField(value = "MEASUREMENT_ID") - private String measurementId; - - /** - * 探测器本底测量ID - */ - @TableField(value = "BKGD_MEASUREMENT_ID") - private String bkgdMeasurementId; - - /** - * 气体本底测量ID - */ - @TableField(value = "GAS_BKGD_MEASUREMENT_ID") - private String gasBkgdMeasurementId; - - /** - * 样品的几何尺寸，#Sample数据块 dimension2 - */ - @TableField(value = "SAMPLE_HEIGHT") - private Double sampleHeight; - - /** - * 样品的几何尺寸，#Sample数据块 dimension1 - */ - @TableField(value = "SAMPLE_DIAMETER") - private Double sampleDiameter; - - /** - * #calibration数据块 - */ - @TableField(value = "CALIBRATION_DTG") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date calibrationDtg; - - /** - * 报文ID号 - */ - @TableField(value = "MSG_ID") - private String msgId; - - /** - * 归档瓶ID号 - */ - @TableField(value = "ARCHIVE_BOTTLE_ID") - private String archiveBottleId; - - /** - * 氙体积 - */ - @TableField(value = "XE_VOLUME") - private Double xeVolume; - - /** - * 氙体积不确定度 - */ - @TableField(value = "XE_VOLUME_UNCER") - private Double xeVolumeUncer; - - /** - * 氙收集效率 - */ - @TableField(value = "XE_COLLECTION_YIED") - private Double xeCollectionYied; - - /** - * 氙收集效率不确定度 - */ - @TableField(value = "XE_COLLECTION_YIED_UNCER") - private Double xeCollectionYiedUncer; - -} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleCert.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleCert.java deleted file mode 100644 index 84e2193c..00000000 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleCert.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.jeecg.modules.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -@Data -@TableName(value = "ORIGINAL.GARDS_SAMPLE_CERT") -public class GardsSampleCert implements Serializable { - - /** - * 台站ID号 - */ - @TableField(value = "SAMPLE_ID") - private Integer sampleId; - - /** - * 刻度源活度（Bq）total_source_activity - */ - @TableField(value = "QUANTITY") - private Double quantity; - - /** - * 鉴定日期 - */ - @TableField(value = "ASSAY_DATE") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date assayDate; - - /** - * 单位 - */ - @TableField(value = "UNIT") - private String unit; - -} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleCertLine.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleCertLine.java deleted file mode 100644 index e4d5de1c..00000000 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleCertLine.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.jeecg.modules.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName(value = "ORIGINAL.GARDS_SAMPLE_CERT_LINE") -public class GardsSampleCertLine implements Serializable { - - /** - * 台站ID号 - */ - @TableField(value = "SAMPLE_ID") - private Double sampleId; - - /** - * 核素名称 - */ - @TableField(value = "NUCL_NAME") - private String nuclName; - - /** - * 半衰期（秒S、小时H、天D、年Y） - */ - @TableField(value = "HALFLIFE") - private String halflife; - - /** - * γ能量（keV） - */ - @TableField(value = "ENERGY") - private Double energy; - - /** - * 核素活度（Bq） - */ - @TableField(value = "ACTIVITY") - private Double activity; - - /** - * 核素活度不确定度（％） - */ - @TableField(value = "ERROR") - private Double error; - - /** - * γ射线强度（％） - */ - @TableField(value = "ABUNDANCE") - private Double abundance; - - /** - * β射线强度（％） - */ - @TableField(value = "B_ABUNDANCE") - private Double bAbundance; - - /** - * β能量 - */ - @TableField(value = "B_ENERGY") - private Double bEnergy; - - /** - * 衰变模式： - */ - @TableField(value = "DECAY_MODE") - private String decayMode; - - /** - * 半衰期单位 - */ - @TableField(value = "HALFLIFT_UNIT") - private String halfliftUnit; - -} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleDescription.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleDescription.java deleted file mode 100644 index 01bf4858..00000000 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleDescription.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; - -@Data -@TableName(value = "ORIGINAL.GARDS_SAMPLE_DESCRIPTION") -public class GardsSampleDescription implements Serializable { - - @TableField(value = "SAMPLE_ID") - private Integer sampleId; - - @TableField(value = "DESCRIPTION") - private String description; - -} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleRatios.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleRatios.java deleted file mode 100644 index 3d3cfd2c..00000000 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleRatios.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.jeecg.modules.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -@Data -@TableName(value = "ORIGINAL.GARDS_SAMPLE_RATIOS") -public class GardsSampleRatios implements Serializable { - - @TableField(value = "SAMPLE_ID") - private Integer sampleId; - - @TableField(value = "RATIO_ID") - private String ratioId; - - @TableField(value = "UPPER_ROI_NUMBER") - private Integer upperRoiNumber; - - @TableField(value = "LOWER_ROI_NUMBER") - private Integer lowerRoiNumber; - - @TableField(value = "COUNT_RATIO") - private Double countRatio; - - @TableField(value = "COUNT_RATIO_ERR") - private Double countRatioErr; - - @TableField(value = "MODDATE") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date moddate; - -} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSpectrum.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSpectrum.java deleted file mode 100644 index 02d86a26..00000000 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSpectrum.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.jeecg.modules.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -@Data -@TableName(value = "ORIGINAL.GARDS_SPECTRUM") -public class GardsSpectrum implements Serializable { - - @TableField(value = "SAMPLE_ID") - private Integer sampleId; - - @TableField(value = "SAMPLE_TYPE") - private String sampleType; - - @TableField(value = "FILENAME") - private String fileName; - - @TableField(value = "CHANNELS") - private Integer channels; - - @TableField(value = "ENERGY_SPAN") - private Integer energySpan; - - @TableField(value = "START_CHANNEL") - private Integer startChannel; - - @TableField(value = "MODDATE") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date moddate; - -} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/SysDict.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/SysDict.java deleted file mode 100644 index 8bca9136..00000000 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/SysDict.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.jeecg.modules.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -@Data -@TableName(value = "sys_dict") -public class SysDict implements Serializable { - - @TableField(value = "id") - private String id; - - @TableField(value = "dict_name") - private String dictName; - - @TableField(value = "dict_code") - private String dictCode; - - @TableField(value = "description") - private String description; - - @TableField(value = "del_flag") - private Integer delFlag; - - @TableField(value = "create_by") - private String createBy; - - @TableField(value = "create_time") - private Date createTime; - - @TableField(value = "update_by") - private String updateBy; - - @TableField(value = "update_time") - private Date updateTime; - - @TableField(value = "type") - private Integer type; - - @TableField(value = "tenant_id") - private Integer tenantId; - - @TableField(value = "low_app_id") - private String lowAppId; - -} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/SysDictItem.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/SysDictItem.java deleted file mode 100644 index 776d4aa4..00000000 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/SysDictItem.java +++ /dev/null @@ -1,80 +0,0 @@ -package org.jeecg.modules.entity; - -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 lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - *

- * - *

- * - * @Author zhangweijian - * @since 2018-12-28 - */ -@Data -@TableName(value = "sys_dict_item") -public class SysDictItem implements Serializable { - - /** - * id - */ - @TableId(value = "id", type = IdType.ASSIGN_ID) - private String id; - - /** - * 字典id - */ - @TableField(value = "dict_id") - private String dictId; - - /** - * 字典项文本 - */ - @TableField(value = "item_text") - private String itemText; - - /** - * 字典项值 - */ - @TableField(value = "item_value") - private String itemValue; - - /** - * 描述 - */ - @TableField(value = "description") - private String description; - - /** - * 排序 - */ - @TableField(value = "sort_order") - private Integer sortOrder; - - - /** - * 状态（1启用 0不启用） - */ - @TableField(value = "status") - private Integer status; - - @TableField(value = "create_by") - private String createBy; - - @TableField(value = "create_time") - private Date createTime; - - @TableField(value = "update_by") - private String updateBy; - - @TableField(value = "update_time") - private Date updateTime; - - -} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsAlertDataMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsAlertDataMapper.java index 66f5c1af..8ba9abec 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsAlertDataMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsAlertDataMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.GardsAlertData; +import org.jeecg.modules.base.entity.original.GardsAlertData; public interface GardsAlertDataMapper extends BaseMapper { diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsAnalysesAutoMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsAnalysesAutoMapper.java index 2ae15ffa..ec42af9e 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsAnalysesAutoMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsAnalysesAutoMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.GardsAnalysesAuto; +import org.jeecg.modules.base.entity.rnauto.GardsAnalyses; -public interface GardsAnalysesAutoMapper extends BaseMapper { +public interface GardsAnalysesAutoMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsAnalysesManMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsAnalysesManMapper.java index fbcff385..0beb8014 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsAnalysesManMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsAnalysesManMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.GardsAnalysesMan; +import org.jeecg.modules.base.entity.rnman.GardsAnalyses; -public interface GardsAnalysesManMapper extends BaseMapper { +public interface GardsAnalysesManMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsBgEfficiencyPairsMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsBgEfficiencyPairsMapper.java index 7642f187..f72fad43 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsBgEfficiencyPairsMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsBgEfficiencyPairsMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.GardsBgEfficiencyPairs; +import org.jeecg.modules.base.entity.original.GardsBgEfficiencyPairs; public interface GardsBgEfficiencyPairsMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsCalibrationPairsOrigMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsCalibrationPairsOrigMapper.java index e71c3024..fac494db 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsCalibrationPairsOrigMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsCalibrationPairsOrigMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.GardsCalibrationPairsOrig; +import org.jeecg.modules.base.entity.original.GardsCalibrationPairsOrig; public interface GardsCalibrationPairsOrigMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsHistogramMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsHistogramMapper.java index 07f17dd6..073419c8 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsHistogramMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsHistogramMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.GardsHistogram; +import org.jeecg.modules.base.entity.original.GardsHistogram; public interface GardsHistogramMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsMetDataMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsMetDataMapper.java index 41a19fc0..71927446 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsMetDataMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsMetDataMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.base.entity.GardsMetData; +import org.jeecg.modules.base.entity.original.GardsMetData; public interface GardsMetDataMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsRoiLimitsMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsRoiLimitsMapper.java index 39547562..7a0d900e 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsRoiLimitsMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsRoiLimitsMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.GardsRoiLimits; +import org.jeecg.modules.base.entity.original.GardsRoiLimits; public interface GardsRoiLimitsMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleAuxMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleAuxMapper.java index e92f66b1..07e5fb38 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleAuxMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleAuxMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.GardsSampleAux; +import org.jeecg.modules.base.entity.original.GardsSampleAux; public interface GardsSampleAuxMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertLineMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertLineMapper.java index 15f9efa9..2652a089 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertLineMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertLineMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.GardsSampleCertLine; +import org.jeecg.modules.base.entity.original.GardsSampleCertLine; public interface GardsSampleCertLineMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertMapper.java index 386c3f59..8bd77ef0 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.GardsSampleCert; +import org.jeecg.modules.base.entity.original.GardsSampleCert; public interface GardsSampleCertMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java index 89a249c3..4fadb35b 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java @@ -2,9 +2,8 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.jeecg.modules.base.entity.GardsSampleData; +import org.jeecg.modules.base.entity.original.GardsSampleData; -import java.util.Date; import java.util.List; public interface GardsSampleDataWebMapper extends BaseMapper { diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDescriptionMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDescriptionMapper.java index e08f418a..1e1ff9a5 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDescriptionMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDescriptionMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.GardsSampleDescription; +import org.jeecg.modules.base.entity.original.GardsSampleDescription; public interface GardsSampleDescriptionMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleRatiosMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleRatiosMapper.java index 67578d8e..87c424fc 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleRatiosMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleRatiosMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.GardsSampleRatios; +import org.jeecg.modules.base.entity.original.GardsSampleRatios; public interface GardsSampleRatiosMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSohDataMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSohDataMapper.java index 268c980d..9421af5a 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSohDataMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSohDataMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.base.entity.GardsSohData; +import org.jeecg.modules.base.entity.original.GardsSohData; public interface GardsSohDataMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSpectrumMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSpectrumMapper.java index c70e09c7..2fafc897 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSpectrumMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSpectrumMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.GardsSpectrum; +import org.jeecg.modules.base.entity.original.GardsSpectrum; public interface GardsSpectrumMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsSampleDataWebMapper.xml b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsSampleDataWebMapper.xml index 071cfd5b..0d010cdf 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsSampleDataWebMapper.xml +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsSampleDataWebMapper.xml @@ -2,7 +2,7 @@ - SELECT sam.SITE_DET_CODE, sam.SAMPLE_ID, @@ -41,7 +41,7 @@ - SELECT sam.SITE_DET_CODE, sam.SAMPLE_ID, diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IAutoService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IAutoService.java index 7a03570e..72644413 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IAutoService.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IAutoService.java @@ -3,17 +3,16 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.entity.GardsAnalysesAuto; -import org.springframework.web.bind.annotation.RequestParam; +import org.jeecg.modules.base.entity.rnauto.GardsAnalyses; import javax.servlet.http.HttpServletResponse; import java.util.Date; -public interface IAutoService extends IService { +public interface IAutoService extends IService { Result findAutoPage(QueryRequest queryRequest, Integer[] stationIds, Date startTime, Date endTime); - GardsAnalysesAuto getOne(Integer sampleId); + GardsAnalyses getOne(Integer sampleId); void arrExport(Integer[] stationIds, String startTime, String endTime, HttpServletResponse response); } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsAlertDataService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsAlertDataService.java index b86285dc..5ae7833f 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsAlertDataService.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsAlertDataService.java @@ -1,14 +1,9 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.common.api.QueryRequest; -import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.GardsSohData; -import org.jeecg.modules.entity.GardsAlertData; -import org.springframework.web.bind.annotation.RequestParam; +import org.jeecg.modules.base.entity.original.GardsAlertData; import javax.servlet.http.HttpServletResponse; -import java.util.Date; public interface IGardsAlertDataService extends IService { diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java index 533b6a62..977c1d95 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java @@ -3,8 +3,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.GardsMetData; -import org.springframework.web.bind.annotation.RequestParam; +import org.jeecg.modules.base.entity.original.GardsMetData; import javax.servlet.http.HttpServletResponse; import java.util.Date; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleCertService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleCertService.java index bbb1acc0..3c4b5733 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleCertService.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleCertService.java @@ -2,7 +2,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.entity.GardsSampleCert; +import org.jeecg.modules.base.entity.original.GardsSampleCert; public interface IGardsSampleCertService extends IService { diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java index 1aba01e6..c4327688 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java @@ -3,7 +3,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.GardsSampleData; +import org.jeecg.modules.base.entity.original.GardsSampleData; import javax.servlet.http.HttpServletResponse; import java.util.Date; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java index 8d0029a4..a57e0f5e 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java @@ -3,9 +3,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.GardsSohData; -import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.web.bind.annotation.RequestParam; +import org.jeecg.modules.base.entity.original.GardsSohData; import javax.servlet.http.HttpServletResponse; import java.util.Date; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IMenuNameService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IMenuNameService.java index e9872ce2..9c02d771 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IMenuNameService.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IMenuNameService.java @@ -1,6 +1,6 @@ package org.jeecg.modules.service; -import org.jeecg.modules.system.entity.GardsStations; +import org.jeecg.modules.base.entity.configuration.GardsStations; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IReviewedService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IReviewedService.java index 4d9daa3d..8064c7a4 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IReviewedService.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IReviewedService.java @@ -3,16 +3,16 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.entity.GardsAnalysesMan; +import org.jeecg.modules.base.entity.rnman.GardsAnalyses; import javax.servlet.http.HttpServletResponse; import java.util.Date; -public interface IReviewedService extends IService { +public interface IReviewedService extends IService { Result findReviewedPage(QueryRequest queryRequest, Integer[] stationIds, Date startTime, Date endTime); - GardsAnalysesMan getOne(Integer sampleId); + GardsAnalyses getOne(Integer sampleId); void rrrExport(Integer[] stationIds, String startTime, String endTime, HttpServletResponse response); } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java index 33e24464..b1e6ad2b 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java @@ -1,8 +1,6 @@ package org.jeecg.modules.service.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -17,9 +15,8 @@ import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.ExportUtil; import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.base.dto.SampleDataDto; -import org.jeecg.modules.base.entity.GardsMetData; -import org.jeecg.modules.base.entity.GardsSampleData; -import org.jeecg.modules.entity.GardsAnalysesAuto; +import org.jeecg.modules.base.entity.original.GardsSampleData; +import org.jeecg.modules.base.entity.rnauto.GardsAnalyses; import org.jeecg.modules.mapper.GardsAnalysesAutoMapper; import org.jeecg.modules.mapper.GardsSampleDataWebMapper; import org.jeecg.modules.service.IAutoService; @@ -32,13 +29,12 @@ import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; -import java.text.ParseException; import java.util.*; import java.util.stream.Collectors; @Service("autoService") @DS("ora") -public class AutoServiceImpl extends ServiceImpl implements IAutoService { +public class AutoServiceImpl extends ServiceImpl implements IAutoService { @Autowired private IGardsSampleDataWebService gardsSampleDataService; @@ -83,12 +79,12 @@ public class AutoServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(GardsAnalysesAuto::getSampleId,sampleId); - GardsAnalysesAuto gardsAnalyses = getOne(wrapper); + public GardsAnalyses getOne(Integer sampleId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(GardsAnalyses::getSampleId,sampleId); + GardsAnalyses gardsAnalyses = getOne(wrapper); return Optional.ofNullable(gardsAnalyses) - .orElse(new GardsAnalysesAuto()); + .orElse(new GardsAnalyses()); } @Override @@ -97,12 +93,12 @@ public class AutoServiceImpl extends ServiceImpl gardsAnalyses = this.list(); + List gardsAnalyses = this.list(); // 获取全部样品id List sampleIds = gardsAnalyses .stream() - .map(GardsAnalysesAuto::getSampleId) + .map(GardsAnalyses::getSampleId) .collect(Collectors.toList()); if (CollUtil.isEmpty(sampleIds)) return; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsAlertDataServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsAlertDataServiceImpl.java index 7e0b1afe..1c8d5af2 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsAlertDataServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsAlertDataServiceImpl.java @@ -1,38 +1,25 @@ package org.jeecg.modules.service.impl; -import cn.hutool.core.collection.ListUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.poi.ss.usermodel.Workbook; -import org.jeecg.common.api.QueryRequest; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.ExportUtil; -import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.base.entity.GardsSampleData; -import org.jeecg.modules.base.entity.GardsSohData; -import org.jeecg.modules.entity.GardsAlertData; +import org.jeecg.modules.base.entity.original.GardsAlertData; import org.jeecg.modules.mapper.GardsAlertDataMapper; -import org.jeecg.modules.mapper.GardsSohDataMapper; import org.jeecg.modules.service.IGardsAlertDataService; -import org.jeecg.modules.service.IGardsSohDataService; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.entity.ExportParams; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; -import java.text.ParseException; -import java.util.*; - -import static org.jeecg.modules.base.enums.PageType.*; +import java.util.Date; +import java.util.List; @Service @DS("ora") diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsMetDataServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsMetDataServiceImpl.java index 23e0c03e..9dfcf6f1 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsMetDataServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsMetDataServiceImpl.java @@ -12,8 +12,7 @@ import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.ExportUtil; -import org.jeecg.modules.base.entity.GardsMetData; -import org.jeecg.modules.entity.GardsAlertData; +import org.jeecg.modules.base.entity.original.GardsMetData; import org.jeecg.modules.mapper.GardsMetDataMapper; import org.jeecg.modules.service.IGardsMetDataService; import org.jeecgframework.poi.excel.ExcelExportUtil; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleCertServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleCertServiceImpl.java index 1c3814b9..9449920e 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleCertServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleCertServiceImpl.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.entity.GardsSampleCert; -import org.jeecg.modules.entity.GardsSampleCertLine; +import org.jeecg.modules.base.entity.original.GardsSampleCert; +import org.jeecg.modules.base.entity.original.GardsSampleCertLine; import org.jeecg.modules.mapper.GardsSampleCertLineMapper; import org.jeecg.modules.mapper.GardsSampleCertMapper; import org.jeecg.modules.service.IGardsSampleCertService; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java index 742f397c..c8cd2e8c 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java @@ -1,12 +1,10 @@ package org.jeecg.modules.service.impl; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; @@ -21,10 +19,7 @@ import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.ExportUtil; import org.jeecg.common.util.ReadLineUtil; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.base.entity.GardsSampleData; -import org.jeecg.modules.base.entity.GardsSohData; -import org.jeecg.modules.base.enums.PageType; -import org.jeecg.modules.entity.*; +import org.jeecg.modules.base.entity.original.*; import org.jeecg.modules.entity.data.*; import org.jeecg.modules.mapper.*; import org.jeecg.modules.service.IGardsSampleDataWebService; @@ -32,16 +27,11 @@ import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.entity.ExportParams; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; -import java.net.URLEncoder; import java.text.ParseException; -import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -258,17 +248,17 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl calibrationPairsOrigQueryWrapper = new LambdaQueryWrapper<>(); calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleType, "G"); calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleId, sampleId); - calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdcalpoint); + calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdCalPoint); List gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigMapper.selectList(calibrationPairsOrigQueryWrapper); gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigs.stream().filter(item->item.getCaltype().trim().equals("energy")).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(gardsCalibrationPairsOrigs)){ gEnergySubBlock = new LinkedList<>(); for (GardsCalibrationPairsOrig orig:gardsCalibrationPairsOrigs) { GEnergy gEnergy = new GEnergy(); - if (Objects.nonNull(orig.getYvalue()) && Objects.nonNull(orig.getXvalue()) && Objects.nonNull(orig.getUncyvalue())){ - gEnergy.setEnergy(orig.getYvalue()); - gEnergy.setCentroid(orig.getXvalue()); - gEnergy.setUncertainty(orig.getUncyvalue()); + if (Objects.nonNull(orig.getYValue()) && Objects.nonNull(orig.getXValue()) && Objects.nonNull(orig.getUncYValue())){ + gEnergy.setEnergy(orig.getYValue()); + gEnergy.setCentroid(orig.getXValue()); + gEnergy.setUncertainty(orig.getUncYValue()); gEnergySubBlock.add(gEnergy); } } @@ -281,17 +271,17 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl calibrationPairsOrigQueryWrapper = new LambdaQueryWrapper<>(); calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleType, "B"); calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleId, sampleId); - calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdcalpoint); + calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdCalPoint); List gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigMapper.selectList(calibrationPairsOrigQueryWrapper); gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigs.stream().filter(item->item.getCaltype().trim().equals("energy")).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(gardsCalibrationPairsOrigs)){ bEnergySubBlock = new LinkedList<>(); for (GardsCalibrationPairsOrig orig:gardsCalibrationPairsOrigs) { BEnergy bEnergy = new BEnergy(); - if (Objects.nonNull(orig.getYvalue()) && Objects.nonNull(orig.getXvalue()) && Objects.nonNull(orig.getUncyvalue()) && Objects.nonNull(orig.getDecayMode())){ - bEnergy.setElectronEnergy(orig.getYvalue()); - bEnergy.setMaximumChannel(orig.getXvalue()); - bEnergy.setUncertainty(orig.getUncyvalue()); + if (Objects.nonNull(orig.getYValue()) && Objects.nonNull(orig.getXValue()) && Objects.nonNull(orig.getUncYValue()) && Objects.nonNull(orig.getDecayMode())){ + bEnergy.setElectronEnergy(orig.getYValue()); + bEnergy.setMaximumChannel(orig.getXValue()); + bEnergy.setUncertainty(orig.getUncYValue()); bEnergy.setDecayModeDescriptor(orig.getDecayMode()); bEnergySubBlock.add(bEnergy); } @@ -305,17 +295,17 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl calibrationPairsOrigQueryWrapper = new LambdaQueryWrapper<>(); calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleType, "G"); calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleId, sampleId); - calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdcalpoint); + calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdCalPoint); List gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigMapper.selectList(calibrationPairsOrigQueryWrapper); gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigs.stream().filter(item->item.getCaltype().trim().equals("Resolution")).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(gardsCalibrationPairsOrigs)){ gResolutionSubBlock = new LinkedList<>(); for (GardsCalibrationPairsOrig orig:gardsCalibrationPairsOrigs) { GResolution gResolution = new GResolution(); - if (Objects.nonNull(orig.getYvalue()) && Objects.nonNull(orig.getXvalue()) && Objects.nonNull(orig.getUncyvalue())){ - gResolution.setEnergy(orig.getXvalue()); - gResolution.setFWHM(orig.getYvalue()); - gResolution.setUncertainty(orig.getUncyvalue()); + if (Objects.nonNull(orig.getYValue()) && Objects.nonNull(orig.getXValue()) && Objects.nonNull(orig.getUncYValue())){ + gResolution.setEnergy(orig.getXValue()); + gResolution.setFWHM(orig.getYValue()); + gResolution.setUncertainty(orig.getUncYValue()); gResolutionSubBlock.add(gResolution); } } @@ -328,17 +318,17 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl calibrationPairsOrigQueryWrapper = new LambdaQueryWrapper<>(); calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleType, "B"); calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleId, sampleId); - calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdcalpoint); + calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdCalPoint); List gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigMapper.selectList(calibrationPairsOrigQueryWrapper); gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigs.stream().filter(item->item.getCaltype().trim().equals("Resolution")).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(gardsCalibrationPairsOrigs)){ bResolutionSubBlock = new LinkedList<>(); for (GardsCalibrationPairsOrig orig:gardsCalibrationPairsOrigs) { BResolution bResolution = new BResolution(); - if (Objects.nonNull(orig.getYvalue()) && Objects.nonNull(orig.getXvalue()) && Objects.nonNull(orig.getUncyvalue())){ - bResolution.setElectronEnergy(orig.getXvalue()); - bResolution.setFWHM(orig.getYvalue()); - bResolution.setUncertainty(orig.getUncyvalue()); + if (Objects.nonNull(orig.getYValue()) && Objects.nonNull(orig.getXValue()) && Objects.nonNull(orig.getUncYValue())){ + bResolution.setElectronEnergy(orig.getXValue()); + bResolution.setFWHM(orig.getYValue()); + bResolution.setUncertainty(orig.getUncYValue()); bResolutionSubBlock.add(bResolution); } } @@ -351,17 +341,17 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl calibrationPairsOrigQueryWrapper = new LambdaQueryWrapper<>(); calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleType, "G"); calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleId, sampleId); - calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdcalpoint); + calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdCalPoint); List gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigMapper.selectList(calibrationPairsOrigQueryWrapper); gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigs.stream().filter(item->item.getCaltype().trim().equals("efficiency")).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(gardsCalibrationPairsOrigs)){ gEfficiencySubBlock = new LinkedList<>(); for (GardsCalibrationPairsOrig orig:gardsCalibrationPairsOrigs) { GEfficiency gEfficiency = new GEfficiency(); - if (Objects.nonNull(orig.getYvalue()) && Objects.nonNull(orig.getXvalue()) && Objects.nonNull(orig.getUncyvalue())){ - gEfficiency.setEnergy(orig.getXvalue()); - gEfficiency.setEfficiency(orig.getYvalue()); - gEfficiency.setUncertainty(orig.getUncyvalue()); + if (Objects.nonNull(orig.getYValue()) && Objects.nonNull(orig.getXValue()) && Objects.nonNull(orig.getUncYValue())){ + gEfficiency.setEnergy(orig.getXValue()); + gEfficiency.setEfficiency(orig.getYValue()); + gEfficiency.setUncertainty(orig.getUncYValue()); gEfficiencySubBlock.add(gEfficiency); } } @@ -446,7 +436,7 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl map = readLineUtil.readLine(gardsSpectrum.getFileName(), SampleFileHeader.GSPECTRUM.getMessage()); + Map map = readLineUtil.readLine(gardsSpectrum.getFilename(), SampleFileHeader.GSPECTRUM.getMessage()); List gSpectrumSubBlock = new LinkedList<>(); if (CollectionUtils.isNotEmpty(map)){ gSpectrumSubBlock = (List)map.get(SampleFileHeader.GSPECTRUM.getMessage()); @@ -470,7 +460,7 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl map = readLineUtil.readLine(gardsSpectrum.getFileName(), SampleFileHeader.BSPECTRUM.getMessage()); + Map map = readLineUtil.readLine(gardsSpectrum.getFilename(), SampleFileHeader.BSPECTRUM.getMessage()); List bSpectrumSubBlock = new LinkedList<>(); if (CollectionUtils.isNotEmpty(map)) { bSpectrumSubBlock = (List)map.get(SampleFileHeader.BSPECTRUM.getMessage()); @@ -493,7 +483,7 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl map = readLineUtil.readLine(gardsHistogram.getFileName(), SampleFileHeader.HISTOGRAM.getMessage()); + Map map = readLineUtil.readLine(gardsHistogram.getFilename(), SampleFileHeader.HISTOGRAM.getMessage()); List histogramSubBlock = new LinkedList<>(); if (CollectionUtils.isNotEmpty(map)) { histogramSubBlock = (List)map.get(SampleFileHeader.HISTOGRAM.getMessage()); diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java index 00e414b3..738918bf 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java @@ -1,10 +1,8 @@ package org.jeecg.modules.service.impl; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,8 +13,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.ExportUtil; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.base.entity.GardsSohData; -import org.jeecg.modules.entity.GardsAlertData; +import org.jeecg.modules.base.entity.original.GardsAlertData; +import org.jeecg.modules.base.entity.original.GardsSohData; import org.jeecg.modules.mapper.GardsAlertDataMapper; import org.jeecg.modules.mapper.GardsSohDataMapper; import org.jeecg.modules.service.IGardsSohDataService; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/ReviewedServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/ReviewedServiceImpl.java index b7e3d3dc..06b8b6ce 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/ReviewedServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/ReviewedServiceImpl.java @@ -15,9 +15,8 @@ import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.ExportUtil; import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.base.dto.SampleDataDto; -import org.jeecg.modules.base.entity.GardsSampleData; -import org.jeecg.modules.entity.GardsAnalysesAuto; -import org.jeecg.modules.entity.GardsAnalysesMan; +import org.jeecg.modules.base.entity.original.GardsSampleData; +import org.jeecg.modules.base.entity.rnman.GardsAnalyses; import org.jeecg.modules.mapper.GardsAnalysesManMapper; import org.jeecg.modules.mapper.GardsSampleDataWebMapper; import org.jeecg.modules.service.IGardsSampleDataWebService; @@ -30,13 +29,12 @@ import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; -import java.text.ParseException; import java.util.*; import java.util.stream.Collectors; @Service("reviewedService") @DS("ora") -public class ReviewedServiceImpl extends ServiceImpl implements IReviewedService { +public class ReviewedServiceImpl extends ServiceImpl implements IReviewedService { @Autowired private IGardsSampleDataWebService gardsSampleDataService; @@ -81,12 +79,12 @@ public class ReviewedServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(GardsAnalysesMan::getSampleId,sampleId); - GardsAnalysesMan gardsAnalyses = getOne(wrapper); + public GardsAnalyses getOne(Integer sampleId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(GardsAnalyses::getSampleId,sampleId); + GardsAnalyses gardsAnalyses = getOne(wrapper); return Optional.ofNullable(gardsAnalyses) - .orElse(new GardsAnalysesMan()); + .orElse(new GardsAnalyses()); } @Override @@ -95,12 +93,12 @@ public class ReviewedServiceImpl extends ServiceImpl gardsAnalyses = this.list(); + List gardsAnalyses = this.list(); // 获取全部样品id List sampleIds = gardsAnalyses .stream() - .map(GardsAnalysesMan::getSampleId) + .map(GardsAnalyses::getSampleId) .collect(Collectors.toList()); if (CollUtil.isEmpty(sampleIds)) return; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/system/entity/GardsDetectors.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/system/entity/GardsDetectors.java deleted file mode 100644 index 1495c58c..00000000 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/system/entity/GardsDetectors.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.jeecg.modules.system.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -@Data -@TableName("GARDS_DETECTORS") -public class GardsDetectors implements Serializable { - - @TableField(value = "DETECTOR_ID") - private Integer detectorId; - - @TableField(value = "DETECTOR_CODE") - private String detectorCode; - - @TableField(value = "LON") - private Double lon; - - @TableField(value = "LAT") - private Double lat; - - @TableField(value = "TYPE") - private String type; - - @TableField(value = "CHANNELS") - private Double channels; - - @TableField(value = "RATED_EFFICIENCY") - private Double ratedEfficiency; - - @TableField(value = "RATED_RESOLUTION") - private Double ratedResolution; - - @TableField(value = "ECAL_RANGE_MAX") - private Double ecalRangeMax; - - @TableField(value = "DATE_BEGIN") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date dateBegin; - - @TableField(value = "DATE_END") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date dateEnd; - - @TableField(value = "STATUS") - private String status; - - @TableField(value = "DESCRIPTION") - private String description; - - @TableField(value = "MODDATE") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date moddate; - - @TableField(value = "STATION_ID") - private Integer stationId; - - @TableField(exist = false) - private String stationName; - -} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/system/entity/GardsStations.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/system/entity/GardsStations.java deleted file mode 100644 index 8966904d..00000000 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/system/entity/GardsStations.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.jeecg.modules.system.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -@Data -@TableName(value = "GARDS_STATIONS") -public class GardsStations implements Serializable { - - @TableField(value = "STATION_ID") - private Integer stationId; - - @TableField(value = "STATION_CODE") - private String stationCode; - - @TableField(value = "COUNTRY_CODE") - private String countryCode; - - @TableField(value = "TYPE") - private String type; - - @TableField(value = "LON") - private Double lon; - - @TableField(value = "LAT") - private Double lat; - - @TableField(value = "ELEVATION") - private Double elevation; - - @TableField(value = "DESCRIPTION") - private String description; - - @TableField(value = "DATE_BEGIN") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date dateBegin; - - @TableField(value = "DATE_END") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date dateEnd; - - @TableField(value = "STATUS") - private String status; - - @TableField(value = "MODDATE") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date moddate; - -} From 8194e893269b07c5e0690781a1817fe8044f84f1 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Tue, 1 Aug 2023 10:42:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/common/Excel/ImportExcel.java | 1 - .../java/org/jeecg/common/api/dto/LogDTO.java | 2 + .../api/dto/message/TemplateMessageDTO.java | 1 + .../jeecg/common/aspect/AutoLogAspect.java | 3 +- .../common/aspect/annotation/AutoLowApp.java | 4 +- .../aspect/annotation/PermissionData.java | 6 +- .../common/constant/ProvinceCityArea.java | 6 +- .../exception/JeecgBootExceptionHandler.java | 3 +- .../base/controller/JeecgController.java | 1 - .../system/base/entity/JeecgEntity.java | 10 +- .../base/service/impl/JeecgServiceImpl.java | 5 +- .../common/system/query/QueryGenerator.java | 32 +- .../org/jeecg/common/system/util/JwtUtil.java | 17 +- .../org/jeecg/common/system/vo/DictModel.java | 5 +- .../org/jeecg/common/system/vo/LoginUser.java | 10 +- .../common/system/vo/SysCategoryModel.java | 2 - .../system/vo/SysPermissionDataRuleModel.java | 7 - .../common/system/vo/SysUserCacheInfo.java | 4 +- .../org/jeecg/common/util/BrowserUtils.java | 3 +- .../org/jeecg/common/util/DySmsHelper.java | 7 +- .../org/jeecg/common/util/ExportUtil.java | 5 - .../java/org/jeecg/common/util/FTPUtil.java | 3 +- .../java/org/jeecg/common/util/IpUtils.java | 4 +- .../org/jeecg/common/util/PasswordUtil.java | 4 +- .../jeecg/common/util/SpringContextUtils.java | 6 +- .../jeecg/common/util/SqlInjectionUtil.java | 1 + .../util/dynamic/db/DataSourceCachePool.java | 1 + .../common/util/dynamic/db/DynamicDBUtil.java | 2 - .../jeecg/common/util/oss/OssBootUtil.java | 1 - .../common/util/security/SecurityTools.java | 3 +- .../org/jeecg/config/AutoPoiDictConfig.java | 10 +- .../java/org/jeecg/config/DruidConfig.java | 12 +- .../java/org/jeecg/config/Swagger2Config.java | 1 - .../config/mybatis/MybatisPlusSaasConfig.java | 18 +- .../config/mybatis/ThreadLocalDataHelper.java | 1 + .../org/jeecg/config/shiro/ShiroConfig.java | 1 - .../filters/CustomShiroFilterFactoryBean.java | 2 +- .../shiro/filters/ResourceCheckFilter.java | 7 +- .../sign/interceptor/SignAuthInterceptor.java | 15 +- .../org/jeecg/config/sign/util/HttpUtils.java | 16 +- .../main/java/org/jeecg/config/vo/Path.java | 2 - .../jeecg/modules/base/dto/AlarmRuleDto.java | 8 - .../jeecg/modules/base/dto/AlarmRuleInfo.java | 1 + .../org/jeecg/modules/base/dto/SourceDto.java | 1 + .../entity/configuration/GardsDetectors.java | 6 - .../entity/configuration/GardsStations.java | 3 - .../modules/base/entity/monitor/Host.java | 1 + .../base/entity/monitor/ItemHistory.java | 1 - .../modules/base/entity/monitor/Servers.java | 1 + .../base/entity/original/GardsAlertData.java | 3 - .../base/entity/original/GardsMetData.java | 7 +- .../base/entity/original/GardsSampleAux.java | 1 + .../entity/original/GardsSampleCertLine.java | 1 + .../base/entity/original/GardsSampleData.java | 27 +- .../original/GardsSampleDescription.java | 1 + .../base/entity/original/GardsSohData.java | 18 - .../entity/postgre/AlarmContactGroup.java | 19 - .../base/entity/postgre/AlarmRule.java | 7 - .../postgre/StationReceivingConfig.java | 7 - .../entity/postgre/SysAnnouncementSend.java | 6 +- .../base/entity/postgre/SysDataLog.java | 10 +- .../entity/postgre/SysDepartPermission.java | 5 - .../base/entity/postgre/SysDepartRole.java | 7 +- .../postgre/SysDepartRolePermission.java | 7 +- .../entity/postgre/SysDepartRoleUser.java | 5 - .../modules/base/entity/postgre/SysDict.java | 7 +- .../base/entity/postgre/SysDictItem.java | 8 +- .../modules/base/entity/postgre/SysEmail.java | 1 - .../base/entity/postgre/SysEmailLog.java | 1 - .../modules/base/entity/postgre/SysFiles.java | 1 + .../base/entity/postgre/SysFormFile.java | 1 + .../modules/base/entity/postgre/SysLog.java | 10 +- .../entity/postgre/SysPackPermission.java | 11 +- .../base/entity/postgre/SysPermission.java | 6 +- .../entity/postgre/SysPermissionDataRule.java | 7 +- .../base/entity/postgre/SysRoleIndex.java | 8 +- .../entity/postgre/SysRolePermission.java | 7 +- .../modules/base/entity/postgre/SysTask.java | 7 - .../base/entity/postgre/SysTaskStation.java | 3 - .../base/entity/postgre/SysTenant.java | 2 +- .../base/entity/postgre/SysTenantPack.java | 23 +- .../base/entity/postgre/SysUserAgent.java | 8 +- .../base/entity/postgre/SysUserDepart.java | 5 +- .../entity/postgre/SysUserFocusStation.java | 33 - .../base/entity/postgre/SysUserRole.java | 5 +- .../base/entity/postgre/SysUserTenant.java | 11 +- .../base/entity/rnauto/GardsAnalyses.java | 7 +- .../base/entity/rnauto/GardsCalibration.java | 8 +- .../entity/rnauto/GardsCalibrationPairs.java | 8 +- .../base/entity/rnauto/GardsNuclIded.java | 7 +- .../entity/rnauto/GardsNuclLinesIded.java | 7 +- .../base/entity/rnauto/GardsPeaks.java | 9 +- .../base/entity/rnauto/GardsRoiChannels.java | 7 +- .../base/entity/rnauto/GardsRoiResults.java | 7 +- .../base/entity/rnauto/GardsXeResults.java | 7 +- .../base/entity/rnman/GardsAnalyses.java | 7 +- .../base/entity/rnman/GardsCalibration.java | 7 +- .../entity/rnman/GardsCalibrationPairs.java | 7 +- .../base/entity/rnman/GardsNuclIded.java | 7 +- .../base/entity/rnman/GardsNuclLinesIded.java | 7 +- .../modules/base/entity/rnman/GardsPeaks.java | 8 +- .../base/entity/rnman/GardsRoiChannels.java | 7 +- .../base/entity/rnman/GardsRoiResults.java | 7 +- .../base/entity/rnman/GardsXeResults.java | 7 +- .../service/impl/BaseCommonServiceImpl.java | 6 +- .../org/jeecg/modules/base/vo/SourceVo.java | 1 + .../AlarmContactGroupMemberController.java | 5 +- .../controller/AlarmItemController.java | 3 +- .../controller/AlarmRuleController.java | 7 +- .../controller/SysDatabaseController.java | 2 +- .../controller/SysEmailController.java | 2 +- .../controller/SysServerController.java | 2 +- .../entity/AlarmContactGroupAbnormal.java | 33 + .../jeecg/modules/entity/AlarmHistory.java | 1 - .../modules/entity/AlarmRuleAbnormal.java | 19 + .../jeecg/modules/mapper/AlarmLogMapper.java | 2 +- .../modules/mapper/SysDatabaseMapper.java | 2 +- .../jeecg/modules/mapper/SysEmailMapper.java | 2 +- .../jeecg/modules/mapper/SysServerMapper.java | 2 +- .../modules/service/ISysDatabaseService.java | 2 +- .../modules/service/ISysEmailService.java | 2 +- .../modules/service/ISysServerService.java | 2 +- .../impl/AlarmContactGroupServiceImpl.java | 6 +- .../service/impl/AlarmItemServiceImpl.java | 2 +- .../service/impl/AlarmLogServiceImpl.java | 2 +- .../service/impl/AlarmRuleServiceImpl.java | 11 +- .../service/impl/SysDatabaseServiceImpl.java | 2 +- .../service/impl/SysEmailServiceImpl.java | 2 +- .../service/impl/SysServerServiceImpl.java | 2 +- .../java/org/jeecg/modules/vo/AlarmVo.java | 1 + .../JcloudDemoProviderController.java | 1 - .../demo/cloud/service/JcloudDemoService.java | 2 - .../service/impl/JcloudDemoServiceImpl.java | 1 - .../test/controller/JeecgDemoController.java | 2 - .../JeecgDynamicDataController.java | 6 +- .../controller/JeecgOrderMainController.java | 36 +- .../test/controller/JoaDemoController.java | 39 +- .../modules/demo/test/entity/JeecgDemo.java | 14 +- .../demo/test/entity/JeecgOrderCustomer.java | 6 +- .../demo/test/entity/JeecgOrderMain.java | 6 +- .../demo/test/entity/JeecgOrderTicket.java | 5 +- .../modules/demo/test/entity/JoaDemo.java | 10 +- .../demo/test/mapper/JeecgDemoMapper.java | 9 +- .../test/mapper/JeecgOrderCustomerMapper.java | 5 +- .../test/mapper/JeecgOrderMainMapper.java | 5 +- .../test/mapper/JeecgOrderTicketMapper.java | 6 +- .../demo/test/mapper/JoaDemoMapper.java | 3 +- .../demo/test/service/IJeecgDemoService.java | 3 +- .../service/IJeecgOrderCustomerService.java | 5 +- .../test/service/IJeecgOrderMainService.java | 9 +- .../service/IJeecgOrderTicketService.java | 5 +- .../demo/test/service/IJoaDemoService.java | 3 +- .../impl/JeecgOrderCustomerServiceImpl.java | 5 +- .../impl/JeecgOrderMainServiceImpl.java | 11 +- .../impl/JeecgOrderTicketServiceImpl.java | 5 +- .../test/service/impl/JoaDemoServiceImpl.java | 3 +- .../demo/test/vo/JeecgOrderMainPage.java | 5 +- .../dlglong/controller/DlMockController.java | 2 +- .../controller/LogManageController.java | 9 +- .../org/jeecg/common/util/PHDFileUtil.java | 32 +- .../org/jeecg/common/util/UserTaskUtil.java | 9 +- .../modules/controller/GammaController.java | 10 - .../SpectrumAnalysesController.java | 50 +- .../modules/entity/GardsAnalysesMan.java | 112 --- .../entity/GardsSampleDataSpectrum.java | 38 + .../jeecg/modules/entity/GardsXeResults.java | 45 -- .../entity/GardsXeResultsSpectrum.java | 16 + .../org/jeecg/modules/entity/SysDict.java | 50 -- .../org/jeecg/modules/entity/SysDictItem.java | 80 --- .../modules/entity/vo/StatisticsData.java | 23 + .../entity/vo/StatisticsQueryData.java | 62 ++ .../org/jeecg/modules/entity/vo/StcGraph.java | 20 + .../mapper/GardsAnalysesManMapper.java | 4 +- .../mapper/SpectrumAnalysisMapper.java | 31 +- .../mapper/SysDictItemSpectrumMapper.java | 2 +- .../modules/mapper/SysDictSpectrumMapper.java | 2 +- .../mapper/xml/SpectrumAnalysisMapper.xml | 198 +++++- .../service/ISpectrumAnalysisService.java | 19 +- .../service/ISysDictSpectrumService.java | 2 +- .../impl/SpectrumAnalysisServiceImpl.java | 655 ++++++++++++++---- .../impl/SysDictSpectrumServiceImpl.java | 4 +- .../jeecg/modules/system/entity/SysUser.java | 1 - .../main/java/org/jeecg/common/CacheName.java | 2 - .../main/java/org/jeecg/common/PointUtil.java | 3 - .../SysUserFocusStationController.java | 6 +- .../entity/StationReceivingConfigStation.java | 20 + .../entity/SysUserFocusStationStation.java | 42 ++ .../jeecg/modules/entity/data/DataInfoVo.java | 3 - .../mapper/StationReceivingConfigMapper.java | 4 +- .../mapper/SysUserFocusStationMapper.java | 4 +- .../modules/service/ICacheTimeService.java | 2 +- .../service/ISysUserFocusStationService.java | 6 +- .../impl/StationOperationServiceImpl.java | 13 +- .../impl/SysUserFocusStationServiceImpl.java | 46 +- .../factory/SysBaseAPIFallbackFactory.java | 2 +- .../java/org/jeecg/modules/aop/TenantLog.java | 3 - .../modules/aop/TenantPackUserLogAspect.java | 2 +- .../cas/controller/CasClientController.java | 17 +- .../modules/cas/util/CasServiceUtil.java | 17 +- .../org/jeecg/modules/cas/util/XmlUtils.java | 23 +- .../modules/feignclient/MonitorSystem.java | 3 +- .../jeecg/modules/message/SendMessage.java | 4 +- .../controller/SysMessageController.java | 26 +- .../SysMessageTemplateController.java | 30 +- .../controller/TestSocketController.java | 3 +- .../modules/message/entity/MsgParams.java | 4 +- .../modules/message/entity/SysMessage.java | 12 +- .../message/entity/SysMessageTemplate.java | 6 +- .../modules/message/enums/RangeDateEnum.java | 1 - .../handle/impl/EmailSendMsgHandle.java | 2 +- .../handle/impl/SystemSendMsgHandle.java | 6 +- .../message/mapper/SysMessageMapper.java | 5 +- .../service/ISysMessageTemplateService.java | 4 +- .../service/impl/SysMessageServiceImpl.java | 2 - .../impl/SysMessageTemplateServiceImpl.java | 1 + .../modules/message/util/PushMsgUtil.java | 3 +- .../modules/message/websocket/WebSocket.java | 15 +- .../modules/monitor/service/RedisService.java | 7 +- .../service/impl/RedisServiceImpl.java | 13 +- .../service/impl/NgAlainServiceImpl.java | 2 +- .../oss/controller/OssFileController.java | 14 +- .../modules/oss/service/IOssFileService.java | 4 +- .../oss/service/impl/OssFileServiceImpl.java | 2 - .../controller/QuartzJobController.java | 2 - .../modules/quartz/entity/QuartzJob.java | 15 +- .../jeecg/modules/quartz/job/SysInfoJob.java | 2 +- .../quartz/mapper/QuartzJobMapper.java | 5 +- .../quartz/service/IQuartzJobService.java | 5 +- .../jeecg/modules/redisStream/ConsumeA1.java | 2 +- .../redisStream/RedisStreamConfig.java | 2 +- .../system/controller/CommonController.java | 14 +- .../controller/DuplicateCheckController.java | 9 +- .../controller/GardsDetectorsController.java | 16 +- .../controller/GardsSampleDataController.java | 6 +- .../system/controller/LoginController.java | 2 +- .../controller/SysAnnouncementController.java | 9 +- .../SysAnnouncementSendController.java | 34 +- .../controller/SysDataLogController.java | 17 +- .../SysDepartPermissionController.java | 27 +- .../controller/SysDepartRoleController.java | 32 +- .../controller/SysDictItemController.java | 24 +- .../system/controller/SysLogController.java | 15 +- .../system/controller/SysRoleController.java | 39 +- .../controller/SysRoleIndexController.java | 24 +- .../system/controller/SysTaskController.java | 12 +- .../controller/SysUserAgentController.java | 34 +- .../system/controller/SysUserController.java | 7 +- .../controller/ThirdLoginController.java | 7 +- .../system/entity/GardsDetectorsSystem.java | 18 + .../system/entity/GardsSampleDataSystem.java | 38 + .../system/entity/SysTaskStationSystem.java | 15 + .../modules/system/entity/SysTaskSystem.java | 20 + .../modules/system/entity/vo/SysTaskVo.java | 4 +- .../system/mapper/GardsDetectorsMapper.java | 6 +- .../system/mapper/GardsSampleDataMapper.java | 4 +- .../system/mapper/SysAnnouncementMapper.java | 11 +- .../mapper/SysAnnouncementSendMapper.java | 7 +- .../system/mapper/SysDataLogMapper.java | 3 +- .../mapper/SysDepartPermissionMapper.java | 2 +- .../system/mapper/SysDepartRoleMapper.java | 6 +- .../mapper/SysDepartRolePermissionMapper.java | 2 +- .../mapper/SysDepartRoleUserMapper.java | 2 +- .../system/mapper/SysDictItemMapper.java | 2 +- .../modules/system/mapper/SysLogMapper.java | 9 +- .../mapper/SysPackPermissionMapper.java | 6 +- .../mapper/SysPermissionDataRuleMapper.java | 5 +- .../system/mapper/SysPermissionMapper.java | 5 +- .../system/mapper/SysRoleIndexMapper.java | 2 +- .../modules/system/mapper/SysRoleMapper.java | 4 +- .../mapper/SysRolePermissionMapper.java | 2 +- .../modules/system/mapper/SysTaskMapper.java | 10 +- .../system/mapper/SysTaskStationMapper.java | 4 +- .../system/mapper/SysUserAgentMapper.java | 2 +- .../system/mapper/SysUserDepartMapper.java | 5 +- .../modules/system/mapper/SysUserMapper.java | 2 +- .../system/mapper/SysUserRoleMapper.java | 5 +- .../system/mapper/SysUserTenantMapper.java | 6 +- .../mapper/xml/GardsDetectorsMapper.xml | 2 +- .../system/mapper/xml/SysTaskMapper.xml | 2 +- .../modules/system/model/DepartIdModel.java | 4 +- .../system/model/DuplicateCheckVo.java | 3 +- .../modules/system/model/SysDictTree.java | 10 +- .../system/model/SysPermissionTree.java | 3 +- .../jeecg/modules/system/model/TreeModel.java | 4 +- .../security/DictQueryBlackListHandler.java | 1 - .../service/IGardsDetectorsService.java | 14 +- .../service/IGardsSampleDataService.java | 6 +- .../service/ISysAnnouncementSendService.java | 9 +- .../system/service/ISysDataLogService.java | 3 +- .../service/ISysDepartPermissionService.java | 2 +- .../ISysDepartRolePermissionService.java | 2 +- .../system/service/ISysDepartRoleService.java | 2 +- .../service/ISysDepartRoleUserService.java | 2 +- .../system/service/ISysDictItemService.java | 2 +- .../system/service/ISysLogService.java | 7 +- .../service/ISysPackPermissionService.java | 2 +- .../ISysPermissionDataRuleService.java | 5 +- .../system/service/ISysPermissionService.java | 5 +- .../system/service/ISysRoleIndexService.java | 2 +- .../service/ISysRolePermissionService.java | 2 +- .../system/service/ISysTaskService.java | 10 +- .../service/ISysTaskStationService.java | 8 +- .../system/service/ISysUserAgentService.java | 2 +- .../system/service/ISysUserDepartService.java | 6 +- .../system/service/ISysUserRoleService.java | 3 +- .../system/service/ISysUserTenantService.java | 2 +- .../impl/GardsDetectorsServiceImpl.java | 66 +- .../impl/GardsSampleDataServiceImpl.java | 30 +- .../impl/SysAnnouncementSendServiceImpl.java | 10 +- .../system/service/impl/SysBaseApiImpl.java | 12 +- .../service/impl/SysDataLogServiceImpl.java | 2 +- .../impl/SysDepartPermissionServiceImpl.java | 3 +- .../SysDepartRolePermissionServiceImpl.java | 3 +- .../impl/SysDepartRoleServiceImpl.java | 3 +- .../impl/SysDepartRoleUserServiceImpl.java | 3 +- .../service/impl/SysDictItemServiceImpl.java | 2 +- .../service/impl/SysLogServiceImpl.java | 12 +- .../impl/SysPackPermissionServiceImpl.java | 3 +- .../impl/SysPermissionDataRuleImpl.java | 16 +- .../impl/SysPermissionServiceImpl.java | 18 +- .../service/impl/SysRoleIndexServiceImpl.java | 3 +- .../impl/SysRolePermissionServiceImpl.java | 11 +- .../service/impl/SysRoleServiceImpl.java | 5 - .../service/impl/SysTaskServiceImpl.java | 125 ++-- .../impl/SysTaskStationServiceImpl.java | 16 +- .../service/impl/SysUserAgentServiceImpl.java | 3 +- .../service/impl/SysUserRoleServiceImpl.java | 3 +- .../service/impl/SysUserServiceImpl.java | 22 +- .../impl/SysUserTenantServiceImpl.java | 2 +- .../system/util/PermissionDataUtil.java | 4 +- .../modules/system/vo/SysDepartUsersVO.java | 4 +- .../modules/system/vo/SysUserOnlineVO.java | 8 +- .../codegenerate/JeecgOneToMainUtil.java | 6 +- .../controller/WebStatisticsController.java | 8 +- .../modules/entity/GardsAlertDataWeb.java | 17 + .../jeecg/modules/entity/GardsMetDataWeb.java | 17 + .../modules/entity/GardsSampleDataWeb.java | 38 + .../jeecg/modules/entity/GardsSohDataWeb.java | 36 + .../modules/entity}/dto/SampleDataDto.java | 6 +- .../modules/mapper/GardsAlertDataMapper.java | 4 +- .../modules/mapper/GardsMetDataMapper.java | 4 +- .../mapper/GardsSampleDataWebMapper.java | 8 +- .../modules/mapper/GardsSohDataMapper.java | 4 +- .../service/IGardsAlertDataService.java | 4 +- .../modules/service/IGardsMetDataService.java | 4 +- .../service/IGardsSampleDataWebService.java | 8 +- .../modules/service/IGardsSohDataService.java | 6 +- .../modules/service/impl/AutoServiceImpl.java | 10 +- .../impl/GardsAlertDataServiceImpl.java | 19 +- .../service/impl/GardsMetDataServiceImpl.java | 30 +- .../impl/GardsSampleDataWebServiceImpl.java | 73 +- .../service/impl/GardsSohDataServiceImpl.java | 52 +- .../service/impl/ReviewedServiceImpl.java | 10 +- .../jeecg/filter/GlobalAccessTokenFilter.java | 2 + .../swagger/MySwaggerResourceProvider.java | 1 - .../repository/DynamicRouteService.java | 1 - .../MyInMemoryRouteDefinitionRepository.java | 12 +- .../dashboard/JeecgSentinelApplication.java | 4 +- .../controller/AuthorityRuleController.java | 24 +- .../controller/DegradeController.java | 21 +- .../controller/SystemController.java | 12 +- .../gateway/GatewayFlowRuleController.java | 2 +- .../controller/v2/FlowControllerV2.java | 22 +- .../dashboard/rule/nacos/SentinelConfig.java | 17 +- .../degrade/DegradeRuleNacosProvider.java | 1 - .../degrade/DegradeRuleNacosPublisher.java | 1 - .../nacos/flow/FlowRuleNacosProvider.java | 12 +- .../nacos/flow/FlowRuleNacosPublisher.java | 10 +- .../GateWayFlowRulesNacosProvider.java | 1 - .../GateWayFlowRulesNacosPublisher.java | 10 +- .../paramflow/ParamFlowRuleNacosProvider.java | 1 - .../ParamFlowRuleNacosPublisher.java | 1 - .../test/feign/client/JeecgTestClient.java | 3 - .../controller/JeecgTestFeignController.java | 11 +- .../feign/factory/JeecgTestClientFactory.java | 4 +- .../feign/fallback/JeecgTestFallback.java | 2 - .../jeecg/modules/test/lock/DemoLockTest.java | 2 - .../modules/test/xxljob/DemoJobHandler.java | 2 +- .../controller/JeecgMqTestController.java | 9 +- .../test/rabbitmq/event/DemoBusEvent.java | 5 +- .../rabbitmq/listener/HelloReceiver1.java | 6 +- .../rabbitmq/listener/HelloTimeReceiver.java | 6 +- .../controller/SeataAccountController.java | 1 - .../service/impl/SeataAccountServiceImpl.java | 1 - .../controller/SeataOrderController.java | 2 +- .../service/impl/SeataOrderServiceImpl.java | 3 +- .../service/impl/SeataProductServiceImpl.java | 2 - .../JeecgShardingDemoController.java | 8 +- .../test/sharding/entity/ShardingSysLog.java | 2 - .../resolver/WebExceptionResolver.java | 2 +- .../job/admin/core/cron/CronExpression.java | 11 +- .../route/strategy/ExecutorRouteBusyover.java | 2 +- .../route/strategy/ExecutorRouteFailover.java | 2 +- .../com/xxl/job/admin/dao/XxlJobUserDao.java | 1 + .../admin/service/impl/XxlJobServiceImpl.java | 2 +- 395 files changed, 2472 insertions(+), 2104 deletions(-) create mode 100644 jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroupAbnormal.java create mode 100644 jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmRuleAbnormal.java delete mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsAnalysesMan.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java delete mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsXeResults.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsXeResultsSpectrum.java delete mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/SysDict.java delete mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/SysDictItem.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StatisticsData.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StatisticsQueryData.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StcGraph.java create mode 100644 jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/StationReceivingConfigStation.java create mode 100644 jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStationStation.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsDetectorsSystem.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsSampleDataSystem.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTaskStationSystem.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTaskSystem.java create mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAlertDataWeb.java create mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsMetDataWeb.java create mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleDataWeb.java create mode 100644 jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSohDataWeb.java rename {jeecg-boot-base-core/src/main/java/org/jeecg/modules/base => jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity}/dto/SampleDataDto.java (87%) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/Excel/ImportExcel.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/Excel/ImportExcel.java index 3f18185b..f5f35de2 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/Excel/ImportExcel.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/Excel/ImportExcel.java @@ -14,7 +14,6 @@ import java.io.InputStream; import java.lang.reflect.Field; import java.text.NumberFormat; import java.text.ParseException; -import java.time.LocalDateTime; import java.util.*; /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java index e9594362..63b56df7 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java @@ -1,6 +1,8 @@ package org.jeecg.common.api.dto; + import lombok.Data; import org.jeecg.common.system.vo.LoginUser; + import java.io.Serializable; import java.util.Date; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateMessageDTO.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateMessageDTO.java index 49427173..32a2d30b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateMessageDTO.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateMessageDTO.java @@ -1,6 +1,7 @@ package org.jeecg.common.api.dto.message; import lombok.Data; + import java.io.Serializable; import java.util.Map; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java index 7738835c..fd8bedea 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java @@ -15,15 +15,16 @@ import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.enums.ModuleType; import org.jeecg.common.constant.enums.OperateTypeEnum; -import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.IpUtils; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.base.service.BaseCommonService; import org.springframework.core.LocalVariableTableParameterNameDiscoverer; import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; + import javax.annotation.Resource; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLowApp.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLowApp.java index 2b3ded92..f5498002 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLowApp.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLowApp.java @@ -1,9 +1,9 @@ package org.jeecg.common.aspect.annotation; -import java.lang.annotation.*; - import org.jeecg.common.constant.enums.LowAppAopEnum; +import java.lang.annotation.*; + /** * 自动注入low_app_id * diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java index 1d8f3996..4c8fa7f8 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java @@ -1,10 +1,6 @@ package org.jeecg.common.aspect.annotation; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * 数据权限注解 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java index 6c2f1707..b476d852 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java @@ -2,16 +2,12 @@ package org.jeecg.common.constant; import com.alibaba.fastjson.JSONObject; import org.jeecg.common.util.oConvertUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.core.io.Resource; import org.springframework.stereotype.Component; import java.io.File; -import java.io.IOException; import java.util.ArrayList; -import java.util.Scanner; -import java.util.Set; import java.util.List; +import java.util.Scanner; /** * @Description: 省市区 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java index 6d5d8ef7..76064333 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java @@ -1,6 +1,7 @@ package org.jeecg.common.exception; import cn.hutool.core.util.ObjectUtil; +import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.AuthorizationException; import org.apache.shiro.authz.UnauthorizedException; import org.jeecg.common.api.vo.Result; @@ -16,8 +17,6 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.multipart.MaxUploadSizeExceededException; import org.springframework.web.servlet.NoHandlerFoundException; -import lombok.extern.slf4j.Slf4j; - /** * 异常处理器 * diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java index fdb1506b..2f621506 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java @@ -27,7 +27,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.*; -import java.util.stream.Collectors; /** * @Description: Controller基类 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java index 2eebaffd..35f50cd4 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java @@ -1,18 +1,16 @@ package org.jeecg.common.system.base.entity; -import java.io.Serializable; - -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; - import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** * @Description: Entity基类 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java index f19ba843..09344bf2 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java @@ -1,11 +1,10 @@ package org.jeecg.common.system.base.service.impl; -import org.jeecg.common.system.base.entity.JeecgEntity; -import org.jeecg.common.system.base.service.JeecgService; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.system.base.entity.JeecgEntity; +import org.jeecg.common.system.base.service.JeecgService; /** * @Description: ServiceImpl基类 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java index 5ad894e3..a6d17ad8 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java @@ -1,17 +1,9 @@ package org.jeecg.common.system.query; -import java.beans.PropertyDescriptor; -import java.io.UnsupportedEncodingException; -import java.lang.reflect.Field; -import java.math.BigDecimal; -import java.net.URLDecoder; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.beanutils.PropertyUtils; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.DataBaseConstant; @@ -26,11 +18,17 @@ import org.jeecg.common.util.SqlInjectionUtil; import org.jeecg.common.util.oConvertUtils; import org.springframework.util.NumberUtils; -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; - -import lombok.extern.slf4j.Slf4j; +import java.beans.PropertyDescriptor; +import java.io.UnsupportedEncodingException; +import java.lang.reflect.Field; +import java.math.BigDecimal; +import java.net.URLDecoder; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; /** * @Description: 查询生成器 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java index ff276e44..19edd7e1 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java @@ -7,15 +7,6 @@ import com.auth0.jwt.exceptions.JWTDecodeException; import com.auth0.jwt.interfaces.DecodedJWT; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Joiner; - -import java.io.IOException; -import java.io.OutputStream; -import java.util.Date; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; @@ -29,6 +20,14 @@ import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Date; + /** * @Author Scott * @Date 2018-07-12 14:23 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModel.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModel.java index b4071469..6c794e13 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModel.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModel.java @@ -1,13 +1,12 @@ package org.jeecg.common.system.vo; -import java.io.Serializable; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * @Description: 字典类 * @author: jeecg-boot diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java index 6d31b244..8a18a01d 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java @@ -1,15 +1,13 @@ package org.jeecg.common.system.vo; -import java.util.Date; - -import org.jeecg.common.desensitization.annotation.SensitiveField; -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.desensitization.annotation.SensitiveField; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** *

diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java index 5499bef2..c9fc0771 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java @@ -1,7 +1,5 @@ package org.jeecg.common.system.vo; -import org.jeecgframework.poi.excel.annotation.Excel; - /** * @Author qinfeng * @Date 2020/2/19 12:01 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java index f9204d62..a3997554 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java @@ -1,12 +1,5 @@ package org.jeecg.common.system.vo; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; import java.util.Date; /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java index a6e117ab..e444329a 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java @@ -1,9 +1,9 @@ package org.jeecg.common.system.vo; -import java.util.List; - import org.jeecg.common.util.DateUtils; +import java.util.List; + /** * @Description: 用户缓存信息 * @author: jeecg-boot diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java index 08b3fbcb..2748de97 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java @@ -1,12 +1,11 @@ package org.jeecg.common.util; +import javax.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.http.HttpServletRequest; - /** * * @Author 张代浩 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java index 48df5678..d8fb4847 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java @@ -1,9 +1,5 @@ package org.jeecg.common.util; -import org.jeecg.config.StaticConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.alibaba.fastjson.JSONObject; import com.aliyuncs.DefaultAcsClient; import com.aliyuncs.IAcsClient; @@ -12,6 +8,9 @@ import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; import com.aliyuncs.exceptions.ClientException; import com.aliyuncs.profile.DefaultProfile; import com.aliyuncs.profile.IClientProfile; +import org.jeecg.config.StaticConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Created on 17/6/7. diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ExportUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ExportUtil.java index 12cce76c..4b40c13a 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ExportUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ExportUtil.java @@ -1,16 +1,11 @@ package org.jeecg.common.util; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.util.CharsetUtil; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import static com.google.common.net.MediaType.OCTET_STREAM; - public class ExportUtil { private static final String UTF_8 = StandardCharsets.UTF_8.name(); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java index c79514f4..07d51776 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java @@ -12,7 +12,8 @@ import org.springframework.stereotype.Component; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.Arrays; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java index 01b9d6be..60987aa6 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java @@ -1,12 +1,12 @@ package org.jeecg.common.util; -import javax.servlet.http.HttpServletRequest; - import org.apache.commons.lang3.StringUtils; import org.jeecg.common.constant.CommonConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.servlet.http.HttpServletRequest; + /** * IP地址 * diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java index aaae509e..4f73e540 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java @@ -1,12 +1,12 @@ package org.jeecg.common.util; -import java.security.Key; -import java.security.SecureRandom; import javax.crypto.Cipher; import javax.crypto.SecretKey; import javax.crypto.SecretKeyFactory; import javax.crypto.spec.PBEKeySpec; import javax.crypto.spec.PBEParameterSpec; +import java.security.Key; +import java.security.SecureRandom; /** * @Description: 密码工具类 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java index bd46b7d8..f9d67869 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java @@ -1,8 +1,5 @@ package org.jeecg.common.util; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.ServiceNameConstants; import org.springframework.beans.BeansException; @@ -12,6 +9,9 @@ import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * @Description: spring上下文工具类 * @author: jeecg-boot diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java index 723e1ce4..60c45dc2 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java @@ -3,6 +3,7 @@ package org.jeecg.common.util; import cn.hutool.crypto.SecureUtil; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.exception.JeecgBootException; + import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Field; import java.util.Set; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java index 01998791..19782ee1 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java @@ -6,6 +6,7 @@ import org.jeecg.common.constant.CacheConstant; import org.jeecg.common.system.vo.DynamicDataSourceModel; import org.jeecg.common.util.SpringContextUtils; import org.springframework.data.redis.core.RedisTemplate; + import java.util.HashMap; import java.util.Map; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java index 38b172f9..fd25b585 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java @@ -4,14 +4,12 @@ import com.alibaba.druid.pool.DruidDataSource; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ArrayUtils; import org.jeecg.common.exception.JeecgBootException; -import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.vo.DynamicDataSourceModel; import org.jeecg.common.util.ReflectHelper; import org.jeecg.common.util.oConvertUtils; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; -import javax.sql.DataSource; import java.sql.SQLException; import java.util.HashMap; import java.util.List; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java index 4fb13e7b..60c35e76 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java @@ -20,7 +20,6 @@ import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.net.URLDecoder; import java.util.Date; import java.util.UUID; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/SecurityTools.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/SecurityTools.java index 9adc8bf1..22f8c703 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/SecurityTools.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/SecurityTools.java @@ -8,8 +8,9 @@ import cn.hutool.crypto.asymmetric.RSA; import cn.hutool.crypto.asymmetric.Sign; import cn.hutool.crypto.asymmetric.SignAlgorithm; import cn.hutool.crypto.symmetric.AES; -import org.jeecg.common.util.security.entity.*; import com.alibaba.fastjson.JSONObject; +import org.jeecg.common.util.security.entity.*; + import javax.crypto.SecretKey; import java.security.KeyPair; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java index 12c4fd86..5fd22c8d 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java @@ -1,10 +1,6 @@ package org.jeecg.config; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - +import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.CommonAPI; import org.jeecg.common.system.vo.DictModel; import org.jeecg.common.util.oConvertUtils; @@ -12,7 +8,9 @@ import org.jeecgframework.dict.service.AutoPoiDictServiceI; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import lombok.extern.slf4j.Slf4j; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; /** * 描述：AutoPoi Excel注解支持字典参数设置 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java index 7659172b..839759a3 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java @@ -1,9 +1,8 @@ package org.jeecg.config; -import java.io.IOException; - -import javax.servlet.*; - +import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; +import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; +import com.alibaba.druid.util.Utils; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; @@ -11,9 +10,8 @@ import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; -import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; -import com.alibaba.druid.util.Utils; +import javax.servlet.*; +import java.io.IOException; /** * @Description: DruidConfig配置类 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java index f3bb9b8f..2d3ef55b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java @@ -19,7 +19,6 @@ import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.ParameterBuilder; import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.oas.annotations.EnableOpenApi; import springfox.documentation.schema.ModelRef; import springfox.documentation.service.*; import springfox.documentation.spi.DocumentationType; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java index 24cfef98..a8911fe9 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java @@ -1,11 +1,14 @@ package org.jeecg.config.mybatis; -import java.util.ArrayList; -import java.util.List; - import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler; import com.baomidou.mybatisplus.extension.plugins.inner.DynamicTableNameInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; +import net.sf.jsqlparser.expression.Expression; +import net.sf.jsqlparser.expression.LongValue; import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.TenantConstant; @@ -16,13 +19,8 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler; -import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; - -import net.sf.jsqlparser.expression.Expression; -import net.sf.jsqlparser.expression.LongValue; +import java.util.ArrayList; +import java.util.List; /** * 单数据源配置（jeecg.datasource.open = false时生效） diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/ThreadLocalDataHelper.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/ThreadLocalDataHelper.java index 0b60721e..5fa0d8e4 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/ThreadLocalDataHelper.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/ThreadLocalDataHelper.java @@ -2,6 +2,7 @@ package org.jeecg.config.mybatis; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; + import java.util.concurrent.ConcurrentHashMap; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 534e47f2..6ba987ac 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -20,7 +20,6 @@ import org.jeecg.config.shiro.filters.CustomShiroFilterFactoryBean; import org.jeecg.config.shiro.filters.JwtFilter; import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.DependsOn; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java index 8668a44a..e084f73f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java @@ -1,6 +1,7 @@ package org.jeecg.config.shiro.filters; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.mgt.SecurityManager; import org.apache.shiro.spring.web.ShiroFilterFactoryBean; import org.apache.shiro.web.filter.InvalidRequestFilter; import org.apache.shiro.web.filter.mgt.DefaultFilter; @@ -9,7 +10,6 @@ import org.apache.shiro.web.filter.mgt.FilterChainResolver; import org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver; import org.apache.shiro.web.mgt.WebSecurityManager; import org.apache.shiro.web.servlet.AbstractShiroFilter; -import org.apache.shiro.mgt.SecurityManager; import org.springframework.beans.factory.BeanInitializationException; import javax.servlet.Filter; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java index ee2adf21..5fd6660e 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java @@ -1,12 +1,13 @@ package org.jeecg.config.shiro.filters; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.subject.Subject; +import org.apache.shiro.web.filter.AccessControlFilter; + import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.shiro.subject.Subject; -import org.apache.shiro.web.filter.AccessControlFilter; -import lombok.extern.slf4j.Slf4j; /** * @Author Scott diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java index 87e9c561..19cdcdea 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java @@ -1,12 +1,8 @@ package org.jeecg.config.sign.interceptor; -import java.io.PrintWriter; -import java.util.SortedMap; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.alibaba.fastjson.JSON; +import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.util.DateUtils; @@ -16,9 +12,10 @@ import org.jeecg.config.sign.util.HttpUtils; import org.jeecg.config.sign.util.SignUtil; import org.springframework.web.servlet.HandlerInterceptor; -import com.alibaba.fastjson.JSON; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.PrintWriter; +import java.util.SortedMap; /** * 签名拦截器 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java index 94fe002c..0af72e40 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java @@ -1,5 +1,12 @@ package org.jeecg.config.sign.util; +import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.constant.SymbolConstant; +import org.jeecg.common.util.oConvertUtils; +import org.springframework.http.HttpMethod; + +import javax.servlet.http.HttpServletRequest; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -10,15 +17,6 @@ import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -import javax.servlet.http.HttpServletRequest; - -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.constant.SymbolConstant; -import org.jeecg.common.util.oConvertUtils; -import org.springframework.http.HttpMethod; - -import com.alibaba.fastjson.JSONObject; - /** * http 工具类 获取请求中的参数 * diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/Path.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/Path.java index 9227a845..1157f5d6 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/Path.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/Path.java @@ -1,7 +1,5 @@ package org.jeecg.config.vo; -import javax.print.DocFlavor; - /** * * @author: scott diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmRuleDto.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmRuleDto.java index 3c88ac32..330704a0 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmRuleDto.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmRuleDto.java @@ -1,16 +1,8 @@ package org.jeecg.modules.base.dto; -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; -import org.jeecg.modules.base.entity.Rule; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.util.Date; @Data public class AlarmRuleDto implements Serializable { diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmRuleInfo.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmRuleInfo.java index e5572a70..f271d81d 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmRuleInfo.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/AlarmRuleInfo.java @@ -1,6 +1,7 @@ package org.jeecg.modules.base.dto; import lombok.Data; + import java.io.Serializable; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/SourceDto.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/SourceDto.java index 2e20f8cb..578fd4bb 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/SourceDto.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/SourceDto.java @@ -1,6 +1,7 @@ package org.jeecg.modules.base.dto; import lombok.Data; + import java.io.Serializable; @Data 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 cf115c55..095e3658 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 @@ -109,10 +109,4 @@ public class GardsDetectors implements Serializable { @TableField(value = "STATION_ID") private Integer stationId; - /** - * 台站名称 - */ - @TableField(exist = false) - private String stationName; - } 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 51a90ada..76bfece0 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,6 +1,5 @@ package org.jeecg.modules.base.entity.configuration; -import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -11,9 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import javax.validation.constraints.Null; import java.io.Serializable; -import java.sql.Timestamp; import java.util.Date; @Data diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/monitor/Host.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/monitor/Host.java index 190ef86c..e3d75e17 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/monitor/Host.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/monitor/Host.java @@ -2,6 +2,7 @@ package org.jeecg.modules.base.entity.monitor; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; + import java.io.Serializable; import java.util.Map; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/monitor/ItemHistory.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/monitor/ItemHistory.java index eb7e5bf3..359b7bdd 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/monitor/ItemHistory.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/monitor/ItemHistory.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import java.io.Serializable; -import java.util.List; @Data @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/monitor/Servers.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/monitor/Servers.java index 8bcf25f9..cf589ab9 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/monitor/Servers.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/monitor/Servers.java @@ -2,6 +2,7 @@ package org.jeecg.modules.base.entity.monitor; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; + import java.io.Serializable; import java.util.List; 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 2024f889..e37e7553 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 @@ -41,7 +41,4 @@ public class GardsAlertData implements Serializable { @TableField(value = "INPUT_FILE_NAME") private String inputFileName; - @Excel(name = "NO",orderNum = "1") - @TableField(exist = false) - private Integer no; } 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 266c7caf..b19c5697 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 @@ -7,7 +7,6 @@ import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.Email; import java.io.Serializable; import java.util.Date; @@ -102,12 +101,8 @@ public class GardsMetData implements Serializable { * 操作时间 */ @TableField(value = "MODDATE") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date moddate; - @TableField(exist = false) - @Excel(name = "NO",orderNum = "1") - private Integer no; - } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleAux.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleAux.java index 1d3614c6..81e55cdb 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleAux.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleAux.java @@ -3,6 +3,7 @@ package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; + import java.io.Serializable; import java.util.Date; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCertLine.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCertLine.java index e2fa955e..d1fb5dec 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCertLine.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCertLine.java @@ -3,6 +3,7 @@ package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; + import java.io.Serializable; /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleData.java index 6c369f17..bd12aeb5 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 @@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecgframework.poi.excel.annotation.ExcelIgnore; -import org.jeecgframework.poi.excel.annotation.ExcelTarget; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; @@ -160,32 +158,9 @@ public class GardsSampleData implements Serializable { * 操作时间 */ @TableField(value = "MODDATE") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date moddate; - /** - * 台站名称 - */ - @TableField(exist = false) - @Excel(name = "STATION" ,orderNum = "2") - private String stationName; - /** - * 探测器名称 - */ - @TableField(exist = false) - private String detectorsName; - - - @TableField(exist = false) - @Excel(name = "CALIB REPORTS" ,orderNum = "7") - private String calibReports; - - @TableField(exist = false) - private String dbName; - - @TableField(exist = false) - @Excel(name = "NO" ,orderNum = "1") - private Integer no; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleDescription.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleDescription.java index 62e119f8..6f5ee4bb 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleDescription.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleDescription.java @@ -3,6 +3,7 @@ package org.jeecg.modules.base.entity.original; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; + import java.io.Serializable; /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSohData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSohData.java index e12adc53..076916c2 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 @@ -81,22 +81,4 @@ public class GardsSohData implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date moddate; - /** - * 探测器名称 - */ - @TableField(exist = false) - private String detectorName; - - /** - * 结束时间 - */ - @TableField(exist = false) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "START TIME",orderNum = "4",width = 30,format = "yyyy-MM-dd HH:mm:ss") - private Date endTime; - - @TableField(exist = false) - @Excel(name = "NO",orderNum = "1") - private Integer no; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmContactGroup.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmContactGroup.java index 4e288a82..9d8ae658 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmContactGroup.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmContactGroup.java @@ -10,7 +10,6 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.time.LocalDate; -import java.util.List; @Data @TableName(value = "alarm_contact_group") @@ -62,22 +61,4 @@ public class AlarmContactGroup implements Serializable { @TableField(value = "update_by") private String updateBy; - /** - * 联系人组关联的用户id - */ - @TableField(exist = false) - List userIds; - - /** - * 联系人组关联的用户集合 - */ - @TableField(exist = false) - List users; - - /** - * 当前联系人组人员数量 - */ - @TableField(exist = false) - Integer personNumber; - } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmRule.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmRule.java index fe2203ec..e2912ada 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmRule.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmRule.java @@ -6,11 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import org.jeecg.modules.base.entity.Rule; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.time.LocalDate; import java.util.Date; @Data @@ -105,9 +103,4 @@ public class AlarmRule implements Serializable { @TableField(value = "update_by") private String updateBy; - /** - * 用于新增报警规则 - */ - @TableField(exist = false) - private Rule rule; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/StationReceivingConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/StationReceivingConfig.java index 88a59ecb..510db70c 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/StationReceivingConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/StationReceivingConfig.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; -import java.util.List; @Data @TableName(value = "station_receiving_config") @@ -49,10 +48,4 @@ public class StationReceivingConfig implements Serializable { @TableField(value = "update_interval_time") private Double updateIntervalTime; - /** - * 用户关注台站信息 - */ - @TableField(exist = false) - List sysUserFocusStations; - } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysAnnouncementSend.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysAnnouncementSend.java index 4dea53d6..c1e91177 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysAnnouncementSend.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysAnnouncementSend.java @@ -1,14 +1,14 @@ package org.jeecg.modules.base.entity.postgre; -import java.io.Serializable; -import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; + /** * @Description: 用户通告阅读标记表 * @Author: jeecg-boot diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDataLog.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDataLog.java index 6b054541..1d9af19a 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDataLog.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDataLog.java @@ -1,17 +1,15 @@ package org.jeecg.modules.base.entity.postgre; -import java.io.Serializable; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; /** * @Description: 系统数据日志 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartPermission.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartPermission.java index 7e4390b9..51bbc7e1 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartPermission.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartPermission.java @@ -1,18 +1,13 @@ package org.jeecg.modules.base.entity.postgre; -import java.io.Serializable; -import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRole.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRole.java index 580f06c3..91dce579 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRole.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRole.java @@ -1,20 +1,17 @@ package org.jeecg.modules.base.entity.postgre; -import java.io.Serializable; -import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.annotation.JsonFormat; import org.jeecg.common.aspect.annotation.Dict; -import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; /** * @Description: 部门角色 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRolePermission.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRolePermission.java index 62418b31..c3fb42e1 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRolePermission.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRolePermission.java @@ -1,19 +1,16 @@ package org.jeecg.modules.base.entity.postgre; -import java.io.Serializable; -import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; /** * @Description: 部门角色权限 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRoleUser.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRoleUser.java index 135ccaa1..df1548d6 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRoleUser.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDepartRoleUser.java @@ -1,18 +1,13 @@ package org.jeecg.modules.base.entity.postgre; -import java.io.Serializable; -import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDict.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDict.java index 4390c06b..94b04b0d 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDict.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDict.java @@ -1,16 +1,15 @@ package org.jeecg.modules.base.entity.postgre; -import java.io.Serializable; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** *

* 字典表 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDictItem.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDictItem.java index 48bd4b4f..d811909c 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDictItem.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysDictItem.java @@ -1,18 +1,16 @@ package org.jeecg.modules.base.entity.postgre; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; +import java.io.Serializable; +import java.util.Date; + /** *

* diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmail.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmail.java index ea822dc2..1f06aabc 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmail.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmail.java @@ -10,7 +10,6 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.time.LocalDate; -import java.util.Date; /** * 邮件管理数据表 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmailLog.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmailLog.java index fd293dc3..3a907667 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmailLog.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysEmailLog.java @@ -9,7 +9,6 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.time.LocalDateTime; import java.util.Date; /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysFiles.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysFiles.java index bbd5d8a9..0d684c1f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysFiles.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysFiles.java @@ -13,6 +13,7 @@ import lombok.experimental.Accessors; import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; + import java.util.Date; /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysFormFile.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysFormFile.java index e8a7fb20..7e53cf3d 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysFormFile.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysFormFile.java @@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; + import java.util.Date; /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysLog.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysLog.java index d66b4a08..0aa85c1d 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysLog.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysLog.java @@ -1,16 +1,16 @@ package org.jeecg.modules.base.entity.postgre; -import java.util.Date; - -import org.jeecg.common.aspect.annotation.Dict; -import org.springframework.format.annotation.DateTimeFormat; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; -import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; /** *

diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPackPermission.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPackPermission.java index ddd9379d..0ad9dd1b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPackPermission.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPackPermission.java @@ -1,18 +1,19 @@ package org.jeecg.modules.base.entity.postgre; -import java.io.Serializable; -import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; /** * @Description: 产品包菜单关系表 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPermission.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPermission.java index 053961c1..de8bd0e0 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPermission.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPermission.java @@ -1,7 +1,5 @@ package org.jeecg.modules.base.entity.postgre; -import java.io.Serializable; -import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -9,7 +7,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecg.common.aspect.annotation.Dict; -import org.jeecgframework.poi.excel.annotation.Excel; + +import java.io.Serializable; +import java.util.Date; /** *

diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPermissionDataRule.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPermissionDataRule.java index ff30d0be..f1a8c730 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPermissionDataRule.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysPermissionDataRule.java @@ -1,15 +1,14 @@ package org.jeecg.modules.base.entity.postgre; -import java.io.Serializable; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** *

* 菜单权限规则表 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysRoleIndex.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysRoleIndex.java index 8b6c3c29..be6335c0 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysRoleIndex.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysRoleIndex.java @@ -1,19 +1,17 @@ package org.jeecg.modules.base.entity.postgre; -import java.io.Serializable; -import java.util.Date; 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.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; /** * @Description: 角色首页配置 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysRolePermission.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysRolePermission.java index 8722faf0..ca243950 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysRolePermission.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysRolePermission.java @@ -1,17 +1,16 @@ package org.jeecg.modules.base.entity.postgre; -import java.io.Serializable; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; - import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; +import java.util.Date; + /** *

* 角色权限表 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTask.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTask.java index e50247a3..f106b249 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTask.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTask.java @@ -13,7 +13,6 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Date; -import java.util.List; @Data @TableName("sys_task") @@ -48,10 +47,4 @@ public class SysTask implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; - @TableField(exist = false) - private String userName; - - @TableField(exist = false) - private List stationList; - } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTaskStation.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTaskStation.java index 7ad176b5..5f11383f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTaskStation.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTaskStation.java @@ -42,7 +42,4 @@ public class SysTaskStation implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; - @TableField(exist = false) - private String stationName; - } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTenant.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTenant.java index 32be51f0..1bf6619b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTenant.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTenant.java @@ -1,12 +1,12 @@ package org.jeecg.modules.base.entity.postgre; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.jeecg.common.aspect.annotation.Dict; import org.springframework.format.annotation.DateTimeFormat; + import java.io.Serializable; import java.util.Date; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTenantPack.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTenantPack.java index af05935d..2ea60587 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTenantPack.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysTenantPack.java @@ -1,18 +1,21 @@ package org.jeecg.modules.base.entity.postgre; +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + import java.io.Serializable; import java.util.Date; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - /** * @Description: 租户产品包 * @Author: jeecg-boot diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserAgent.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserAgent.java index 6f1fc4c2..ecdd7f01 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserAgent.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserAgent.java @@ -1,14 +1,14 @@ package org.jeecg.modules.base.entity.postgre; -import java.io.Serializable; -import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; +import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** * @Description: 用户代理人设置 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserDepart.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserDepart.java index d0b22364..d0464b5b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserDepart.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserDepart.java @@ -1,13 +1,12 @@ package org.jeecg.modules.base.entity.postgre; -import java.io.Serializable; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import lombok.Data; +import java.io.Serializable; + /** * @Description: 用户部门 * @author: jeecg-boot diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserFocusStation.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserFocusStation.java index ba2f842a..c4de2006 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserFocusStation.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserFocusStation.java @@ -11,11 +11,8 @@ import org.jeecg.config.valid.UpdateGroup; import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Null; import java.io.Serializable; import java.time.LocalDateTime; -import java.util.Date; @Data @TableName("sys_user_focus_station") @@ -62,34 +59,4 @@ public class SysUserFocusStation implements Serializable { @TableField(value = "create_by") private String createBy; - /** - * 经度 - */ - @TableField(exist = false) - private Double lon; - - /** - * 纬度 - */ - @TableField(exist = false) - private Double lat; - - /** - * 海拔 - */ - @TableField(exist = false) - private String altitude; - - /** - * 状态 - */ - @TableField(exist = false) - private String status; - - /** - * 台站编码 - */ - @TableField(exist = false) - private String stationCode; - } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserRole.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserRole.java index c09ad482..0fa08222 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserRole.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserRole.java @@ -1,14 +1,13 @@ package org.jeecg.modules.base.entity.postgre; -import java.io.Serializable; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; + /** *

* 用户角色表 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserTenant.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserTenant.java index ce3fc01a..ab9dbc98 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserTenant.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserTenant.java @@ -1,18 +1,19 @@ package org.jeecg.modules.base.entity.postgre; -import java.io.Serializable; -import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; /** * @Description: sys_user_tenant_relation 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 0179d2ac..8bd06629 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 @@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.rnauto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * gards_analyses数据表存储谱数据分析的基本信息，包括: @@ -116,7 +119,9 @@ public class GardsAnalyses implements Serializable { private String comments; @TableField(value = "MODDATE") - private Long moddate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; @TableField(value = "USEDGASPHD") private String usedgasphd; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibration.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibration.java index 53cfcf13..daed7654 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibration.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibration.java @@ -2,8 +2,12 @@ package org.jeecg.modules.base.entity.rnauto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + import java.io.Serializable; +import java.util.Date; /** * 存储数据分析过程中能量、分辨率和效率刻度的拟合结果。 @@ -101,7 +105,9 @@ public class GardsCalibration implements Serializable { private Double coeff9; @TableField(value = "MODDATE") - private Long moddate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; @TableField(value = "COEFF_STRING") private String coeffString; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibrationPairs.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibrationPairs.java index cb72fc57..a5192320 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibrationPairs.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibrationPairs.java @@ -2,8 +2,12 @@ package org.jeecg.modules.base.entity.rnauto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + import java.io.Serializable; +import java.util.Date; /** * 存储数据分析过程中能量、分辨率和效率刻度实际使用的刻度点数据。 @@ -60,5 +64,7 @@ public class GardsCalibrationPairs implements Serializable { private String uncYValue; @TableField(value = "MODDATE") - private Long moddate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclIded.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclIded.java index 488b60f0..d2d46f9e 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclIded.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclIded.java @@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.rnauto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * 存储gamma谱中识别到的核素计算结果。 @@ -96,7 +99,9 @@ public class GardsNuclIded implements Serializable { private Integer cscModFlag; @TableField(value = "MODDATE") - private Long moddate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; @TableField(value = "MDC") private String mdc; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclLinesIded.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclLinesIded.java index 1e7d495e..1a5d15d5 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclLinesIded.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclLinesIded.java @@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.rnauto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * 存储gamma谱中识别到的峰计算结果。 @@ -36,7 +39,9 @@ public class GardsNuclLinesIded implements Serializable { private String nuclideName; @TableField(value = "MODDATE") - private Long moddate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; /** * 核素库中核素对应峰的能量（keV） diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsPeaks.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsPeaks.java index a2d4fcac..eb99d293 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsPeaks.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsPeaks.java @@ -2,8 +2,13 @@ package org.jeecg.modules.base.entity.rnauto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + import java.io.Serializable; +import java.util.Date; + /** * 存储gamma谱的寻峰结果 */ @@ -28,7 +33,9 @@ public class GardsPeaks implements Serializable { private Integer idAnalysis; @TableField(value = "MODDATE") - private Long moddate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; /** * 峰中心道（道址） diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiChannels.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiChannels.java index 0759427f..dae04fa9 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiChannels.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiChannels.java @@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.rnauto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * 存储β-γ符合谱中感兴趣区道址边界数据。 @@ -50,5 +53,7 @@ public class GardsRoiChannels implements Serializable { private Integer gChanStop; @TableField(value = "MODDATE") - private Long moddate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiResults.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiResults.java index 98b69836..d3b0de5b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiResults.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiResults.java @@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.rnauto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * 存储β-γ符合谱中分析过程中的有关感兴趣区（ROI）计算的中间结果。 @@ -90,5 +93,7 @@ public class GardsRoiResults implements Serializable { private Integer nidFlag; @TableField(value = "MODDATE") - private Long moddate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsXeResults.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsXeResults.java index 4be801db..fc99ec2f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsXeResults.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsXeResults.java @@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.rnauto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * 存储β-γ符合谱最终分析结果。 @@ -55,5 +58,7 @@ public class GardsXeResults implements Serializable { private Integer nidFlag; @TableField(value = "MODDATE") - private Long moddate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; } 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 e2659fb9..ca19a171 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 @@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.rnman; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * gards_analyses数据表存储谱数据分析的基本信息，包括: @@ -116,7 +119,9 @@ public class GardsAnalyses implements Serializable { private String comments; @TableField(value = "MODDATE") - private Long moddate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; @TableField(value = "USEDGASPHD") private String usedgasphd; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsCalibration.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsCalibration.java index fe33854f..4a9c3e4c 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsCalibration.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsCalibration.java @@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.rnman; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * 存储数据分析过程中能量、分辨率和效率刻度的拟合结果。 @@ -102,7 +105,9 @@ public class GardsCalibration implements Serializable { private Double coeff9; @TableField(value = "MODDATE") - private Long moddate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; @TableField(value = "COEFF_STRING") private String coeffString; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsCalibrationPairs.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsCalibrationPairs.java index b0a0e8e0..cd87ba66 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsCalibrationPairs.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsCalibrationPairs.java @@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.rnman; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * 存储数据分析过程中能量、分辨率和效率刻度实际使用的刻度点数据。 @@ -61,5 +64,7 @@ public class GardsCalibrationPairs implements Serializable { private String uncYValue; @TableField(value = "MODDATE") - private Long moddate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsNuclIded.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsNuclIded.java index f1ea507c..a98dd98a 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsNuclIded.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsNuclIded.java @@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.rnman; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * 存储gamma谱中识别到的核素计算结果。 @@ -96,7 +99,9 @@ public class GardsNuclIded implements Serializable { private Integer cscModFlag; @TableField(value = "MODDATE") - private Long moddate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; @TableField(value = "MDC") private String mdc; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsNuclLinesIded.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsNuclLinesIded.java index 6e3a1ae9..833d2291 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsNuclLinesIded.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsNuclLinesIded.java @@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.rnman; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * 存储gamma谱中识别到的峰计算结果。 @@ -36,7 +39,9 @@ public class GardsNuclLinesIded implements Serializable { private String nuclideName; @TableField(value = "MODDATE") - private Long moddate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; /** * 核素库中核素对应峰的能量（keV） diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsPeaks.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsPeaks.java index 44fe946e..b4557f31 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsPeaks.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsPeaks.java @@ -2,9 +2,13 @@ package org.jeecg.modules.base.entity.rnman; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; + /** * 存储gamma谱的寻峰结果 */ @@ -29,7 +33,9 @@ public class GardsPeaks implements Serializable { private Integer idAnalysis; @TableField(value = "MODDATE") - private Long moddate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; /** * 峰中心道（道址） diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsRoiChannels.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsRoiChannels.java index ea668cc5..20f3e7a9 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsRoiChannels.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsRoiChannels.java @@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.rnman; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * 存储β-γ符合谱中感兴趣区道址边界数据。 @@ -50,5 +53,7 @@ public class GardsRoiChannels implements Serializable { private Integer gChanStop; @TableField(value = "MODDATE") - private Long moddate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsRoiResults.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsRoiResults.java index d343bab4..ef8d2f01 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsRoiResults.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsRoiResults.java @@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.rnman; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * 存储β-γ符合谱中分析过程中的有关感兴趣区（ROI）计算的中间结果。 @@ -90,5 +93,7 @@ public class GardsRoiResults implements Serializable { private Integer nidFlag; @TableField(value = "MODDATE") - private Long moddate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsXeResults.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsXeResults.java index 7bb1e891..3577b8a9 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsXeResults.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsXeResults.java @@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.rnman; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * 存储β-γ符合谱最终分析结果。 @@ -55,5 +58,7 @@ public class GardsXeResults implements Serializable { private Integer nidFlag; @TableField(value = "MODDATE") - private Long moddate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java index 3bd057c5..3c1da04a 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java @@ -4,17 +4,17 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.dto.LogDTO; -import org.jeecg.modules.base.mapper.BaseCommonMapper; -import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.IpUtils; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.base.mapper.BaseCommonMapper; +import org.jeecg.modules.base.service.BaseCommonService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.*; +import java.util.Date; /** * @Description: common实现类 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SourceVo.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SourceVo.java index fdc258b8..364749ff 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SourceVo.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SourceVo.java @@ -2,6 +2,7 @@ package org.jeecg.modules.base.vo; import lombok.Data; import org.jeecg.common.api.QueryRequest; + import java.io.Serializable; import java.util.List; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupMemberController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupMemberController.java index 28984010..7bc2ec6b 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupMemberController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupMemberController.java @@ -4,7 +4,10 @@ import io.swagger.annotations.Api; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.service.IAlarmContactGroupMemberService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("alarmContactGroupMember") diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmItemController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmItemController.java index 288b9439..0062a4bf 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmItemController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmItemController.java @@ -5,7 +5,8 @@ import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.modules.base.entity.postgre.AlarmItem; import org.jeecg.modules.service.IAlarmItemService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @Api(value = "监控项管理",tags = "监控项管理") @RestController diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java index fdd6ba45..b85ac04a 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java @@ -3,17 +3,18 @@ package org.jeecg.modules.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.postgre.AlarmRule; +import org.jeecg.modules.base.dto.ItemDto; import org.jeecg.modules.base.entity.monitor.Host; import org.jeecg.modules.base.entity.monitor.Servers; +import org.jeecg.modules.base.entity.postgre.AlarmRule; import org.jeecg.modules.base.vo.AlarmRuleVo; -import org.jeecg.modules.base.dto.ItemDto; import org.jeecg.modules.feignclient.MonitorAlarm; import org.jeecg.modules.service.IAlarmRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import java.util.stream.Collectors; @RestController diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java index 15272da2..bd84cea8 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java @@ -5,8 +5,8 @@ import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.base.dto.SourceDto; -import org.jeecg.modules.base.vo.SourceVo; import org.jeecg.modules.base.entity.postgre.SysDatabase; +import org.jeecg.modules.base.vo.SourceVo; import org.jeecg.modules.service.ISysDatabaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java index d0245ff6..56e4be1d 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java @@ -4,8 +4,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.postgre.SysEmail; import org.jeecg.modules.base.dto.SourceDto; +import org.jeecg.modules.base.entity.postgre.SysEmail; import org.jeecg.modules.base.vo.SourceVo; import org.jeecg.modules.service.ISysEmailService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysServerController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysServerController.java index 688352e4..aff67d8f 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysServerController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysServerController.java @@ -5,8 +5,8 @@ import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.base.dto.SourceDto; -import org.jeecg.modules.base.vo.SourceVo; import org.jeecg.modules.base.entity.postgre.SysServer; +import org.jeecg.modules.base.vo.SourceVo; import org.jeecg.modules.service.ISysServerService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroupAbnormal.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroupAbnormal.java new file mode 100644 index 00000000..e83d0fd5 --- /dev/null +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroupAbnormal.java @@ -0,0 +1,33 @@ +package org.jeecg.modules.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.jeecg.modules.base.entity.postgre.AlarmContactGroup; +import org.jeecg.modules.base.entity.postgre.SysUser; + +import java.util.List; + +@Data +@TableName(value = "alarm_contact_group") +public class AlarmContactGroupAbnormal extends AlarmContactGroup { + + /** + * 联系人组关联的用户id + */ + @TableField(exist = false) + List userIds; + + /** + * 联系人组关联的用户集合 + */ + @TableField(exist = false) + List users; + + /** + * 当前联系人组人员数量 + */ + @TableField(exist = false) + Integer personNumber; + +} diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmHistory.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmHistory.java index c9293c01..6e7129a6 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmHistory.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmHistory.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDate; import java.time.LocalDateTime; @Data diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmRuleAbnormal.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmRuleAbnormal.java new file mode 100644 index 00000000..da120e55 --- /dev/null +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmRuleAbnormal.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.jeecg.modules.base.entity.Rule; +import org.jeecg.modules.base.entity.postgre.AlarmRule; + +@Data +@TableName(value = "alarm_rule") +public class AlarmRuleAbnormal extends AlarmRule { + + /** + * 用于新增报警规则 + */ + @TableField(exist = false) + private Rule rule; + +} diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmLogMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmLogMapper.java index b1b7dcdb..aef2ea74 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmLogMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmLogMapper.java @@ -2,8 +2,8 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.base.dto.TypeDto; -import org.jeecg.modules.entity.AlarmHistory; import org.jeecg.modules.base.entity.postgre.AlarmLog; +import org.jeecg.modules.entity.AlarmHistory; import java.time.LocalDateTime; import java.util.List; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java index 1d5dfa6f..553c3bfd 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java @@ -2,8 +2,8 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.base.dto.DatabaseDto; -import org.jeecg.modules.entity.AlarmHistory; import org.jeecg.modules.base.entity.postgre.SysDatabase; +import org.jeecg.modules.entity.AlarmHistory; import java.util.List; import java.util.Map; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java index dcfbb37e..60efce4f 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java @@ -2,8 +2,8 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.base.dto.EmailDto; -import org.jeecg.modules.entity.AlarmHistory; import org.jeecg.modules.base.entity.postgre.SysEmail; +import org.jeecg.modules.entity.AlarmHistory; import java.util.List; import java.util.Map; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysServerMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysServerMapper.java index b650d279..b2291004 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysServerMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysServerMapper.java @@ -2,8 +2,8 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.base.dto.ServerDto; -import org.jeecg.modules.entity.AlarmHistory; import org.jeecg.modules.base.entity.postgre.SysServer; +import org.jeecg.modules.entity.AlarmHistory; import java.util.List; import java.util.Map; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysDatabaseService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysDatabaseService.java index 0980df46..c76692f6 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysDatabaseService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysDatabaseService.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.base.dto.SourceDto; -import org.jeecg.modules.base.vo.SourceVo; import org.jeecg.modules.base.entity.postgre.SysDatabase; +import org.jeecg.modules.base.vo.SourceVo; import java.util.List; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java index d2a58292..3d431780 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java @@ -3,8 +3,8 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.postgre.SysEmail; import org.jeecg.modules.base.dto.SourceDto; +import org.jeecg.modules.base.entity.postgre.SysEmail; import org.jeecg.modules.base.vo.SourceVo; import java.util.List; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysServerService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysServerService.java index 560e0df4..77cd73c5 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysServerService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysServerService.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.base.dto.SourceDto; -import org.jeecg.modules.base.vo.SourceVo; import org.jeecg.modules.base.entity.postgre.SysServer; +import org.jeecg.modules.base.vo.SourceVo; import java.util.List; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java index 4c955c88..91a17797 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java @@ -20,9 +20,13 @@ import org.jeecg.modules.mapper.AlarmContactGroupMemberMapper; import org.jeecg.modules.service.IAlarmContactGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import javax.servlet.http.HttpServletRequest; import java.time.LocalDate; -import java.util.*; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; @Service("alarmContactGroupService") diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmItemServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmItemServiceImpl.java index 1d5b99d0..0a064152 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmItemServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmItemServiceImpl.java @@ -6,10 +6,10 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.Prompt; -import org.jeecg.modules.base.entity.postgre.AlarmItem; import org.jeecg.modules.base.entity.monitor.Host; import org.jeecg.modules.base.entity.monitor.Item; import org.jeecg.modules.base.entity.monitor.Servers; +import org.jeecg.modules.base.entity.postgre.AlarmItem; import org.jeecg.modules.feignclient.MonitorAlarm; import org.jeecg.modules.mapper.AlarmItemMapper; import org.jeecg.modules.service.IAlarmItemService; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmLogServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmLogServiceImpl.java index 3ad9f1c5..6e373030 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmLogServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmLogServiceImpl.java @@ -12,8 +12,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.DateConstant; import org.jeecg.modules.base.dto.TypeDto; -import org.jeecg.modules.entity.AlarmHistory; import org.jeecg.modules.base.entity.postgre.AlarmLog; +import org.jeecg.modules.entity.AlarmHistory; import org.jeecg.modules.mapper.AlarmLogMapper; import org.jeecg.modules.service.IAlarmLogService; import org.jeecg.modules.vo.AlarmVo; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmRuleServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmRuleServiceImpl.java index 27c6ee93..575cc64f 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmRuleServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmRuleServiceImpl.java @@ -13,10 +13,10 @@ import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.util.RedisStreamUtil; import org.jeecg.modules.base.dto.AlarmRuleDto; import org.jeecg.modules.base.dto.AlarmRuleInfo; -import org.jeecg.modules.base.entity.postgre.AlarmRule; -import org.jeecg.modules.base.entity.Rule; -import org.jeecg.modules.base.vo.AlarmRuleVo; import org.jeecg.modules.base.dto.SourceDto; +import org.jeecg.modules.base.entity.Rule; +import org.jeecg.modules.base.entity.postgre.AlarmRule; +import org.jeecg.modules.base.vo.AlarmRuleVo; import org.jeecg.modules.mapper.AlarmRuleMapper; import org.jeecg.modules.service.IAlarmRuleService; import org.jeecg.modules.service.ISysDatabaseService; @@ -26,7 +26,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static org.jeecg.modules.base.enums.SourceType.*; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java index c4e10c85..697d1f0f 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java @@ -13,9 +13,9 @@ import org.jeecg.common.constant.DateConstant; import org.jeecg.common.constant.Prompt; import org.jeecg.modules.base.dto.DatabaseDto; import org.jeecg.modules.base.dto.SourceDto; +import org.jeecg.modules.base.entity.postgre.SysDatabase; import org.jeecg.modules.base.vo.SourceVo; import org.jeecg.modules.entity.AlarmHistory; -import org.jeecg.modules.base.entity.postgre.SysDatabase; import org.jeecg.modules.mapper.SysDatabaseMapper; import org.jeecg.modules.service.ISysDatabaseService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java index 6ef0af50..148a933b 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java @@ -15,9 +15,9 @@ import org.jeecg.common.constant.Prompt; import org.jeecg.common.email.emuns.SysMailType; import org.jeecg.modules.base.dto.EmailDto; import org.jeecg.modules.base.dto.SourceDto; +import org.jeecg.modules.base.entity.postgre.SysEmail; import org.jeecg.modules.base.vo.SourceVo; import org.jeecg.modules.entity.AlarmHistory; -import org.jeecg.modules.base.entity.postgre.SysEmail; import org.jeecg.modules.mapper.SysEmailMapper; import org.jeecg.modules.service.ISysEmailService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java index cda73020..d7c75d61 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java @@ -14,9 +14,9 @@ import org.jeecg.common.constant.DateConstant; import org.jeecg.common.constant.Prompt; import org.jeecg.modules.base.dto.ServerDto; import org.jeecg.modules.base.dto.SourceDto; +import org.jeecg.modules.base.entity.postgre.SysServer; import org.jeecg.modules.base.vo.SourceVo; import org.jeecg.modules.entity.AlarmHistory; -import org.jeecg.modules.base.entity.postgre.SysServer; import org.jeecg.modules.mapper.SysServerMapper; import org.jeecg.modules.service.ISysServerService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/vo/AlarmVo.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/vo/AlarmVo.java index 07b48f81..6d2e9047 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/vo/AlarmVo.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/vo/AlarmVo.java @@ -2,6 +2,7 @@ package org.jeecg.modules.vo; import lombok.Data; import org.jeecg.common.api.QueryRequest; + import java.io.Serializable; import java.util.List; diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoProviderController.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoProviderController.java index 4688694c..a6fafca3 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoProviderController.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoProviderController.java @@ -1,7 +1,6 @@ package org.jeecg.modules.demo.cloud.controller; import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.api.vo.Result; import org.jeecg.modules.demo.cloud.service.JcloudDemoService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/JcloudDemoService.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/JcloudDemoService.java index ba731eb4..1c48b9cb 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/JcloudDemoService.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/JcloudDemoService.java @@ -1,7 +1,5 @@ package org.jeecg.modules.demo.cloud.service; -import org.jeecg.common.api.vo.Result; - /** * @Description: JcloudDemoService接口 * @author: jeecg-boot diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java index 8d66d4f4..651c87f8 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java @@ -1,6 +1,5 @@ package org.jeecg.modules.demo.cloud.service.impl; -import org.jeecg.common.api.vo.Result; import org.jeecg.modules.demo.cloud.service.JcloudDemoService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java index b517afb8..4110652b 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java @@ -4,8 +4,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDynamicDataController.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDynamicDataController.java index 4036fb3e..08821164 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDynamicDataController.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDynamicDataController.java @@ -1,6 +1,5 @@ package org.jeecg.modules.demo.test.controller; -import io.lettuce.core.dynamic.annotation.Param; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -11,7 +10,10 @@ import org.jeecg.modules.demo.test.entity.JeecgDemo; import org.jeecg.modules.demo.test.service.IJeecgDemoService; import org.jeecg.modules.demo.test.service.IJeecgDynamicDataService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java index bfb9ea53..588d75fb 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java @@ -1,24 +1,17 @@ package org.jeecg.modules.demo.test.controller; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.demo.test.entity.JeecgDemo; import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer; import org.jeecg.modules.demo.test.entity.JeecgOrderMain; import org.jeecg.modules.demo.test.entity.JeecgOrderTicket; -import org.jeecg.modules.demo.test.service.IJeecgDemoService; import org.jeecg.modules.demo.test.service.IJeecgOrderCustomerService; import org.jeecg.modules.demo.test.service.IJeecgOrderMainService; import org.jeecg.modules.demo.test.service.IJeecgOrderTicketService; @@ -30,24 +23,17 @@ import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; /** * @Description: 一对多示例（JEditableTable行编辑） diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java index c375ebc9..5668510f 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java @@ -1,15 +1,10 @@ package org.jeecg.modules.demo.test.controller; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; @@ -21,25 +16,19 @@ import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.util.Arrays; +import java.util.List; +import java.util.Map; /** * @Description: 流程测试 diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java index 58b177f0..da1afeb0 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java @@ -1,20 +1,18 @@ package org.jeecg.modules.demo.test.entity; -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotation.Version; -import org.jeecg.common.system.base.entity.JeecgEntity; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; import com.fasterxml.jackson.annotation.JsonFormat; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.system.base.entity.JeecgEntity; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** * @Description: jeecg 测试demo diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.java index 7dfd9308..53fca1ba 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.java @@ -1,15 +1,15 @@ package org.jeecg.modules.demo.test.entity; -import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; - +import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; + /** * @Description: 订单客户 * @Author: jeecg-boot diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderMain.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderMain.java index 819314f4..228d3d6e 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderMain.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderMain.java @@ -1,14 +1,14 @@ package org.jeecg.modules.demo.test.entity; -import java.io.Serializable; -import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; + /** * @Description: 订单 * @Author: jeecg-boot diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.java index 0005ce34..2900c7ba 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.java @@ -1,14 +1,15 @@ package org.jeecg.modules.demo.test.entity; -import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; + /** * @Description: 订单机票 * @Author: jeecg-boot diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JoaDemo.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JoaDemo.java index fe9750f3..9b23b627 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JoaDemo.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JoaDemo.java @@ -1,16 +1,14 @@ package org.jeecg.modules.demo.test.entity; -import java.io.Serializable; - -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** * @Description: 流程测试 diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java index ccdb2c1f..e9f7bc2f 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java @@ -1,13 +1,12 @@ package org.jeecg.modules.demo.test.mapper; -import java.util.List; -import java.util.Map; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.test.entity.JeecgDemo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.demo.test.entity.JeecgDemo; + +import java.util.List; /** * @Description: jeecg 测试demo diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java index a1ff5212..286865c1 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java @@ -1,12 +1,11 @@ package org.jeecg.modules.demo.test.mapper; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Select; import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; /** * @Description: 订单客户 diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderMainMapper.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderMainMapper.java index 8c549d66..f5e36da6 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderMainMapper.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderMainMapper.java @@ -1,10 +1,7 @@ package org.jeecg.modules.demo.test.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.test.entity.JeecgOrderMain; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.demo.test.entity.JeecgOrderMain; /** * @Description: 订单 diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java index 6604cc80..eae0fdc3 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java @@ -1,11 +1,11 @@ package org.jeecg.modules.demo.test.mapper; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Select; import org.jeecg.modules.demo.test.entity.JeecgOrderTicket; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; /** * @Description: 订单机票 diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JoaDemoMapper.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JoaDemoMapper.java index 6f937136..56032a56 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JoaDemoMapper.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JoaDemoMapper.java @@ -1,8 +1,7 @@ package org.jeecg.modules.demo.test.mapper; -import org.jeecg.modules.demo.test.entity.JoaDemo; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.demo.test.entity.JoaDemo; /** * @Description: 流程测试 diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java index f92dd695..f1ba8610 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java @@ -1,10 +1,9 @@ package org.jeecg.modules.demo.test.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.jeecg.common.system.base.service.JeecgService; import org.jeecg.modules.demo.test.entity.JeecgDemo; -import com.baomidou.mybatisplus.core.metadata.IPage; - import java.util.List; /** diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java index 45f0fd8d..9cf51b92 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java @@ -1,10 +1,9 @@ package org.jeecg.modules.demo.test.service; -import java.util.List; - +import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer; -import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; /** * @Description: 订单客户 diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java index a7111b7b..1a47f68a 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java @@ -1,14 +1,13 @@ package org.jeecg.modules.demo.test.service; -import java.io.Serializable; -import java.util.Collection; -import java.util.List; - +import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer; import org.jeecg.modules.demo.test.entity.JeecgOrderMain; import org.jeecg.modules.demo.test.entity.JeecgOrderTicket; -import com.baomidou.mybatisplus.extension.service.IService; +import java.io.Serializable; +import java.util.Collection; +import java.util.List; /** * @Description: 订单 diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java index 7f2aa420..751478a1 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java @@ -1,10 +1,9 @@ package org.jeecg.modules.demo.test.service; -import java.util.List; - +import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.demo.test.entity.JeecgOrderTicket; -import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; /** * @Description: 订单机票 diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJoaDemoService.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJoaDemoService.java index 499c0491..c6dcd086 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJoaDemoService.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJoaDemoService.java @@ -1,8 +1,7 @@ package org.jeecg.modules.demo.test.service; -import org.jeecg.modules.demo.test.entity.JoaDemo; - import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.demo.test.entity.JoaDemo; /** * @Description: 流程测试 diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java index 664f7360..2fc45328 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java @@ -1,14 +1,13 @@ package org.jeecg.modules.demo.test.service.impl; -import java.util.List; - +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer; import org.jeecg.modules.demo.test.mapper.JeecgOrderCustomerMapper; import org.jeecg.modules.demo.test.service.IJeecgOrderCustomerService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; /** * @Description: 订单客户 diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java index c7a30ecc..13d46f84 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java @@ -1,10 +1,6 @@ package org.jeecg.modules.demo.test.service.impl; -import java.io.Serializable; -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; - +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer; import org.jeecg.modules.demo.test.entity.JeecgOrderMain; import org.jeecg.modules.demo.test.entity.JeecgOrderTicket; @@ -16,7 +12,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.io.Serializable; +import java.util.Collection; +import java.util.List; +import java.util.stream.Collectors; /** * @Description: 订单 diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.java index 8d57c040..459512a9 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.java @@ -1,14 +1,13 @@ package org.jeecg.modules.demo.test.service.impl; -import java.util.List; - +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.demo.test.entity.JeecgOrderTicket; import org.jeecg.modules.demo.test.mapper.JeecgOrderTicketMapper; import org.jeecg.modules.demo.test.service.IJeecgOrderTicketService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; /** * @Description: 订单机票 diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JoaDemoServiceImpl.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JoaDemoServiceImpl.java index 22ee1150..579f9bbb 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JoaDemoServiceImpl.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JoaDemoServiceImpl.java @@ -1,12 +1,11 @@ package org.jeecg.modules.demo.test.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.demo.test.entity.JoaDemo; import org.jeecg.modules.demo.test.mapper.JoaDemoMapper; import org.jeecg.modules.demo.test.service.IJoaDemoService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - /** * @Description: 流程测试 * @Author: jeecg-boot diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/vo/JeecgOrderMainPage.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/vo/JeecgOrderMainPage.java index 481f5249..0bbe99c0 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/vo/JeecgOrderMainPage.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/vo/JeecgOrderMainPage.java @@ -1,13 +1,12 @@ package org.jeecg.modules.demo.test.vo; -import java.util.List; - +import lombok.Data; import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer; import org.jeecg.modules.demo.test.entity.JeecgOrderTicket; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.ExcelCollection; -import lombok.Data; +import java.util.List; /** * @Description: 一对多示例 diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/controller/DlMockController.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/controller/DlMockController.java index e3f99a38..91d74d36 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/controller/DlMockController.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/controller/DlMockController.java @@ -10,10 +10,10 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.constant.VxeSocketConst; import org.jeecg.common.system.query.MatchTypeEnum; import org.jeecg.common.system.query.QueryCondition; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.constant.VxeSocketConst; import org.jeecg.modules.demo.mock.vxe.websocket.VxeSocket; import org.jeecg.modules.dlglong.entity.MockEntity; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-log-manage/src/main/java/org/jeecg/modules/controller/LogManageController.java b/jeecg-module-log-manage/src/main/java/org/jeecg/modules/controller/LogManageController.java index bc142853..ddfa6443 100644 --- a/jeecg-module-log-manage/src/main/java/org/jeecg/modules/controller/LogManageController.java +++ b/jeecg-module-log-manage/src/main/java/org/jeecg/modules/controller/LogManageController.java @@ -1,11 +1,7 @@ package org.jeecg.modules.controller; -import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.commons.net.ftp.FTPClient; -import org.apache.commons.net.ftp.FTPFile; -import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.FTPUtil; import org.jeecg.modules.entity.FileInfo; import org.jeecg.modules.entity.LogManage; @@ -16,11 +12,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.util.*; +import java.util.List; @RestController @RequestMapping("logManage") diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java index 2bace2dc..508247e9 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java @@ -6,14 +6,13 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPFile; -import org.jeecg.modules.entity.GardsXeResults; +import org.jeecg.modules.entity.GardsXeResultsSpectrum; import org.jeecg.modules.entity.vo.*; import org.jeecg.modules.native_jni.EnergySpectrumHandler; import org.jeecg.modules.native_jni.struct.BgBoundary; import org.jeecg.modules.native_jni.struct.CalcBgBoundaryParam; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import java.io.File; @@ -28,7 +27,7 @@ public class PHDFileUtil { @Autowired private FTPUtil ftpUtil; - public Map getSourceData(String filePath, String fileName, List xeDataList, Integer sampleId, String status){ + public Map getSourceData(String filePath, String fileName, List xeDataList, Integer sampleId, String status){ //加载dll工具库 System.loadLibrary("ReadPHDFile"); EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(filePath); @@ -213,6 +212,17 @@ public class PHDFileUtil { } map.put("betaEnergyData", betaEnergyList); //Xe + for (GardsXeResultsSpectrum xeData:xeDataList) { + Double conc = xeData.getConc(); + Double mdc = xeData.getMdc(); + if (conc < 0){ + xeData.setColor("red"); + } else if (0 mdc) { + xeData.setColor("green"); + } + } map.put("XeData", xeDataList); //计算边界值 CalcBgBoundaryParam calcBgBoundaryParam = new CalcBgBoundaryParam(); @@ -299,7 +309,7 @@ public class PHDFileUtil { } public void getLightColor(Map sampleMap, Map gasBgMap, Map detBgMap, Map qcMap){ - SpectrumData spectrumData = (SpectrumData)sampleMap.get("spectrumData"); + SpectrumData sampleSpectrumData = (SpectrumData)sampleMap.get("spectrumData"); SpectrumData gasBgSpectrumData = (SpectrumData)gasBgMap.get("spectrumData"); SpectrumData detBgSpectrumData = (SpectrumData)detBgMap.get("spectrumData"); //灯颜色 @@ -308,7 +318,7 @@ public class PHDFileUtil { List collectionTimeSections = sections.getCollectionTimeSections(); List acquisitionTimeSections = sections.getAcquisitionTimeSections(); List xeVolumeSections = sections.getXeVolumeSections(); - double airVolume = spectrumData.getAirVolume(); + double airVolume = sampleSpectrumData.getAirVolume(); if (Objects.nonNull(airVolume)){ // air volume check if (airVolumeSections.get(0) < airVolume && airVolume <= airVolumeSections.get(1)) { // red @@ -328,9 +338,10 @@ public class PHDFileUtil { qcMap.put("SampleVolumeBtn", "GreenLight"); } } - String collectionTime = spectrumData.getCollectionTime(); + String collectionTime = sampleSpectrumData.getCollectionTime(); if (StringUtils.isNotBlank(collectionTime)){ double collection_time = Double.parseDouble(collectionTime); + collection_time = collection_time/3600; // collection time check if (collectionTimeSections.get(0) < collection_time && collection_time <= collectionTimeSections.get(1)) { // red sampleMap.put("CollectTimeBtn", "RedLight"); @@ -359,8 +370,9 @@ public class PHDFileUtil { qcMap.put("CollectTimeBtn", "RedLight"); } } - double acquisitionLiveTime = spectrumData.getAcquisitionLiveTime(); + double acquisitionLiveTime = sampleSpectrumData.getAcquisitionLiveTime(); if (Objects.nonNull(acquisitionLiveTime)){ + acquisitionLiveTime = acquisitionLiveTime/3600; // acquisition time check if (acquisitionTimeSections.get(0) < acquisitionLiveTime && acquisitionLiveTime <= acquisitionTimeSections.get(1)) { // red sampleMap.put("AcqTimeBtn", "RedLight"); @@ -389,7 +401,7 @@ public class PHDFileUtil { qcMap.put("AcqTimeBtn", "RedLight"); } } - double yield = spectrumData.getYield(); + double yield = sampleSpectrumData.getYield(); if (Objects.nonNull(yield)) { if (xeVolumeSections.get(0) < yield && yield <= xeVolumeSections.get(1)) { // red sampleMap.put("XeVolumeBtn", "RedLight"); @@ -409,7 +421,7 @@ public class PHDFileUtil { } } - if (gasBgSpectrumData.getMeasurementId().equals(spectrumData.getGasBkMeasurementId())){ + if (gasBgSpectrumData.getMeasurementId().equals(sampleSpectrumData.getGasBkMeasurementId())){ sampleMap.put("GasBgBtn", "GreenLight"); gasBgMap.put("GasBgBtn", "GreenLight"); detBgMap.put("GasBgBtn", "GreenLight"); @@ -421,7 +433,7 @@ public class PHDFileUtil { qcMap.put("GasBgBtn", "RedLight"); } - if (detBgSpectrumData.getMeasurementId().equals(spectrumData.getDetectorBkMeasurementId())){ + if (detBgSpectrumData.getMeasurementId().equals(sampleSpectrumData.getDetectorBkMeasurementId())){ sampleMap.put("DetBgBtn", "GreenLight"); gasBgMap.put("DetBgBtn", "GreenLight"); detBgMap.put("DetBgBtn", "GreenLight"); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/UserTaskUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/UserTaskUtil.java index 801fbcd5..f12a2c06 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/UserTaskUtil.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/UserTaskUtil.java @@ -1,5 +1,6 @@ package org.jeecg.common.util; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import org.jeecg.modules.service.IUserTaskService; import org.jeecg.modules.system.entity.SysUser; import org.springframework.beans.factory.annotation.Autowired; @@ -46,7 +47,13 @@ public class UserTaskUtil { //根据用户名称查询用户id SysUser user = userTaskService.findUserByName(userName); String userId = user.getId(); - List stationIds = userTaskService.findUserStations(userId).stream().distinct().collect(Collectors.toList()); + //声明一个当前日期 + Date nowDate = new Date(); + String dateStr = DateUtils.formatDate(nowDate, "yyyy-MM-dd"); + List stationIds = userTaskService.findUserTaskStations(userId, dateStr); + if (CollectionUtils.isNotEmpty(stationIds)){ + stationIds = stationIds.stream().distinct().collect(Collectors.toList()); + } return stationIds; } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java index 9b21364f..622348cd 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java @@ -1,24 +1,14 @@ package org.jeecg.modules.controller; -import cn.hutool.core.io.FileUtil; -import com.google.common.io.Files; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.GardsSampleData; import org.jeecg.modules.service.IGammaService; import org.jeecg.modules.service.ISpectrumAnalysisService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.io.File; -import java.util.Date; - @RestController @RequestMapping("gamma") public class GammaController { diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java index 537b8490..3f44d148 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java @@ -4,7 +4,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.GardsSampleData; +import org.jeecg.modules.entity.GardsSampleDataSpectrum; +import org.jeecg.modules.entity.vo.StatisticsQueryData; import org.jeecg.modules.service.ISpectrumAnalysisService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; @@ -30,14 +31,14 @@ public class SpectrumAnalysesController { @GetMapping("getDBSpectrumList") @ApiOperation(value = "获取数据库中交互分析基础数据", notes = "获取数据库中交互分析基础数据") - public Result getDBSpectrumList(QueryRequest queryRequest, GardsSampleData gardsSampleData, String dbName, String[] menuTypes,boolean AllUsers,boolean CollectStop, boolean AcqStart, + public Result getDBSpectrumList(QueryRequest queryRequest, GardsSampleDataSpectrum gardsSampleData, String dbName, String[] menuTypes, boolean AllUsers, boolean CollectStopB, boolean AcqStartB, @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate, HttpServletRequest request) { - return spectrumAnalysisService.getDBSpectrumList(queryRequest, gardsSampleData, dbName, menuTypes, AllUsers, CollectStop, AcqStart, startDate, endDate, request); + return spectrumAnalysisService.getDBSpectrumList(queryRequest, gardsSampleData, dbName, menuTypes, AllUsers, CollectStopB, AcqStartB, startDate, endDate, request); } @GetMapping("getDBSpectrumChart") @ApiOperation(value = "查询折线图相关信息接口", notes = "查询折线图相关信息接口") - public Result getDBSpectrumPie(String dbName, Integer sampleId){ + public Result getDBSpectrumChart(String dbName, Integer sampleId){ return spectrumAnalysisService.getDBSpectrumChart(dbName, sampleId); } @@ -53,12 +54,6 @@ public class SpectrumAnalysesController { return spectrumAnalysisService.viewComment(sampleId, request); } - @PostMapping("addComment") - @ApiOperation(value = "新增comment", notes = "新增comment") - public Result addComment(Integer sampleId, HttpServletRequest request, String comment){ - return spectrumAnalysisService.addComment(sampleId, request, comment); - } - @GetMapping("viewARR") @ApiOperation(value = "查看ARR报告", notes = "查看ARR报告") public void viewARR(Integer sampleId, HttpServletResponse response){ @@ -108,7 +103,42 @@ public class SpectrumAnalysesController { } @GetMapping("viewExtrapolation") + @ApiOperation(value = "查询Extrapolation数据", notes = "查询Extrapolation数据") public Result viewExtrapolation(Integer sampleId){ + return spectrumAnalysisService.viewExtrapolation(sampleId); + } + + @GetMapping("viewMDC") + @ApiOperation(value = "查看MDC数据", notes = "查看MDC数据") + public Result viewMDC(Integer sampleId){ + return spectrumAnalysisService.viewMDC(sampleId); + } + + @GetMapping("changeDetector") + @ApiOperation(value = "切换台站及探测器信息", notes = "切换台站及探测器信息") + public Result changeDetector(String stationName){ + return spectrumAnalysisService.changeDetector(stationName); + } + + @PostMapping("statisticsQuery") + @ApiOperation(value = "MDC分析数据", notes = "MDC分析数据") + public Result statisticsQuery(@RequestBody StatisticsQueryData statisticsQueryData){ + return spectrumAnalysisService.statisticsQuery(statisticsQueryData); + } + + @GetMapping("statisticsQueryBtn") + @ApiOperation(value = "报警按钮分析数据", notes = "报警按钮分析数据") + public Result statisticsQueryBtn(String detectorName, Integer stationId, String statisticsType, @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime){ + return spectrumAnalysisService.statisticsQueryBtn(detectorName, stationId, statisticsType, startTime, endTime); + } + + @GetMapping("fitting") + public Result fitting(Double paramA, Double paramB, Double paramC, Integer points){ + return null; + } + + @PostMapping("savetoDB") + public Result savetoDB(HttpServletRequest request, Integer stationId, Integer sampleId){ return null; } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsAnalysesMan.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsAnalysesMan.java deleted file mode 100644 index 48d78fb9..00000000 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsAnalysesMan.java +++ /dev/null @@ -1,112 +0,0 @@ -package org.jeecg.modules.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -@Data -@TableName("RNMAN.GARDS_ANALYSES") -public class GardsAnalysesMan implements Serializable { - - @TableField(value = "IDANALYSIS") - private Integer IDANALYSIS; - - @TableField(value = "SAMPLE_ID") - private Integer sampleId; - - @TableField(value = "ANALYSISBEGIN") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date analysisBegin; - - @TableField(value = "ANALYSISEND") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date analysisEnd; - - @TableField(value = "TYPE") - private String type; - - @TableField(value = "SOFTWARE") - private String software; - - @TableField(value = "SWVERSION") - private String swversion; - - @TableField(value = "ANALYST") - private String analyst; - - @TableField(value = "BASELINEMETHOD") - private String baselineMethod; - - @TableField(value = "PEAKSMETHOD") - private String peaksMethod; - - @TableField(value = "NUCLIDEMETHOD") - private String nuclideMethod; - - @TableField(value = "UNCCALCMETHOD") - private String unccalcMethod; - - @TableField(value = "LCMETHOD") - private String lcMethod; - - @TableField(value = "SEARCHSTARTCHANNEL") - private Integer searchStartChannel; - - @TableField(value = "SEARCHENDCHANNEL") - private Integer searchEndChannel; - - @TableField(value = "SEARCHTHRESHOLD") - private Double searchThreshold; - - @TableField(value = "NUMBEROFPEAKS") - private Integer numberOfPeaks; - - @TableField(value = "TOTALCOUNTS") - private Double totalCounts; - - @TableField(value = "CATEGORY") - private Integer category; - - @TableField(value = "COMMENTS") - private String comments; - - @TableField(value = "MODDATE") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date moddate; - - @TableField(value = "USEDGASPHD") - private String usedGasPHD; - - @TableField(value = "USEDDETPHD") - private String usedDetPHD; - - @TableField(value = "USEDGASPHD_ID") - private Integer usedGasPHDId; - - @TableField(value = "USEDDETPHD_ID") - private Integer usedDetPHDId; - - @TableField(value = "BASELINE_PATH") - private String baseLinePath; - - @TableField(value = "LC_PATH") - private String lcPath; - - @TableField(value = "SCAC_PATH") - private String scacPath; - - @TableField(value = "LOG_PATH") - private String logPath; - - @TableField(value = "REPORT_PAHT") - private String reportPath; - -} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java new file mode 100644 index 00000000..8360d816 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java @@ -0,0 +1,38 @@ +package org.jeecg.modules.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.jeecg.modules.base.entity.original.GardsSampleData; +import org.jeecgframework.poi.excel.annotation.Excel; + +@Data +@TableName("ORIGINAL.GARDS_SAMPLE_DATA") +public class GardsSampleDataSpectrum extends GardsSampleData { + + /** + * 台站名称 + */ + @TableField(exist = false) + @Excel(name = "STATION" ,orderNum = "2") + private String stationName; + + /** + * 探测器名称 + */ + @TableField(exist = false) + private String detectorsName; + + + @TableField(exist = false) + @Excel(name = "CALIB REPORTS" ,orderNum = "7") + private String calibReports; + + @TableField(exist = false) + private String dbName; + + @TableField(exist = false) + @Excel(name = "NO" ,orderNum = "1") + private Integer no; + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsXeResults.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsXeResults.java deleted file mode 100644 index 1e977c27..00000000 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsXeResults.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.jeecg.modules.entity; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -@Data -@TableName(value = "GARDS_XE_RESULTS") -public class GardsXeResults { - - @TableField(value = "SAMPLE_ID") - private Integer sampleId; - - @TableField(value = "IDANALYSIS") - private Integer idanalysis; - - @TableField(value = "NUCLIDE_NAME") - private String nuclideName; - - @TableField(value = "CONC") - private Double conc; - - @TableField(value = "CONC_ERR") - private Double concErr; - - @TableField(value = "MDC") - private Double mdc; - - @TableField(value = "LC") - private Double lc; - - @TableField(value = "NID_FLAG") - private Integer nidFlag; - - @TableField(value = "MODDATE") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date moddate; - -} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsXeResultsSpectrum.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsXeResultsSpectrum.java new file mode 100644 index 00000000..493bb740 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsXeResultsSpectrum.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.entity; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.jeecg.modules.base.entity.rnauto.GardsXeResults; + +@Data +@TableName(value = "GARDS_XE_RESULTS") +public class GardsXeResultsSpectrum extends GardsXeResults { + + @TableField(exist = false) + private String color; + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/SysDict.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/SysDict.java deleted file mode 100644 index 8bca9136..00000000 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/SysDict.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.jeecg.modules.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -@Data -@TableName(value = "sys_dict") -public class SysDict implements Serializable { - - @TableField(value = "id") - private String id; - - @TableField(value = "dict_name") - private String dictName; - - @TableField(value = "dict_code") - private String dictCode; - - @TableField(value = "description") - private String description; - - @TableField(value = "del_flag") - private Integer delFlag; - - @TableField(value = "create_by") - private String createBy; - - @TableField(value = "create_time") - private Date createTime; - - @TableField(value = "update_by") - private String updateBy; - - @TableField(value = "update_time") - private Date updateTime; - - @TableField(value = "type") - private Integer type; - - @TableField(value = "tenant_id") - private Integer tenantId; - - @TableField(value = "low_app_id") - private String lowAppId; - -} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/SysDictItem.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/SysDictItem.java deleted file mode 100644 index 776d4aa4..00000000 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/SysDictItem.java +++ /dev/null @@ -1,80 +0,0 @@ -package org.jeecg.modules.entity; - -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 lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - *

- * - *

- * - * @Author zhangweijian - * @since 2018-12-28 - */ -@Data -@TableName(value = "sys_dict_item") -public class SysDictItem implements Serializable { - - /** - * id - */ - @TableId(value = "id", type = IdType.ASSIGN_ID) - private String id; - - /** - * 字典id - */ - @TableField(value = "dict_id") - private String dictId; - - /** - * 字典项文本 - */ - @TableField(value = "item_text") - private String itemText; - - /** - * 字典项值 - */ - @TableField(value = "item_value") - private String itemValue; - - /** - * 描述 - */ - @TableField(value = "description") - private String description; - - /** - * 排序 - */ - @TableField(value = "sort_order") - private Integer sortOrder; - - - /** - * 状态（1启用 0不启用） - */ - @TableField(value = "status") - private Integer status; - - @TableField(value = "create_by") - private String createBy; - - @TableField(value = "create_time") - private Date createTime; - - @TableField(value = "update_by") - private String updateBy; - - @TableField(value = "update_time") - private Date updateTime; - - -} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StatisticsData.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StatisticsData.java new file mode 100644 index 00000000..f6107aab --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StatisticsData.java @@ -0,0 +1,23 @@ +package org.jeecg.modules.entity.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class StatisticsData implements Serializable { + + private String nuclideName; + + private Date collectStart; + + private Double mdc; + + private Double conc; + + private Date dateTime; + + private Double dataValue; + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StatisticsQueryData.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StatisticsQueryData.java new file mode 100644 index 00000000..46f287f7 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StatisticsQueryData.java @@ -0,0 +1,62 @@ +package org.jeecg.modules.entity.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +public class StatisticsQueryData implements Serializable { + + private String dbName; + + private String detectorName; + + private Integer stationId; + + private String statisticsType; + + private boolean MDC; + + private boolean Activity; + + private boolean filterGrpbox; + + private List nuclidesList; + + private String minCollectTimeLine; + + private String maxCollectTimeLine; + + private String minAcqLiveLine; + + private String maxAcqLiveLine; + + private String quantityLine; + + private String xeVolumeLine; + + private String mdcLine; + + private String concLine; + + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date startTime; + + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date endTime; + + private List items; + + private String startDate; + + private String endDate; + + private List detectorList; + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StcGraph.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StcGraph.java new file mode 100644 index 00000000..7d6a2926 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StcGraph.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.entity.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +public class StcGraph implements Serializable { + + private String m_GraphPen; + + private String m_strGraphName; + + private List m_Keys; + + private List m_Values; + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsAnalysesManMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsAnalysesManMapper.java index fbcff385..0beb8014 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsAnalysesManMapper.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsAnalysesManMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.GardsAnalysesMan; +import org.jeecg.modules.base.entity.rnman.GardsAnalyses; -public interface GardsAnalysesManMapper extends BaseMapper { +public interface GardsAnalysesManMapper extends BaseMapper { } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java index 0ee21058..1077dc3c 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java @@ -3,24 +3,24 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.base.entity.GardsSampleData; -import org.jeecg.modules.entity.GardsXeResults; +import org.jeecg.modules.entity.GardsSampleDataSpectrum; +import org.jeecg.modules.entity.GardsXeResultsSpectrum; import org.jeecg.modules.entity.vo.CommentData; import org.jeecg.modules.entity.vo.SpectrumFileRecord; -import org.springframework.format.annotation.DateTimeFormat; +import org.jeecg.modules.entity.vo.StatisticsData; +import org.jeecg.modules.entity.vo.StatisticsQueryData; -import java.util.Date; import java.util.List; public interface SpectrumAnalysisMapper { - List getDBSearchList(String dbName, List stationTypes, List userStations, boolean AllUsers); + List getDBSearchList(String dbName, List stationTypes, List userStations, boolean AllUsers); - Page getDBSpectrumList(IPage page, GardsSampleData gardsSampleData, String dbName, List stationTypes, boolean CollectStop, boolean AcqStart, String startTime, String endTime, List userStations, boolean AllUsers); + Page getDBSpectrumList(IPage page, GardsSampleDataSpectrum gardsSampleData, String dbName, List stationTypes, boolean CollectStopB, boolean AcqStartB, String startTime, String endTime, List userStations, boolean AllUsers); SpectrumFileRecord getDBSpectrumFilePath(String dbName, Integer sampleId); - List getXeDataList(Integer sampleId); + List getXeDataList(Integer sampleId); String getQCFilePath(String siteDetCode, String collectStartStr); @@ -34,8 +34,21 @@ public interface SpectrumAnalysisMapper { String viewRRR(@Param(value = "sampleId") Integer sampleId); - GardsSampleData getSampleData(@Param(value = "sampleId") Integer sampleId); + GardsSampleDataSpectrum getSampleData(@Param(value = "sampleId") Integer sampleId); + + GardsSampleDataSpectrum findSampleByFilePath(@Param(value = "filePath") String filePath); + + List getDetectorList(@Param(value = "stationId") Integer stationId); + + List statisticsQueryNuclides(@Param(value = "statisticsQueryData") StatisticsQueryData statisticsQueryData); + + List statisticsQueryCollection(String startDate, String endDate, List detectorList); + + List statisticsQueryAcquisition(String startDate, String endDate, List detectorList); + + List statisticsQueryXeVolumn(String startDate, String endDate, List detectorList); + + List statisticsQuerySampleVolumn(String startDate, String endDate, List detectorList); - GardsSampleData findSampleByFilePath(@Param(value = "filePath") String filePath); } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SysDictItemSpectrumMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SysDictItemSpectrumMapper.java index 86f8d4ec..0d5e09b8 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SysDictItemSpectrumMapper.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SysDictItemSpectrumMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.SysDictItem; +import org.jeecg.modules.base.entity.postgre.SysDictItem; public interface SysDictItemSpectrumMapper extends BaseMapper { } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SysDictSpectrumMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SysDictSpectrumMapper.java index b1ea90d2..a4fbb516 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SysDictSpectrumMapper.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SysDictSpectrumMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.SysDict; +import org.jeecg.modules.base.entity.postgre.SysDict; public interface SysDictSpectrumMapper extends BaseMapper { } 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 9f3c163c..697945ef 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 @@ -2,7 +2,7 @@ - SELECT DISTINCT cfg_stations.station_code stationName, @@ -34,7 +34,7 @@ - select c.sample_id, b.station_code stationName, a.detector_code detectorsName, @@ -84,10 +84,10 @@ and c.status = #{gardsSampleData.status} - + and c.collect_stop between TO_DATE(#{startTime}, 'yyyy-mm-dd hh24:mi:ss') and TO_DATE(#{endTime}, 'yyyy-mm-dd hh24:mi:ss') - + and c.acquisition_start between TO_DATE(#{startTime}, 'yyyy-mm-dd hh24:mi:ss') and TO_DATE(#{endTime}, 'yyyy-mm-dd hh24:mi:ss') @@ -105,7 +105,7 @@ ORDER BY c.collect_stop DESC - SELECT SAMPLE_ID,NUCLIDE_NAME,CONC,CONC_ERR,MDC,LC FROM RNAUTO.GARDS_XE_RESULTS where SAMPLE_ID = #{sampleId} @@ -160,7 +160,7 @@ SELECT REPORT_PAHT FROM RNMAN.GARDS_ANALYSES where SAMPLE_ID = #{sampleId} - SELECT SITE_DET_CODE, SAMPLE_ID, @@ -189,33 +189,177 @@ - SELECT - SITE_DET_CODE, - SAMPLE_ID, - STATION_ID, - DETECTOR_ID, - INPUT_FILE_NAME, - SAMPLE_TYPE, - DATA_TYPE, - GEOMETRY, - SPECTRAL_QUALIFIE, - TRANSMIT_DTG, - COLLECT_START, - COLLECT_STOP, - ACQUISITION_START, - ACQUISITION_STOP, - ACQUISITION_REAL_SEC, - ACQUISITION_LIVE_SEC, - QUANTITY, - STATUS, - MODDATE + SITE_DET_CODE, + SAMPLE_ID, + STATION_ID, + DETECTOR_ID, + INPUT_FILE_NAME, + SAMPLE_TYPE, + DATA_TYPE, + GEOMETRY, + SPECTRAL_QUALIFIE, + TRANSMIT_DTG, + COLLECT_START, + COLLECT_STOP, + ACQUISITION_START, + ACQUISITION_STOP, + ACQUISITION_REAL_SEC, + ACQUISITION_LIVE_SEC, + QUANTITY, + STATUS, + MODDATE FROM - ORIGINAL.GARDS_SAMPLE_DATA + ORIGINAL.GARDS_SAMPLE_DATA INPUT_FILE_NAME = #{filePath} + + + + + + + + + + + + + \ No newline at end of file diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java index 5596f777..5f6e6a99 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java @@ -2,7 +2,8 @@ package org.jeecg.modules.service; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.GardsSampleData; +import org.jeecg.modules.entity.GardsSampleDataSpectrum; +import org.jeecg.modules.entity.vo.StatisticsQueryData; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -12,7 +13,7 @@ public interface ISpectrumAnalysisService { Result getDBSearchList(HttpServletRequest request, boolean AllUsers, String dbName, String[] menuTypes); - Result getDBSpectrumList(QueryRequest queryRequest, GardsSampleData gardsSampleData, String dbName, String[] menuTypes, boolean AllUsers, boolean CollectStop, boolean AcqStart, Date startDate, Date endDate, HttpServletRequest request); + Result getDBSpectrumList(QueryRequest queryRequest, GardsSampleDataSpectrum gardsSampleData, String dbName, String[] menuTypes, boolean AllUsers, boolean CollectStopB, boolean AcqStartB, Date startDate, Date endDate, HttpServletRequest request); Result getDBSpectrumChart(String dbName, Integer sampleId); @@ -20,8 +21,6 @@ public interface ISpectrumAnalysisService { Result viewComment(Integer sampleId, HttpServletRequest request); - Result addComment(Integer sampleId, HttpServletRequest request, String comment); - void viewARR(Integer sampleId, HttpServletResponse response); void viewRRR(Integer sampleId, HttpServletResponse response); @@ -40,4 +39,16 @@ public interface ISpectrumAnalysisService { Result viewExtrapolation(Integer sampleId); + Result viewMDC(Integer sampleId); + + Result changeDetector(String stationName); + + Result statisticsQuery(StatisticsQueryData statisticsQueryData); + + Result statisticsQueryBtn(String detectorName, Integer stationId, String statisticsType, Date startTime, Date endTime); + + Result fitting(Double paramA, Double paramB, Double paramC, Integer points); + + Result saveToDB(HttpServletRequest request, Integer stationId, Integer sampleId); + } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISysDictSpectrumService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISysDictSpectrumService.java index 58856205..65bb41c3 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISysDictSpectrumService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISysDictSpectrumService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.entity.SysDict; +import org.jeecg.modules.base.entity.postgre.SysDict; import java.util.List; diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java index cf0d707d..8eb9e5de 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java @@ -2,7 +2,6 @@ package org.jeecg.modules.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -10,25 +9,20 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.io.FileUtils; import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPFile; -import org.apache.xmlbeans.impl.xb.xsdschema.All; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.common.properties.SpectrumPathProperties; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.*; -import org.jeecg.modules.base.entity.GardsSampleData; -import org.jeecg.modules.entity.GardsAnalysesMan; -import org.jeecg.modules.entity.GardsXeResults; +import org.jeecg.modules.base.entity.original.GardsSampleData; +import org.jeecg.modules.entity.GardsSampleDataSpectrum; +import org.jeecg.modules.entity.GardsXeResultsSpectrum; import org.jeecg.modules.entity.vo.*; -import org.jeecg.modules.mapper.GardsAnalysesManMapper; -import org.jeecg.modules.mapper.GardsDetectorsSpectrumMapper; import org.jeecg.modules.mapper.SpectrumAnalysisMapper; import org.jeecg.modules.native_jni.EnergySpectrumHandler; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; import org.jeecg.modules.service.ISpectrumAnalysisService; import org.jeecg.modules.service.ISysDictSpectrumService; -import org.jeecg.modules.system.entity.GardsDetectors; -import org.jeecg.modules.system.entity.GardsStations; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -53,16 +47,12 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { @Autowired private ISysDictSpectrumService sysDictService; @Autowired - private GardsDetectorsSpectrumMapper gardsDetectorsSpectrumMapper; - @Autowired private FTPUtil ftpUtil; @Autowired private SpectrumPathProperties spectrumPathProperties; @Autowired private UserTaskUtil userTaskUtil; @Autowired - private GardsAnalysesManMapper gardsAnalysesManMapper; - @Autowired private PHDFileUtil phdFileUtil; @Override @@ -98,13 +88,13 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { result.error500("数据库类型不存在"); return result; } - List sampleData = spectrumAnalysisMapper.getDBSearchList(dbName, stationTypes, userStations, AllUsers); + List sampleData = spectrumAnalysisMapper.getDBSearchList(dbName, stationTypes, userStations, AllUsers); //获取台站编码 List stationCodes = new LinkedList<>(); List detectorCodes = new LinkedList<>(); if (CollectionUtils.isNotEmpty(sampleData)){ - stationCodes = sampleData.stream().map(GardsSampleData::getStationName).distinct().collect(Collectors.toList()); - detectorCodes = sampleData.stream().map(GardsSampleData::getDetectorsName).distinct().collect(Collectors.toList()); + stationCodes = sampleData.stream().map(GardsSampleDataSpectrum::getStationName).distinct().collect(Collectors.toList()); + detectorCodes = sampleData.stream().map(GardsSampleDataSpectrum::getDetectorsName).distinct().collect(Collectors.toList()); } map.put("stationCode", stationCodes); map.put("detectorCode", detectorCodes); @@ -114,7 +104,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { } @Override - public Result getDBSpectrumList(QueryRequest queryRequest, GardsSampleData gardsSampleData, String dbName, String[] menuTypes, boolean AllUsers, boolean CollectStop, boolean AcqStart, Date startDate, Date endDate, HttpServletRequest request) { + public Result getDBSpectrumList(QueryRequest queryRequest, GardsSampleDataSpectrum gardsSampleData, String dbName, String[] menuTypes, boolean AllUsers, boolean CollectStopB, boolean AcqStartB, Date startDate, Date endDate, HttpServletRequest request) { Result result = new Result(); if (Objects.isNull(startDate)){ result.error500("开始时间不能为空"); @@ -159,8 +149,8 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { userStations = userTaskUtil.findUserStation(userName); } //声明分页page - Page page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); - Page sampleDataPage = spectrumAnalysisMapper.getDBSpectrumList(page, gardsSampleData, dbName, stationTypes, CollectStop, AcqStart, startTime, endTime, userStations, AllUsers); + Page page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); + Page sampleDataPage = spectrumAnalysisMapper.getDBSpectrumList(page, gardsSampleData, dbName, stationTypes, CollectStopB, AcqStartB, startTime, endTime, userStations, AllUsers); sampleDataPage.getRecords().stream().forEach(item->{item.setDbName(tempDBName);}); result.setSuccess(true); result.setResult(sampleDataPage); @@ -183,10 +173,14 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { result.error500("数据库类型不存在"); return result; } + if (redisUtil.hasKey("Spectrum_"+sampleId)){ + redisUtil.del("Spectrum_"+sampleId); + } //查询数据库文件信息 SpectrumFileRecord dbSpectrumFilePath = spectrumAnalysisMapper.getDBSpectrumFilePath(dbName, sampleId); //查询数据库中结果的Xe数据 - List xeDataList = spectrumAnalysisMapper.getXeDataList(sampleId); + List xeDataList = spectrumAnalysisMapper.getXeDataList(sampleId); + List filePath = new LinkedList<>(); if (Objects.nonNull(dbSpectrumFilePath)) { Map sampleMap = new HashMap<>(); Map gasBgMap = new HashMap<>(); @@ -194,6 +188,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { Map qcMap = new HashMap<>(); if(StringUtils.isNotBlank(dbSpectrumFilePath.getSampleFilePath())){ String sampleFilePath = dbSpectrumFilePath.getSampleFilePath(); + filePath.add(sampleFilePath); GardsSampleData sample = spectrumAnalysisMapper.findSampleByFilePath(sampleFilePath); String pathName = sampleFilePath.substring(0, sampleFilePath.lastIndexOf(StringPool.SLASH)); String fileName = sampleFilePath.substring(sampleFilePath.lastIndexOf(StringPool.SLASH)+1); @@ -202,6 +197,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { } if(StringUtils.isNotBlank(dbSpectrumFilePath.getGasBgFilePath())){ String gasBgFilePath = dbSpectrumFilePath.getGasBgFilePath(); + filePath.add(gasBgFilePath); GardsSampleData gasBg = spectrumAnalysisMapper.findSampleByFilePath(gasBgFilePath); String pathName = gasBgFilePath.substring(0, gasBgFilePath.lastIndexOf(StringPool.SLASH)); String fileName = gasBgFilePath.substring(gasBgFilePath.lastIndexOf(StringPool.SLASH)+1); @@ -210,6 +206,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { } if(StringUtils.isNotBlank(dbSpectrumFilePath.getDetBgFilePath())){ String detBgFilePath = dbSpectrumFilePath.getDetBgFilePath(); + filePath.add(detBgFilePath); GardsSampleData detBg = spectrumAnalysisMapper.findSampleByFilePath(detBgFilePath); String pathName = detBgFilePath.substring(0, detBgFilePath.lastIndexOf(StringPool.SLASH)); String fileName = detBgFilePath.substring(detBgFilePath.lastIndexOf(StringPool.SLASH)+1); @@ -219,6 +216,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { String collectStartStr = DateUtils.formatDate(dbSpectrumFilePath.getCollectStart(), "yyyy-MM-dd HH:mm:ss"); String dbQcFilePath = spectrumAnalysisMapper.getQCFilePath(dbSpectrumFilePath.getSiteDetCode(), collectStartStr); dbSpectrumFilePath.setQcFilePath(dbQcFilePath); + filePath.add(dbQcFilePath); if(StringUtils.isNotBlank(dbQcFilePath)){ GardsSampleData qc = spectrumAnalysisMapper.findSampleByFilePath(dbQcFilePath); String pathName = dbQcFilePath.substring(0, dbQcFilePath.lastIndexOf(StringPool.SLASH)); @@ -228,12 +226,13 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { } phdFileUtil.getLightColor(sampleMap,gasBgMap,detBgMap,qcMap); } + redisUtil.set("Spectrum_"+sampleId, filePath); result.setSuccess(true); result.setResult(resultMap); return result; } - private Map fenxi(String pathName, String fileName, List xeDataList, Integer sampleId, String status) { + private Map fenxi(String pathName, String fileName, List xeDataList, Integer sampleId, String status) { Map map = new HashMap<>(); FTPClient ftpClient = ftpUtil.LoginFTP(); if (Objects.isNull(ftpClient)){ @@ -250,6 +249,9 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { ftpClient.changeWorkingDirectory(pathName); List ftpFiles = Arrays.asList(ftpClient.listFiles()); ftpFiles=ftpFiles.stream().filter(item -> item.getName().equals(fileName)).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(ftpFiles)){ + throw new RuntimeException("ftp下对应文件不存在"); + } FTPFile ftpFile = ftpFiles.get(0); if (Objects.nonNull(ftpFile)){ InputStream inputStream = ftpClient.retrieveFileStream(ftpFile.getName()); @@ -342,77 +344,22 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { } } CommentData commentData = spectrumAnalysisMapper.viewComment(sampleId); - if (!commentData.getAnalyst().equals(userName)){ - if (StringUtils.isNotBlank(commentData.getComment())){ - String line = "------------------------------------------------------------"; - String comment = line+"\n[ User "+commentData.getAnalyst()+" Comment ] : \n"+commentData.getComment()+"\n"+line+" \n"; - commentInfo.setSpectrumOtherCommentInfo(comment); + if (Objects.nonNull(commentData)){ + if (!commentData.getAnalyst().equals(userName)){ + if (StringUtils.isNotBlank(commentData.getComment())){ + String line = "------------------------------------------------------------"; + String comment = line+"\n[ User "+commentData.getAnalyst()+" Comment ] : \n"+commentData.getComment()+"\n"+line+" \n"; + commentInfo.setSpectrumOtherCommentInfo(comment); + } + }else { + commentInfo.setSpectrumAnalysisCommentInfo(commentData.getComment()); } - }else { - commentInfo.setSpectrumAnalysisCommentInfo(commentData.getComment()); } result.setSuccess(true); result.setResult(commentInfo); return result; } - @Override - public Result addComment(Integer sampleId, HttpServletRequest request, String comment) { - Result result = new Result(); - CommentData commentData = spectrumAnalysisMapper.viewComment(sampleId); - String userName = JwtUtil.getUserNameByToken(request); - if (StringUtils.isBlank(userName)){ - result.error500("当前登录用户信息获取失败！"); - return result; - } - //查询备注信息不为空 - if (Objects.nonNull(commentData)){ - //判断查询出的备注信息的操作用户是否是当前登录用户 - if( userName.equals(commentData.getAnalyst()) ){ - //如果是 则可以进行修改备注信息的操作 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(GardsAnalysesMan::getSampleId, sampleId); - GardsAnalysesMan analysesMan = gardsAnalysesManMapper.selectOne(queryWrapper); - if (Objects.isNull(analysesMan)){ - result.error500("人工交互分析结果不存在！"); - return result; - }else { - analysesMan.setComments(comment); - analysesMan.setModdate(new Date()); - gardsAnalysesManMapper.updateById(analysesMan); - result.success("修改成功"); - } - }else { - //如果不是 则提示 不可以进行操作 - result.error500("当前信息操作人员不是当前登录用户，不允许操作！"); - return result; - } - }else { - //根据样品id查询对应的台站id - Integer stationId = spectrumAnalysisMapper.findStationIdBySampleId(sampleId); - if (Objects.isNull(stationId)){ - result.error500("当前信息对应的台站信息不存在，请核对当前基础数据！"); - return result; - } - //检查当前用户是否在当前时间有当前台站的排班任务 - boolean checkFlag = userTaskUtil.checkUserStation(stationId, userName); - //如果有排班任务 则可以新增 否则不可以新增 - if (checkFlag){ - GardsAnalysesMan analysesMan = new GardsAnalysesMan(); - analysesMan.setSampleId(sampleId); - analysesMan.setAnalyst(userName); - analysesMan.setComments(comment); - analysesMan.setModdate(new Date()); - gardsAnalysesManMapper.insert(analysesMan); - result.success("新增成功"); - }else { - result.error500("当前操作人员没有对应台站的排班任务，不允许操作！"); - return result; - } - } - return result; - } - @Override public void viewARR(Integer sampleId, HttpServletResponse response) { //获取自动处理生成的报告地址 @@ -683,7 +630,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { String dbName = "RNAUTO.GARDS_ANALYSES"; SpectrumFileRecord dbSpectrumFilePath = spectrumAnalysisMapper.getDBSpectrumFilePath(dbName, sampleId); //查询数据库中结果的Xe数据 - List xeDataList = spectrumAnalysisMapper.getXeDataList(sampleId); + List xeDataList = spectrumAnalysisMapper.getXeDataList(sampleId); //加载dll工具库 System.loadLibrary("ReadPHDFile"); if (Objects.nonNull(dbSpectrumFilePath)){ @@ -875,8 +822,8 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { } } if (CollectionUtils.isNotEmpty(xeDataList)){ - List xeData = xeDataList.stream().filter(item -> item.getNuclideName().equals("Xe133")).collect(Collectors.toList()); - GardsXeResults gardsXeResults = xeData.get(0); + List xeData = xeDataList.stream().filter(item -> item.getNuclideName().equals("Xe133")).collect(Collectors.toList()); + GardsXeResultsSpectrum gardsXeResults = xeData.get(0); qcResult.setXe133MDCValue(String.valueOf(gardsXeResults.getMdc())); if ( 0.001 < gardsXeResults.getMdc() && gardsXeResults.getMdc() < 5.0 ){ qcResult.setXe133MDCStatus("Pass"); @@ -901,7 +848,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { return result; } //查询数据库中结果的Xe数据 - List xeDataList = spectrumAnalysisMapper.getXeDataList(sampleId); + List xeDataList = spectrumAnalysisMapper.getXeDataList(sampleId); try { //切换被动模式 ftpClient.enterLocalPassiveMode(); @@ -942,29 +889,29 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { rlrDataValues.setAcq_live_time(String.valueOf(struct.acquisition_live_time)); if (CollectionUtils.isNotEmpty(xeDataList)){ - List xe131mDataList = xeDataList.stream().filter(item -> item.getNuclideName().equals("Xe131m")).collect(Collectors.toList()); - GardsXeResults xe131m = xe131mDataList.get(0); + List xe131mDataList = xeDataList.stream().filter(item -> item.getNuclideName().equals("Xe131m")).collect(Collectors.toList()); + GardsXeResultsSpectrum xe131m = xe131mDataList.get(0); rlrDataValues.setXe131m_conc(String.valueOf(xe131m.getConc())); rlrDataValues.setXe131m_uncert_conc(String.valueOf(xe131m.getConcErr())); rlrDataValues.setXe131m_MDC(String.valueOf(xe131m.getMdc())); rlrDataValues.setXe131m_LC(String.valueOf(xe131m.getLc())); - List xe133DataList = xeDataList.stream().filter(item -> item.getNuclideName().equals("Xe133")).collect(Collectors.toList()); - GardsXeResults xe133 = xe133DataList.get(0); + List xe133DataList = xeDataList.stream().filter(item -> item.getNuclideName().equals("Xe133")).collect(Collectors.toList()); + GardsXeResultsSpectrum xe133 = xe133DataList.get(0); rlrDataValues.setXe133_conc(String.valueOf(xe133.getConc())); rlrDataValues.setXe133_uncert_conc(String.valueOf(xe133.getConcErr())); rlrDataValues.setXe133_MDC(String.valueOf(xe133.getMdc())); rlrDataValues.setXe133_LC(String.valueOf(xe133.getLc())); - List xe133mDataList = xeDataList.stream().filter(item -> item.getNuclideName().equals("Xe133m")).collect(Collectors.toList()); - GardsXeResults xe133m = xe133mDataList.get(0); + List xe133mDataList = xeDataList.stream().filter(item -> item.getNuclideName().equals("Xe133m")).collect(Collectors.toList()); + GardsXeResultsSpectrum xe133m = xe133mDataList.get(0); rlrDataValues.setXe133m_conc(String.valueOf(xe133m.getConc())); rlrDataValues.setXe133m_uncert_conc(String.valueOf(xe133m.getConcErr())); rlrDataValues.setXe133m_MDC(String.valueOf(xe133m.getMdc())); rlrDataValues.setXe133m_LC(String.valueOf(xe133m.getLc())); - List xe135DataList = xeDataList.stream().filter(item -> item.getNuclideName().equals("Xe135")).collect(Collectors.toList()); - GardsXeResults xe135 = xe135DataList.get(0); + List xe135DataList = xeDataList.stream().filter(item -> item.getNuclideName().equals("Xe135")).collect(Collectors.toList()); + GardsXeResultsSpectrum xe135 = xe135DataList.get(0); rlrDataValues.setXe135_conc(String.valueOf(xe135.getConc())); rlrDataValues.setXe135_uncert_conc(String.valueOf(xe135.getConcErr())); rlrDataValues.setXe135_MDC(String.valueOf(xe135.getMdc())); @@ -1271,6 +1218,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { @Override public Result viewExtrapolation(Integer sampleId) { Result result = new Result(); + Map map = new HashMap<>(); String dbName = "RNAUTO.GARDS_ANALYSES"; SpectrumFileRecord dbSpectrumFilePath = spectrumAnalysisMapper.getDBSpectrumFilePath(dbName, sampleId); //加载dll工具库 @@ -1313,10 +1261,21 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { String acquisitionStart = struct.acquisition_start_date + " " + struct.acquisition_start_time; String acquisitionRealTime = String.valueOf(struct.acquisition_real_time); String acquisitionLiveTime = String.valueOf(struct.acquisition_live_time); - + map.put("acquisitionStart", acquisitionStart); + map.put("acquisitionRealTime", acquisitionRealTime); + map.put("acquisitionLiveTime", acquisitionLiveTime); //Gamma Spectrum: Sample - //蓝色 + //蓝色线 List gCounts = struct.g_counts; + List gammaOriginSeriseData = new LinkedList<>(); + for (int i=0; i< struct.num_g_channel; i++){ + long count = gCounts.get(i); + SeriseData temp = new SeriseData(); + temp.setX(i); + temp.setY(count); + gammaOriginSeriseData.add(temp); + } + map.put("gammaOriginSeriseData", gammaOriginSeriseData); List chanelEnergy = new LinkedList<>(); List gCentroidChannel = struct.g_centroid_channel; List gEnergy = struct.g_energy; @@ -1329,62 +1288,40 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { chanelEnergy.add(energy.get(0)); } } - + map.put("gammaChannelEnergy", chanelEnergy); + //绿色线 + List gammaProjectedSeriseData = new LinkedList<>(); + List gammaProjectedDataValue = this.handleHistogram(struct.h_counts, struct.b_channels, struct.g_channels, "Vertical"); + for (int i=0; i bCounts = struct.b_counts; - - if (Objects.nonNull(inputStream)){ - inputStream.close(); + List betaOriginSeriseData = new LinkedList<>(); + for (int i=0; i< struct.num_b_channel; i++){ + long count = bCounts.get(i); + SeriseData temp = new SeriseData(); + temp.setX(i); + temp.setY(count); + betaOriginSeriseData.add(temp); } - } - } catch (IOException e) { - throw new RuntimeException(e); - } finally { - try { - if (Objects.nonNull(ftpClient)){ - ftpClient.disconnect(); + map.put("betaOriginSeriseData", betaOriginSeriseData); + List betaProjectedSeriseData = new LinkedList<>(); + List betaProjectedDataValue = this.handleHistogram(struct.h_counts, struct.b_channels, struct.g_channels, "Horizontal"); + for (int i=0; i detBgFtpFiles = Arrays.asList(ftpClient.listFiles()); - detBgFtpFiles = detBgFtpFiles.stream().filter(item-> item.getName().equals(detBgFileName)).collect(Collectors.toList()); - if (CollectionUtils.isEmpty(detBgFtpFiles)){ - result.error500("ftp下对应的SAMPLE文件不存在"); - return result; - } - FTPFile detBgFtpFile = detBgFtpFiles.get(0); - if (Objects.nonNull(detBgFtpFile)){ - //获取ftp文件的输入流 - InputStream inputStream = ftpClient.retrieveFileStream(detBgFtpFile.getName()); - //声明一个临时文件 - File file = File.createTempFile("tmp", null); - //ftp文件输入流复制给临时文件 - FileUtils.copyInputStreamToFile(inputStream, file); - //读取文件信息 - EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(file.getAbsolutePath()); - - + map.put("betaProjectedSeriseData", betaProjectedSeriseData); if (Objects.nonNull(inputStream)){ inputStream.close(); } @@ -1402,8 +1339,424 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { } } } - + result.setSuccess(true); + result.setResult(map); return result; } + private List handleHistogram(List hcounts, long bChannels, long gChannels, String type){ + List projected_data_value = new LinkedList<>(); + if (type.equals("Vertical")){ + for (int i=0; i map = new HashMap<>(); + GardsSampleData sampleData = spectrumAnalysisMapper.getSampleData(sampleId); + if (Objects.isNull(sampleData)){ + result.error500("样品数据信息不存在!"); + return result; + } + Integer stationId = sampleData.getStationId(); + //根据台站id查询台站名称 + Map stationMap = (Map)redisUtil.get("stationMap"); + if (CollectionUtils.isEmpty(stationMap)){ + result.error500("台站缓存信息为空!"); + return result; + } + String stationName = ""; + if (Objects.nonNull(stationMap.get(String.valueOf(stationId)))){ + stationName = stationMap.get(String.valueOf(stationId)); + } + map.put("stationId", stationId); + map.put("stationName", stationName); + //根据台站id查询探测器集合 + List detectorList = new LinkedList<>(); + detectorList.add("All"); + List stationDetectorList = spectrumAnalysisMapper.getDetectorList(stationId); + detectorList.addAll(stationDetectorList); + map.put("detectorList", detectorList); + result.setSuccess(true); + result.setResult(map); + return result; + } + + @Override + public Result changeDetector(String stationName) { + Result result = new Result(); + Map map = new HashMap<>(); + //根据台站id查询台站名称 + Map stationMap = (Map)redisUtil.get("stationMap"); + if (CollectionUtils.isEmpty(stationMap)){ + result.error500("台站缓存信息为空!"); + return result; + } + List stationNames = stationMap.values().stream().collect(Collectors.toList()); + int index = stationNames.indexOf(stationName); + if (index<0){ + result.error500("台站信息不存在!"); + return result; + } + List stationIds = stationMap.keySet().stream().collect(Collectors.toList()); + String stationId = String.valueOf(stationIds.get(index)); + map.put("stationId", stationId); + map.put("stationName", stationName); + //根据台站id查询探测器集合 + List detectorList = new LinkedList<>(); + detectorList.add("All"); + List stationDetectorList = spectrumAnalysisMapper.getDetectorList(Integer.valueOf(stationId)); + detectorList.addAll(stationDetectorList); + map.put("detectorList", detectorList); + result.setSuccess(true); + result.setResult(map); + return result; + } + + @Override + public Result statisticsQuery(StatisticsQueryData statisticsQueryData) { + Result result = new Result(); + if (Objects.isNull(statisticsQueryData.getStartTime())){ + result.error500("开始时间不能为空"); + return result; + } + String startDate = DateUtils.formatDate(statisticsQueryData.getStartTime(), "yyyy-MM-dd"); + statisticsQueryData.setStartDate(startDate); + if (Objects.isNull(statisticsQueryData.getEndTime())){ + result.error500("结束时间不能为空"); + return result; + } + String endDate = DateUtils.formatDate(statisticsQueryData.getEndTime(), "yyyy-MM-dd"); + statisticsQueryData.setEndDate(endDate); + List detectorList = new LinkedList<>(); + if (StringUtils.isNotBlank(statisticsQueryData.getDetectorName())){ + if (statisticsQueryData.getDetectorName().equals("All")){ + detectorList = spectrumAnalysisMapper.getDetectorList(statisticsQueryData.getStationId()); + }else { + detectorList.add(statisticsQueryData.getDetectorName()); + } + } + statisticsQueryData.setDetectorList(detectorList); + List items = new LinkedList<>(); + if (statisticsQueryData.isMDC()){ + items.add("GXR.MDC"); + } + if (statisticsQueryData.isActivity()){ + items.add("GXR.CONC"); + } + statisticsQueryData.setItems(items); + if (CollectionUtils.isEmpty(statisticsQueryData.getNuclidesList())){ + statisticsQueryData.setNuclidesList(new LinkedList<>()); + } + //根据类型判断查询对应数据 + List statisticsData = spectrumAnalysisMapper.statisticsQueryNuclides(statisticsQueryData); + if(CollectionUtils.isNotEmpty(statisticsData)){ + List stcGraphList = new LinkedList<>(); + if (statisticsQueryData.getNuclidesList().contains("Xe131m")){ + List xe131m = statisticsData.stream().filter(item -> item.getNuclideName().equals("Xe131m")).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(xe131m)){ + if (statisticsQueryData.isMDC()){ + StcGraph stcGraph = new StcGraph(); + stcGraph.setM_strGraphName("Xe131m MDC"); + stcGraph.setM_GraphPen("#00cafd"); + List keys = new LinkedList<>(); + List values = new LinkedList<>(); + for (StatisticsData data:xe131m) { + keys.add(data.getCollectStart()); + values.add(data.getMdc()); + } + stcGraph.setM_Keys(keys); + stcGraph.setM_Values(values); + stcGraphList.add(stcGraph); + } + if (statisticsQueryData.isActivity()){ + StcGraph stcGraph = new StcGraph(); + stcGraph.setM_strGraphName("Xe131m Activity Concentration"); + stcGraph.setM_GraphPen("#f89c1f"); + List keys = new LinkedList<>(); + List values = new LinkedList<>(); + for (StatisticsData data:xe131m) { + keys.add(data.getCollectStart()); + if (statisticsQueryData.isMDC()){ + values.add(data.getMdc()); + }else { + values.add(data.getConc()); + } + } + stcGraph.setM_Keys(keys); + stcGraph.setM_Values(values); + stcGraphList.add(stcGraph); + } + } + } + if (statisticsQueryData.getNuclidesList().contains("Xe133m")){ + List xe133m = statisticsData.stream().filter(item -> item.getNuclideName().equals("Xe133m")).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(xe133m)){ + if (statisticsQueryData.isMDC()){ + StcGraph stcGraph = new StcGraph(); + stcGraph.setM_strGraphName("Xe133m MDC"); + stcGraph.setM_GraphPen("#119e4f"); + List keys = new LinkedList<>(); + List values = new LinkedList<>(); + for (StatisticsData data:xe133m) { + keys.add(data.getCollectStart()); + values.add(data.getMdc()); + } + stcGraph.setM_Keys(keys); + stcGraph.setM_Values(values); + stcGraphList.add(stcGraph); + } + if (statisticsQueryData.isActivity()){ + StcGraph stcGraph = new StcGraph(); + stcGraph.setM_strGraphName("Xe133m Activity Concentration"); + stcGraph.setM_GraphPen("#fff64f"); + List keys = new LinkedList<>(); + List values = new LinkedList<>(); + for (StatisticsData data:xe133m) { + keys.add(data.getCollectStart()); + if (statisticsQueryData.isMDC()){ + values.add(data.getMdc()); + }else { + values.add(data.getConc()); + } + } + stcGraph.setM_Keys(keys); + stcGraph.setM_Values(values); + stcGraphList.add(stcGraph); + } + } + } + if (statisticsQueryData.getNuclidesList().contains("Xe133")){ + List xe133 = statisticsData.stream().filter(item -> item.getNuclideName().equals("Xe133")).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(xe133)){ + if (statisticsQueryData.isMDC()){ + StcGraph stcGraph = new StcGraph(); + stcGraph.setM_strGraphName("Xe133 MDC"); + stcGraph.setM_GraphPen("#00cafd"); + List keys = new LinkedList<>(); + List values = new LinkedList<>(); + for (StatisticsData data:xe133) { + keys.add(data.getCollectStart()); + values.add(data.getMdc()); + } + stcGraph.setM_Keys(keys); + stcGraph.setM_Values(values); + stcGraphList.add(stcGraph); + } + if (statisticsQueryData.isActivity()){ + StcGraph stcGraph = new StcGraph(); + stcGraph.setM_strGraphName("Xe133 Activity Concentration"); + stcGraph.setM_GraphPen("#01a99a"); + List keys = new LinkedList<>(); + List values = new LinkedList<>(); + for (StatisticsData data:xe133) { + keys.add(data.getCollectStart()); + if (statisticsQueryData.isMDC()){ + values.add(data.getMdc()); + }else { + values.add(data.getConc()); + } + } + stcGraph.setM_Keys(keys); + stcGraph.setM_Values(values); + stcGraphList.add(stcGraph); + } + } + } + if (statisticsQueryData.getNuclidesList().contains("Xe135")){ + List xe135 = statisticsData.stream().filter(item -> item.getNuclideName().equals("Xe135")).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(xe135)){ + if (statisticsQueryData.isMDC()){ + StcGraph stcGraph = new StcGraph(); + stcGraph.setM_strGraphName("Xe135 MDC"); + stcGraph.setM_GraphPen("#1775e7"); + List keys = new LinkedList<>(); + List values = new LinkedList<>(); + for (StatisticsData data:xe135) { + keys.add(data.getCollectStart()); + values.add(data.getMdc()); + } + stcGraph.setM_Keys(keys); + stcGraph.setM_Values(values); + stcGraphList.add(stcGraph); + } + if (statisticsQueryData.isActivity()){ + StcGraph stcGraph = new StcGraph(); + stcGraph.setM_strGraphName("Xe135 Activity Concentration"); + stcGraph.setM_GraphPen("#ff32ab"); + List keys = new LinkedList<>(); + List values = new LinkedList<>(); + for (StatisticsData data:xe135) { + keys.add(data.getCollectStart()); + if (statisticsQueryData.isMDC()){ + values.add(data.getMdc()); + }else { + values.add(data.getConc()); + } + } + stcGraph.setM_Keys(keys); + stcGraph.setM_Values(values); + stcGraphList.add(stcGraph); + } + } + } + result.setSuccess(true); + result.setResult(stcGraphList); + } + return result; + } + + @Override + public Result statisticsQueryBtn(String detectorName, Integer stationId, String statisticsType, Date startTime, Date endTime) { + Result result = new Result(); + if (Objects.isNull(startTime)){ + result.error500("开始时间不能为空"); + return result; + } + String startDate = DateUtils.formatDate(startTime, "yyyy-MM-dd"); + if (Objects.isNull(endTime)){ + result.error500("结束时间不能为空"); + return result; + } + String endDate = DateUtils.formatDate(endTime, "yyyy-MM-dd"); + List detectorList = new LinkedList<>(); + if (StringUtils.isNotBlank(detectorName)){ + if (detectorName.equals("All")){ + detectorList = spectrumAnalysisMapper.getDetectorList(stationId); + }else { + detectorList.add(detectorName); + } + } + if (statisticsType.equals("Colloc_Time")) { + List statisticsData = spectrumAnalysisMapper.statisticsQueryCollection(startDate, endDate, detectorList); + StcGraph stcGraph = new StcGraph(); + stcGraph.setM_strGraphName("Colloction Time"); + stcGraph.setM_GraphPen("green"); + List keys = new LinkedList<>(); + List values = new LinkedList<>(); + for (StatisticsData data:statisticsData) { + keys.add(data.getDateTime()); + values.add(data.getDataValue()); + } + stcGraph.setM_Keys(keys); + stcGraph.setM_Values(values); + result.setSuccess(true); + result.setResult(stcGraph); + } else if (statisticsType.equals("Acq_Time")) { + List statisticsData = spectrumAnalysisMapper.statisticsQueryAcquisition(startDate, endDate, detectorList); + StcGraph stcGraph = new StcGraph(); + stcGraph.setM_strGraphName("Acquisition Time"); + stcGraph.setM_GraphPen("green"); + List keys = new LinkedList<>(); + List values = new LinkedList<>(); + for (StatisticsData data:statisticsData) { + keys.add(data.getDateTime()); + values.add(data.getDataValue()); + } + stcGraph.setM_Keys(keys); + stcGraph.setM_Values(values); + result.setSuccess(true); + result.setResult(stcGraph); + } else if (statisticsType.equals("Xe_volumn")) { + List statisticsData = spectrumAnalysisMapper.statisticsQueryXeVolumn(startDate, endDate, detectorList); + StcGraph stcGraph = new StcGraph(); + stcGraph.setM_strGraphName("Xe Volumn"); + stcGraph.setM_GraphPen("green"); + List keys = new LinkedList<>(); + List values = new LinkedList<>(); + for (StatisticsData data:statisticsData) { + keys.add(data.getDateTime()); + values.add(data.getDataValue()); + } + stcGraph.setM_Keys(keys); + stcGraph.setM_Values(values); + result.setSuccess(true); + result.setResult(stcGraph); + } else if (statisticsType.equals("Sample_Volumn")) { + List statisticsData = spectrumAnalysisMapper.statisticsQuerySampleVolumn(startDate, endDate, detectorList); + StcGraph stcGraph = new StcGraph(); + stcGraph.setM_strGraphName("Sample Volumn"); + stcGraph.setM_GraphPen("green"); + List keys = new LinkedList<>(); + List values = new LinkedList<>(); + for (StatisticsData data:statisticsData) { + keys.add(data.getDateTime()); + values.add(data.getDataValue()); + } + stcGraph.setM_Keys(keys); + stcGraph.setM_Values(values); + result.setSuccess(true); + result.setResult(stcGraph); + } + return result; + } + + @Override + public Result fitting(Double paramA, Double paramB, Double paramC, Integer points) { + List fittingPara = new LinkedList<>(); + fittingPara.add(paramA); + fittingPara.add(paramB); + fittingPara.add(paramC); + List xs = new LinkedList<>(); + for (int i=0; i ys = EnergySpectrumHandler.GetFileFittingPara(xs, fittingPara); + List seriseDataList = new LinkedList<>(); + for (int i=0; i diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/common/CacheName.java b/jeecg-module-station-operation/src/main/java/org/jeecg/common/CacheName.java index b4e775de..403f214c 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/common/CacheName.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/common/CacheName.java @@ -1,7 +1,5 @@ package org.jeecg.common; -import org.springframework.stereotype.Component; - public class CacheName { public static final String cacheTime = "Cache time"; diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/common/PointUtil.java b/jeecg-module-station-operation/src/main/java/org/jeecg/common/PointUtil.java index 379bfa94..9f13a60e 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/common/PointUtil.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/common/PointUtil.java @@ -1,8 +1,5 @@ package org.jeecg.common; -import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; - import java.util.Objects; public class PointUtil { diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/SysUserFocusStationController.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/SysUserFocusStationController.java index fb5cf5ad..4d04374e 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/SysUserFocusStationController.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/SysUserFocusStationController.java @@ -3,7 +3,7 @@ package org.jeecg.modules.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.postgre.SysUserFocusStation; +import org.jeecg.modules.entity.SysUserFocusStationStation; import org.jeecg.modules.entity.data.UserFocusStation; import org.jeecg.modules.service.ISysUserFocusStationService; import org.springframework.beans.factory.annotation.Autowired; @@ -21,8 +21,8 @@ public class SysUserFocusStationController { @GetMapping("findList") @ApiOperation(value = "查询关注台站列表", notes = "查询关注台站列表") - public List findList(){ - List result = sysUserFocusStationService.findList(); + public List findList(){ + List result = sysUserFocusStationService.findList(); return result; } diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/StationReceivingConfigStation.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/StationReceivingConfigStation.java new file mode 100644 index 00000000..e6050ef6 --- /dev/null +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/StationReceivingConfigStation.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.jeecg.modules.base.entity.postgre.StationReceivingConfig; + +import java.util.List; + +@Data +@TableName(value = "station_receiving_config") +public class StationReceivingConfigStation extends StationReceivingConfig { + + /** + * 用户关注台站信息 + */ + @TableField(exist = false) + List sysUserFocusStations; + +} diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStationStation.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStationStation.java new file mode 100644 index 00000000..c1522232 --- /dev/null +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStationStation.java @@ -0,0 +1,42 @@ +package org.jeecg.modules.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.jeecg.modules.base.entity.postgre.SysUserFocusStation; + +@Data +@TableName("sys_user_focus_station") +public class SysUserFocusStationStation extends SysUserFocusStation { + + /** + * 经度 + */ + @TableField(exist = false) + private Double lon; + + /** + * 纬度 + */ + @TableField(exist = false) + private Double lat; + + /** + * 海拔 + */ + @TableField(exist = false) + private String altitude; + + /** + * 状态 + */ + @TableField(exist = false) + private String status; + + /** + * 台站编码 + */ + @TableField(exist = false) + private String stationCode; + +} diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/data/DataInfoVo.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/data/DataInfoVo.java index 5d06eec1..e0caccce 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/data/DataInfoVo.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/data/DataInfoVo.java @@ -1,11 +1,8 @@ package org.jeecg.modules.entity.data; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.util.Date; @Data public class DataInfoVo implements Serializable { diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationReceivingConfigMapper.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationReceivingConfigMapper.java index c2504597..a89adf78 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationReceivingConfigMapper.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationReceivingConfigMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.base.entity.postgre.StationReceivingConfig; +import org.jeecg.modules.entity.StationReceivingConfigStation; -public interface StationReceivingConfigMapper extends BaseMapper { +public interface StationReceivingConfigMapper extends BaseMapper { } diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/SysUserFocusStationMapper.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/SysUserFocusStationMapper.java index d2f9cf99..b3f3b227 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/SysUserFocusStationMapper.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/SysUserFocusStationMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.base.entity.postgre.SysUserFocusStation; +import org.jeecg.modules.entity.SysUserFocusStationStation; -public interface SysUserFocusStationMapper extends BaseMapper { +public interface SysUserFocusStationMapper extends BaseMapper { } diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ICacheTimeService.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ICacheTimeService.java index dd7ed514..3dffeae0 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ICacheTimeService.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ICacheTimeService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.service; -import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.base.entity.configuration.GardsDetectors; +import org.jeecg.modules.base.entity.postgre.SysUser; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestBody; diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ISysUserFocusStationService.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ISysUserFocusStationService.java index a1618c32..1e3ab12c 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ISysUserFocusStationService.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ISysUserFocusStationService.java @@ -2,18 +2,18 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.postgre.SysUserFocusStation; +import org.jeecg.modules.entity.SysUserFocusStationStation; import org.jeecg.modules.entity.data.UserFocusStation; import java.util.List; -public interface ISysUserFocusStationService extends IService { +public interface ISysUserFocusStationService extends IService { /** * 查询当前用户的全部关注台站，核设施信息 * @return */ - List findList(); + List findList(); /** * 新增关注的台站，核设施信息 diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java index 2c6fdda4..a0c1daf9 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java @@ -13,17 +13,18 @@ import org.jeecg.common.PointUtil; import org.jeecg.common.StationTypeUtil; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.RedisUtil; +import org.jeecg.modules.base.entity.configuration.GardsDetectors; +import org.jeecg.modules.base.entity.configuration.GardsNuclearfacility; +import org.jeecg.modules.base.entity.configuration.GardsStations; import org.jeecg.modules.base.entity.original.GardsMetData; import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecg.modules.base.entity.original.GardsSohData; import org.jeecg.modules.base.entity.postgre.SysUserFocusStation; +import org.jeecg.modules.entity.SysUserFocusStationStation; import org.jeecg.modules.entity.data.*; import org.jeecg.modules.mapper.*; import org.jeecg.modules.service.ICacheTimeService; import org.jeecg.modules.service.IStationOperationService; -import org.jeecg.modules.base.entity.configuration.GardsDetectors; -import org.jeecg.modules.base.entity.configuration.GardsNuclearfacility; -import org.jeecg.modules.base.entity.configuration.GardsStations; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -373,9 +374,9 @@ public class StationOperationServiceImpl extends ServiceImpl userFocusStationQueryWrapper = new LambdaQueryWrapper<>(); - userFocusStationQueryWrapper.eq(SysUserFocusStation::getUserId, userId); - List userFocusStations = sysUserFocusStationMapper.selectList(userFocusStationQueryWrapper); + LambdaQueryWrapper userFocusStationQueryWrapper = new LambdaQueryWrapper<>(); + userFocusStationQueryWrapper.eq(SysUserFocusStationStation::getUserId, userId); + List userFocusStations = sysUserFocusStationMapper.selectList(userFocusStationQueryWrapper); List stationIds = userFocusStations.stream().map(SysUserFocusStation::getStationId).collect(Collectors.toList()); //从redis中获取台站信息 Map stationInfoMap = (Map)redisUtil.get("stationMap"); diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/SysUserFocusStationServiceImpl.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/SysUserFocusStationServiceImpl.java index fc280064..97504ced 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/SysUserFocusStationServiceImpl.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/SysUserFocusStationServiceImpl.java @@ -11,15 +11,15 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.modules.base.entity.postgre.StationReceivingConfig; +import org.jeecg.modules.base.entity.configuration.GardsStations; import org.jeecg.modules.base.entity.postgre.SysUser; -import org.jeecg.modules.base.entity.postgre.SysUserFocusStation; +import org.jeecg.modules.entity.StationReceivingConfigStation; +import org.jeecg.modules.entity.SysUserFocusStationStation; import org.jeecg.modules.entity.data.UserFocusStation; import org.jeecg.modules.mapper.StationReceivingConfigMapper; import org.jeecg.modules.mapper.SysUserFocusStationMapper; import org.jeecg.modules.service.ICacheTimeService; import org.jeecg.modules.service.ISysUserFocusStationService; -import org.jeecg.modules.base.entity.configuration.GardsStations; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -29,7 +29,7 @@ import java.time.LocalDateTime; import java.util.*; @Service("sysUserFocusStationService") -public class SysUserFocusStationServiceImpl extends ServiceImpl implements ISysUserFocusStationService { +public class SysUserFocusStationServiceImpl extends ServiceImpl implements ISysUserFocusStationService { @Autowired private RedisUtil redisUtil; @@ -41,10 +41,10 @@ public class SysUserFocusStationServiceImpl extends ServiceImpl findList() { + public List findList() { //查询全部台站信息 HashMap stationInfoMap = (HashMap) redisUtil.get("stationInfoMap"); - List sysUserFocusStations = this.baseMapper.selectList(new LambdaQueryWrapper<>()); + List sysUserFocusStations = this.baseMapper.selectList(new LambdaQueryWrapper<>()); if (CollectionUtils.isNotEmpty(sysUserFocusStations)){ sysUserFocusStations.stream().forEach(item->{ if (CollectionUtils.isNotEmpty(stationInfoMap)){ @@ -82,12 +82,12 @@ public class SysUserFocusStationServiceImpl extends ServiceImpl receivingConfigQueryWrapper = new LambdaQueryWrapper<>(); - receivingConfigQueryWrapper.eq(StationReceivingConfig::getUserId, sysUser.getId()); - StationReceivingConfig receivingConfig = stationReceivingConfigMapper.selectOne(receivingConfigQueryWrapper); + LambdaQueryWrapper receivingConfigQueryWrapper = new LambdaQueryWrapper<>(); + receivingConfigQueryWrapper.eq(StationReceivingConfigStation::getUserId, sysUser.getId()); + StationReceivingConfigStation receivingConfig = stationReceivingConfigMapper.selectOne(receivingConfigQueryWrapper); //如果没有对应的用户缓存信息 则进行新增 if (Objects.isNull(receivingConfig)){ - receivingConfig = new StationReceivingConfig(); + receivingConfig = new StationReceivingConfigStation(); Long id = IdWorker.getId(); receivingConfig.setId(id.toString()); receivingConfig.setUserId(sysUser.getId()); @@ -106,11 +106,11 @@ public class SysUserFocusStationServiceImpl extends ServiceImpl userFocusStationQueryWrapper = new LambdaQueryWrapper<>(); - userFocusStationQueryWrapper.eq(SysUserFocusStation::getUserId, sysUser.getId()); + LambdaQueryWrapper userFocusStationQueryWrapper = new LambdaQueryWrapper<>(); + userFocusStationQueryWrapper.eq(SysUserFocusStationStation::getUserId, sysUser.getId()); this.baseMapper.delete(userFocusStationQueryWrapper); for (Integer stationId:userFocusStation.getStationIds()) { - SysUserFocusStation sysUserFocusStation = new SysUserFocusStation(); + SysUserFocusStationStation sysUserFocusStation = new SysUserFocusStationStation(); Long id = IdWorker.getId(); sysUserFocusStation.setId(String.valueOf(id)); sysUserFocusStation.setUserId(sysUser.getId()); @@ -140,9 +140,9 @@ public class SysUserFocusStationServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysUserFocusStation::getUserId, sysUser.getId()); - queryWrapper.eq(SysUserFocusStation::getStationId, stationId); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SysUserFocusStationStation::getUserId, sysUser.getId()); + queryWrapper.eq(SysUserFocusStationStation::getStationId, stationId); this.baseMapper.delete(queryWrapper); result.success("删除成功"); return result; @@ -152,12 +152,12 @@ public class SysUserFocusStationServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(StationReceivingConfig::getUserId, userId); - StationReceivingConfig receivingConfig = stationReceivingConfigMapper.selectOne(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(StationReceivingConfigStation::getUserId, userId); + StationReceivingConfigStation receivingConfig = stationReceivingConfigMapper.selectOne(queryWrapper); //如果用户对应的缓存配置信息为空时，查询字典表中的默认值 if (Objects.isNull(receivingConfig)){ - receivingConfig = new StationReceivingConfig(); + receivingConfig = new StationReceivingConfigStation(); //调用接口获取数据库中对应缓存配置信息默认值 List> cacheList = cacheTimeService.findCacheTime(); for (int i=0; i< cacheList.size(); i++){ @@ -177,9 +177,9 @@ public class SysUserFocusStationServiceImpl extends ServiceImpl focusStationQueryWrapper = new LambdaQueryWrapper<>(); - focusStationQueryWrapper.eq(SysUserFocusStation::getUserId, userId); - List sysUserFocusStations = this.baseMapper.selectList(focusStationQueryWrapper); + LambdaQueryWrapper focusStationQueryWrapper = new LambdaQueryWrapper<>(); + focusStationQueryWrapper.eq(SysUserFocusStationStation::getUserId, userId); + List sysUserFocusStations = this.baseMapper.selectList(focusStationQueryWrapper); if (Objects.nonNull(sysUserFocusStations)){ receivingConfig.setSysUserFocusStations(sysUserFocusStations); } diff --git a/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/factory/SysBaseAPIFallbackFactory.java b/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/factory/SysBaseAPIFallbackFactory.java index fa3e3c12..d2faaf39 100644 --- a/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/factory/SysBaseAPIFallbackFactory.java +++ b/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/factory/SysBaseAPIFallbackFactory.java @@ -1,8 +1,8 @@ package org.jeecg.common.system.api.factory; -import org.springframework.cloud.openfeign.FallbackFactory; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.api.fallback.SysBaseAPIFallback; +import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantLog.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantLog.java index a19f5c4d..f52751d8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantLog.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantLog.java @@ -1,8 +1,5 @@ package org.jeecg.modules.aop; -import org.jeecg.common.constant.CommonConstant; -import org.jeecg.common.constant.enums.ModuleType; - import java.lang.annotation.*; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.java index e34307dd..764a1a0b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.java @@ -9,9 +9,9 @@ import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; import org.jeecg.common.api.dto.LogDTO; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.base.entity.postgre.SysTenantPack; import org.jeecg.modules.base.entity.postgre.SysTenantPackUser; +import org.jeecg.modules.base.service.BaseCommonService; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java index b1ed0bf8..12f6a903 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java @@ -1,19 +1,16 @@ package org.jeecg.modules.cas.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.cas.util.CasServiceUtil; -import org.jeecg.modules.cas.util.XmlUtils; import org.jeecg.modules.base.entity.postgre.SysDepart; import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.cas.util.CasServiceUtil; +import org.jeecg.modules.cas.util.XmlUtils; import org.jeecg.modules.system.service.ISysDepartService; import org.jeecg.modules.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; @@ -24,9 +21,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.alibaba.fastjson.JSONObject; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** *

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/util/CasServiceUtil.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/util/CasServiceUtil.java index 12fcec1f..2c39c66c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/util/CasServiceUtil.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/util/CasServiceUtil.java @@ -1,14 +1,5 @@ package org.jeecg.modules.cas.util; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.security.cert.X509Certificate; - -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; - import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.conn.socket.LayeredConnectionSocketFactory; @@ -16,6 +7,14 @@ import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.security.cert.X509Certificate; + /** * @Description: CasServiceUtil * @author: jeecg-boot diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/util/XmlUtils.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/util/XmlUtils.java index 408a100c..20d38f02 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/util/XmlUtils.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/util/XmlUtils.java @@ -1,20 +1,7 @@ package org.jeecg.modules.cas.util; -import java.io.StringReader; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import javax.xml.XMLConstants; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; -import org.jeecg.common.constant.CommonConstant; +import lombok.extern.slf4j.Slf4j; import org.w3c.dom.Document; import org.xml.sax.Attributes; import org.xml.sax.InputSource; @@ -22,7 +9,13 @@ import org.xml.sax.SAXException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.DefaultHandler; -import lombok.extern.slf4j.Slf4j; +import javax.xml.XMLConstants; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import java.io.StringReader; +import java.util.*; /** * 解析cas,ST验证后的xml diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/feignclient/MonitorSystem.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/feignclient/MonitorSystem.java index 94ebe5fe..e63ce3e7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/feignclient/MonitorSystem.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/feignclient/MonitorSystem.java @@ -4,7 +4,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.modules.base.entity.monitor.ItemHistory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; @Component @FeignClient(name = "monitorSystem",url = "${monitor.url}") diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/SendMessage.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/SendMessage.java index 67996131..b8642fae 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/SendMessage.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/SendMessage.java @@ -5,15 +5,17 @@ import cn.hutool.core.util.StrUtil; import org.jeecg.common.api.dto.message.MessageDTO; import org.jeecg.common.config.mqtoken.UserTokenContext; import org.jeecg.common.system.api.ISysBaseAPI; -import org.jeecg.modules.feignclient.AbnormalAlarmClient; import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.feignclient.AbnormalAlarmClient; import org.jeecg.modules.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; + import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; + import static org.jeecg.common.constant.enums.MessageTypeEnum.*; import static org.jeecg.common.util.TokenUtils.getTempToken; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java index 393ac8a9..7873daff 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java @@ -1,31 +1,21 @@ package org.jeecg.modules.message.controller; -import java.util.Arrays; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.message.entity.SysMessage; import org.jeecg.modules.message.service.ISysMessageService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; /** * @Description: 消息 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageTemplateController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageTemplateController.java index 3325b886..5ea4633e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageTemplateController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageTemplateController.java @@ -1,11 +1,10 @@ package org.jeecg.modules.message.controller; -import java.util.Arrays; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.dto.message.MessageDTO; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.api.ISysBaseAPI; @@ -17,22 +16,13 @@ import org.jeecg.modules.message.entity.SysMessageTemplate; import org.jeecg.modules.message.service.ISysMessageTemplateService; import org.jeecg.modules.message.util.PushMsgUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.Map; /** * @Description: 消息模板 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/TestSocketController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/TestSocketController.java index d89a720e..d65de068 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/TestSocketController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/TestSocketController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.message.controller; +import com.alibaba.fastjson.JSONObject; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.WebsocketConst; import org.jeecg.modules.message.websocket.WebSocket; @@ -9,8 +10,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.alibaba.fastjson.JSONObject; - /** * @Description: TestSocketController * @author: jeecg-boot diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/MsgParams.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/MsgParams.java index 7bb63676..31707982 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/MsgParams.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/MsgParams.java @@ -1,9 +1,9 @@ package org.jeecg.modules.message.entity; -import java.io.Serializable; - import lombok.Data; +import java.io.Serializable; + /** * 发送消息实体 * @author: jeecg-boot diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessage.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessage.java index 3599efa1..f9b90a3a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessage.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessage.java @@ -1,17 +1,15 @@ package org.jeecg.modules.message.entity; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; import org.jeecg.common.aspect.annotation.Dict; import org.jeecg.common.system.base.entity.JeecgEntity; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java index f1e8ca87..fe407cc2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java @@ -1,13 +1,11 @@ package org.jeecg.modules.message.entity; -import org.jeecg.common.system.base.entity.JeecgEntity; -import org.jeecgframework.poi.excel.annotation.Excel; - import com.baomidou.mybatisplus.annotation.TableName; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.system.base.entity.JeecgEntity; +import org.jeecgframework.poi.excel.annotation.Excel; /** * 消息模板 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/enums/RangeDateEnum.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/enums/RangeDateEnum.java index 5c6583e5..11c18e98 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/enums/RangeDateEnum.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/enums/RangeDateEnum.java @@ -1,6 +1,5 @@ package org.jeecg.modules.message.enums; -import org.jeecg.common.constant.enums.MessageTypeEnum; import org.jeecg.common.system.annotation.EnumDict; import org.jeecg.common.system.vo.DictModel; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java index 990192f9..8be46f23 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java @@ -10,8 +10,8 @@ import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.StaticConfig; -import org.jeecg.modules.message.handle.ISendMsgHandle; import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.message.handle.ISendMsgHandle; import org.jeecg.modules.system.mapper.SysUserMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mail.javamail.JavaMailSender; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SystemSendMsgHandle.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SystemSendMsgHandle.java index 8dd668a6..6dce58b0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SystemSendMsgHandle.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SystemSendMsgHandle.java @@ -9,12 +9,12 @@ import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.message.handle.ISendMsgHandle; -import org.jeecg.modules.message.service.ISysMessageService; -import org.jeecg.modules.message.websocket.WebSocket; import org.jeecg.modules.base.entity.postgre.SysAnnouncement; import org.jeecg.modules.base.entity.postgre.SysAnnouncementSend; import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.message.handle.ISendMsgHandle; +import org.jeecg.modules.message.service.ISysMessageService; +import org.jeecg.modules.message.websocket.WebSocket; import org.jeecg.modules.system.mapper.SysAnnouncementMapper; import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper; import org.jeecg.modules.system.mapper.SysUserMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/mapper/SysMessageMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/mapper/SysMessageMapper.java index 8deb2a0b..b2cbef14 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/mapper/SysMessageMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/mapper/SysMessageMapper.java @@ -1,10 +1,7 @@ package org.jeecg.modules.message.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.message.entity.SysMessage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.message.entity.SysMessage; public interface SysMessageMapper extends BaseMapper { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/ISysMessageTemplateService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/ISysMessageTemplateService.java index da3e78e8..ef85769a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/ISysMessageTemplateService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/ISysMessageTemplateService.java @@ -1,10 +1,10 @@ package org.jeecg.modules.message.service; -import java.util.List; - import org.jeecg.common.system.base.service.JeecgService; import org.jeecg.modules.message.entity.SysMessageTemplate; +import java.util.List; + /** * @Description: 消息模板 * @Author: jeecg-boot diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/impl/SysMessageServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/impl/SysMessageServiceImpl.java index 0aae61c3..6c1d3149 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/impl/SysMessageServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/impl/SysMessageServiceImpl.java @@ -2,9 +2,7 @@ package org.jeecg.modules.message.service.impl; import cn.hutool.core.collection.ListUtil; import org.jeecg.common.api.dto.message.MessageDTO; -import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; -import org.jeecg.common.constant.enums.MessageTypeEnum; import org.jeecg.common.system.base.service.impl.JeecgServiceImpl; import org.jeecg.modules.message.entity.SysMessage; import org.jeecg.modules.message.mapper.SysMessageMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/impl/SysMessageTemplateServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/impl/SysMessageTemplateServiceImpl.java index 7bce5924..b925df4f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/impl/SysMessageTemplateServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/impl/SysMessageTemplateServiceImpl.java @@ -6,6 +6,7 @@ import org.jeecg.modules.message.mapper.SysMessageTemplateMapper; import org.jeecg.modules.message.service.ISysMessageTemplateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import java.util.List; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/util/PushMsgUtil.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/util/PushMsgUtil.java index 84f6f04d..8de5a777 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/util/PushMsgUtil.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/util/PushMsgUtil.java @@ -1,5 +1,6 @@ package org.jeecg.modules.message.util; +import com.alibaba.fastjson.JSONObject; import freemarker.template.Configuration; import freemarker.template.Template; import freemarker.template.TemplateException; @@ -11,8 +12,6 @@ import org.jeecg.modules.message.service.ISysMessageTemplateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.alibaba.fastjson.JSONObject; - import java.io.IOException; import java.io.StringWriter; import java.util.Date; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/websocket/WebSocket.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/websocket/WebSocket.java index 89d1ee0e..5463f673 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/websocket/WebSocket.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/websocket/WebSocket.java @@ -1,18 +1,17 @@ package org.jeecg.modules.message.websocket; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import javax.websocket.*; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; - -import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; import org.jeecg.common.base.BaseMap; import org.jeecg.common.constant.WebsocketConst; import org.jeecg.common.modules.redis.client.JeecgRedisClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import lombok.extern.slf4j.Slf4j; + +import javax.websocket.*; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; /** * @Author scott diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/monitor/service/RedisService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/monitor/service/RedisService.java index ebb67552..3fa820a8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/monitor/service/RedisService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/monitor/service/RedisService.java @@ -1,13 +1,12 @@ package org.jeecg.modules.monitor.service; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.alibaba.fastjson.JSONArray; import org.jeecg.modules.monitor.domain.RedisInfo; import org.jeecg.modules.monitor.exception.RedisConnectException; +import java.util.List; +import java.util.Map; + /** * @Description: redis信息service接口 * @author: jeecg-boot diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/monitor/service/impl/RedisServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/monitor/service/impl/RedisServiceImpl.java index 5bdcb459..d3ffa83e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/monitor/service/impl/RedisServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/monitor/service/impl/RedisServiceImpl.java @@ -1,18 +1,10 @@ package org.jeecg.modules.monitor.service.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import javax.annotation.Resource; - import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Maps; -import org.jeecg.common.constant.CommonConstant; +import lombok.extern.slf4j.Slf4j; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.monitor.domain.RedisInfo; import org.jeecg.modules.monitor.exception.RedisConnectException; @@ -21,7 +13,8 @@ import org.springframework.cglib.beans.BeanMap; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.stereotype.Service; -import lombok.extern.slf4j.Slf4j; +import javax.annotation.Resource; +import java.util.*; /** * Redis 监控信息获取 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java index e083cb05..73847d9e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java @@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONObject; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.ngalain.service.NgAlainService; import org.jeecg.modules.base.entity.postgre.SysPermission; +import org.jeecg.modules.ngalain.service.NgAlainService; import org.jeecg.modules.system.mapper.SysDictMapper; import org.jeecg.modules.system.service.ISysPermissionService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/controller/OssFileController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/controller/OssFileController.java index 6e81ced9..9b652a1e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/controller/OssFileController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/controller/OssFileController.java @@ -1,9 +1,9 @@ package org.jeecg.modules.oss.controller; -import javax.servlet.http.HttpServletRequest; - -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.authz.annotation.RequiresRoles; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.oss.entity.OssFile; @@ -13,11 +13,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; /** * 云存储示例 DEMO diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/service/IOssFileService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/service/IOssFileService.java index 815d7c49..d1b886be 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/service/IOssFileService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/service/IOssFileService.java @@ -1,11 +1,11 @@ package org.jeecg.modules.oss.service; -import java.io.IOException; - import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.oss.entity.OssFile; import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; + /** * @Description: OOS云存储service接口 * @author: jeecg-boot diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/service/impl/OssFileServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/service/impl/OssFileServiceImpl.java index e69f3c68..6c2be332 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/service/impl/OssFileServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/service/impl/OssFileServiceImpl.java @@ -11,8 +11,6 @@ import org.jeecg.modules.oss.service.IOssFileService; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import java.io.IOException; - /** * @Description: OSS云存储实现类 * @author: jeecg-boot diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java index 9f2f8152..d39686a1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java @@ -7,8 +7,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.authz.annotation.RequiresRoles; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java index 9fd7e02b..e28d2ccb 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java @@ -1,18 +1,15 @@ package org.jeecg.modules.quartz.entity; -import java.io.Serializable; - +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; -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; +import java.io.Serializable; /** * @Description: 定时任务在线管理 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/SysInfoJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/SysInfoJob.java index ff8d1e4b..d3427746 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/SysInfoJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/SysInfoJob.java @@ -11,10 +11,10 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.util.RedisStreamUtil; import org.jeecg.common.util.SpringContextUtils; +import org.jeecg.modules.base.entity.Rule; import org.jeecg.modules.base.entity.monitor.ItemHistory; import org.jeecg.modules.base.entity.postgre.AlarmLog; import org.jeecg.modules.base.entity.postgre.AlarmRule; -import org.jeecg.modules.base.entity.Rule; import org.jeecg.modules.feignclient.AbnormalAlarmClient; import org.jeecg.modules.feignclient.MonitorSystem; import org.jeecg.modules.message.SendMessage; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/QuartzJobMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/QuartzJobMapper.java index a84c3c61..cc5d1217 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/QuartzJobMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/QuartzJobMapper.java @@ -1,11 +1,10 @@ package org.jeecg.modules.quartz.mapper; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.quartz.entity.QuartzJob; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; /** * @Description: 定时任务在线管理 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/service/IQuartzJobService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/service/IQuartzJobService.java index cf90d13c..78d18509 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/service/IQuartzJobService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/service/IQuartzJobService.java @@ -1,11 +1,10 @@ package org.jeecg.modules.quartz.service; -import java.util.List; - +import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.quartz.entity.QuartzJob; import org.quartz.SchedulerException; -import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; /** * @Description: 定时任务在线管理 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/redisStream/ConsumeA1.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/redisStream/ConsumeA1.java index c745ff21..038ae314 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/redisStream/ConsumeA1.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/redisStream/ConsumeA1.java @@ -12,8 +12,8 @@ import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.util.RedisStreamUtil; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.modules.base.dto.RuleDto; -import org.jeecg.modules.base.entity.postgre.AlarmRule; import org.jeecg.modules.base.entity.Rule; +import org.jeecg.modules.base.entity.postgre.AlarmRule; import org.jeecg.modules.message.SendMessage; import org.springframework.data.redis.connection.stream.ObjectRecord; import org.springframework.data.redis.connection.stream.RecordId; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/redisStream/RedisStreamConfig.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/redisStream/RedisStreamConfig.java index e21b1ef7..627cd02a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/redisStream/RedisStreamConfig.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/redisStream/RedisStreamConfig.java @@ -10,8 +10,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.connection.stream.*; -import org.springframework.data.redis.stream.StreamMessageListenerContainer.*; import org.springframework.data.redis.stream.StreamMessageListenerContainer; +import org.springframework.data.redis.stream.StreamMessageListenerContainer.StreamMessageListenerContainerOptions; import javax.annotation.Resource; import java.time.Duration; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java index 4d366b4c..0ce7acde 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java @@ -1,7 +1,5 @@ package org.jeecg.modules.system.controller; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; @@ -9,8 +7,6 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.CommonUtils; -import org.jeecg.common.util.RestUtil; -import org.jeecg.common.util.TokenUtils; import org.jeecg.common.util.filter.FileTypeFilter; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.system.service.IGardsDetectorsService; @@ -18,13 +14,12 @@ import org.jeecg.modules.system.service.IGardsNuclearfacilityService; import org.jeecg.modules.system.service.IGardsStationsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.ResponseEntity; -import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.util.AntPathMatcher; import org.springframework.util.FileCopyUtils; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.HandlerMapping; @@ -33,7 +28,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; -import java.net.URLDecoder; /** *

* 用户表 前端控制器 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java index 187b5904..7b0b95a1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java @@ -1,7 +1,8 @@ package org.jeecg.modules.system.controller; -import javax.servlet.http.HttpServletRequest; - +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.SymbolConstant; @@ -15,9 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; /** * @Title: DuplicateCheckAction diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsDetectorsController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsDetectorsController.java index 1032533d..f986567f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsDetectorsController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsDetectorsController.java @@ -7,7 +7,7 @@ import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.config.valid.InsertGroup; import org.jeecg.config.valid.UpdateGroup; -import org.jeecg.modules.base.entity.configuration.GardsDetectors; +import org.jeecg.modules.system.entity.GardsDetectorsSystem; import org.jeecg.modules.system.service.IGardsDetectorsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -26,15 +26,15 @@ public class GardsDetectorsController { @GetMapping("findPage") @ApiOperation(value = "分页查询监测器", notes = "分页查询监测器") - public Result> findPage(QueryRequest queryRequest, GardsDetectors gardsDetectors){ - Result> result = gardsDetectorsService.findPage(queryRequest, gardsDetectors); + public Result> findPage(QueryRequest queryRequest, GardsDetectorsSystem gardsDetectors){ + Result> result = gardsDetectorsService.findPage(queryRequest, gardsDetectors); return result; } @GetMapping("findInfo") @ApiOperation(value = "查询监测器详情信息", notes = "查询监测器详情信息") - public GardsDetectors findInfo(Integer id){ - GardsDetectors result = gardsDetectorsService.findInfo(id); + public GardsDetectorsSystem findInfo(Integer id){ + GardsDetectorsSystem result = gardsDetectorsService.findInfo(id); return result; } @@ -47,14 +47,14 @@ public class GardsDetectorsController { @PostMapping("create") @ApiOperation(value = "新增监测器信息", notes = "新增监测器信息") - public Result create(@RequestBody @Validated(value = InsertGroup.class) GardsDetectors gardsDetectors){ + public Result create(@RequestBody @Validated(value = InsertGroup.class) GardsDetectorsSystem gardsDetectors){ Result result = gardsDetectorsService.create(gardsDetectors); return result; } @PutMapping("update") @ApiOperation(value = "修改监测器信息", notes = "修改监测器信息") - public Result update(@RequestBody @Validated(value = UpdateGroup.class) GardsDetectors gardsDetectors){ + public Result update(@RequestBody @Validated(value = UpdateGroup.class) GardsDetectorsSystem gardsDetectors){ Result result = gardsDetectorsService.update(gardsDetectors); return result; } @@ -67,7 +67,7 @@ public class GardsDetectorsController { } @RequestMapping("findStationDetectors") - public Map> findStationDetectors(@RequestBody List stationIds){ + public Map> findStationDetectors(@RequestBody List stationIds){ return gardsDetectorsService.findStationDetectors(stationIds); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsSampleDataController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsSampleDataController.java index 19fa0818..2ac1d1e2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsSampleDataController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsSampleDataController.java @@ -6,7 +6,7 @@ import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.base.entity.original.GardsSampleData; +import org.jeecg.modules.system.entity.GardsSampleDataSystem; import org.jeecg.modules.system.service.IGardsSampleDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; @@ -28,8 +28,8 @@ public class GardsSampleDataController { @GetMapping("findPage") @ApiOperation(value = "分页查询DATA_BASE数据", notes = "分页查询DATA_BASE数据") - public Result> findPage(QueryRequest queryRequest, GardsSampleData gardsSampleData){ - Result> result = gardsSampleDataService.findPage(queryRequest, gardsSampleData); + public Result> findPage(QueryRequest queryRequest, GardsSampleDataSystem gardsSampleData){ + Result> result = gardsSampleDataService.findPage(queryRequest, gardsSampleData); return result; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java index 2a27d7e3..9c38ead9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java @@ -19,10 +19,10 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.*; import org.jeecg.common.util.encryption.EncryptedString; import org.jeecg.config.JeecgBaseConfig; -import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.base.entity.postgre.SysDepart; import org.jeecg.modules.base.entity.postgre.SysRoleIndex; import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.system.model.SysLoginModel; import org.jeecg.modules.system.service.*; import org.jeecg.modules.system.service.impl.SysBaseApiImpl; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java index 54923f2f..1b14eb43 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java @@ -22,10 +22,10 @@ import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.TokenUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.jeecg.modules.message.enums.RangeDateEnum; -import org.jeecg.modules.message.websocket.WebSocket; import org.jeecg.modules.base.entity.postgre.SysAnnouncement; import org.jeecg.modules.base.entity.postgre.SysAnnouncementSend; +import org.jeecg.modules.message.enums.RangeDateEnum; +import org.jeecg.modules.message.websocket.WebSocket; import org.jeecg.modules.system.service.ISysAnnouncementSendService; import org.jeecg.modules.system.service.ISysAnnouncementService; import org.jeecg.modules.system.service.impl.SysBaseApiImpl; @@ -49,7 +49,10 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import static org.jeecg.common.constant.CommonConstant.ANNOUNCEMENT_SEND_STATUS_1; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java index 355d811c..e28d36f5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java @@ -1,10 +1,12 @@ package org.jeecg.modules.system.controller; -import java.util.Arrays; -import java.util.Date; - -import javax.servlet.http.HttpServletRequest; - +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; @@ -13,28 +15,16 @@ import org.jeecg.common.constant.WebsocketConst; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.SqlInjectionUtil; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.message.websocket.WebSocket; import org.jeecg.modules.base.entity.postgre.SysAnnouncementSend; +import org.jeecg.modules.message.websocket.WebSocket; import org.jeecg.modules.system.model.AnnouncementSendModel; import org.jeecg.modules.system.service.ISysAnnouncementSendService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.Date; /** * @Title: Controller diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java index a4afc18e..a624628a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java @@ -1,10 +1,9 @@ package org.jeecg.modules.system.controller; -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; @@ -17,11 +16,9 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.List; /** * @Description: 系统数据日志 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java index 8f1175ba..9f73073c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java @@ -1,39 +1,38 @@ package org.jeecg.modules.system.controller; -import java.util.*; -import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.base.entity.postgre.SysDepartPermission; import org.jeecg.modules.base.entity.postgre.SysDepartRolePermission; import org.jeecg.modules.base.entity.postgre.SysPermission; import org.jeecg.modules.base.entity.postgre.SysPermissionDataRule; +import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.system.model.TreeModel; import org.jeecg.modules.system.service.ISysDepartPermissionService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.modules.system.service.ISysDepartRolePermissionService; import org.jeecg.modules.system.service.ISysPermissionDataRuleService; import org.jeecg.modules.system.service.ISysPermissionService; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.*; +import java.util.stream.Collectors; /** * @Description: 部门权限表 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java index 627ca23f..6c832502 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java @@ -1,17 +1,19 @@ package org.jeecg.modules.system.controller; -import java.util.*; -import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; -import org.jeecg.common.constant.CommonConstant; -import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.base.entity.postgre.SysDepartRole; @@ -20,17 +22,17 @@ import org.jeecg.modules.base.entity.postgre.SysDepartRoleUser; import org.jeecg.modules.base.entity.postgre.SysPermissionDataRule; import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.system.service.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.system.base.controller.JeecgController; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * @Description: 部门角色 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java index 6cba3621..19d051e5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java @@ -1,13 +1,13 @@ package org.jeecg.modules.system.controller; -import java.util.*; - -import javax.servlet.http.HttpServletRequest; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CacheConstant; @@ -16,17 +16,13 @@ import org.jeecg.modules.base.entity.postgre.SysDictItem; import org.jeecg.modules.system.service.ISysDictItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Map; /** *

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysLogController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysLogController.java index 372d3c9a..39c046b7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysLogController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysLogController.java @@ -1,10 +1,10 @@ package org.jeecg.modules.system.controller; -import java.util.Arrays; - -import javax.servlet.http.HttpServletRequest; - +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; @@ -17,11 +17,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; /** *

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java index 83de8bc3..53bc8834 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java @@ -1,20 +1,18 @@ package org.jeecg.modules.system.controller; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; import org.jeecg.modules.base.entity.postgre.SysPermission; @@ -28,26 +26,15 @@ import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import org.jeecg.common.system.vo.LoginUser; -import org.apache.shiro.SecurityUtils; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.*; /** *

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java index 780b4168..7f120ea9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java @@ -1,27 +1,25 @@ package org.jeecg.modules.system.controller; -import java.util.Arrays; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.aspect.annotation.AutoLog; -import org.jeecg.modules.base.entity.postgre.SysRoleIndex; -import org.jeecg.modules.system.service.ISysRoleIndexService; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; - +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.base.entity.postgre.SysRoleIndex; +import org.jeecg.modules.system.service.ISysRoleIndexService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; /** * @Description: 角色首页配置 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTaskController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTaskController.java index 88f27980..f8bc0a27 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTaskController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTaskController.java @@ -7,7 +7,7 @@ import org.jeecg.common.Excel.ImportExcel; import org.jeecg.common.api.vo.Result; import org.jeecg.config.valid.InsertGroup; import org.jeecg.config.valid.UpdateGroup; -import org.jeecg.modules.base.entity.postgre.SysTask; +import org.jeecg.modules.system.entity.SysTaskSystem; import org.jeecg.modules.system.entity.vo.ImportViewVo; import org.jeecg.modules.system.entity.vo.SysTaskChangeVo; import org.jeecg.modules.system.entity.vo.SysTaskExportVo; @@ -23,7 +23,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.ParseException; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; @Slf4j @RestController @@ -44,19 +46,19 @@ public class SysTaskController { @GetMapping("findInfo") @ApiOperation(value = "查询日期当天的排班任务详情信息", notes = "查询日期当天的排班任务详情信息") public Result findInfo(@DateTimeFormat(pattern = "yyyy-MM-dd") Date day){ - Result> result = sysTaskService.findInfo(day); + Result> result = sysTaskService.findInfo(day); return result; } @PostMapping("create") @ApiOperation(value = "新增排班任务", notes = "新增排班任务") - public Result create(@RequestBody @Validated(value = InsertGroup.class) List sysTasks){ + public Result create(@RequestBody @Validated(value = InsertGroup.class) List sysTasks){ return sysTaskService.create(sysTasks); } @PutMapping("update") @ApiOperation(value = "修改排班任务", notes = "修改排班任务") - public Result update(@RequestBody @Validated(value = UpdateGroup.class) List sysTasks){ + public Result update(@RequestBody @Validated(value = UpdateGroup.class) List sysTasks){ return sysTaskService.update(sysTasks); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserAgentController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserAgentController.java index d031696e..1573f3f9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserAgentController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserAgentController.java @@ -1,13 +1,10 @@ package org.jeecg.modules.system.controller; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; @@ -21,24 +18,17 @@ import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.Map; /** * @Title: Controller diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 8bb56fbb..c7b61471 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -19,14 +19,13 @@ import org.jeecg.common.aspect.annotation.PermissionData; import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; -import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.jeecg.modules.base.entity.postgre.*; -import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.*; -import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.config.mybatis.MybatisPlusSaasConfig; +import org.jeecg.modules.base.entity.postgre.*; +import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.system.model.DepartIdModel; import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.service.*; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java index 9af3b228..ba22cd97 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java @@ -12,12 +12,15 @@ import me.zhyd.oauth.utils.AuthStateUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.util.JwtUtil; -import org.jeecg.common.util.*; +import org.jeecg.common.util.CommonUtils; +import org.jeecg.common.util.PasswordUtil; +import org.jeecg.common.util.RedisUtil; +import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.thirdapp.ThirdAppConfig; import org.jeecg.config.thirdapp.ThirdAppTypeItemVo; -import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.base.entity.postgre.SysThirdAccount; import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.system.model.ThirdLoginModel; import org.jeecg.modules.system.service.ISysDictService; import org.jeecg.modules.system.service.ISysThirdAccountService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsDetectorsSystem.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsDetectorsSystem.java new file mode 100644 index 00000000..42e9a6aa --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsDetectorsSystem.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.system.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.jeecg.modules.base.entity.configuration.GardsDetectors; + +@Data +@TableName("CONFIGURATION.GARDS_DETECTORS") +public class GardsDetectorsSystem extends GardsDetectors { + + /** + * 台站名称 + */ + @TableField(exist = false) + private String stationName; + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsSampleDataSystem.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsSampleDataSystem.java new file mode 100644 index 00000000..40e88fe0 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsSampleDataSystem.java @@ -0,0 +1,38 @@ +package org.jeecg.modules.system.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.jeecg.modules.base.entity.original.GardsSampleData; +import org.jeecgframework.poi.excel.annotation.Excel; + +@Data +@TableName("ORIGINAL.GARDS_SAMPLE_DATA") +public class GardsSampleDataSystem extends GardsSampleData { + + /** + * 台站名称 + */ + @TableField(exist = false) + @Excel(name = "STATION" ,orderNum = "2") + private String stationName; + + /** + * 探测器名称 + */ + @TableField(exist = false) + private String detectorsName; + + + @TableField(exist = false) + @Excel(name = "CALIB REPORTS" ,orderNum = "7") + private String calibReports; + + @TableField(exist = false) + private String dbName; + + @TableField(exist = false) + @Excel(name = "NO" ,orderNum = "1") + private Integer no; + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTaskStationSystem.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTaskStationSystem.java new file mode 100644 index 00000000..715b5fd8 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTaskStationSystem.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.system.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.jeecg.modules.base.entity.postgre.SysTaskStation; + +@Data +@TableName(value = "sys_task_station") +public class SysTaskStationSystem extends SysTaskStation { + + @TableField(exist = false) + private String stationName; + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTaskSystem.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTaskSystem.java new file mode 100644 index 00000000..fd3e6718 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTaskSystem.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.system.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.jeecg.modules.base.entity.postgre.SysTask; + +import java.util.List; + +@Data +@TableName("sys_task") +public class SysTaskSystem extends SysTask { + + @TableField(exist = false) + private String userName; + + @TableField(exist = false) + private List stationList; + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/vo/SysTaskVo.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/vo/SysTaskVo.java index d35406f4..e9472ba4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/vo/SysTaskVo.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/vo/SysTaskVo.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.entity.vo; import lombok.Data; -import org.jeecg.modules.base.entity.postgre.SysTaskStation; +import org.jeecg.modules.system.entity.SysTaskStationSystem; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -21,5 +21,5 @@ public class SysTaskVo { private Integer number; - private List stationList; + private List stationList; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsDetectorsMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsDetectorsMapper.java index 7fef8c6a..b63ec5f5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsDetectorsMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsDetectorsMapper.java @@ -2,11 +2,11 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.jeecg.modules.base.entity.configuration.GardsDetectors; +import org.jeecg.modules.system.entity.GardsDetectorsSystem; import java.util.List; -public interface GardsDetectorsMapper extends BaseMapper { +public interface GardsDetectorsMapper extends BaseMapper { /** * 分页查询探测器数据 @@ -14,7 +14,7 @@ public interface GardsDetectorsMapper extends BaseMapper { * @param gardsDetectors * @return */ - Page findPage(Page page, GardsDetectors gardsDetectors); + Page findPage(Page page, GardsDetectorsSystem gardsDetectors); /** * 查询探测器类型数据 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsSampleDataMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsSampleDataMapper.java index 53b693cd..741273dd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsSampleDataMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsSampleDataMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.base.entity.original.GardsSampleData; +import org.jeecg.modules.system.entity.GardsSampleDataSystem; -public interface GardsSampleDataMapper extends BaseMapper { +public interface GardsSampleDataMapper extends BaseMapper { } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java index 46e3c3c5..af8c55ff 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java @@ -1,13 +1,12 @@ package org.jeecg.modules.system.mapper; -import java.util.Date; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.base.entity.postgre.SysAnnouncement; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.base.entity.postgre.SysAnnouncement; + +import java.util.Date; +import java.util.List; /** * @Description: 系统通告表 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java index e9af8505..87010a9e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java @@ -1,13 +1,12 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.base.entity.postgre.SysAnnouncementSend; import org.jeecg.modules.system.model.AnnouncementSendModel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; /** * @Description: 用户通告阅读标记表 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java index 78f8e608..8e88ff52 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java @@ -1,10 +1,9 @@ package org.jeecg.modules.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.base.entity.postgre.SysDataLog; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - /** * @Description: 系统数据日志Mapper接口 * @author: jeecg-boot diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartPermissionMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartPermissionMapper.java index 08cb22d3..c106edc2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartPermissionMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartPermissionMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; -import org.jeecg.modules.base.entity.postgre.SysDepartPermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.base.entity.postgre.SysDepartPermission; /** * @Description: 部门权限表 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java index c2414136..e36320c7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java @@ -1,10 +1,10 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.base.entity.postgre.SysDepartRole; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; /** * @Description: 部门角色 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRolePermissionMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRolePermissionMapper.java index 092699fc..675c6c03 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRolePermissionMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRolePermissionMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; -import org.jeecg.modules.base.entity.postgre.SysDepartRolePermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.base.entity.postgre.SysDepartRolePermission; /** * @Description: 部门角色权限 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.java index 287c93e2..baa0f765 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; -import org.jeecg.modules.base.entity.postgre.SysDepartRoleUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.base.entity.postgre.SysDepartRoleUser; /** * @Description: 部门角色人员信息 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java index c5e1f858..b099ed59 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java @@ -1,8 +1,8 @@ package org.jeecg.modules.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Select; import org.jeecg.modules.base.entity.postgre.SysDictItem; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java index 3686b1b7..cc608c31 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java @@ -1,14 +1,13 @@ package org.jeecg.modules.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.base.entity.postgre.SysLog; + import java.util.Date; import java.util.List; import java.util.Map; -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.base.entity.postgre.SysLog; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - /** *

* 系统日志表 Mapper 接口 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPackPermissionMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPackPermissionMapper.java index a4b61bc7..3eb1c556 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPackPermissionMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPackPermissionMapper.java @@ -1,10 +1,10 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.base.entity.postgre.SysPackPermission; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; /** * @Description: 产品包菜单关系表 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java index 1d47ed50..bd154131 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java @@ -1,11 +1,10 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.base.entity.postgre.SysPermissionDataRule; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; /** *

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java index 02fe59ae..d0a5e488 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java @@ -1,14 +1,13 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; import org.jeecg.modules.base.entity.postgre.SysPermission; import org.jeecg.modules.system.model.TreeModel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; /** *

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleIndexMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleIndexMapper.java index 8559b7a4..7b99d1ac 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleIndexMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleIndexMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; -import org.jeecg.modules.base.entity.postgre.SysRoleIndex; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.base.entity.postgre.SysRoleIndex; /** * @Description: 角色首页配置 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java index 0327f225..addb6001 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java @@ -1,12 +1,10 @@ package org.jeecg.modules.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Update; import org.jeecg.modules.base.entity.postgre.SysRole; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - /** *

* 角色表 Mapper 接口 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.java index 25ba2366..ce46135c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; -import org.jeecg.modules.base.entity.postgre.SysRolePermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.base.entity.postgre.SysRolePermission; /** *

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskMapper.java index 93834794..a02a0e52 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskMapper.java @@ -2,13 +2,13 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.base.entity.postgre.SysTask; -import org.jeecg.modules.base.entity.postgre.SysTaskStation; +import org.jeecg.modules.system.entity.SysTaskStationSystem; +import org.jeecg.modules.system.entity.SysTaskSystem; import org.jeecg.modules.system.entity.vo.SysTaskVo; import java.util.List; -public interface SysTaskMapper extends BaseMapper { +public interface SysTaskMapper extends BaseMapper { /** * 查询月份第一天到最后一天所有的排班任务信息 @@ -24,9 +24,9 @@ public interface SysTaskMapper extends BaseMapper { * @param lastDay * @return */ - List selectTaskByDate(String firstDay, String lastDay); + List selectTaskByDate(String firstDay, String lastDay); - List selectList(LambdaQueryWrapper sysTaskStationQueryWrapper); + List selectList(LambdaQueryWrapper sysTaskStationQueryWrapper); /** * 查询用户当前日期下值班任务台站信息 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskStationMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskStationMapper.java index 6ab48ef3..c7cf5460 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskStationMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskStationMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.base.entity.postgre.SysTaskStation; +import org.jeecg.modules.system.entity.SysTaskStationSystem; -public interface SysTaskStationMapper extends BaseMapper { +public interface SysTaskStationMapper extends BaseMapper { } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserAgentMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserAgentMapper.java index a002a8d2..29b34ead 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserAgentMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserAgentMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.mapper; -import org.jeecg.modules.base.entity.postgre.SysUserAgent; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.base.entity.postgre.SysUserAgent; /** * @Description: 用户代理人设置 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java index 29ab5302..cf038fdf 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java @@ -1,12 +1,13 @@ package org.jeecg.modules.system.mapper; -import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.base.entity.postgre.SysUserDepart; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; /** * @Description: 用户部门mapper接口 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java index edcd17ed..b9ad66e5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java @@ -1,12 +1,12 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.base.entity.postgre.SysUser; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.vo.SysUserDepVo; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java index f37d097d..1758934f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java @@ -1,11 +1,12 @@ package org.jeecg.modules.system.mapper; -import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.jeecg.modules.base.entity.postgre.SysRole; import org.jeecg.modules.base.entity.postgre.SysUserRole; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; /** *

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserTenantMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserTenantMapper.java index 5627ec46..c7bdcf10 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserTenantMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserTenantMapper.java @@ -1,14 +1,14 @@ package org.jeecg.modules.system.mapper; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.base.entity.postgre.SysUserTenant; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.system.vo.SysUserTenantVo; +import java.util.List; + /** * @Description: sys_user_tenant_relation * @Author: jeecg-boot diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsDetectorsMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsDetectorsMapper.xml index adf1747b..54ed1ca4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsDetectorsMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsDetectorsMapper.xml @@ -2,7 +2,7 @@ - SELECT DETECTOR_ID, DETECTOR_CODE, diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTaskMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTaskMapper.xml index 75567827..5882dd74 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTaskMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTaskMapper.xml @@ -16,7 +16,7 @@ group by t.user_id,t.scheduling_date,t.id,u.username - SELECT t.user_id as userId, t.scheduling_date as schedulingDate, diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java index 777711ae..260cef50 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java @@ -1,11 +1,11 @@ package org.jeecg.modules.system.model; +import org.jeecg.modules.base.entity.postgre.SysDepart; + import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.jeecg.modules.base.entity.postgre.SysDepart; - /** *

* 部门表 封装树结构的部门的名称的实体类 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java index c00dd97b..2dd85727 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java @@ -1,10 +1,11 @@ package org.jeecg.modules.system.model; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + /** * @Title: DuplicateCheckVo * @Description: 重复校验VO diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDictTree.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDictTree.java index d5dd5f74..ded11bdb 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDictTree.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDictTree.java @@ -1,16 +1,14 @@ package org.jeecg.modules.system.model; -import java.io.Serializable; -import java.util.Date; - -import org.jeecg.modules.base.entity.postgre.SysDict; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.modules.base.entity.postgre.SysDict; + +import java.io.Serializable; +import java.util.Date; /** *

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java index 9eae1f27..82d8c0c6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java @@ -1,10 +1,11 @@ package org.jeecg.modules.system.model; +import org.jeecg.modules.base.entity.postgre.SysPermission; + import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.jeecg.modules.base.entity.postgre.SysPermission; /** * @Description: 菜单树，封装树结构 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/TreeModel.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/TreeModel.java index c7172272..8b195c01 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/TreeModel.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/TreeModel.java @@ -1,13 +1,13 @@ package org.jeecg.modules.system.model; +import org.jeecg.modules.base.entity.postgre.SysPermission; + import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jeecg.modules.base.entity.postgre.SysPermission; - /** * 树形列表用到 * @author: jeecg-boot diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/security/DictQueryBlackListHandler.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/security/DictQueryBlackListHandler.java index 5d120c83..d3c76699 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/security/DictQueryBlackListHandler.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/security/DictQueryBlackListHandler.java @@ -1,6 +1,5 @@ package org.jeecg.modules.system.security; -import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.security.AbstractQueryBlackListHandler; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsDetectorsService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsDetectorsService.java index d40e3881..e2e30219 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsDetectorsService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsDetectorsService.java @@ -4,26 +4,26 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.configuration.GardsDetectors; +import org.jeecg.modules.system.entity.GardsDetectorsSystem; import java.util.List; import java.util.Map; -public interface IGardsDetectorsService extends IService { +public interface IGardsDetectorsService extends IService { /** * 分页查询监测器信息 * @param gardsDetectors * @return */ - Result> findPage(QueryRequest queryRequest, GardsDetectors gardsDetectors); + Result> findPage(QueryRequest queryRequest, GardsDetectorsSystem gardsDetectors); /** * 查询监测器详情信息 * @param id * @return */ - GardsDetectors findInfo(Integer id); + GardsDetectorsSystem findInfo(Integer id); /** * 查询Type属性值 @@ -36,14 +36,14 @@ public interface IGardsDetectorsService extends IService { * @param gardsDetectors * @return */ - Result create(GardsDetectors gardsDetectors); + Result create(GardsDetectorsSystem gardsDetectors); /** * 修改监测器信息 * @param gardsDetectors * @return */ - Result update(GardsDetectors gardsDetectors); + Result update(GardsDetectorsSystem gardsDetectors); /** * 删除监测器信息 @@ -63,6 +63,6 @@ public interface IGardsDetectorsService extends IService { * @param stationIds * @return */ - Map> findStationDetectors(List stationIds); + Map> findStationDetectors(List stationIds); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsSampleDataService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsSampleDataService.java index 0ace27f6..58aa94ed 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsSampleDataService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsSampleDataService.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.original.GardsSampleData; +import org.jeecg.modules.system.entity.GardsSampleDataSystem; -public interface IGardsSampleDataService extends IService { +public interface IGardsSampleDataService extends IService { /** * 分页查询DATA BASE数据 @@ -14,7 +14,7 @@ public interface IGardsSampleDataService extends IService { * @param gardsSampleData * @return */ - Result> findPage(QueryRequest queryRequest, GardsSampleData gardsSampleData); + Result> findPage(QueryRequest queryRequest, GardsSampleDataSystem gardsSampleData); /** * 删除DATA BASE数据 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java index c290ce29..1f55ce67 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java @@ -1,12 +1,11 @@ package org.jeecg.modules.system.service; -import java.util.List; - -import org.jeecg.modules.base.entity.postgre.SysAnnouncementSend; -import org.jeecg.modules.system.model.AnnouncementSendModel; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.postgre.SysAnnouncementSend; +import org.jeecg.modules.system.model.AnnouncementSendModel; + +import java.util.List; /** * @Description: 用户通告阅读标记表 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java index 74b46ad9..93f36c54 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java @@ -1,8 +1,7 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.base.entity.postgre.SysDataLog; - import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.postgre.SysDataLog; /** * @Description: 数据日志service接口 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartPermissionService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartPermissionService.java index 05a51a8b..dbfb3dd7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartPermissionService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartPermissionService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.base.entity.postgre.SysDepartPermission; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.postgre.SysDepartPermission; import org.jeecg.modules.base.entity.postgre.SysPermissionDataRule; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRolePermissionService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRolePermissionService.java index 18c4c219..c345337e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRolePermissionService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRolePermissionService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.base.entity.postgre.SysDepartRolePermission; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.postgre.SysDepartRolePermission; /** * @Description: 部门角色权限 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleService.java index 619b19a5..bd1d4477 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.base.entity.postgre.SysDepartRole; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.postgre.SysDepartRole; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleUserService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleUserService.java index c47fa471..58dea832 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleUserService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleUserService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.base.entity.postgre.SysDepartRoleUser; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.postgre.SysDepartRoleUser; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java index 7e005aa9..84db557f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.base.entity.postgre.SysDictItem; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.postgre.SysDictItem; import java.util.List; import java.util.Map; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysLogService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysLogService.java index f421b8b5..38c453c1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysLogService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysLogService.java @@ -1,13 +1,12 @@ package org.jeecg.modules.system.service; +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.postgre.SysLog; + import java.util.Date; import java.util.List; import java.util.Map; -import org.jeecg.modules.base.entity.postgre.SysLog; - -import com.baomidou.mybatisplus.extension.service.IService; - /** *

* 系统日志表 服务类 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPackPermissionService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPackPermissionService.java index ee844706..e2a22c3b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPackPermissionService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPackPermissionService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.base.entity.postgre.SysPackPermission; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.postgre.SysPackPermission; /** * @Description: 产品包菜单关系表 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java index e2c1ca14..8aa1d0dc 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java @@ -1,10 +1,9 @@ package org.jeecg.modules.system.service; -import java.util.List; - +import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.base.entity.postgre.SysPermissionDataRule; -import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; /** *

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.java index 7729547e..577cc36e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.java @@ -1,12 +1,11 @@ package org.jeecg.modules.system.service; -import java.util.List; - +import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.modules.base.entity.postgre.SysPermission; import org.jeecg.modules.system.model.TreeModel; -import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; /** *

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleIndexService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleIndexService.java index 3b2fd053..2a238bbe 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleIndexService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleIndexService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.base.entity.postgre.SysRoleIndex; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.postgre.SysRoleIndex; /** * @Description: 角色首页配置 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java index 0f376aad..97c85a10 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.base.entity.postgre.SysRolePermission; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.postgre.SysRolePermission; /** *

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTaskService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTaskService.java index f61e4d18..c445cd17 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTaskService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTaskService.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.postgre.SysTask; +import org.jeecg.modules.system.entity.SysTaskSystem; import org.jeecg.modules.system.entity.vo.ImportViewVo; import org.jeecg.modules.system.entity.vo.SysTaskChangeVo; import org.jeecg.modules.system.entity.vo.SysTaskExportVo; @@ -14,7 +14,7 @@ import java.util.Date; import java.util.List; import java.util.Map; -public interface ISysTaskService extends IService { +public interface ISysTaskService extends IService { /** * 查询一个月的排班任务信息 @@ -28,21 +28,21 @@ public interface ISysTaskService extends IService { * @param day * @return */ - Result> findInfo(Date day); + Result> findInfo(Date day); /** * 新增排班任务信息 * @param sysTasks * @return */ - Result create(List sysTasks); + Result create(List sysTasks); /** * 修改用户的任务信息 * @param sysTasks * @return */ - Result update(List sysTasks); + Result update(List sysTasks); /** * 删除排班任务信息 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTaskStationService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTaskStationService.java index b7e296a5..466f866d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTaskStationService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTaskStationService.java @@ -1,14 +1,14 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.base.entity.postgre.SysTaskStation; +import org.jeecg.modules.system.entity.SysTaskStationSystem; import java.util.List; -public interface ISysTaskStationService extends IService { +public interface ISysTaskStationService extends IService { - void create(String taskId, String ipAddr, List taskStations); + void create(String taskId, String ipAddr, List taskStations); - void updateStation(String taskId, String ipAddr, List stationList); + void updateStation(String taskId, String ipAddr, List stationList); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserAgentService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserAgentService.java index 131b3fe0..2f1672b2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserAgentService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserAgentService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.base.entity.postgre.SysUserAgent; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.postgre.SysUserAgent; /** * @Description: 用户代理人设置 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java index 014548ba..9025244a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java @@ -1,15 +1,13 @@ package org.jeecg.modules.system.service; -import java.util.List; - import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.base.entity.postgre.SysUserDepart; import org.jeecg.modules.system.model.DepartIdModel; - -import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; /** *

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.java index 5aedf4e2..a8d34acb 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.java @@ -1,8 +1,7 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.base.entity.postgre.SysUserRole; - import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.postgre.SysUserRole; /** *

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserTenantService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserTenantService.java index 59e79836..27072519 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserTenantService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserTenantService.java @@ -2,9 +2,9 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.base.entity.postgre.SysUserTenant; -import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.system.vo.SysUserTenantVo; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java index 4a9ec46f..0e316d1e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.base.entity.configuration.GardsDetectors; +import org.jeecg.modules.system.entity.GardsDetectorsSystem; import org.jeecg.modules.system.mapper.GardsDetectorsMapper; import org.jeecg.modules.system.service.IGardsDetectorsService; import org.springframework.beans.factory.annotation.Autowired; @@ -23,18 +23,18 @@ import java.util.stream.Collectors; @Service("gardsDetectorsService") @DS("ora") -public class GardsDetectorsServiceImpl extends ServiceImpl implements IGardsDetectorsService { +public class GardsDetectorsServiceImpl extends ServiceImpl implements IGardsDetectorsService { @Autowired private RedisUtil redisUtil; @Override - public Result> findPage(QueryRequest queryRequest, GardsDetectors gardsDetectors) { - Result> result = new Result<>(); + public Result> findPage(QueryRequest queryRequest, GardsDetectorsSystem gardsDetectors) { + Result> result = new Result<>(); //查询台站信息接口 HashMap stationMap = (HashMap)redisUtil.get("stationMap"); //分页查询 - Page page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); - Page detectorsPage = this.baseMapper.findPage(page, gardsDetectors); + Page page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); + Page detectorsPage = this.baseMapper.findPage(page, gardsDetectors); detectorsPage.getRecords().forEach(item->{ if (CollectionUtils.isNotEmpty(stationMap) && Objects.nonNull(item.getStationId())) { String stationValue = stationMap.get(item.getStationId().toString()); @@ -49,12 +49,12 @@ public class GardsDetectorsServiceImpl extends ServiceImpl stationMap = (HashMap) redisUtil.get("stationMap"); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(GardsDetectors::getDetectorId, id); - GardsDetectors gardsDetectors = this.baseMapper.selectOne(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(GardsDetectorsSystem::getDetectorId, id); + GardsDetectorsSystem gardsDetectors = this.baseMapper.selectOne(queryWrapper); if (Objects.isNull(gardsDetectors)) { throw new RuntimeException("当前数据不存在"); } @@ -74,12 +74,12 @@ public class GardsDetectorsServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(GardsDetectors::getDetectorCode, gardsDetectors.getDetectorCode()); - GardsDetectors detectors = this.baseMapper.selectOne(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(GardsDetectorsSystem::getDetectorCode, gardsDetectors.getDetectorCode()); + GardsDetectorsSystem detectors = this.baseMapper.selectOne(queryWrapper); if (Objects.nonNull(detectors)) { result.error500("当前数据已存在，新增失败！"); return result; @@ -93,26 +93,26 @@ public class GardsDetectorsServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(GardsDetectors::getDetectorId, gardsDetectors.getDetectorId()); - GardsDetectors stations = this.baseMapper.selectOne(wrapper); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(GardsDetectorsSystem::getDetectorId, gardsDetectors.getDetectorId()); + GardsDetectorsSystem stations = this.baseMapper.selectOne(wrapper); if (Objects.isNull(stations)) { result.error500("当前数据不存在，修改失败"); return result; } if (StringUtils.isNotBlank(gardsDetectors.getDetectorCode())){ - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(GardsDetectors::getDetectorCode, gardsDetectors.getDetectorCode()); - GardsDetectors detectors = this.baseMapper.selectOne(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(GardsDetectorsSystem::getDetectorCode, gardsDetectors.getDetectorCode()); + GardsDetectorsSystem detectors = this.baseMapper.selectOne(queryWrapper); if (Objects.nonNull(detectors) && !detectors.getDetectorId().equals(gardsDetectors.getDetectorId())) { result.error500("当前数据"+gardsDetectors.getDetectorCode()+"已存在，修改失败！"); return result; } } - LambdaQueryWrapper detectorsQueryWrapper = new LambdaQueryWrapper<>(); - detectorsQueryWrapper.eq(GardsDetectors::getDetectorId, gardsDetectors.getDetectorId()); + LambdaQueryWrapper detectorsQueryWrapper = new LambdaQueryWrapper<>(); + detectorsQueryWrapper.eq(GardsDetectorsSystem::getDetectorId, gardsDetectors.getDetectorId()); this.baseMapper.update(gardsDetectors, detectorsQueryWrapper); result.success("修改成功"); this.findDetectors(); @@ -122,8 +122,8 @@ public class GardsDetectorsServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(GardsDetectors::getDetectorId, id); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(GardsDetectorsSystem::getDetectorId, id); this.baseMapper.delete(queryWrapper); result.success("删除成功"); this.findDetectors(); @@ -136,20 +136,20 @@ public class GardsDetectorsServiceImpl extends ServiceImpl gardsDetectors = this.baseMapper.selectList(new LambdaQueryWrapper<>()); - Map detectorsMap = gardsDetectors.stream().collect(Collectors.toMap(GardsDetectors::getDetectorId, GardsDetectors::getDetectorCode)); + List gardsDetectors = this.baseMapper.selectList(new LambdaQueryWrapper<>()); + Map detectorsMap = gardsDetectors.stream().collect(Collectors.toMap(GardsDetectorsSystem::getDetectorId, GardsDetectorsSystem::getDetectorCode)); redisUtil.set("detectorsMap",detectorsMap); } @Override - public Map> findStationDetectors(List stationIds) { - Map> map = new HashMap<>(); + public Map> findStationDetectors(List stationIds) { + Map> map = new HashMap<>(); if (CollectionUtils.isNotEmpty(stationIds)){ - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(GardsDetectors::getStationId, stationIds); - List detectorsList = this.baseMapper.selectList(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(GardsDetectorsSystem::getStationId, stationIds); + List detectorsList = this.baseMapper.selectList(queryWrapper); for (String stationId:stationIds) { - List detectors = detectorsList.stream().filter(item -> item.getStationId().equals(Integer.valueOf(stationId)) && item.getStatus().trim().equals("Operating")).collect(Collectors.toList()); + List detectors = detectorsList.stream().filter(item -> item.getStationId().equals(Integer.valueOf(stationId)) && item.getStatus().trim().equals("Operating")).collect(Collectors.toList()); map.put(stationId, detectors); } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java index 101b6338..2171ea66 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.base.entity.original.GardsSampleData; +import org.jeecg.modules.system.entity.GardsSampleDataSystem; import org.jeecg.modules.system.mapper.GardsSampleDataMapper; import org.jeecg.modules.system.service.IGardsSampleDataService; import org.springframework.beans.factory.annotation.Autowired; @@ -22,26 +22,26 @@ import java.util.Objects; @Service("gardsSampleDataService") @DS("ora") -public class GardsSampleDataServiceImpl extends ServiceImpl implements IGardsSampleDataService { +public class GardsSampleDataServiceImpl extends ServiceImpl implements IGardsSampleDataService { @Autowired private RedisUtil redisUtil; @Override - public Result> findPage(QueryRequest queryRequest, GardsSampleData gardsSampleData) { + public Result> findPage(QueryRequest queryRequest, GardsSampleDataSystem gardsSampleData) { //查询全部台站信息 HashMap stationMap = (HashMap) redisUtil.get("stationMap"); //查询全部监测器信息 HashMap detectorsMap = (HashMap) redisUtil.get("detectorsMap"); - Result> result = new Result<>(); - Page page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.like(Objects.nonNull(gardsSampleData.getSampleId()) ,GardsSampleData::getSampleId, gardsSampleData.getSampleId()); - queryWrapper.eq(Objects.nonNull(gardsSampleData.getStationId()) ,GardsSampleData::getStationId, gardsSampleData.getStationId()); - queryWrapper.eq(Objects.nonNull(gardsSampleData.getDetectorId()) ,GardsSampleData::getDetectorId, gardsSampleData.getDetectorId()); - queryWrapper.ge(Objects.nonNull(gardsSampleData.getCollectStart()) ,GardsSampleData::getCollectStart, gardsSampleData.getCollectStart()); - queryWrapper.le(Objects.nonNull(gardsSampleData.getCollectStop()) ,GardsSampleData::getCollectStop, gardsSampleData.getCollectStop()); - queryWrapper.orderByAsc(GardsSampleData::getSampleId); - Page sampleDataPage = this.baseMapper.selectPage(page, queryWrapper); + Result> result = new Result<>(); + Page page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(Objects.nonNull(gardsSampleData.getSampleId()) ,GardsSampleDataSystem::getSampleId, gardsSampleData.getSampleId()); + queryWrapper.eq(Objects.nonNull(gardsSampleData.getStationId()) ,GardsSampleDataSystem::getStationId, gardsSampleData.getStationId()); + queryWrapper.eq(Objects.nonNull(gardsSampleData.getDetectorId()) ,GardsSampleDataSystem::getDetectorId, gardsSampleData.getDetectorId()); + queryWrapper.ge(Objects.nonNull(gardsSampleData.getCollectStart()) ,GardsSampleDataSystem::getCollectStart, gardsSampleData.getCollectStart()); + queryWrapper.le(Objects.nonNull(gardsSampleData.getCollectStop()) ,GardsSampleDataSystem::getCollectStop, gardsSampleData.getCollectStop()); + queryWrapper.orderByAsc(GardsSampleDataSystem::getSampleId); + Page sampleDataPage = this.baseMapper.selectPage(page, queryWrapper); sampleDataPage.getRecords().forEach(item->{ if (CollectionUtils.isNotEmpty(stationMap) && Objects.nonNull(item.getStationId())){ String stationValue = stationMap.get(item.getStationId().toString()); @@ -65,8 +65,8 @@ public class GardsSampleDataServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(GardsSampleData::getSampleId, sampleId); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(GardsSampleDataSystem::getSampleId, sampleId); this.baseMapper.delete(queryWrapper); result.success("删除成功"); return result; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java index 8c610d70..0fb1fd9e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java @@ -1,17 +1,15 @@ package org.jeecg.modules.system.service.impl; -import java.util.List; - -import javax.annotation.Resource; - +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.base.entity.postgre.SysAnnouncementSend; import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper; import org.jeecg.modules.system.model.AnnouncementSendModel; import org.jeecg.modules.system.service.ISysAnnouncementSendService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import javax.annotation.Resource; +import java.util.List; /** * @Description: 用户通告阅读标记表 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index c6537918..35b398ba 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -24,15 +24,19 @@ import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.*; -import org.jeecg.common.util.*; +import org.jeecg.common.util.SqlInjectionUtil; +import org.jeecg.common.util.SysAnnmentTypeEnum; +import org.jeecg.common.util.YouBianCodeUtil; import org.jeecg.common.util.dynamic.db.FreemarkerParseFactory; +import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.base.entity.postgre.*; import org.jeecg.modules.message.entity.SysMessageTemplate; -import org.jeecg.modules.message.handle.impl.*; +import org.jeecg.modules.message.handle.impl.EmailPushMsgHandle; +import org.jeecg.modules.message.handle.impl.EmailSendMsgHandle; +import org.jeecg.modules.message.handle.impl.SmsSendMsgHandle; +import org.jeecg.modules.message.handle.impl.SystemSendMsgHandle; import org.jeecg.modules.message.service.ISysMessageTemplateService; import org.jeecg.modules.message.websocket.WebSocket; -import org.jeecg.modules.base.entity.postgre.SysRole; -import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.system.mapper.*; import org.jeecg.modules.system.service.*; import org.jeecg.modules.system.util.SecurityUtil; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.java index 0c1dd1c9..e0759bf8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.java @@ -1,11 +1,11 @@ package org.jeecg.modules.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.base.entity.postgre.SysDataLog; import org.jeecg.modules.system.mapper.SysDataLogMapper; import org.jeecg.modules.system.service.ISysDataLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 系统数据日志实现类 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartPermissionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartPermissionServiceImpl.java index 210534e1..49f10afc 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartPermissionServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartPermissionServiceImpl.java @@ -2,6 +2,7 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.base.entity.postgre.SysDepartPermission; import org.jeecg.modules.base.entity.postgre.SysDepartRole; @@ -13,8 +14,6 @@ import org.jeecg.modules.system.mapper.SysDepartRolePermissionMapper; import org.jeecg.modules.system.mapper.SysPermissionDataRuleMapper; import org.jeecg.modules.system.service.ISysDepartPermissionService; import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java index f87afb89..42bd0e39 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java @@ -1,6 +1,7 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.util.IpUtils; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; @@ -9,8 +10,6 @@ import org.jeecg.modules.system.mapper.SysDepartRolePermissionMapper; import org.jeecg.modules.system.service.ISysDepartRolePermissionService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - import javax.servlet.http.HttpServletRequest; import java.util.*; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleServiceImpl.java index 6d4e8bd0..e4e3b1a3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleServiceImpl.java @@ -1,12 +1,11 @@ package org.jeecg.modules.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.base.entity.postgre.SysDepartRole; import org.jeecg.modules.system.mapper.SysDepartRoleMapper; import org.jeecg.modules.system.service.ISysDepartRoleService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - import java.util.List; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.java index 727c97b1..df158605 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.java @@ -1,6 +1,7 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.base.entity.postgre.SysDepartRole; import org.jeecg.modules.base.entity.postgre.SysDepartRoleUser; @@ -9,8 +10,6 @@ import org.jeecg.modules.system.mapper.SysDepartRoleUserMapper; import org.jeecg.modules.system.service.ISysDepartRoleUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; import java.util.*; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictItemServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictItemServiceImpl.java index f27f67f4..d5f3385d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictItemServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictItemServiceImpl.java @@ -2,10 +2,10 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.base.entity.postgre.SysDictItem; import org.jeecg.modules.system.mapper.SysDictItemMapper; import org.jeecg.modules.system.service.ISysDictItemService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java index 11159a4e..849cd267 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java @@ -1,19 +1,17 @@ package org.jeecg.modules.system.service.impl; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.util.CommonUtils; import org.jeecg.modules.base.entity.postgre.SysLog; import org.jeecg.modules.system.mapper.SysLogMapper; import org.jeecg.modules.system.service.ISysLogService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; +import java.util.Map; /** *

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPackPermissionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPackPermissionServiceImpl.java index 7599526c..8a3f9b19 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPackPermissionServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPackPermissionServiceImpl.java @@ -1,12 +1,11 @@ package org.jeecg.modules.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.base.entity.postgre.SysPackPermission; import org.jeecg.modules.system.mapper.SysPackPermissionMapper; import org.jeecg.modules.system.service.ISysPackPermissionService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - /** * @Description: 产品包菜单关系表 * @Author: jeecg-boot diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java index a76f0b1c..712fdb98 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java @@ -1,11 +1,8 @@ package org.jeecg.modules.system.service.impl; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import javax.annotation.Resource; - +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; @@ -17,9 +14,10 @@ import org.jeecg.modules.system.service.ISysPermissionDataRuleService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import javax.annotation.Resource; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** *

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java index 250fba13..0efb3e71 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java @@ -1,12 +1,8 @@ package org.jeecg.modules.system.service.impl; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.constant.CacheConstant; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.exception.JeecgBootException; @@ -25,9 +21,11 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import javax.annotation.Resource; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** *

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleIndexServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleIndexServiceImpl.java index 37ab5196..d10dadc8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleIndexServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleIndexServiceImpl.java @@ -1,12 +1,11 @@ package org.jeecg.modules.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.base.entity.postgre.SysRoleIndex; import org.jeecg.modules.system.mapper.SysRoleIndexMapper; import org.jeecg.modules.system.service.ISysRoleIndexService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - /** * @Description: 角色首页配置 * @Author: jeecg-boot diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java index 23d1f175..a4e5c906 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java @@ -1,21 +1,18 @@ package org.jeecg.modules.system.service.impl; -import java.util.*; - +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.util.IpUtils; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.base.entity.postgre.SysRolePermission; import org.jeecg.modules.system.mapper.SysRolePermissionMapper; import org.jeecg.modules.system.service.ISysRolePermissionService; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; +import java.util.*; /** *

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java index dd69c6cc..64daee02 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java @@ -1,13 +1,9 @@ package org.jeecg.modules.system.service.impl; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.apache.poi.ss.formula.functions.T; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.util.ImportExcelUtil; -import org.jeecg.common.util.PmsUtil; -import org.jeecg.modules.quartz.service.IQuartzJobService; import org.jeecg.modules.base.entity.postgre.SysRole; import org.jeecg.modules.system.mapper.SysRoleMapper; import org.jeecg.modules.system.mapper.SysUserMapper; @@ -19,7 +15,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskServiceImpl.java index 57c1750c..eb58bf3d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskServiceImpl.java @@ -21,6 +21,8 @@ import org.jeecg.modules.base.entity.configuration.GardsStations; import org.jeecg.modules.base.entity.postgre.SysTask; import org.jeecg.modules.base.entity.postgre.SysTaskStation; import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.system.entity.SysTaskStationSystem; +import org.jeecg.modules.system.entity.SysTaskSystem; import org.jeecg.modules.system.entity.vo.*; import org.jeecg.modules.system.mapper.SysTaskMapper; import org.jeecg.modules.system.mapper.SysTaskStationMapper; @@ -42,7 +44,7 @@ import java.util.*; import java.util.stream.Collectors; @Service(value = "sysTaskService") -public class SysTaskServiceImpl extends ServiceImpl implements ISysTaskService { +public class SysTaskServiceImpl extends ServiceImpl implements ISysTaskService { @Autowired private ISysTaskStationService sysTaskStationService; @@ -87,14 +89,14 @@ public class SysTaskServiceImpl extends ServiceImpl impl //过滤出当前所有的排版任务id List taskIds = sysTaskVos.stream().map(item -> item.getId()).collect(Collectors.toList()); //根据排版任务id查询出各排版任务对应的台站信息 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysTaskStation::getTaskId, taskIds); - queryWrapper.select(SysTaskStation::getTaskId, SysTaskStation::getStationId); - List sysTaskStations = sysTaskStationMapper.selectList(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(SysTaskStationSystem::getTaskId, taskIds); + queryWrapper.select(SysTaskStationSystem::getTaskId, SysTaskStationSystem::getStationId); + List sysTaskStations = sysTaskStationMapper.selectList(queryWrapper); //台站信息不为空 if (CollectionUtils.isNotEmpty(sysTaskStations)){ //遍历所有台站信息并赋值台站名称 - for (SysTaskStation taskStation:sysTaskStations) { + for (SysTaskStationSystem taskStation:sysTaskStations) { if (StringUtils.isNotBlank(taskStation.getStationId())){ //通过台站id查询台站code String stationValue = stationMap.get(taskStation.getStationId()); @@ -103,12 +105,11 @@ public class SysTaskServiceImpl extends ServiceImpl impl taskStation.setStationName(stationValue); } } - } //遍历排版任务信息 for (SysTaskVo taskVo:sysTaskVos) { //根据排版任务id过滤出属于当前任务的台站集合，取台站名称字段合成集合 - List stationNames = sysTaskStations.stream().filter(item -> item.getTaskId().equals(taskVo.getId())).collect(Collectors.toList()); + List stationNames = sysTaskStations.stream().filter(item -> item.getTaskId().equals(taskVo.getId())).collect(Collectors.toList()); //返回台站名称集合 taskVo.setStationList(stationNames); } @@ -134,8 +135,8 @@ public class SysTaskServiceImpl extends ServiceImpl impl } @Override - public Result> findInfo(Date day) { - Result> result = new Result(); + public Result> findInfo(Date day) { + Result> result = new Result(); //获取全部台站信息 HashMap stationMap = (HashMap)redisUtil.get("stationMap"); try { @@ -143,16 +144,16 @@ public class SysTaskServiceImpl extends ServiceImpl impl Calendar cal = Calendar.getInstance(); cal.setTime(sdf.parse(DateUtils.formatDate(day, "yyyy-MM-dd"))); String date = sdf.format(cal.getTime()); - List sysTasks = this.baseMapper.selectTaskByDate(date, date); + List sysTasks = this.baseMapper.selectTaskByDate(date, date); if (CollectionUtils.isNotEmpty(sysTasks)){ List taskIds = sysTasks.stream().map(SysTask::getId).collect(Collectors.toList()); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysTaskStation::getTaskId, taskIds); - queryWrapper.select(SysTaskStation::getId,SysTaskStation::getTaskId,SysTaskStation::getStationId); - List taskStations = sysTaskStationMapper.selectList(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(SysTaskStationSystem::getTaskId, taskIds); + queryWrapper.select(SysTaskStationSystem::getId,SysTaskStation::getTaskId,SysTaskStation::getStationId); + List taskStations = sysTaskStationMapper.selectList(queryWrapper); if (CollectionUtils.isNotEmpty(taskStations)){ //遍历所有台站信息并赋值台站名称 - for (SysTaskStation taskStation:taskStations) { + for (SysTaskStationSystem taskStation:taskStations) { if (StringUtils.isNotBlank(taskStation.getStationId())){ //通过stream流获取当前台站id对应的台站信息 String stationValue = stationMap.get(taskStation.getStationId()); @@ -162,8 +163,8 @@ public class SysTaskServiceImpl extends ServiceImpl impl } } } - for (SysTask sysTask:sysTasks) { - List stations = taskStations.stream().filter(item -> item.getTaskId().equals(sysTask.getId())).collect(Collectors.toList()); + for (SysTaskSystem sysTask:sysTasks) { + List stations = taskStations.stream().filter(item -> item.getTaskId().equals(sysTask.getId())).collect(Collectors.toList()); sysTask.setStationList(stations); } } @@ -177,7 +178,7 @@ public class SysTaskServiceImpl extends ServiceImpl impl @Override @Transactional - public Result create(List sysTasks){ + public Result create(List sysTasks){ Result result = new Result(); //获取request HttpServletRequest request = SpringContextUtils.getHttpServletRequest(); @@ -188,7 +189,7 @@ public class SysTaskServiceImpl extends ServiceImpl impl //如果新增排班任务不为空 if (CollectionUtils.isNotEmpty(sysTasks)){ //遍历排班任务进行存储 - for (SysTask sysTask:sysTasks) { + for (SysTaskSystem sysTask:sysTasks) { //操作人 sysTask.setCreateBy(username); //操作人的ip @@ -211,7 +212,7 @@ public class SysTaskServiceImpl extends ServiceImpl impl @Override @Transactional - public Result update(List sysTasks) { + public Result update(List sysTasks) { Result result = new Result(); //获取request HttpServletRequest request = SpringContextUtils.getHttpServletRequest(); @@ -222,10 +223,10 @@ public class SysTaskServiceImpl extends ServiceImpl impl //如果新增排班任务不为空 if (CollectionUtils.isNotEmpty(sysTasks)){ //获取第一个排班任务的信息 - SysTask task = sysTasks.get(0); + SysTaskSystem task = sysTasks.get(0); this.deleteByDate(task.getSchedulingDate()); //遍历排班任务进行存储 - for (SysTask sysTask:sysTasks) { + for (SysTaskSystem sysTask:sysTasks) { //操作人 sysTask.setCreateBy(username); //操作人的ip @@ -253,14 +254,14 @@ public class SysTaskServiceImpl extends ServiceImpl impl private void deleteByDate(Date schedulingDate){ try { //根据排班日期查询对应的任务信息 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysTask::getSchedulingDate, DateUtils.parseDate(DateUtils.formatDate(schedulingDate, "yyyy-MM-dd"), "yyyy-MM-dd")); - List sysTasks = this.baseMapper.selectList(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SysTaskSystem::getSchedulingDate, DateUtils.parseDate(DateUtils.formatDate(schedulingDate, "yyyy-MM-dd"), "yyyy-MM-dd")); + List sysTasks = this.baseMapper.selectList(queryWrapper); //获取任务信息的id - List taskIds = sysTasks.stream().map(SysTask::getId).collect(Collectors.toList()); + List taskIds = sysTasks.stream().map(SysTaskSystem::getId).collect(Collectors.toList()); //根据任务id删除关联的台站信息 - LambdaQueryWrapper taskStationQueryWrapper = new LambdaQueryWrapper<>(); - taskStationQueryWrapper.in(SysTaskStation::getTaskId, taskIds); + LambdaQueryWrapper taskStationQueryWrapper = new LambdaQueryWrapper<>(); + taskStationQueryWrapper.in(SysTaskStationSystem::getTaskId, taskIds); sysTaskStationMapper.delete(taskStationQueryWrapper); //根据任务id删除任务信息 this.baseMapper.deleteBatchIds(taskIds); @@ -272,12 +273,12 @@ public class SysTaskServiceImpl extends ServiceImpl impl @Override public Result deleteById(String taskId, String userId) { Result result = new Result(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysTaskStation::getTaskId, taskId); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SysTaskStationSystem::getTaskId, taskId); sysTaskStationMapper.delete(queryWrapper); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SysTask::getId, taskId); - wrapper.eq(SysTask::getUserId, userId); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysTaskSystem::getId, taskId); + wrapper.eq(SysTaskSystem::getUserId, userId); this.baseMapper.delete(wrapper); result.success("删除成功"); return result; @@ -290,33 +291,33 @@ public class SysTaskServiceImpl extends ServiceImpl impl try { //来源用户相关信息查询 //查询出当前来源用户在排版日期的任务信息 - LambdaQueryWrapper fromQueryWrapper = new LambdaQueryWrapper<>(); - fromQueryWrapper.eq(SysTask::getUserId, sysTaskChangeVo.getFromUserId()); - fromQueryWrapper.eq(SysTask::getSchedulingDate, DateUtils.parseDate(DateUtils.formatDate(sysTaskChangeVo.getDay(), "yyyy-MM-dd"), "yyyy-MM-dd")); - SysTask fromSysTask = this.baseMapper.selectOne(fromQueryWrapper); + LambdaQueryWrapper fromQueryWrapper = new LambdaQueryWrapper<>(); + fromQueryWrapper.eq(SysTaskSystem::getUserId, sysTaskChangeVo.getFromUserId()); + fromQueryWrapper.eq(SysTaskSystem::getSchedulingDate, DateUtils.parseDate(DateUtils.formatDate(sysTaskChangeVo.getDay(), "yyyy-MM-dd"), "yyyy-MM-dd")); + SysTaskSystem fromSysTask = this.baseMapper.selectOne(fromQueryWrapper); //根据来源用户的任务以及台站信息查询出对应的任务及台站信息 - LambdaQueryWrapper fromTaskQueryWrapper = new LambdaQueryWrapper<>(); - fromTaskQueryWrapper.eq(SysTaskStation::getTaskId, fromSysTask.getId()); - fromTaskQueryWrapper.in(SysTaskStation::getStationId, sysTaskChangeVo.getStationIds()); - List sysTaskStations = sysTaskStationMapper.selectList(fromTaskQueryWrapper); + LambdaQueryWrapper fromTaskQueryWrapper = new LambdaQueryWrapper<>(); + fromTaskQueryWrapper.eq(SysTaskStationSystem::getTaskId, fromSysTask.getId()); + fromTaskQueryWrapper.in(SysTaskStationSystem::getStationId, sysTaskChangeVo.getStationIds()); + List sysTaskStations = sysTaskStationMapper.selectList(fromTaskQueryWrapper); //转移到用户相关信息查询 //查询出当前转移到用户在排班日期的任务信息 - LambdaQueryWrapper toQueryWrapper = new LambdaQueryWrapper<>(); - toQueryWrapper.eq(SysTask::getUserId, sysTaskChangeVo.getToUserId()); - toQueryWrapper.eq(SysTask::getSchedulingDate, DateUtils.parseDate(DateUtils.formatDate(sysTaskChangeVo.getDay(), "yyyy-MM-dd"), "yyyy-MM-dd")); - SysTask toSysTask = this.baseMapper.selectOne(toQueryWrapper); + LambdaQueryWrapper toQueryWrapper = new LambdaQueryWrapper<>(); + toQueryWrapper.eq(SysTaskSystem::getUserId, sysTaskChangeVo.getToUserId()); + toQueryWrapper.eq(SysTaskSystem::getSchedulingDate, DateUtils.parseDate(DateUtils.formatDate(sysTaskChangeVo.getDay(), "yyyy-MM-dd"), "yyyy-MM-dd")); + SysTaskSystem toSysTask = this.baseMapper.selectOne(toQueryWrapper); //台站信息不为空 if (CollectionUtils.isNotEmpty(sysTaskStations)){ //遍历当前要进行修改的台站信息 - for (SysTaskStation taskStation:sysTaskStations) { + for (SysTaskStationSystem taskStation:sysTaskStations) { taskStation.setTaskId(toSysTask.getId()); sysTaskStationMapper.updateById(taskStation); } } //判断 如果当前来源用户及日期下的排班任务对应的台站信息为空，排班任务信息删除 - LambdaQueryWrapper sysTaskStationQueryWrapper = new LambdaQueryWrapper<>(); - sysTaskStationQueryWrapper.eq(SysTaskStation::getTaskId, fromSysTask.getId()); - List stations = sysTaskStationMapper.selectList(sysTaskStationQueryWrapper); + LambdaQueryWrapper sysTaskStationQueryWrapper = new LambdaQueryWrapper<>(); + sysTaskStationQueryWrapper.eq(SysTaskStationSystem::getTaskId, fromSysTask.getId()); + List stations = sysTaskStationMapper.selectList(sysTaskStationQueryWrapper); if (CollectionUtils.isEmpty(stations)){ this.baseMapper.deleteById(fromSysTask); } @@ -343,7 +344,7 @@ public class SysTaskServiceImpl extends ServiceImpl impl String schedulingDate = DateUtils.formatDate(sysTaskVo.getSchedulingDate(), "yyyy-MM-dd"); String username = sysTaskVo.getUsername(); String stationNames = ""; - for (SysTaskStation sysTaskStation:sysTaskVo.getStationList()) { + for (SysTaskStationSystem sysTaskStation:sysTaskVo.getStationList()) { stationNames+=sysTaskStation.getStationName()+StringPool.COMMA; } stationNames = stationNames.substring(0,stationNames.length()-1); @@ -407,9 +408,9 @@ public class SysTaskServiceImpl extends ServiceImpl impl //获取台站信息 List stationsList = gardsStationsService.getGardsStations(); //获取排班任务信息 - List sysTaskList = this.baseMapper.selectList(new LambdaQueryWrapper()); + List sysTaskList = this.baseMapper.selectList(new LambdaQueryWrapper()); //存储排班任务信息 - List taskList = new ArrayList<>(); + List taskList = new ArrayList<>(); //导入失败的结果集 List failureList = new ArrayList<>(); int successNum = 0; @@ -421,8 +422,8 @@ public class SysTaskServiceImpl extends ServiceImpl impl for (SysTaskExportVo sysTaskExportVo:dataList) { boolean failFlag = false; //排班任务相关台站信息集合 - List sysTaskStationList = new ArrayList<>(); - SysTask sysTask = new SysTask(); + List sysTaskStationList = new ArrayList<>(); + SysTaskSystem sysTask = new SysTaskSystem(); headRow++; //排班日期 String schedulingDate = sysTaskExportVo.getSchedulingDate(); @@ -489,7 +490,7 @@ public class SysTaskServiceImpl extends ServiceImpl impl for (GardsStations station:stationsList) { for (String sName:stations) { if (station.getStationCode().equals(sName)){ - SysTaskStation taskStation = new SysTaskStation(); + SysTaskStationSystem taskStation = new SysTaskStationSystem(); taskStation.setStationId(String.valueOf(station.getStationId())); taskStation.setStationName(sName); sysTaskStationList.add(taskStation); @@ -499,7 +500,7 @@ public class SysTaskServiceImpl extends ServiceImpl impl //判断 台站名称集合长度与排班任务对应台站信息长度不一致 丢失台站信息 if (stations.size()!=sysTaskStationList.size()){ String code = ""; - List sysTaskStationNames = sysTaskStationList.stream().map(SysTaskStation::getStationName).collect(Collectors.toList()); + List sysTaskStationNames = sysTaskStationList.stream().map(SysTaskStationSystem::getStationName).collect(Collectors.toList()); for (String name:stations) { if (sysTaskStationNames.indexOf(name)<0){ code+=name+","; @@ -542,20 +543,20 @@ public class SysTaskServiceImpl extends ServiceImpl impl return this.baseMapper.findUserStations(userId); } - private void addOrUpdate(List sysTaskList,List taskList){ + private void addOrUpdate(List sysTaskList,List taskList){ //获取request HttpServletRequest request = SpringContextUtils.getHttpServletRequest(); //获取当前操作人用户名 String username = JwtUtil.getUserNameByToken(request); //设置IP地址 String ipAddr = IpUtils.getIpAddr(request); - for (SysTask sysTask:taskList) { - List tasks = sysTaskList.stream() + for (SysTaskSystem sysTask:taskList) { + List tasks = sysTaskList.stream() .filter(item -> item.getUserId().equals(sysTask.getUserId()) && item.getSchedulingDate().equals(sysTask.getSchedulingDate())).collect(Collectors.toList()); //如果查询到的内容不为空，则进行修改 if (CollectionUtils.isNotEmpty(tasks)){ - SysTask task = tasks.get(0); - List stationList = sysTask.getStationList(); + SysTaskSystem task = tasks.get(0); + List stationList = sysTask.getStationList(); if (CollectionUtils.isNotEmpty(stationList)){ sysTaskStationService.updateStation(task.getId(), ipAddr, stationList); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskStationServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskStationServiceImpl.java index 47dd052b..a90cfc57 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskStationServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskStationServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; -import org.jeecg.modules.base.entity.postgre.SysTaskStation; +import org.jeecg.modules.system.entity.SysTaskStationSystem; import org.jeecg.modules.system.mapper.SysTaskStationMapper; import org.jeecg.modules.system.service.ISysTaskStationService; import org.springframework.stereotype.Service; @@ -14,12 +14,12 @@ import java.util.Date; import java.util.List; @Service(value = "sysTaskStationService") -public class SysTaskStationServiceImpl extends ServiceImpl implements ISysTaskStationService { +public class SysTaskStationServiceImpl extends ServiceImpl implements ISysTaskStationService { @Override @Transactional - public void create(String taskId, String ipAddr, List taskStations) { - for (SysTaskStation sysTaskStation:taskStations) { + public void create(String taskId, String ipAddr, List taskStations) { + for (SysTaskStationSystem sysTaskStation:taskStations) { if (StringUtils.isBlank(sysTaskStation.getStationId())){ throw new RuntimeException("台站信息不能为空"); } @@ -33,11 +33,11 @@ public class SysTaskStationServiceImpl extends ServiceImpl stationList) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysTaskStation::getTaskId, taskId); + public void updateStation(String taskId, String ipAddr, List stationList) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SysTaskStationSystem::getTaskId, taskId); this.baseMapper.delete(queryWrapper); - for (SysTaskStation sysTaskStation:stationList) { + for (SysTaskStationSystem sysTaskStation:stationList) { if (StringUtils.isBlank(sysTaskStation.getStationId())){ throw new RuntimeException("台站信息不能为空"); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserAgentServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserAgentServiceImpl.java index 6b42df84..6e30d7d1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserAgentServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserAgentServiceImpl.java @@ -1,12 +1,11 @@ package org.jeecg.modules.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.base.entity.postgre.SysUserAgent; import org.jeecg.modules.system.mapper.SysUserAgentMapper; import org.jeecg.modules.system.service.ISysUserAgentService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - /** * @Description: 用户代理人设置 * @Author: jeecg-boot diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java index 78523612..e680762a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java @@ -1,12 +1,11 @@ package org.jeecg.modules.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.base.entity.postgre.SysUserRole; import org.jeecg.modules.system.mapper.SysUserRoleMapper; import org.jeecg.modules.system.service.ISysUserRoleService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - /** *

* 用户角色表 服务实现类 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index 3653b0ae..d424ea90 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -30,8 +30,8 @@ import org.jeecg.common.util.*; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; import org.jeecg.modules.base.entity.postgre.*; import org.jeecg.modules.base.service.BaseCommonService; -import org.jeecg.modules.base.entity.postgre.SysRole; -import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.system.entity.SysTaskStationSystem; +import org.jeecg.modules.system.entity.SysTaskSystem; import org.jeecg.modules.system.mapper.*; import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.service.ISysUserService; @@ -230,10 +230,10 @@ public class SysUserServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public Result deleteUser(String userId) throws ParseException { //判断当前用户是否有排班任务，如果有就不让删除 - LambdaQueryWrapper taskQueryWrapper = new LambdaQueryWrapper<>(); - taskQueryWrapper.eq(SysTask::getUserId, userId); - taskQueryWrapper.ge(SysTask::getSchedulingDate, DateUtils.parseDate(DateUtils.formatDate(new Date()) ,"yyyy-MM-dd")); - List sysTasks = sysTaskMapper.selectList(taskQueryWrapper); + LambdaQueryWrapper taskQueryWrapper = new LambdaQueryWrapper<>(); + taskQueryWrapper.eq(SysTaskSystem::getUserId, userId); + taskQueryWrapper.ge(SysTaskSystem::getSchedulingDate, DateUtils.parseDate(DateUtils.formatDate(new Date()) ,"yyyy-MM-dd")); + List sysTasks = sysTaskMapper.selectList(taskQueryWrapper); if (CollectionUtils.isNotEmpty(sysTasks)){ return Result.error("删除失败, 当前用户存在排班任务信息！"); } @@ -253,14 +253,14 @@ public class SysUserServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public Result deleteById(String userId) { //根据用户id删除排班任务信息 - LambdaQueryWrapper taskQueryWrapper = new LambdaQueryWrapper<>(); - taskQueryWrapper.eq(SysTask::getUserId, userId); - List sysTasks = sysTaskMapper.selectList(taskQueryWrapper); + LambdaQueryWrapper taskQueryWrapper = new LambdaQueryWrapper<>(); + taskQueryWrapper.eq(SysTaskSystem::getUserId, userId); + List sysTasks = sysTaskMapper.selectList(taskQueryWrapper); //如果排班任务信息不为空，删除排班任务相关台站信息 if (CollectionUtils.isNotEmpty(sysTasks)){ List taskIds = sysTasks.stream().map(SysTask::getId).collect(Collectors.toList()); - LambdaQueryWrapper taskStationQueryWrapper = new LambdaQueryWrapper<>(); - taskStationQueryWrapper.in(SysTaskStation::getTaskId, taskIds); + LambdaQueryWrapper taskStationQueryWrapper = new LambdaQueryWrapper<>(); + taskStationQueryWrapper.in(SysTaskStationSystem::getTaskId, taskIds); sysTaskStationMapper.delete(taskStationQueryWrapper); } sysTaskMapper.delete(taskQueryWrapper); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserTenantServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserTenantServiceImpl.java index 8791b493..f8ff2e5c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserTenantServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserTenantServiceImpl.java @@ -3,6 +3,7 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang.StringUtils; import org.jeecg.common.constant.CacheConstant; import org.jeecg.common.constant.SymbolConstant; @@ -18,7 +19,6 @@ import org.jeecg.modules.system.vo.SysUserTenantVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java index 1109f244..c057bdd9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java @@ -1,12 +1,12 @@ package org.jeecg.modules.system.util; -import java.util.List; - import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.base.entity.postgre.SysPermission; +import java.util.List; + /** * @Author: scott * @Date: 2019-04-03 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDepartUsersVO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDepartUsersVO.java index 79d201a1..61b14216 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDepartUsersVO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDepartUsersVO.java @@ -1,10 +1,10 @@ package org.jeecg.modules.system.vo; +import lombok.Data; + import java.io.Serializable; import java.util.List; -import lombok.Data; - /** * @Description: 系统部门VO * @author: jeecg-boot diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserOnlineVO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserOnlineVO.java index cb5654b9..b5582783 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserOnlineVO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserOnlineVO.java @@ -1,13 +1,11 @@ package org.jeecg.modules.system.vo; -import java.util.Date; - +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.jeecg.common.aspect.annotation.Dict; import org.springframework.format.annotation.DateTimeFormat; -import com.fasterxml.jackson.annotation.JsonFormat; - -import lombok.Data; +import java.util.Date; /** * diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/codegenerate/JeecgOneToMainUtil.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/codegenerate/JeecgOneToMainUtil.java index 39b74eef..31edfc40 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/codegenerate/JeecgOneToMainUtil.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/codegenerate/JeecgOneToMainUtil.java @@ -1,12 +1,12 @@ package org.jeecg.codegenerate; -import java.util.ArrayList; -import java.util.List; - import org.jeecgframework.codegenerate.generate.impl.CodeGenerateOneToMany; import org.jeecgframework.codegenerate.generate.pojo.onetomany.MainTableVo; import org.jeecgframework.codegenerate.generate.pojo.onetomany.SubTableVo; +import java.util.ArrayList; +import java.util.List; + /** * 代码生成器入口【一对多】 * @Author 张代浩 diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java index 6ef8c9c3..31a5c4d0 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java @@ -8,9 +8,9 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.Prompt; import org.jeecg.common.util.ReadLineUtil; import org.jeecg.modules.base.entity.configuration.GardsStations; -import org.jeecg.modules.base.entity.original.GardsSampleData; -import org.jeecg.modules.base.entity.original.GardsSohData; import org.jeecg.modules.base.enums.PageType; +import org.jeecg.modules.entity.GardsSampleDataWeb; +import org.jeecg.modules.entity.GardsSohDataWeb; import org.jeecg.modules.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; @@ -89,7 +89,7 @@ public class WebStatisticsController { @ApiOperation("查看Radionuclide的文件") public Result radionuclideFile(@RequestParam Integer sampleId, HttpServletResponse response){ - GardsSampleData sampleData = gardsSampleDataWebService.getOneSample(sampleId); + GardsSampleDataWeb sampleData = gardsSampleDataWebService.getOneSample(sampleId); String filePath = sampleData.getInputFileName(); if (StrUtil.isBlank(filePath)) return Result.error(Prompt.FILE_NOT_EXITS); @@ -100,7 +100,7 @@ public class WebStatisticsController { @ApiOperation(value = "查看RMSSHO的文件",notes = "查看RMSSHO的文件") public Result sohFile(@RequestParam Integer sohId, HttpServletResponse response){ - GardsSohData soh = gardsSohDataService.getOneSoh(sohId); + GardsSohDataWeb soh = gardsSohDataService.getOneSoh(sohId); String filePath = soh.getInputFileName(); if (StrUtil.isBlank(filePath)) return Result.error(Prompt.FILE_NOT_EXITS); diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAlertDataWeb.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAlertDataWeb.java new file mode 100644 index 00000000..e0369000 --- /dev/null +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAlertDataWeb.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.jeecg.modules.base.entity.original.GardsAlertData; +import org.jeecgframework.poi.excel.annotation.Excel; + +@Data +@TableName("ORIGINAL.GARDS_ALERT_DATA") +public class GardsAlertDataWeb extends GardsAlertData { + + @Excel(name = "NO",orderNum = "1") + @TableField(exist = false) + private Integer no; + +} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsMetDataWeb.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsMetDataWeb.java new file mode 100644 index 00000000..ba9b205e --- /dev/null +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsMetDataWeb.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.jeecg.modules.base.entity.original.GardsMetData; +import org.jeecgframework.poi.excel.annotation.Excel; + +@Data +@TableName(value = "ORIGINAL.GARDS_MET_DATA") +public class GardsMetDataWeb extends GardsMetData { + + @TableField(exist = false) + @Excel(name = "NO",orderNum = "1") + private Integer no; + +} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleDataWeb.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleDataWeb.java new file mode 100644 index 00000000..ecabcbb4 --- /dev/null +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleDataWeb.java @@ -0,0 +1,38 @@ +package org.jeecg.modules.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.jeecg.modules.base.entity.original.GardsSampleData; +import org.jeecgframework.poi.excel.annotation.Excel; + +@Data +@TableName("ORIGINAL.GARDS_SAMPLE_DATA") +public class GardsSampleDataWeb extends GardsSampleData { + + /** + * 台站名称 + */ + @TableField(exist = false) + @Excel(name = "STATION" ,orderNum = "2") + private String stationName; + + /** + * 探测器名称 + */ + @TableField(exist = false) + private String detectorsName; + + + @TableField(exist = false) + @Excel(name = "CALIB REPORTS" ,orderNum = "7") + private String calibReports; + + @TableField(exist = false) + private String dbName; + + @TableField(exist = false) + @Excel(name = "NO" ,orderNum = "1") + private Integer no; + +} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSohDataWeb.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSohDataWeb.java new file mode 100644 index 00000000..475eebf0 --- /dev/null +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSohDataWeb.java @@ -0,0 +1,36 @@ +package org.jeecg.modules.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.jeecg.modules.base.entity.original.GardsSohData; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@TableName(value = "ORIGINAL.GARDS_SOH_DATA") +public class GardsSohDataWeb extends GardsSohData { + + /** + * 探测器名称 + */ + @TableField(exist = false) + private String detectorName; + + /** + * 结束时间 + */ + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "START TIME",orderNum = "4",width = 30,format = "yyyy-MM-dd HH:mm:ss") + private Date endTime; + + @TableField(exist = false) + @Excel(name = "NO",orderNum = "1") + private Integer no; + +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/SampleDataDto.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/dto/SampleDataDto.java similarity index 87% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/SampleDataDto.java rename to jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/dto/SampleDataDto.java index 5e89a70d..5900a636 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/SampleDataDto.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/dto/SampleDataDto.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.base.dto; +package org.jeecg.modules.entity.dto; import lombok.Data; -import org.jeecg.modules.base.entity.original.GardsSampleData; +import org.jeecg.modules.entity.GardsSampleDataWeb; import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; @@ -37,7 +37,7 @@ public class SampleDataDto implements Serializable { @Excel(name = "SID" ,orderNum = "5") private Integer sampleId; - public SampleDataDto(GardsSampleData sampleData) { + public SampleDataDto(GardsSampleDataWeb sampleData) { this.no = sampleData.getNo(); this.stationName = sampleData.getStationName(); this.collectStart = sampleData.getCollectStart(); diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsAlertDataMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsAlertDataMapper.java index 8ba9abec..c2a8c1c1 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsAlertDataMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsAlertDataMapper.java @@ -1,8 +1,8 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.base.entity.original.GardsAlertData; +import org.jeecg.modules.entity.GardsAlertDataWeb; -public interface GardsAlertDataMapper extends BaseMapper { +public interface GardsAlertDataMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsMetDataMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsMetDataMapper.java index 71927446..6c9c6fab 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsMetDataMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsMetDataMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.base.entity.original.GardsMetData; +import org.jeecg.modules.entity.GardsMetDataWeb; -public interface GardsMetDataMapper extends BaseMapper { +public interface GardsMetDataMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java index 4fadb35b..4ee88830 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java @@ -2,14 +2,14 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.jeecg.modules.base.entity.original.GardsSampleData; +import org.jeecg.modules.entity.GardsSampleDataWeb; import java.util.List; -public interface GardsSampleDataWebMapper extends BaseMapper { +public interface GardsSampleDataWebMapper extends BaseMapper { - Page findAutoPage(String startDate, String endDate, List stationIdList, Page page); + Page findAutoPage(String startDate, String endDate, List stationIdList, Page page); - Page findReviewedPage(String startDate, String endDate, List stationIdList, Page page); + Page findReviewedPage(String startDate, String endDate, List stationIdList, Page page); } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSohDataMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSohDataMapper.java index 9421af5a..267d1980 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSohDataMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSohDataMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.base.entity.original.GardsSohData; +import org.jeecg.modules.entity.GardsSohDataWeb; -public interface GardsSohDataMapper extends BaseMapper { +public interface GardsSohDataMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsAlertDataService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsAlertDataService.java index 5ae7833f..b7ce9d90 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsAlertDataService.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsAlertDataService.java @@ -1,11 +1,11 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.base.entity.original.GardsAlertData; +import org.jeecg.modules.entity.GardsAlertDataWeb; import javax.servlet.http.HttpServletResponse; -public interface IGardsAlertDataService extends IService { +public interface IGardsAlertDataService extends IService { void alertsExport(Integer[] stationIds, String startTime, diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java index 977c1d95..986adc22 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java @@ -3,12 +3,12 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.original.GardsMetData; +import org.jeecg.modules.entity.GardsMetDataWeb; import javax.servlet.http.HttpServletResponse; import java.util.Date; -public interface IGardsMetDataService extends IService { +public interface IGardsMetDataService extends IService { /** * 分页查询气象数据信息 diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java index c4327688..4dc5de52 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java @@ -3,14 +3,14 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.original.GardsSampleData; +import org.jeecg.modules.entity.GardsSampleDataWeb; import javax.servlet.http.HttpServletResponse; import java.util.Date; import java.util.List; -public interface IGardsSampleDataWebService extends IService { +public interface IGardsSampleDataWebService extends IService { /** * 分页查询气溶胶相关数据 @@ -31,7 +31,7 @@ public interface IGardsSampleDataWebService extends IService { */ Result findGeneratedReport(Integer sampleId); - GardsSampleData getOneSample(Integer sampleId); + GardsSampleDataWeb getOneSample(Integer sampleId); void radionuclideExport(Integer[] stationIds, String dataType, @@ -41,7 +41,7 @@ public interface IGardsSampleDataWebService extends IService { String endTime, HttpServletResponse response); - List listBySampleIds(Integer[] stationIds, + List listBySampleIds(Integer[] stationIds, String startTime, String endTime, List sampleIds); diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java index a57e0f5e..11ab0ee1 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java @@ -3,12 +3,12 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.original.GardsSohData; +import org.jeecg.modules.entity.GardsSohDataWeb; import javax.servlet.http.HttpServletResponse; import java.util.Date; -public interface IGardsSohDataService extends IService { +public interface IGardsSohDataService extends IService { /** * 分页查询状态数据信息 @@ -35,7 +35,7 @@ public interface IGardsSohDataService extends IService { * * @param sohId */ - GardsSohData getOneSoh(Integer sohId); + GardsSohDataWeb getOneSoh(Integer sohId); void sohExport(Integer[] stationIds, String startTime, diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java index b1e6ad2b..b660f74e 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java @@ -14,9 +14,9 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.ExportUtil; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.base.dto.SampleDataDto; -import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecg.modules.base.entity.rnauto.GardsAnalyses; +import org.jeecg.modules.entity.GardsSampleDataWeb; +import org.jeecg.modules.entity.dto.SampleDataDto; import org.jeecg.modules.mapper.GardsAnalysesAutoMapper; import org.jeecg.modules.mapper.GardsSampleDataWebMapper; import org.jeecg.modules.service.IAutoService; @@ -64,8 +64,8 @@ public class AutoServiceImpl extends ServiceImpl page = new Page(queryRequest.getPageNo(), queryRequest.getPageSize()); - Page sampleDataPage = gardsSampleDataWebMapper.findAutoPage(startDate, endDate, stationIdList, page); + Page page = new Page(queryRequest.getPageNo(), queryRequest.getPageSize()); + Page sampleDataPage = gardsSampleDataWebMapper.findAutoPage(startDate, endDate, stationIdList, page); sampleDataPage.getRecords().forEach(item->{ item.setSiteDetCode(StringUtils.trim(item.getSiteDetCode())); if (stationMap.containsKey(item.getStationId().toString()) && CollectionUtils.isNotEmpty(stationMap)){ @@ -103,7 +103,7 @@ public class AutoServiceImpl extends ServiceImpl sampleData = gardsSampleDataService.listBySampleIds(stationIds, + List sampleData = gardsSampleDataService.listBySampleIds(stationIds, startTime, endTime, sampleIds); // 导出Excel文件 diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsAlertDataServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsAlertDataServiceImpl.java index 1c8d5af2..8f31e2a7 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsAlertDataServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsAlertDataServiceImpl.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.poi.ss.usermodel.Workbook; import org.jeecg.common.util.ExportUtil; -import org.jeecg.modules.base.entity.original.GardsAlertData; +import org.jeecg.modules.entity.GardsAlertDataWeb; import org.jeecg.modules.mapper.GardsAlertDataMapper; import org.jeecg.modules.service.IGardsAlertDataService; import org.jeecgframework.poi.excel.ExcelExportUtil; @@ -23,7 +23,7 @@ import java.util.List; @Service @DS("ora") -public class GardsAlertDataServiceImpl extends ServiceImpl implements IGardsAlertDataService { +public class GardsAlertDataServiceImpl extends ServiceImpl implements IGardsAlertDataService { @Override public void alertsExport(Integer[] stationIds, @@ -41,13 +41,13 @@ public class GardsAlertDataServiceImpl extends ServiceImpl detectorsMap = (Map)redisUtil.get("detectorsMap"); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(GardsAlertData::getStationId, stationIds); - wrapper.ge(GardsAlertData::getTime, startDate); - wrapper.le(GardsAlertData::getTime, endDate); - List gardsAlertData = this.list(wrapper); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(GardsAlertDataWeb::getStationId, stationIds); + wrapper.ge(GardsAlertDataWeb::getTime, startDate); + wrapper.le(GardsAlertDataWeb::getTime, endDate); + List gardsAlertData = this.list(wrapper); int no = 1; - for (GardsAlertData alertData : gardsAlertData) { + for (GardsAlertDataWeb alertData : gardsAlertData) { alertData.setNo(no++); } // 导出Excel文件 @@ -58,8 +58,7 @@ public class GardsAlertDataServiceImpl extends ServiceImpl implements IGardsMetDataService { +public class GardsMetDataServiceImpl extends ServiceImpl implements IGardsMetDataService { @Override public Result findMetPage(QueryRequest queryRequest, Integer[] stationIds, Date startTime, Date endTime) { @@ -50,12 +50,12 @@ public class GardsMetDataServiceImpl extends ServiceImpl page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(GardsMetData::getStationId, stationIds); - queryWrapper.ge(GardsMetData::getStartTime, startDate); - queryWrapper.le(GardsMetData::getEndTime, endDate); - Page metDataPage = this.baseMapper.selectPage(page, queryWrapper); + Page page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(GardsMetDataWeb::getStationId, stationIds); + queryWrapper.ge(GardsMetDataWeb::getStartTime, startDate); + queryWrapper.le(GardsMetDataWeb::getEndTime, endDate); + Page metDataPage = this.baseMapper.selectPage(page, queryWrapper); result.setSuccess(true); result.setResult(metDataPage); return result; @@ -78,13 +78,13 @@ public class GardsMetDataServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.in(GardsMetData::getStationId, stationIds); - wrapper.ge(GardsMetData::getStartTime, startDate); - wrapper.le(GardsMetData::getEndTime, endDate); - List gardsMetData = this.list(wrapper); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(GardsMetDataWeb::getStationId, stationIds); + wrapper.ge(GardsMetDataWeb::getStartTime, startDate); + wrapper.le(GardsMetDataWeb::getEndTime, endDate); + List gardsMetData = this.list(wrapper); int no = 1; - for (GardsMetData metData : gardsMetData) { + for (GardsMetDataWeb metData : gardsMetData) { metData.setNo(no++); } // 导出Excel文件 @@ -96,7 +96,7 @@ public class GardsMetDataServiceImpl extends ServiceImpl implements IGardsSampleDataWebService { +public class GardsSampleDataWebServiceImpl extends ServiceImpl implements IGardsSampleDataWebService { @Autowired private RedisUtil redisUtil; @@ -92,22 +93,22 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); + Page page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); //声明Lambda 传递参数进行条件查询 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(GardsSampleData::getDataType, dataType); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(GardsSampleDataWeb::getDataType, dataType); //数据分为全谱与过程谱则使用采集日期进行日期查询 if (StringUtils.isNotBlank(spectralQualifie)) { - queryWrapper.eq(GardsSampleData::getSpectralQualifie, spectralQualifie); - queryWrapper.ge(GardsSampleData::getCollectStart, startDate); - queryWrapper.le(GardsSampleData::getCollectStop, endDate); + queryWrapper.eq(GardsSampleDataWeb::getSpectralQualifie, spectralQualifie); + queryWrapper.ge(GardsSampleDataWeb::getCollectStart, startDate); + queryWrapper.le(GardsSampleDataWeb::getCollectStop, endDate); }else {//数据不区分全谱与过程谱则使用 - queryWrapper.ge(GardsSampleData::getAcquisitionStart, startDate); - queryWrapper.le(GardsSampleData::getAcquisitionStop, endDate); + queryWrapper.ge(GardsSampleDataWeb::getAcquisitionStart, startDate); + queryWrapper.le(GardsSampleDataWeb::getAcquisitionStop, endDate); } - queryWrapper.in(GardsSampleData::getStationId, stationIds); + queryWrapper.in(GardsSampleDataWeb::getStationId, stationIds); //进行分页查询 - Page sampleDataPage = this.baseMapper.selectPage(page, queryWrapper); + Page sampleDataPage = this.baseMapper.selectPage(page, queryWrapper); sampleDataPage.getRecords().forEach(item->{ item.setSiteDetCode(StringUtils.trim(item.getSiteDetCode())); if (stationMap.containsKey(item.getStationId().toString()) && CollectionUtils.isNotEmpty(stationMap)){ @@ -167,9 +168,9 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl stationMap = (Map)redisUtil.get("stationMap"); //根据sample_id查询sample_data内容 - LambdaQueryWrapper sampleDataQueryWrapper = new LambdaQueryWrapper<>(); - sampleDataQueryWrapper.eq(GardsSampleData::getSampleId, sampleId); - GardsSampleData gardsSampleData = this.baseMapper.selectOne(sampleDataQueryWrapper); + LambdaQueryWrapper sampleDataQueryWrapper = new LambdaQueryWrapper<>(); + sampleDataQueryWrapper.eq(GardsSampleDataWeb::getSampleId, sampleId); + GardsSampleDataWeb gardsSampleData = this.baseMapper.selectOne(sampleDataQueryWrapper); if (Objects.nonNull(gardsSampleData) && CollectionUtils.isNotEmpty(stationMap)){ String stationName = stationMap.get(gardsSampleData.getStationId().toString()); gardsSampleData.setStationName(stationName); @@ -568,11 +569,11 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(GardsSampleData::getSampleId,sampleId); + public GardsSampleDataWeb getOneSample(Integer sampleId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(GardsSampleDataWeb::getSampleId,sampleId); return Optional.ofNullable(getOne(wrapper)) - .orElse(new GardsSampleData()); + .orElse(new GardsSampleDataWeb()); } @Override @@ -592,26 +593,26 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(GardsSampleData::getDataType, dataType); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(GardsSampleDataWeb::getDataType, dataType); // 数据分为全谱与过程谱则使用采集日期进行日期查询 if (StringUtils.isNotBlank(spectralQualifie)) { - queryWrapper.eq(GardsSampleData::getSpectralQualifie, spectralQualifie); - queryWrapper.ge(GardsSampleData::getCollectStart, startDate); - queryWrapper.le(GardsSampleData::getCollectStop, endDate); + queryWrapper.eq(GardsSampleDataWeb::getSpectralQualifie, spectralQualifie); + queryWrapper.ge(GardsSampleDataWeb::getCollectStart, startDate); + queryWrapper.le(GardsSampleDataWeb::getCollectStop, endDate); } else { //数据不区分全谱与过程谱则使用 - queryWrapper.ge(GardsSampleData::getAcquisitionStart, startDate); - queryWrapper.le(GardsSampleData::getAcquisitionStop, endDate); + queryWrapper.ge(GardsSampleDataWeb::getAcquisitionStart, startDate); + queryWrapper.le(GardsSampleDataWeb::getAcquisitionStop, endDate); } boolean notEmpty = ArrayUtil.isNotEmpty(stationIds); - queryWrapper.in(notEmpty, GardsSampleData::getStationId, stationIds); + queryWrapper.in(notEmpty, GardsSampleDataWeb::getStationId, stationIds); // 封装信息 - List sampleDatas = this.list(queryWrapper); + List sampleDatas = this.list(queryWrapper); // 获取redis中缓存的台站信息 Map stationMap = (Map) redisUtil.get("stationMap"); int no = 1; - for (GardsSampleData sampleData : sampleDatas) { + for (GardsSampleDataWeb sampleData : sampleDatas) { sampleData.setNo(no++); sampleData.setSiteDetCode(StringUtils.trim(sampleData.getSiteDetCode())); String stationId = sampleData.getStationId().toString(); @@ -668,7 +669,7 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl listBySampleIds(Integer[] stationIds, + public List listBySampleIds(Integer[] stationIds, String startTime, String endTime, List sampleIds) { @@ -678,18 +679,18 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.in(GardsSampleData::getStationId, stationIds); - wrapper.in(GardsSampleData::getSampleId, sampleIds); - wrapper.ge(GardsSampleData::getCollectStart, startDate); - wrapper.le(GardsSampleData::getCollectStop, endDate); - List sampleData = this.list(wrapper); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(GardsSampleDataWeb::getStationId, stationIds); + wrapper.in(GardsSampleDataWeb::getSampleId, sampleIds); + wrapper.ge(GardsSampleDataWeb::getCollectStart, startDate); + wrapper.le(GardsSampleDataWeb::getCollectStop, endDate); + List sampleData = this.list(wrapper); // 获取redis中缓存的台站信息 Map stationMap = (Map)redisUtil.get("stationMap"); int no = 1; boolean emptyMap = MapUtil.isEmpty(stationMap); - for (GardsSampleData sampleDatum : sampleData) { + for (GardsSampleDataWeb sampleDatum : sampleData) { sampleDatum.setNo(no++); String stationId = sampleDatum.getStationId().toString(); boolean hasKey = emptyMap ? false : stationMap.containsKey(stationId) ; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java index 738918bf..98f1668f 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java @@ -13,8 +13,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.ExportUtil; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.base.entity.original.GardsAlertData; -import org.jeecg.modules.base.entity.original.GardsSohData; +import org.jeecg.modules.entity.GardsAlertDataWeb; +import org.jeecg.modules.entity.GardsSohDataWeb; import org.jeecg.modules.mapper.GardsAlertDataMapper; import org.jeecg.modules.mapper.GardsSohDataMapper; import org.jeecg.modules.service.IGardsSohDataService; @@ -31,7 +31,7 @@ import java.util.*; @Service("gardsSohDataService") @DS("ora") -public class GardsSohDataServiceImpl extends ServiceImpl implements IGardsSohDataService { +public class GardsSohDataServiceImpl extends ServiceImpl implements IGardsSohDataService { @Autowired private RedisUtil redisUtil; @@ -58,12 +58,12 @@ public class GardsSohDataServiceImpl extends ServiceImpl detectorsMap = (Map)redisUtil.get("detectorsMap"); - Page page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(GardsSohData::getStationId, stationIds); - queryWrapper.ge(GardsSohData::getStartTime, startDate); - queryWrapper.le(GardsSohData::getStartTime, endDate); - Page sohDataPage = this.baseMapper.selectPage(page, queryWrapper); + Page page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(GardsSohDataWeb::getStationId, stationIds); + queryWrapper.ge(GardsSohDataWeb::getStartTime, startDate); + queryWrapper.le(GardsSohDataWeb::getStartTime, endDate); + Page sohDataPage = this.baseMapper.selectPage(page, queryWrapper); sohDataPage.getRecords().forEach(item->{ if (Objects.nonNull(item.getDetectorId()) && detectorsMap.containsKey(item.getDetectorId().toString())) { String detectorName = detectorsMap.get(item.getDetectorId().toString()); @@ -104,12 +104,12 @@ public class GardsSohDataServiceImpl extends ServiceImpl detectorsMap = (Map)redisUtil.get("detectorsMap"); - Page page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(GardsAlertData::getStationId, stationIds); - queryWrapper.ge(GardsAlertData::getTime, startDate); - queryWrapper.le(GardsAlertData::getTime, endDate); - Page alertDataPage = gardsAlertDataMapper.selectPage(page, queryWrapper); + Page page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(GardsAlertDataWeb::getStationId, stationIds); + queryWrapper.ge(GardsAlertDataWeb::getTime, startDate); + queryWrapper.le(GardsAlertDataWeb::getTime, endDate); + Page alertDataPage = gardsAlertDataMapper.selectPage(page, queryWrapper); result.setSuccess(true); result.setResult(alertDataPage); return result; @@ -119,11 +119,11 @@ public class GardsSohDataServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(GardsSohData::getSohId,sohId); + public GardsSohDataWeb getOneSoh(Integer sohId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(GardsSohDataWeb::getSohId,sohId); return Optional.ofNullable(getOne(wrapper)) - .orElse(new GardsSohData()); + .orElse(new GardsSohDataWeb()); } @Override @@ -141,15 +141,15 @@ public class GardsSohDataServiceImpl extends ServiceImpl detectorsMap = (Map) redisUtil.get("detectorsMap"); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(GardsSohData::getStationId, stationIds); - wrapper.ge(GardsSohData::getStartTime, startDate); - wrapper.le(GardsSohData::getStartTime, endDate); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(GardsSohDataWeb::getStationId, stationIds); + wrapper.ge(GardsSohDataWeb::getStartTime, startDate); + wrapper.le(GardsSohDataWeb::getStartTime, endDate); - List sohData = this.list(wrapper); + List sohData = this.list(wrapper); int no = 1; - for (GardsSohData sohDatum : sohData) { + for (GardsSohDataWeb sohDatum : sohData) { sohDatum.setNo(no++); /*String detectorId = sohDatum.getDetectorId().toString(); boolean hasKey = MapUtil.isEmpty(detectorsMap) ? false : detectorsMap.containsKey(detectorId) ; @@ -175,7 +175,7 @@ public class GardsSohDataServiceImpl extends ServiceImpl page = new Page(queryRequest.getPageNo(), queryRequest.getPageSize()); - Page sampleDataPage = gardsSampleDataWebMapper.findReviewedPage(startDate, endDate, stationIdList, page); + Page page = new Page(queryRequest.getPageNo(), queryRequest.getPageSize()); + Page sampleDataPage = gardsSampleDataWebMapper.findReviewedPage(startDate, endDate, stationIdList, page); sampleDataPage.getRecords().forEach(item->{ item.setSiteDetCode(StringUtils.trim(item.getSiteDetCode())); if (stationMap.containsKey(item.getStationId().toString()) && CollectionUtils.isNotEmpty(stationMap)){ @@ -103,7 +103,7 @@ public class ReviewedServiceImpl extends ServiceImpl sampleData = gardsSampleDataService.listBySampleIds(stationIds, + List sampleData = gardsSampleDataService.listBySampleIds(stationIds, startTime, endTime, sampleIds); // 导出Excel文件 diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/filter/GlobalAccessTokenFilter.java b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/filter/GlobalAccessTokenFilter.java index f1191493..f54e3d07 100644 --- a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/filter/GlobalAccessTokenFilter.java +++ b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/filter/GlobalAccessTokenFilter.java @@ -9,8 +9,10 @@ import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; + import java.util.Arrays; import java.util.stream.Collectors; + import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_REQUEST_URL_ATTR; import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.addOriginalRequestUrl; diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/MySwaggerResourceProvider.java b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/MySwaggerResourceProvider.java index bce7b5f1..cb9bc90c 100644 --- a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/MySwaggerResourceProvider.java +++ b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/MySwaggerResourceProvider.java @@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.cloud.gateway.route.RouteLocator; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Component; - import springfox.documentation.swagger.web.SwaggerResource; import springfox.documentation.swagger.web.SwaggerResourcesProvider; diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/repository/DynamicRouteService.java b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/repository/DynamicRouteService.java index a0fe7fdb..639bd7be 100644 --- a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/repository/DynamicRouteService.java +++ b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/repository/DynamicRouteService.java @@ -1,7 +1,6 @@ package org.jeecg.loader.repository; import lombok.extern.slf4j.Slf4j; -import org.jeecg.loader.repository.MyInMemoryRouteDefinitionRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.gateway.event.RefreshRoutesEvent; import org.springframework.cloud.gateway.route.RouteDefinition; diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/repository/MyInMemoryRouteDefinitionRepository.java b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/repository/MyInMemoryRouteDefinitionRepository.java index d5f627f4..1a568759 100644 --- a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/repository/MyInMemoryRouteDefinitionRepository.java +++ b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/repository/MyInMemoryRouteDefinitionRepository.java @@ -5,22 +5,18 @@ package org.jeecg.loader.repository; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.function.Function; -import java.util.function.Supplier; - -import ch.qos.logback.classic.Logger; import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.gateway.route.RouteDefinition; import org.springframework.cloud.gateway.route.RouteDefinitionRepository; -import org.springframework.cloud.gateway.support.NotFoundException; import org.springframework.stereotype.Component; import org.springframework.util.ObjectUtils; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.Map; + /** * @author qinfeng */ diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/JeecgSentinelApplication.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/JeecgSentinelApplication.java index 64d78814..b72e9dbc 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/JeecgSentinelApplication.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/JeecgSentinelApplication.java @@ -15,12 +15,12 @@ */ package com.alibaba.csp.sentinel.dashboard; +import com.alibaba.csp.sentinel.init.InitExecutor; +import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.env.Environment; -import com.alibaba.csp.sentinel.init.InitExecutor; -import lombok.extern.slf4j.Slf4j; /** * Sentinel dashboard application. diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthorityRuleController.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthorityRuleController.java index a6da6433..5522238c 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthorityRuleController.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthorityRuleController.java @@ -1,34 +1,24 @@ package com.alibaba.csp.sentinel.dashboard.controller; -import java.util.Date; -import java.util.List; - import com.alibaba.csp.sentinel.dashboard.auth.AuthAction; import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType; import com.alibaba.csp.sentinel.dashboard.controller.base.BaseRuleController; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity; +import com.alibaba.csp.sentinel.dashboard.domain.Result; +import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository; import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider; import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher; import com.alibaba.csp.sentinel.slots.block.RuleConstant; import com.alibaba.csp.sentinel.util.StringUtil; - -import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity; -import com.alibaba.csp.sentinel.dashboard.domain.Result; -import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; /** * 授权规则控制器 diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DegradeController.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DegradeController.java index 1a451c29..e7c7f44a 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DegradeController.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DegradeController.java @@ -1,34 +1,25 @@ package com.alibaba.csp.sentinel.dashboard.controller; -import java.util.Date; -import java.util.List; - import com.alibaba.csp.sentinel.dashboard.auth.AuthAction; import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType; import com.alibaba.csp.sentinel.dashboard.controller.base.BaseRuleController; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity; +import com.alibaba.csp.sentinel.dashboard.domain.Result; import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository; import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider; import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher; import com.alibaba.csp.sentinel.slots.block.RuleConstant; import com.alibaba.csp.sentinel.slots.block.degrade.circuitbreaker.CircuitBreakerStrategy; import com.alibaba.csp.sentinel.util.StringUtil; - -import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity; -import com.alibaba.csp.sentinel.dashboard.domain.Result; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; /** * 降级规则控制器 diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/SystemController.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/SystemController.java index 74ba4539..73e72dca 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/SystemController.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/SystemController.java @@ -1,20 +1,15 @@ package com.alibaba.csp.sentinel.dashboard.controller; -import java.util.Date; -import java.util.List; - import com.alibaba.csp.sentinel.dashboard.auth.AuthAction; import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType; import com.alibaba.csp.sentinel.dashboard.controller.base.BaseRuleController; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity; +import com.alibaba.csp.sentinel.dashboard.domain.Result; import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository; import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider; import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher; import com.alibaba.csp.sentinel.util.StringUtil; - -import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity; -import com.alibaba.csp.sentinel.dashboard.domain.Result; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -23,6 +18,9 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Date; +import java.util.List; + /** * 系统规则控制器 diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayFlowRuleController.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayFlowRuleController.java index a0589c44..7ffac260 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayFlowRuleController.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayFlowRuleController.java @@ -23,9 +23,9 @@ import java.util.Arrays; import java.util.Date; import java.util.List; -import static com.alibaba.csp.sentinel.slots.block.RuleConstant.*; import static com.alibaba.csp.sentinel.adapter.gateway.common.SentinelGatewayConstants.*; import static com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.GatewayFlowRuleEntity.*; +import static com.alibaba.csp.sentinel.slots.block.RuleConstant.*; /** * 网关限流规则控制器 diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java index 74f58d1a..561ef85e 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java @@ -15,35 +15,25 @@ */ package com.alibaba.csp.sentinel.dashboard.controller.v2; -import java.util.Date; -import java.util.List; - import com.alibaba.csp.sentinel.dashboard.auth.AuthAction; import com.alibaba.csp.sentinel.dashboard.auth.AuthService; import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType; import com.alibaba.csp.sentinel.dashboard.controller.base.BaseRuleController; -import com.alibaba.csp.sentinel.util.StringUtil; - import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; +import com.alibaba.csp.sentinel.dashboard.domain.Result; import com.alibaba.csp.sentinel.dashboard.repository.rule.InMemoryRuleRepositoryAdapter; import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider; import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher; -import com.alibaba.csp.sentinel.dashboard.domain.Result; - +import com.alibaba.csp.sentinel.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.util.ObjectUtils; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; /** * 流控规则控制器 diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/SentinelConfig.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/SentinelConfig.java index de9450e0..7e1532c4 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/SentinelConfig.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/SentinelConfig.java @@ -15,24 +15,25 @@ */ package com.alibaba.csp.sentinel.dashboard.rule.nacos; -import java.util.List; -import java.util.Properties; - import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity; import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.GatewayFlowRuleEntity; -import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.*; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity; import com.alibaba.csp.sentinel.dashboard.rule.nacos.entity.AuthorityRuleCorrectEntity; import com.alibaba.csp.sentinel.dashboard.rule.nacos.entity.ParamFlowRuleCorrectEntity; +import com.alibaba.csp.sentinel.datasource.Converter; +import com.alibaba.fastjson.JSON; import com.alibaba.nacos.api.PropertyKeyConst; +import com.alibaba.nacos.api.config.ConfigFactory; +import com.alibaba.nacos.api.config.ConfigService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.alibaba.csp.sentinel.datasource.Converter; -import com.alibaba.fastjson.JSON; -import com.alibaba.nacos.api.config.ConfigFactory; -import com.alibaba.nacos.api.config.ConfigService; +import java.util.List; +import java.util.Properties; /** * sentinel配置类 diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/degrade/DegradeRuleNacosProvider.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/degrade/DegradeRuleNacosProvider.java index 6f425a20..e63e35a9 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/degrade/DegradeRuleNacosProvider.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/degrade/DegradeRuleNacosProvider.java @@ -3,7 +3,6 @@ package com.alibaba.csp.sentinel.dashboard.rule.nacos.degrade; import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants; import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity; import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider; -import com.alibaba.csp.sentinel.dashboard.rule.nacos.SentinelConfig; import com.alibaba.csp.sentinel.datasource.Converter; import com.alibaba.csp.sentinel.util.StringUtil; import com.alibaba.nacos.api.config.ConfigService; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/degrade/DegradeRuleNacosPublisher.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/degrade/DegradeRuleNacosPublisher.java index a0e844bd..52049f97 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/degrade/DegradeRuleNacosPublisher.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/degrade/DegradeRuleNacosPublisher.java @@ -3,7 +3,6 @@ package com.alibaba.csp.sentinel.dashboard.rule.nacos.degrade; import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants; import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity; import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher; -import com.alibaba.csp.sentinel.dashboard.rule.nacos.SentinelConfig; import com.alibaba.csp.sentinel.datasource.Converter; import com.alibaba.csp.sentinel.util.AssertUtil; import com.alibaba.nacos.api.config.ConfigService; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/flow/FlowRuleNacosProvider.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/flow/FlowRuleNacosProvider.java index 52876733..f0693b56 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/flow/FlowRuleNacosProvider.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/flow/FlowRuleNacosProvider.java @@ -15,19 +15,17 @@ */ package com.alibaba.csp.sentinel.dashboard.rule.nacos.flow; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants; -import com.alibaba.csp.sentinel.dashboard.rule.nacos.SentinelConfig; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider; import com.alibaba.csp.sentinel.datasource.Converter; import com.alibaba.csp.sentinel.util.StringUtil; import com.alibaba.nacos.api.config.ConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; /** * 流控规则拉取 diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/flow/FlowRuleNacosPublisher.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/flow/FlowRuleNacosPublisher.java index 87c23355..f5194eea 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/flow/FlowRuleNacosPublisher.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/flow/FlowRuleNacosPublisher.java @@ -15,18 +15,16 @@ */ package com.alibaba.csp.sentinel.dashboard.rule.nacos.flow; -import java.util.List; - import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants; -import com.alibaba.csp.sentinel.dashboard.rule.nacos.SentinelConfig; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity; import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher; import com.alibaba.csp.sentinel.datasource.Converter; import com.alibaba.csp.sentinel.util.AssertUtil; import com.alibaba.nacos.api.config.ConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.List; /** * 流控规则推送 diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/gateway/GateWayFlowRulesNacosProvider.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/gateway/GateWayFlowRulesNacosProvider.java index 5bbe7851..d49b8921 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/gateway/GateWayFlowRulesNacosProvider.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/gateway/GateWayFlowRulesNacosProvider.java @@ -3,7 +3,6 @@ package com.alibaba.csp.sentinel.dashboard.rule.nacos.gateway; import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants; import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.GatewayFlowRuleEntity; import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider; -import com.alibaba.csp.sentinel.dashboard.rule.nacos.SentinelConfig; import com.alibaba.csp.sentinel.datasource.Converter; import com.alibaba.csp.sentinel.util.StringUtil; import com.alibaba.nacos.api.config.ConfigService; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/gateway/GateWayFlowRulesNacosPublisher.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/gateway/GateWayFlowRulesNacosPublisher.java index 8b7defd8..379270af 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/gateway/GateWayFlowRulesNacosPublisher.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/gateway/GateWayFlowRulesNacosPublisher.java @@ -1,18 +1,16 @@ package com.alibaba.csp.sentinel.dashboard.rule.nacos.gateway; -import java.util.List; - import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants; -import com.alibaba.csp.sentinel.dashboard.rule.nacos.SentinelConfig; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.GatewayFlowRuleEntity; import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher; import com.alibaba.csp.sentinel.datasource.Converter; import com.alibaba.csp.sentinel.util.AssertUtil; import com.alibaba.nacos.api.config.ConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.List; /** * 网关流控规则推送 diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/paramflow/ParamFlowRuleNacosProvider.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/paramflow/ParamFlowRuleNacosProvider.java index 140d6362..4e39a9c9 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/paramflow/ParamFlowRuleNacosProvider.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/paramflow/ParamFlowRuleNacosProvider.java @@ -4,7 +4,6 @@ package com.alibaba.csp.sentinel.dashboard.rule.nacos.paramflow; import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants; import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity; import com.alibaba.csp.sentinel.dashboard.rule.DynamicRuleProvider; -import com.alibaba.csp.sentinel.dashboard.rule.nacos.SentinelConfig; import com.alibaba.csp.sentinel.dashboard.rule.nacos.entity.ParamFlowRuleCorrectEntity; import com.alibaba.csp.sentinel.datasource.Converter; import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRule; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/paramflow/ParamFlowRuleNacosPublisher.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/paramflow/ParamFlowRuleNacosPublisher.java index b00319b9..39084a45 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/paramflow/ParamFlowRuleNacosPublisher.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/paramflow/ParamFlowRuleNacosPublisher.java @@ -3,7 +3,6 @@ package com.alibaba.csp.sentinel.dashboard.rule.nacos.paramflow; import com.alibaba.csp.sentinel.dashboard.constants.SentinelConStants; import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity; import com.alibaba.csp.sentinel.dashboard.rule.DynamicRulePublisher; -import com.alibaba.csp.sentinel.dashboard.rule.nacos.SentinelConfig; import com.alibaba.csp.sentinel.dashboard.rule.nacos.entity.ParamFlowRuleCorrectEntity; import com.alibaba.csp.sentinel.datasource.Converter; import com.alibaba.csp.sentinel.util.AssertUtil; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/client/JeecgTestClient.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/client/JeecgTestClient.java index 340a9518..06aaffa3 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/client/JeecgTestClient.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/client/JeecgTestClient.java @@ -1,10 +1,7 @@ package org.jeecg.modules.test.feign.client; -import org.jeecg.common.api.vo.Result; - import org.jeecg.common.constant.ServiceNameConstants; import org.jeecg.config.FeignConfig; -import org.jeecg.modules.test.constant.CloudConstant; import org.jeecg.modules.test.feign.factory.JeecgTestClientFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.stereotype.Component; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/controller/JeecgTestFeignController.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/controller/JeecgTestFeignController.java index cc4d6752..72a44a27 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/controller/JeecgTestFeignController.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/controller/JeecgTestFeignController.java @@ -1,15 +1,18 @@ package org.jeecg.modules.test.feign.controller; +import com.alibaba.csp.sentinel.annotation.SentinelResource; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.test.feign.client.JeecgTestClient; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.alibaba.csp.sentinel.annotation.SentinelResource; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** * 微服务单元测试 diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/factory/JeecgTestClientFactory.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/factory/JeecgTestClientFactory.java index 9db19744..a5ac0646 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/factory/JeecgTestClientFactory.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/factory/JeecgTestClientFactory.java @@ -1,11 +1,9 @@ package org.jeecg.modules.test.feign.factory; - - -import org.springframework.cloud.openfeign.FallbackFactory; import org.jeecg.modules.test.feign.client.JeecgTestClient; import org.jeecg.modules.test.feign.fallback.JeecgTestFallback; +import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; /** diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/fallback/JeecgTestFallback.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/fallback/JeecgTestFallback.java index 62441cbc..f11642a9 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/fallback/JeecgTestFallback.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/fallback/JeecgTestFallback.java @@ -1,7 +1,5 @@ package org.jeecg.modules.test.feign.fallback; -import org.jeecg.common.api.vo.Result; - import lombok.Setter; import org.jeecg.modules.test.feign.client.JeecgTestClient; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/lock/DemoLockTest.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/lock/DemoLockTest.java index 68c8d999..d8d37f61 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/lock/DemoLockTest.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/lock/DemoLockTest.java @@ -8,8 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.util.Map; - /** * 分布式锁测试demo * @author: zyf diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/xxljob/DemoJobHandler.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/xxljob/DemoJobHandler.java index 840a9022..c8867853 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/xxljob/DemoJobHandler.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/xxljob/DemoJobHandler.java @@ -5,10 +5,10 @@ package org.jeecg.modules.test.xxljob; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.IJobHandler; import com.xxl.job.core.handler.annotation.XxlJob; -import com.xxl.job.core.log.XxlJobLogger; import com.xxl.job.core.util.ShardingUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; + import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.DataOutputStream; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/controller/JeecgMqTestController.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/controller/JeecgMqTestController.java index 25c699fa..a6c8dd46 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/controller/JeecgMqTestController.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/controller/JeecgMqTestController.java @@ -1,8 +1,9 @@ package org.jeecg.modules.test.rabbitmq.controller; -import javax.servlet.http.HttpServletRequest; - +import cn.hutool.core.util.RandomUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.jeecg.boot.starter.rabbitmq.client.RabbitMqClient; import org.jeecg.common.api.vo.Result; import org.jeecg.common.base.BaseMap; @@ -12,9 +13,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import cn.hutool.core.util.RandomUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import javax.servlet.http.HttpServletRequest; /** diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/event/DemoBusEvent.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/event/DemoBusEvent.java index ac2001ba..a867dfb9 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/event/DemoBusEvent.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/event/DemoBusEvent.java @@ -1,14 +1,13 @@ package org.jeecg.modules.test.rabbitmq.event; +import cn.hutool.core.util.ObjectUtil; +import lombok.extern.slf4j.Slf4j; import org.jeecg.boot.starter.rabbitmq.event.EventObj; import org.jeecg.boot.starter.rabbitmq.event.JeecgBusEventHandler; import org.jeecg.common.base.BaseMap; import org.jeecg.modules.test.rabbitmq.constant.CloudConstant; import org.springframework.stereotype.Component; -import cn.hutool.core.util.ObjectUtil; -import lombok.extern.slf4j.Slf4j; - /** * 消息处理器【发布订阅】 * @author: zyf diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloReceiver1.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloReceiver1.java index 77ff14ff..64eb2068 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloReceiver1.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloReceiver1.java @@ -1,5 +1,7 @@ package org.jeecg.modules.test.rabbitmq.listener; +import com.rabbitmq.client.Channel; +import lombok.extern.slf4j.Slf4j; import org.jeecg.boot.starter.rabbitmq.core.BaseRabbiMqHandler; import org.jeecg.boot.starter.rabbitmq.listenter.MqListener; import org.jeecg.common.annotation.RabbitComponent; @@ -12,10 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.handler.annotation.Header; import org.springframework.web.client.RestTemplate; -import com.rabbitmq.client.Channel; - -import lombok.extern.slf4j.Slf4j; - /** * 定义接收者（可以定义N个接受者，消息会均匀的发送到N个接收者中） * diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloTimeReceiver.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloTimeReceiver.java index 2404a924..fe004c2d 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloTimeReceiver.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloTimeReceiver.java @@ -1,5 +1,7 @@ package org.jeecg.modules.test.rabbitmq.listener; +import com.rabbitmq.client.Channel; +import lombok.extern.slf4j.Slf4j; import org.jeecg.boot.starter.rabbitmq.core.BaseRabbiMqHandler; import org.jeecg.boot.starter.rabbitmq.listenter.MqListener; import org.jeecg.common.annotation.RabbitComponent; @@ -10,10 +12,6 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.support.AmqpHeaders; import org.springframework.messaging.handler.annotation.Header; -import com.rabbitmq.client.Channel; - -import lombok.extern.slf4j.Slf4j; - /** * 定义接收者（可以定义N个接受者，消息会均匀的发送到N个接收者中） * @author: zyf diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/controller/SeataAccountController.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/controller/SeataAccountController.java index 2653a089..218dfed1 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/controller/SeataAccountController.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/controller/SeataAccountController.java @@ -1,6 +1,5 @@ package org.jeecg.modules.test.seata.account.controller; -import lombok.extern.slf4j.Slf4j; import org.jeecg.modules.test.seata.account.service.SeataAccountService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/service/impl/SeataAccountServiceImpl.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/service/impl/SeataAccountServiceImpl.java index d9127fe2..3ea4bc02 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/service/impl/SeataAccountServiceImpl.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/service/impl/SeataAccountServiceImpl.java @@ -3,7 +3,6 @@ package org.jeecg.modules.test.seata.account.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import lombok.extern.slf4j.Slf4j; - import org.jeecg.modules.test.seata.account.entity.SeataAccount; import org.jeecg.modules.test.seata.account.mapper.SeataAccountMapper; import org.jeecg.modules.test.seata.account.service.SeataAccountService; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/controller/SeataOrderController.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/controller/SeataOrderController.java index 04f983bb..e36f11da 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/controller/SeataOrderController.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/controller/SeataOrderController.java @@ -6,9 +6,9 @@ package org.jeecg.modules.test.seata.order.controller; * @date: 2022/01/24 * @version: V1.0 */ + import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; - import org.jeecg.modules.test.seata.order.dto.PlaceOrderRequest; import org.jeecg.modules.test.seata.order.service.SeataOrderService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/service/impl/SeataOrderServiceImpl.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/service/impl/SeataOrderServiceImpl.java index 48676cd5..3c3a77fc 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/service/impl/SeataOrderServiceImpl.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/service/impl/SeataOrderServiceImpl.java @@ -1,6 +1,6 @@ package org.jeecg.modules.test.seata.order.service.impl; -import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.dynamic.datasource.annotation.DS; import io.seata.spring.annotation.GlobalTransactional; import lombok.extern.slf4j.Slf4j; import org.jeecg.modules.test.seata.order.dto.PlaceOrderRequest; @@ -10,7 +10,6 @@ import org.jeecg.modules.test.seata.order.feign.AccountClient; import org.jeecg.modules.test.seata.order.feign.ProductClient; import org.jeecg.modules.test.seata.order.mapper.SeataOrderMapper; import org.jeecg.modules.test.seata.order.service.SeataOrderService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/service/impl/SeataProductServiceImpl.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/service/impl/SeataProductServiceImpl.java index f7b91f75..5a67132f 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/service/impl/SeataProductServiceImpl.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/service/impl/SeataProductServiceImpl.java @@ -2,8 +2,6 @@ package org.jeecg.modules.test.seata.product.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import lombok.extern.slf4j.Slf4j; - - import org.jeecg.modules.test.seata.product.entity.SeataProduct; import org.jeecg.modules.test.seata.product.mapper.SeataProductMapper; import org.jeecg.modules.test.seata.product.service.SeataProductService; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/controller/JeecgShardingDemoController.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/controller/JeecgShardingDemoController.java index ab4f70d0..c4499aad 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/controller/JeecgShardingDemoController.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/controller/JeecgShardingDemoController.java @@ -1,7 +1,9 @@ package org.jeecg.modules.test.sharding.controller; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; -import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.modules.test.sharding.entity.ShardingSysLog; import org.jeecg.modules.test.sharding.service.IShardingSysLogService; @@ -10,10 +12,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; - /** * @Description: 分库分表测试 * @author: zyf diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/entity/ShardingSysLog.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/entity/ShardingSysLog.java index c32cff2f..253fead0 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/entity/ShardingSysLog.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/entity/ShardingSysLog.java @@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; import org.jeecg.common.aspect.annotation.Dict; import org.springframework.format.annotation.DateTimeFormat; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java index 5b143532..6bc856fb 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java @@ -1,8 +1,8 @@ package com.xxl.job.admin.controller.resolver; import com.xxl.job.admin.core.exception.XxlJobException; -import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.admin.core.util.JacksonUtil; +import com.xxl.job.core.biz.model.ReturnT; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java index 4cd737d0..0e50c28a 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java @@ -19,16 +19,7 @@ package com.xxl.job.admin.core.cron; import java.io.Serializable; import java.text.ParseException; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Locale; -import java.util.Map; -import java.util.SortedSet; -import java.util.StringTokenizer; -import java.util.TimeZone; -import java.util.TreeSet; +import java.util.*; /** * Provides a parser and evaluator for unix-like cron expressions. Cron diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java index 868560fc..50fe5bd7 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java @@ -1,7 +1,7 @@ package com.xxl.job.admin.core.route.strategy; -import com.xxl.job.admin.core.scheduler.XxlJobScheduler; import com.xxl.job.admin.core.route.ExecutorRouter; +import com.xxl.job.admin.core.scheduler.XxlJobScheduler; import com.xxl.job.admin.core.util.I18nUtil; import com.xxl.job.core.biz.ExecutorBiz; import com.xxl.job.core.biz.model.IdleBeatParam; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java index a2e4c909..1b575028 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java @@ -1,7 +1,7 @@ package com.xxl.job.admin.core.route.strategy; -import com.xxl.job.admin.core.scheduler.XxlJobScheduler; import com.xxl.job.admin.core.route.ExecutorRouter; +import com.xxl.job.admin.core.scheduler.XxlJobScheduler; import com.xxl.job.admin.core.util.I18nUtil; import com.xxl.job.core.biz.ExecutorBiz; import com.xxl.job.core.biz.model.ReturnT; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/dao/XxlJobUserDao.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/dao/XxlJobUserDao.java index e8404947..78ba99f4 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/dao/XxlJobUserDao.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/dao/XxlJobUserDao.java @@ -3,6 +3,7 @@ package com.xxl.job.admin.dao; import com.xxl.job.admin.core.model.XxlJobUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; + import java.util.List; /** diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java index 526c43b3..85e04997 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java @@ -1,8 +1,8 @@ package com.xxl.job.admin.service.impl; +import com.xxl.job.admin.core.cron.CronExpression; import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.core.model.XxlJobInfo; -import com.xxl.job.admin.core.cron.CronExpression; import com.xxl.job.admin.core.model.XxlJobLogReport; import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum; import com.xxl.job.admin.core.thread.JobScheduleHelper; From 566e11aaf3a903d837d78889f8ee62940c766977 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Tue, 1 Aug 2023 10:48:22 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=BC=95=E5=85=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20redis=E7=BC=93=E5=AD=98=E5=B7=A5=E5=85=B7=E7=B1=BB=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/common/util/RedisStreamUtil.java | 3 +- .../mapper/AlarmContactGroupMapper.java | 3 +- .../jeecg/modules/mapper/AlarmRuleMapper.java | 4 +-- .../service/IAlarmContactGroupService.java | 11 +++--- .../modules/service/IAlarmRuleService.java | 8 ++--- .../impl/AlarmContactGroupServiceImpl.java | 35 ++++++++++--------- .../service/impl/AlarmRuleServiceImpl.java | 26 +++++++------- 7 files changed, 47 insertions(+), 43 deletions(-) rename {jeecg-boot-base-core => jeecg-module-abnormal-alarm}/src/main/java/org/jeecg/common/util/RedisStreamUtil.java (98%) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RedisStreamUtil.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/common/util/RedisStreamUtil.java similarity index 98% rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RedisStreamUtil.java rename to jeecg-module-abnormal-alarm/src/main/java/org/jeecg/common/util/RedisStreamUtil.java index 103eb1d0..18fdd99c 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RedisStreamUtil.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/common/util/RedisStreamUtil.java @@ -7,6 +7,7 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.modules.base.dto.RuleDto; import org.jeecg.modules.base.entity.postgre.AlarmRule; +import org.jeecg.modules.entity.AlarmRuleAbnormal; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.stream.*; @@ -166,7 +167,7 @@ public class RedisStreamUtil{ return putRecord(record); } - public void setRules(Map ruleMap){ + public void setRules(Map ruleMap){ Jackson2JsonRedisSerializer jacksonSerializer = new Jackson2JsonRedisSerializer(Object.class); ObjectMapper objectMapper = new ObjectMapper(); // 使Jackson支持Java8的新日期API diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMapper.java index 7a3ce705..90c728b8 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMapper.java @@ -2,6 +2,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.base.entity.postgre.AlarmContactGroup; +import org.jeecg.modules.entity.AlarmContactGroupAbnormal; -public interface AlarmContactGroupMapper extends BaseMapper { +public interface AlarmContactGroupMapper extends BaseMapper { } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmRuleMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmRuleMapper.java index f7c9d10d..494cbaaa 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmRuleMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmRuleMapper.java @@ -3,12 +3,12 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.base.dto.AlarmRuleDto; import org.jeecg.modules.base.dto.AlarmRuleInfo; -import org.jeecg.modules.base.entity.postgre.AlarmRule; +import org.jeecg.modules.entity.AlarmRuleAbnormal; import java.util.List; import java.util.Map; -public interface AlarmRuleMapper extends BaseMapper { +public interface AlarmRuleMapper extends BaseMapper { List findPage(Map params); diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java index e78f3b62..e03f62f4 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java @@ -4,20 +4,21 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.base.entity.postgre.AlarmContactGroup; +import org.jeecg.modules.entity.AlarmContactGroupAbnormal; -public interface IAlarmContactGroupService extends IService { +public interface IAlarmContactGroupService extends IService { - Result findPage(QueryRequest queryRequest, AlarmContactGroup alarmContactGroup); + Result findPage(QueryRequest queryRequest, AlarmContactGroupAbnormal alarmContactGroup); Result findInfo(String id); - Result create(AlarmContactGroup alarmContactGroup); + Result create(AlarmContactGroupAbnormal alarmContactGroup); - Result update(AlarmContactGroup alarmContactGroup); + Result update(AlarmContactGroupAbnormal alarmContactGroup); Result deleteById(String id); Result deleteUserById(String id, String userId); - AlarmContactGroup getByName(String groupName); + AlarmContactGroupAbnormal getByName(String groupName); } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmRuleService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmRuleService.java index 644bfbb9..fac1d2a2 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmRuleService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmRuleService.java @@ -2,18 +2,18 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.postgre.AlarmRule; import org.jeecg.modules.base.vo.AlarmRuleVo; +import org.jeecg.modules.entity.AlarmRuleAbnormal; -public interface IAlarmRuleService extends IService { +public interface IAlarmRuleService extends IService { Result findPage(AlarmRuleVo alarmRuleVo); Result findInfo(String alarmRuleId); - Result create(AlarmRule alarmRule); + Result create(AlarmRuleAbnormal alarmRule); - Result update(AlarmRule alarmRule); + Result update(AlarmRuleAbnormal alarmRule); Result deleteById(String alarmRuleId); diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java index 91a17797..83f7fd11 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java @@ -14,6 +14,7 @@ import org.jeecg.common.util.SpringContextUtils; import org.jeecg.modules.base.entity.postgre.AlarmContactGroup; import org.jeecg.modules.base.entity.postgre.AlarmContactGroupMember; import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.entity.AlarmContactGroupAbnormal; import org.jeecg.modules.feignclient.SystemClient; import org.jeecg.modules.mapper.AlarmContactGroupMapper; import org.jeecg.modules.mapper.AlarmContactGroupMemberMapper; @@ -30,7 +31,7 @@ import java.util.Objects; import java.util.stream.Collectors; @Service("alarmContactGroupService") -public class AlarmContactGroupServiceImpl extends ServiceImpl implements IAlarmContactGroupService { +public class AlarmContactGroupServiceImpl extends ServiceImpl implements IAlarmContactGroupService { @Autowired private AlarmContactGroupMemberMapper alarmContactGroupMemberMapper; @@ -38,14 +39,14 @@ public class AlarmContactGroupServiceImpl extends ServiceImpl userList = systemClient.findUserMap(); - Page page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.orderByDesc(AlarmContactGroup::getCreateTime); - Page alarmContactGroupPage = this.baseMapper.selectPage(page, queryWrapper); + Page page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.orderByDesc(AlarmContactGroupAbnormal::getCreateTime); + Page alarmContactGroupPage = this.baseMapper.selectPage(page, queryWrapper); LambdaQueryWrapper contactGroupMemberQueryWrapper = new LambdaQueryWrapper<>(); List alarmContactGroupMembers = alarmContactGroupMemberMapper.selectList(contactGroupMemberQueryWrapper); alarmContactGroupPage.getRecords().forEach(item->{ @@ -77,9 +78,9 @@ public class AlarmContactGroupServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(AlarmContactGroup::getId, id); - AlarmContactGroup alarmContactGroup = this.baseMapper.selectOne(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AlarmContactGroupAbnormal::getId, id); + AlarmContactGroupAbnormal alarmContactGroup = this.baseMapper.selectOne(queryWrapper); if (Objects.isNull(alarmContactGroup)){ result.error500("Failed to query the data because the corresponding data does not exist!"); return result; @@ -98,7 +99,7 @@ public class AlarmContactGroupServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(AlarmContactGroup::getId, alarmContactGroup.getId()); - AlarmContactGroup contactGroup = this.baseMapper.selectOne(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AlarmContactGroupAbnormal::getId, alarmContactGroup.getId()); + AlarmContactGroupAbnormal contactGroup = this.baseMapper.selectOne(queryWrapper); if (Objects.isNull(contactGroup)){ result.error500("The corresponding data does not exist!"); return result; @@ -205,9 +206,9 @@ public class AlarmContactGroupServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(AlarmContactGroup::getName,groupName); + public AlarmContactGroupAbnormal getByName(String groupName) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(AlarmContactGroupAbnormal::getName,groupName); return getOne(wrapper); } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmRuleServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmRuleServiceImpl.java index 575cc64f..3cf7b395 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmRuleServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmRuleServiceImpl.java @@ -15,8 +15,8 @@ import org.jeecg.modules.base.dto.AlarmRuleDto; import org.jeecg.modules.base.dto.AlarmRuleInfo; import org.jeecg.modules.base.dto.SourceDto; import org.jeecg.modules.base.entity.Rule; -import org.jeecg.modules.base.entity.postgre.AlarmRule; import org.jeecg.modules.base.vo.AlarmRuleVo; +import org.jeecg.modules.entity.AlarmRuleAbnormal; import org.jeecg.modules.mapper.AlarmRuleMapper; import org.jeecg.modules.service.IAlarmRuleService; import org.jeecg.modules.service.ISysDatabaseService; @@ -34,7 +34,7 @@ import java.util.Map; import static org.jeecg.modules.base.enums.SourceType.*; @Service("alarmRuleService") -public class AlarmRuleServiceImpl extends ServiceImpl implements IAlarmRuleService { +public class AlarmRuleServiceImpl extends ServiceImpl implements IAlarmRuleService { @Autowired private RedisStreamUtil redisStreamUtil; @@ -73,7 +73,7 @@ public class AlarmRuleServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(AlarmRule::getId, alarmRule.getId()); - AlarmRule alarmRuleOld = this.baseMapper.selectOne(wrapper); + public Result update(AlarmRuleAbnormal alarmRule) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(AlarmRuleAbnormal::getId, alarmRule.getId()); + AlarmRuleAbnormal alarmRuleOld = this.baseMapper.selectOne(wrapper); if (ObjectUtil.isNull(alarmRuleOld)){ return Result.error(Prompt.DATA_NOT_EXITS); } @@ -124,7 +124,7 @@ public class AlarmRuleServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(AlarmRule::getEnabled,1); - List alarmRules = this.list(wrapper); - Map ruleMap = new HashMap<>(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(AlarmRuleAbnormal::getEnabled,1); + List alarmRules = this.list(wrapper); + Map ruleMap = new HashMap<>(); Map silenceMap = new HashMap<>(); - for (AlarmRule alarmRule : alarmRules) { + for (AlarmRuleAbnormal alarmRule : alarmRules) { String sourceType = alarmRule.getSourceType(); String ruleId = alarmRule.getId(); Long silence = alarmRule.getSilenceCycle(); From aad350fe9cd77f97fea1cd9bf043e28958c2d081 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Tue, 1 Aug 2023 10:50:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=BC=95=E5=85=A5=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/controller/AlarmContactGroupController.java | 7 ++++--- .../org/jeecg/modules/controller/AlarmRuleController.java | 5 +++-- .../org/jeecg/modules/mapper/AlarmContactGroupMapper.java | 1 - .../jeecg/modules/service/IAlarmContactGroupService.java | 1 - 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java index 7953436c..ac649f40 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.base.entity.postgre.AlarmContactGroup; +import org.jeecg.modules.entity.AlarmContactGroupAbnormal; import org.jeecg.modules.service.IAlarmContactGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -19,7 +20,7 @@ public class AlarmContactGroupController { @GetMapping("findPage") @ApiOperation(value = "分页查询报警联系人组信息", notes = "分页查询报警联系人组信息") - public Result findPage(QueryRequest queryRequest, AlarmContactGroup alarmContactGroup){ + public Result findPage(QueryRequest queryRequest, AlarmContactGroupAbnormal alarmContactGroup){ return alarmContactGroupService.findPage(queryRequest, alarmContactGroup); } @@ -31,13 +32,13 @@ public class AlarmContactGroupController { @PostMapping("create") @ApiOperation(value = "新增报警人联系人组", notes = "新增报警联系人组") - public Result create(@RequestBody AlarmContactGroup alarmContactGroup){ + public Result create(@RequestBody AlarmContactGroupAbnormal alarmContactGroup){ return alarmContactGroupService.create(alarmContactGroup); } @PutMapping("update") @ApiOperation(value = "修改报警人联系人组", notes = "修改报警联系人组") - public Result update(@RequestBody AlarmContactGroup alarmContactGroup){ + public Result update(@RequestBody AlarmContactGroupAbnormal alarmContactGroup){ return alarmContactGroupService.update(alarmContactGroup); } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java index b85ac04a..d8d7361d 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java @@ -8,6 +8,7 @@ import org.jeecg.modules.base.entity.monitor.Host; import org.jeecg.modules.base.entity.monitor.Servers; import org.jeecg.modules.base.entity.postgre.AlarmRule; import org.jeecg.modules.base.vo.AlarmRuleVo; +import org.jeecg.modules.entity.AlarmRuleAbnormal; import org.jeecg.modules.feignclient.MonitorAlarm; import org.jeecg.modules.service.IAlarmRuleService; import org.springframework.beans.factory.annotation.Autowired; @@ -42,13 +43,13 @@ public class AlarmRuleController { @PostMapping("create") @ApiOperation(value = "新增规则信息", notes = "新增规则信息") - public Result create(@RequestBody AlarmRule alarmRule){ + public Result create(@RequestBody AlarmRuleAbnormal alarmRule){ return alarmRuleService.create(alarmRule); } @PutMapping("update") @ApiOperation(value = "修改规则信息", notes = "修改规则信息") - public Result update(@RequestBody AlarmRule alarmRule){ + public Result update(@RequestBody AlarmRuleAbnormal alarmRule){ return alarmRuleService.update(alarmRule); } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMapper.java index 90c728b8..f8262bc1 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMapper.java @@ -1,7 +1,6 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.base.entity.postgre.AlarmContactGroup; import org.jeecg.modules.entity.AlarmContactGroupAbnormal; public interface AlarmContactGroupMapper extends BaseMapper { diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java index e03f62f4..7dccbac5 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java @@ -3,7 +3,6 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.postgre.AlarmContactGroup; import org.jeecg.modules.entity.AlarmContactGroupAbnormal; public interface IAlarmContactGroupService extends IService {