* 用户表 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserAgent.java similarity index 98% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserAgent.java index f443f5d2..6f1fc4c2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserAgent.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserDepart.java similarity index 94% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserDepart.java index d370ddde..d0b22364 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserDepart.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStation.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserFocusStation.java similarity index 97% rename from jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStation.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserFocusStation.java index 5b012fa3..ba2f842a 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStation.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserFocusStation.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.entity; +package org.jeecg.modules.base.entity.postgre; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserRole.java similarity index 94% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserRole.java index b8145ee7..c09ad482 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserRole.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserTenant.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserTenant.java similarity index 97% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserTenant.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserTenant.java index d85931ea..ce3fc01a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserTenant.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserTenant.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.entity; +package org.jeecg.modules.base.entity.postgre; import java.io.Serializable; import java.util.Date; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsAnalyses.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalyses.java similarity index 98% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsAnalyses.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalyses.java index b0fbb7e0..0179d2ac 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsAnalyses.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalyses.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.rnauto; 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/GardsCalibration.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibration.java similarity index 98% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsCalibration.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibration.java index f3135876..53cfcf13 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsCalibration.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibration.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.rnauto; 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/GardsCalibrationPairs.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibrationPairs.java similarity index 97% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsCalibrationPairs.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibrationPairs.java index 99ee09c7..cb72fc57 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsCalibrationPairs.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsCalibrationPairs.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.rnauto; 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/GardsNuclIded.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclIded.java similarity index 98% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsNuclIded.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclIded.java index 4abb82e1..488b60f0 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsNuclIded.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclIded.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.rnauto; 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/GardsNuclLinesIded.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclLinesIded.java similarity index 98% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsNuclLinesIded.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclLinesIded.java index 4c641450..1e7d495e 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsNuclLinesIded.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclLinesIded.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.rnauto; 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/GardsPeaks.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsPeaks.java similarity index 98% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsPeaks.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsPeaks.java index 60c8a35b..a2d4fcac 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsPeaks.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsPeaks.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.rnauto; 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/GardsRoiChannels.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiChannels.java similarity index 96% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsRoiChannels.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiChannels.java index 8690269e..0759427f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsRoiChannels.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiChannels.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.rnauto; 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/GardsRoiResults.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiResults.java similarity index 97% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsRoiResults.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiResults.java index 64bdd4ba..98b69836 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsRoiResults.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsRoiResults.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.rnauto; 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/GardsXeResults.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsXeResults.java similarity index 96% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsXeResults.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsXeResults.java index 035eced5..4be801db 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsXeResults.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsXeResults.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.entity; +package org.jeecg.modules.base.entity.rnauto; 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/rnman/GardsAnalyses.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsAnalyses.java new file mode 100644 index 00000000..e2659fb9 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsAnalyses.java @@ -0,0 +1,147 @@ +package org.jeecg.modules.base.entity.rnman; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * gards_analyses数据表存储谱数据分析的基本信息，包括: + * 谱数据到达的时间、分析开始和结束时间、分析员姓名、使用的软件、谱分析使用的参数（基线类型、寻峰方式、核素识别方法）等 + */ +@Data +@TableName("RNMAN.GARDS_ANALYSES") +public class GardsAnalyses implements Serializable { + + /** + * 分析ID号 + */ + @TableField(value = "IDANALYSIS") + private Integer idAnalysis; + /** + * 样品id + */ + @TableField(value = "SAMPLE_ID") + private Integer sampleId; + /** + * 分析开始时间 + */ + @TableField(value = "ANALYSISBEGIN") + private Data analysisBegin; + /** + * 分析结束时间 + */ + @TableField(value = "ANALYSISEND") + private Data analysisEnd; + /** + * Reviewed:交互,auto:自动 + */ + @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 Float totalCounts; + /** + * 分级结果 + */ + @TableField(value = "CATEGORY") + private Integer category; + /** + * 注释 + */ + @TableField(value = "COMMENTS") + private String comments; + + @TableField(value = "MODDATE") + private Long 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-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 new file mode 100644 index 00000000..fe33854f --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsCalibration.java @@ -0,0 +1,109 @@ +package org.jeecg.modules.base.entity.rnman; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 存储数据分析过程中能量、分辨率和效率刻度的拟合结果。 + */ +@Data +@TableName("RNMAN.GARDS_CALIBRATION") +public class GardsCalibration implements Serializable { + + /** + * 样品id + */ + @TableField(value = "SAMPLE_ID") + private Integer sampleId; + /** + * 分析ID号 + */ + @TableField(value = "IDANALYSIS") + private Integer idAnalysis; + /** + * G：gamma探测器的数据，#g_；B：beta探测器的数据,#b_ + */ + @TableField(value = "SAMPLE_TYPE") + private String sampleType; + /** + * energy：能量刻度； + * efficiency：效率刻度； + * Resolution：分辨率刻度 + */ + @TableField(value = "CALTYPE") + private String calType; + /** + * 拟合方程ID号（统一定义） + */ + @TableField(value = "FUNCTION") + private Integer function; + /** + * 拟合方程描述 + */ + @TableField(value = "FUNCTIONDEF") + private String functionDef; + /** + * 拟合的起始值 + */ + @TableField(value = "STARTOFRANGE") + private Integer startOfRange; + /** + * 拟合的结束值 + */ + @TableField(value = "ENDOFRANGE") + private Integer endOfRange; + /** + * 拟合系数1 + */ + @TableField(value = "COEFF1") + private Double coeff1; + /** + * 拟合系数2 + */ + @TableField(value = "COEFF2") + private Double coeff2; + /** + * 拟合系数3 + */ + @TableField(value = "COEFF3") + private Double coeff3; + /** + * 拟合系数4 + */ + @TableField(value = "COEFF4") + private Double coeff4; + /** + * 拟合系数5 + */ + @TableField(value = "COEFF5") + private Double coeff5; + /** + * 拟合系数6 + */ + @TableField(value = "COEFF6") + private Double coeff6; + /** + * 拟合系数7 + */ + @TableField(value = "COEFF7") + private Double coeff7; + /** + * 拟合系数8 + */ + @TableField(value = "COEFF8") + private Double coeff8; + /** + * 拟合系数9 + */ + @TableField(value = "COEFF9") + private Double coeff9; + + @TableField(value = "MODDATE") + private Long 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 new file mode 100644 index 00000000..b0a0e8e0 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsCalibrationPairs.java @@ -0,0 +1,65 @@ +package org.jeecg.modules.base.entity.rnman; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 存储数据分析过程中能量、分辨率和效率刻度实际使用的刻度点数据。 + */ +@Data +@TableName("RNMAN.GARDS_CALIBRATION_PAIRS") +public class GardsCalibrationPairs implements Serializable { + + /** + * 样品id + */ + @TableField(value = "SAMPLE_ID") + private Integer sampleId; + /** + * 分析ID号 + */ + @TableField(value = "IDANALYSIS") + private Integer idAnalysis; + /** + * 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; + + @TableField(value = "XVALUE") + private Double xValue; + + @TableField(value = "YVALUE") + private Double yValue; + + @TableField(value = "DECAY_MODE") + private String decayMode; + /** + * y值不确定度 + */ + @TableField(value = "UNCYVALUE") + private String uncYValue; + + @TableField(value = "MODDATE") + private Long 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 new file mode 100644 index 00000000..f1ea507c --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsNuclIded.java @@ -0,0 +1,112 @@ +package org.jeecg.modules.base.entity.rnman; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 存储gamma谱中识别到的核素计算结果。 + */ +@Data +@TableName("RNMAN.GARDS_NUCL_IDED") +public class GardsNuclIded implements Serializable { + + /** + * 样品id + */ + @TableField(value = "SAMPLE_ID") + private Integer sampleId; + /** + * 分析ID号 + */ + @TableField(value = "IDANALYSIS") + private Integer idAnalysis; + /** + * 核素名称 + */ + @TableField(value = "NUCLIDE_NAME") + private String nuclideName; + /** + * 核素类型 + */ + @TableField(value = "TYPE") + private String type; + /** + * 核素半衰期 + */ + @TableField(value = "HALFLIFE") + private String halflife; + /** + * 平均活度值 + */ + @TableField(value = "AVE_ACTIV") + private String aveActiv; + /** + * 平均活度值不确定度 + */ + @TableField(value = "AVE_ACTIV_ERR") + private Double aveActivErr; + /** + * 主射线活度值 + */ + @TableField(value = "ACTIV_KEY") + private Double activKey; + /** + * 主射线活度值不确定度 + */ + @TableField(value = "ACTIV_KEY_ERR") + private Double activKeyErr; + /** + * 核素的最小可探测活度 + */ + @TableField(value = "MDA") + private String mda; + /** + * 核素的最小可探测活度不确定度 + */ + @TableField(value = "MDA_ERR") + private Double mdaErr; + /** + * 核素识别标志 + */ + @TableField(value = "NID_FLAG") + private Integer nidFlag; + + @TableField(value = "ACTIV_DECAY") + private Double activDecay; + + @TableField(value = "ACTIV_DECAY_ERR") + private Double activDecayErr; + /** + * 符合相加校正因子（无设为1） + */ + @TableField(value = "CSC_RATIO") + private Double cscRatio; + /** + * 符合相加校正因子不确定度（无设为0） + */ + @TableField(value = "CSC_RATIO_ERR") + private Double cscRatioErr; + /** + * 活度是否经过符合相加校正 + */ + @TableField(value = "CSC_MOD_FLAG") + private Integer cscModFlag; + + @TableField(value = "MODDATE") + private Long moddate; + + @TableField(value = "MDC") + private String mdc; + + @TableField(value = "CONCENTRATION") + private String concentration; + + @TableField(value = "KEY_ENERGY") + private String keyEnergy; + + @TableField(value = "KEY_YIELD") + private String keyYield; +} 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 new file mode 100644 index 00000000..6e3a1ae9 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsNuclLinesIded.java @@ -0,0 +1,106 @@ +package org.jeecg.modules.base.entity.rnman; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 存储gamma谱中识别到的峰计算结果。 + */ +@Data +@TableName("RNMAN.GARDS_NUCL_LINES_IDED") +public class GardsNuclLinesIded implements Serializable { + + /** + * 样品id + */ + @TableField(value = "SAMPLE_ID") + private Integer sampleId; + /** + * 峰序号 + */ + @TableField(value = "IDPEAK") + private Integer idPeak; + /** + * 分析ID号 + */ + @TableField(value = "IDANALYSIS") + private Integer idAnalysis; + + /** + * 核素名称 + */ + @TableField(value = "NUCLIDE_NAME") + private String nuclideName; + + @TableField(value = "MODDATE") + private Long moddate; + + /** + * 核素库中核素对应峰的能量（keV） + */ + @TableField(value = "ENERGY") + private Double energy; + /** + * 核素库中核素对应峰的能量不确定度（keV） + */ + @TableField(value = "UNCENERGY") + private Double uncEnergy; + /** + * 核素库中核素对应峰的发射几率 + */ + @TableField(value = "ABUNDANCE") + private Double abundance; + /** + * 核素库中核素对应峰的发射几率不确定度 + */ + @TableField(value = "UNCABUNDANCE") + private Double uncAbundance; + /** + * 利用该峰计算得到的活度 + */ + @TableField(value = "ACTIVITY") + private String activity; + /** + * 利用该峰计算得到的活度不确定度 + */ + @TableField(value = "UNCACTIVITY") + private Double uncActivity; + /** + * 该峰处的探测效率 + */ + @TableField(value = "EFFIC") + private Double effic; + /** + * 该峰处的探测效率不确定度 + */ + @TableField(value = "UNEFFIC") + private Double uncEffic; + /** + * 利用该峰计算得到的最小可探测活度 + */ + @TableField(value = "MDA") + private Double mda; + /** + * 主射线标识：0－否；1－是 + */ + @TableField(value = "KEY_FLAG") + private Double keyFlag; + /** + * 符合相加校正因子（无设为1） + */ + @TableField(value = "CSC_RATIO") + private Double cscRatio; + /** + * 符合相加校正因子不确定度（无设为0） + */ + @TableField(value = "CSC_RATIO_ERR") + private Double cscRatioErr; + /** + * 活度是否经过符合相加校正 + */ + @TableField(value = "CSC_MOD_FLAG") + private Double cscModFlag; +} 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 new file mode 100644 index 00000000..44fe946e --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsPeaks.java @@ -0,0 +1,156 @@ +package org.jeecg.modules.base.entity.rnman; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +/** + * 存储gamma谱的寻峰结果 + */ +@Data +@TableName("RNMAN.GARDS_PEAKS") +public class GardsPeaks implements Serializable { + + /** + * 样品id + */ + @TableField(value = "SAMPLE_ID") + private Integer sampleId; + /** + * 峰序号 + */ + @TableField(value = "IDPEAK") + private Integer idPeak; + /** + * 分析ID号 + */ + @TableField(value = "IDANALYSIS") + private Integer idAnalysis; + + @TableField(value = "MODDATE") + private Long moddate; + + /** + * 峰中心道（道址） + */ + @TableField(value = "CENTROIDCHANNEL") + private Double centroidChannel; + /** + * 峰中心道不确定度（道址） + */ + @TableField(value = "UNCCENTROIDCHANNEL") + private Double uncCentroidChannel; + /** + * 峰中心道能量（keV） + */ + @TableField(value = "ENERGY") + private Double energy; + /** + * 峰中心道能量不确定度（keV） + */ + @TableField(value = "UNCENERGY") + private Double uncEnergy; + /** + * 峰面积（计数）。已扣除基线面积，但未扣除空白样品计数和探测器本底计数 + */ + @TableField(value = "AREA") + private Double area; + /** + * 峰面积不确定度（计数） + */ + @TableField(value = "UNCAREA") + private Double uncArea; + /** + * 峰的净计数率（1/s）=峰面积/活时间 + */ + @TableField(value = "NETCOUNTRATE") + private Double netCountRate; + /** + * 峰的净计数率的不确定度（1/s） + */ + @TableField(value = "UNCNETCOUNTRATE") + private Double uncNetCountRate; + /** + * 测量系统在峰能量处的绝对效率 + */ + @TableField(value = "EFFICIENCY") + private Double efficiency; + /** + * 测量系统在峰能量处的绝对效率的不确定度 + */ + @TableField(value = "UNCEFFICIENCY") + private Double uncefficiency; + /** + * 峰的半高宽（道） + */ + @TableField(value = "FWHM") + private Double fwhm; + /** + * 峰的十分之一高宽（道） + */ + @TableField(value = "FWTM") + private Double fwtm; + /** + * 峰的重要性因子 + */ + @TableField(value = "SIGNIFICANCE") + private Double significance; + /** + * 峰的可探测线Lc + */ + @TableField(value = "LC") + private Double lc; + /** + * 峰的感兴趣区的起始道 + */ + @TableField(value = "ROISTART") + private Double roiStart; + /** + * 峰的感兴趣区的结束道 + */ + @TableField(value = "ROIEND") + private Double roiEnd; + + @TableField(value = "MULTIINDEX") + private Double mulitiIndex; + + @TableField(value = "TAIL") + private Double tail; + + @TableField(value = "TAILALPHA") + private Double tailAlpha; + + @TableField(value = "UPPERTAIL") + private Double upperTail; + + @TableField(value = "UPPERTAILALPHA") + private Double upperTailAlpha; + + @TableField(value = "BWWIDTHCHAN") + private Double bwwidthchan; + + @TableField(value = "RECOILDELTACHAN") + private Double recoildeltachan; + + @TableField(value = "STEPRAIO") + private Double stepraio; + + @TableField(value = "LD") + private Double ld; + + @TableField(value = "SENSITIVITY") + private Double sensitivity; + + @TableField(value = "BACKGROUNDAREA") + private Double backgroundarea; + + @TableField(value = "MEANBACKCOUNT") + private Double meanbackcount; + + @TableField(value = "RECOILBETACHAN") + private Double recoilbetachan; + + @TableField(value = "PEAKCOMMENTS") + private String peakcomments; +} 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 new file mode 100644 index 00000000..ea668cc5 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsRoiChannels.java @@ -0,0 +1,54 @@ +package org.jeecg.modules.base.entity.rnman; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 存储β-γ符合谱中感兴趣区道址边界数据。 + */ +@Data +@TableName("RNMAN.GARDS_ROI_CHANNELS") +public class GardsRoiChannels implements Serializable { + + /** + * 样品id + */ + @TableField(value = "SAMPLE_ID") + private Integer sampleId; + /** + * 感兴趣区ID号 + */ + @TableField(value = "ROI") + private Integer roi; + /** + * 分析ID号 + */ + @TableField(value = "IDANALYSIS") + private Integer idAnalysis; + /** + * 感兴趣区的β能量起始值 + */ + @TableField(value = "B_CHAN_START") + private Integer bChanStart; + /** + * 感兴趣区的β能量结束值 + */ + @TableField(value = "B_CHAN_STOP") + private Integer bChanStop; + /** + * 感兴趣区的γ能量起始值 + */ + @TableField(value = "G_CHAN_START") + private Integer gChanStart; + /** + * 感兴趣区的γ能量结束值 + */ + @TableField(value = "G_CHAN_STOP") + private Integer gChanStop; + + @TableField(value = "MODDATE") + private Long 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 new file mode 100644 index 00000000..d343bab4 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsRoiResults.java @@ -0,0 +1,94 @@ +package org.jeecg.modules.base.entity.rnman; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 存储β-γ符合谱中分析过程中的有关感兴趣区（ROI）计算的中间结果。 + */ +@Data +@TableName("RNMAN.GARDS_ROI_RESULTS") +public class GardsRoiResults implements Serializable { + + /** + * 样品id + */ + @TableField(value = "SAMPLE_ID") + private Integer sampleId; + /** + * 感兴趣区ID号 + */ + @TableField(value = "ROI") + private Integer roi; + /** + * 分析ID号 + */ + @TableField(value = "IDANALYSIS") + private Integer idAnalysis; + /** + * 样品谱感兴趣区总计数 + */ + @TableField(value = "S_GROSS") + private Double sGross; + /** + * 气体本底谱感兴趣区总计数 + */ + @TableField(value = "G_GROSS") + private Double gGross; + /** + * 探测器本底谱感兴趣区总计数 + */ + @TableField(value = "B_GROSS") + private Double bGross; + /** + * 样品谱感兴趣区净计数 + */ + @TableField(value = "S_NET") + private Double sNet; + /** + * 气体本底谱感兴趣区净计数 + */ + @TableField(value = "G_NET") + private Double gNet; + /** + * 感兴趣区净计数 + */ + @TableField(value = "NET") + private Double net; + /** + * 感兴趣区净计数不确定度 + */ + @TableField(value = "NET_ERR") + private Double netErr; + /** + * 感兴趣区活度浓度 + */ + @TableField(value = "CONC") + private Double conc; + /** + * 感兴趣区活度浓度不确定度 + */ + @TableField(value = "CONC_ERR") + private Double concErr; + /** + * 感兴趣区LC + */ + @TableField(value = "LC") + private Double lc; + /** + * 感兴趣区MDC + */ + @TableField(value = "MDC") + private Double mdc; + /** + * 感兴趣区识别标示；1：识别到，0，未识别到 + */ + @TableField(value = "NID_FLAG") + private Integer nidFlag; + + @TableField(value = "MODDATE") + private Long 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 new file mode 100644 index 00000000..7bb1e891 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsXeResults.java @@ -0,0 +1,59 @@ +package org.jeecg.modules.base.entity.rnman; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 存储β-γ符合谱最终分析结果。 + */ +@Data +@TableName("RNMAN.GARDS_XE_RESULTS") +public class GardsXeResults implements Serializable { + + /** + * 样品id + */ + @TableField(value = "SAMPLE_ID") + private Integer sampleId; + /** + * 分析ID号 + */ + @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; + /** + * 感兴趣区MDC + */ + @TableField(value = "MDC") + private Double mdc; + /** + * 感兴趣区LC + */ + @TableField(value = "LC") + private Double lc; + /** + * 感兴趣区识别标示；1：识别到，0，未识别到 + */ + @TableField(value = "NID_FLAG") + private Integer nidFlag; + + @TableField(value = "MODDATE") + private Long moddate; +} 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 267bd125..7953436c 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 @@ -4,7 +4,7 @@ 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.entity.AlarmContactGroup; +import org.jeecg.modules.base.entity.postgre.AlarmContactGroup; import org.jeecg.modules.service.IAlarmContactGroupService; 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/AlarmContactGroupMemberController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupMemberController.java index 9fe3ac6f..28984010 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 @@ -1,12 +1,8 @@ package org.jeecg.modules.controller; 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.entity.AlarmContactGroup; import org.jeecg.modules.service.IAlarmContactGroupMemberService; -import org.jeecg.modules.service.IAlarmContactGroupService; 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/AlarmItemController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmItemController.java index 4eb3fe0f..288b9439 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 @@ -1,23 +1,11 @@ package org.jeecg.modules.controller; -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.AlarmItem; +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.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; @Api(value = "监控项管理",tags = "监控项管理") @RestController diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmLogController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmLogController.java index f9b95337..585b009e 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmLogController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmLogController.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.AlarmLog; +import org.jeecg.modules.base.entity.postgre.AlarmLog; import org.jeecg.modules.service.IAlarmLogService; import org.jeecg.modules.vo.AlarmVo; import org.springframework.beans.factory.annotation.Autowired; 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 4b181954..fdd6ba45 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,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.AlarmRule; +import org.jeecg.modules.base.entity.postgre.AlarmRule; import org.jeecg.modules.base.entity.monitor.Host; import org.jeecg.modules.base.entity.monitor.Servers; import org.jeecg.modules.base.vo.AlarmRuleVo; 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 8de5971f..15272da2 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 @@ -6,7 +6,7 @@ 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.entity.SysDatabase; +import org.jeecg.modules.base.entity.postgre.SysDatabase; 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 382bae57..d0245ff6 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,15 +4,13 @@ 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.SysEmail; +import org.jeecg.modules.base.entity.postgre.SysEmail; import org.jeecg.modules.base.dto.SourceDto; import org.jeecg.modules.base.vo.SourceVo; import org.jeecg.modules.service.ISysEmailService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; -import java.util.Date; import java.util.List; @RestController 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 ca6f3488..688352e4 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 @@ -6,13 +6,11 @@ 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.entity.SysServer; +import org.jeecg.modules.base.entity.postgre.SysServer; import org.jeecg.modules.service.ISysServerService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; -import java.util.Date; import java.util.List; @RestController diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysUser.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysUser.java deleted file mode 100644 index 3db925de..00000000 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysUser.java +++ /dev/null @@ -1,208 +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.TableLogic; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonProperty; -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 org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -/** - *
- * 用户表 - *
- * 角色表 - *
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java index b50832e3..d16f46e8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java @@ -1,6 +1,6 @@ package org.jeecg.modules.system.model; -import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.base.entity.postgre.SysDepart; import java.io.Serializable; import java.util.ArrayList; 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 fb7983ab..d5dd5f74 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 @@ -3,7 +3,7 @@ package org.jeecg.modules.system.model; import java.io.Serializable; import java.util.Date; -import org.jeecg.modules.system.entity.SysDict; +import org.jeecg.modules.base.entity.postgre.SysDict; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; 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 be9b16bc..9eae1f27 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 @@ -4,7 +4,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.jeecg.modules.system.entity.SysPermission; +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/SysUserSysDepartModel.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysUserSysDepartModel.java index 65c0ddd7..50b29b32 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysUserSysDepartModel.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysUserSysDepartModel.java @@ -1,8 +1,6 @@ package org.jeecg.modules.system.model; import lombok.Data; -import org.jeecg.modules.system.entity.SysDepart; -import org.jeecg.modules.system.entity.SysUser; /** * 包含 SysUser 和 SysDepart 的 Model 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 c2da973a..c7172272 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 @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jeecg.modules.system.entity.SysPermission; +import org.jeecg.modules.base.entity.postgre.SysPermission; /** * 树形列表用到 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java index dff63ae0..4621ed7a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java @@ -7,7 +7,7 @@ import org.jeecg.common.handler.IFillRuleHandler; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.YouBianCodeUtil; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysCategory; +import org.jeecg.modules.base.entity.postgre.SysCategory; import org.jeecg.modules.system.mapper.SysCategoryMapper; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.java index 56c028fa..f268810a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.java @@ -8,7 +8,7 @@ import io.netty.util.internal.StringUtil; import org.jeecg.common.handler.IFillRuleHandler; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.YouBianCodeUtil; -import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.base.entity.postgre.SysDepart; import org.jeecg.modules.system.service.ISysDepartService; import java.util.ArrayList; 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 403102b9..d40e3881 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,7 +4,7 @@ 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.system.entity.GardsDetectors; +import org.jeecg.modules.base.entity.configuration.GardsDetectors; 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/IGardsNuclearfacilityService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsNuclearfacilityService.java index e009ae4b..1b563e61 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsNuclearfacilityService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsNuclearfacilityService.java @@ -4,7 +4,7 @@ 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.system.entity.GardsNuclearfacility; +import org.jeecg.modules.base.entity.configuration.GardsNuclearfacility; import java.util.List; 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 d4027b5f..0ace27f6 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,7 +4,7 @@ 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.GardsSampleData; +import org.jeecg.modules.base.entity.original.GardsSampleData; public interface IGardsSampleDataService extends IService { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsStationsService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsStationsService.java index b5f0bfb0..5423113b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsStationsService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsStationsService.java @@ -4,7 +4,7 @@ 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.system.entity.GardsStations; +import org.jeecg.modules.base.entity.configuration.GardsStations; import java.util.List; 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 a846d232..c290ce29 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 @@ -2,7 +2,7 @@ package org.jeecg.modules.system.service; import java.util.List; -import org.jeecg.modules.system.entity.SysAnnouncementSend; +import org.jeecg.modules.base.entity.postgre.SysAnnouncementSend; import org.jeecg.modules.system.model.AnnouncementSendModel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java index bf0ea45f..9e38b0b3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysAnnouncement; +import org.jeecg.modules.base.entity.postgre.SysAnnouncement; import java.util.Date; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCategoryService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCategoryService.java index 6c8b3015..fc995ba1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCategoryService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCategoryService.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.exception.JeecgBootException; -import org.jeecg.modules.system.entity.SysCategory; +import org.jeecg.modules.base.entity.postgre.SysCategory; import org.jeecg.modules.system.model.TreeSelectModel; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCheckRuleService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCheckRuleService.java index c0871de2..657aad3a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCheckRuleService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCheckRuleService.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysCheckRule; +import org.jeecg.modules.base.entity.postgre.SysCheckRule; /** * @Description: 编码校验规则 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCommentService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCommentService.java index 3e4e686d..09a5830a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCommentService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCommentService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysComment; +import org.jeecg.modules.base.entity.postgre.SysComment; import org.jeecg.modules.system.vo.SysCommentFileVo; import org.jeecg.modules.system.vo.SysCommentVO; 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 3886fc5c..74b46ad9 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,6 +1,6 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysDataLog; +import org.jeecg.modules.base.entity.postgre.SysDataLog; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataSourceService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataSourceService.java index eab243c7..26e28aba 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataSourceService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataSourceService.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.system.entity.SysDataSource; +import org.jeecg.modules.base.entity.postgre.SysDataSource; /** * @Description: 多数据源管理 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 08ff1be3..05a51a8b 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,8 +1,8 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysDepartPermission; +import org.jeecg.modules.base.entity.postgre.SysDepartPermission; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysPermissionDataRule; +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 29c488a6..18c4c219 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,6 +1,6 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysDepartRolePermission; +import org.jeecg.modules.base.entity.postgre.SysDepartRolePermission; import com.baomidou.mybatisplus.extension.service.IService; /** 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 a8568f97..619b19a5 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,6 +1,6 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysDepartRole; +import org.jeecg.modules.base.entity.postgre.SysDepartRole; 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/ISysDepartRoleUserService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleUserService.java index 2c5ca6ff..c47fa471 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,6 +1,6 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysDepartRoleUser; +import org.jeecg.modules.base.entity.postgre.SysDepartRoleUser; 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/ISysDepartService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java index 6973dd33..fecb8297 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java @@ -4,11 +4,10 @@ import com.alibaba.fastjson.JSONObject; 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.system.entity.SysDepart; +import org.jeecg.modules.base.entity.postgre.SysDepart; import org.jeecg.modules.system.model.DepartIdModel; import org.jeecg.modules.system.model.SysDepartTreeModel; -import javax.servlet.http.HttpServletRequest; 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 913945a6..7e005aa9 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,6 +1,6 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysDictItem; +import org.jeecg.modules.base.entity.postgre.SysDictItem; 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/ISysDictService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java index 6a03dfd8..69feb2b1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java @@ -3,10 +3,10 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.system.vo.DictModel; import org.jeecg.common.system.vo.DictQuery; +import org.jeecg.modules.base.entity.configuration.GardsStations; +import org.jeecg.modules.base.entity.postgre.SysDict; +import org.jeecg.modules.base.entity.postgre.SysDictItem; import org.jeecg.modules.system.dto.DatabaseTypeDto; -import org.jeecg.modules.system.entity.GardsStations; -import org.jeecg.modules.system.entity.SysDict; -import org.jeecg.modules.system.entity.SysDictItem; import org.jeecg.modules.system.model.TreeSelectModel; import org.jeecg.modules.system.vo.lowapp.SysDictVo; @@ -279,5 +279,4 @@ public interface ISysDictService extends IService { List findStationListByMenuName(String menuName); - List dataBaseType(); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFilesService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFilesService.java index 1bcb7ead..edaeebce 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFilesService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFilesService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysFiles; +import org.jeecg.modules.base.entity.postgre.SysFiles; /** * @Description: 知识库-文档管理 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFillRuleService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFillRuleService.java index 5afcd1a1..399b592d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFillRuleService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFillRuleService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysFillRule; +import org.jeecg.modules.base.entity.postgre.SysFillRule; /** * @Description: 填值规则 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFormFileService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFormFileService.java index 2a2e4f97..be22c2f9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFormFileService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFormFileService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysFormFile; +import org.jeecg.modules.base.entity.postgre.SysFormFile; /** * @Description: 表单评论文件 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysGatewayRouteService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysGatewayRouteService.java index 51eec857..bd7cb63a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysGatewayRouteService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysGatewayRouteService.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysGatewayRoute; +import org.jeecg.modules.base.entity.postgre.SysGatewayRoute; /** * @Description: gateway路由管理 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 2d7238db..f421b8b5 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 @@ -4,7 +4,7 @@ import java.util.Date; import java.util.List; import java.util.Map; -import org.jeecg.modules.system.entity.SysLog; +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 18f74779..ee844706 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,6 +1,6 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysPackPermission; +import org.jeecg.modules.base.entity.postgre.SysPackPermission; import com.baomidou.mybatisplus.extension.service.IService; /** 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 3e0a5d08..e2c1ca14 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 @@ -2,7 +2,7 @@ package org.jeecg.modules.system.service; import java.util.List; -import org.jeecg.modules.system.entity.SysPermissionDataRule; +import org.jeecg.modules.base.entity.postgre.SysPermissionDataRule; import com.baomidou.mybatisplus.extension.service.IService; 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 ae8650a0..7729547e 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 @@ -2,9 +2,8 @@ package org.jeecg.modules.system.service; import java.util.List; -import org.apache.ibatis.annotations.Param; import org.jeecg.common.exception.JeecgBootException; -import org.jeecg.modules.system.entity.SysPermission; +import org.jeecg.modules.base.entity.postgre.SysPermission; import org.jeecg.modules.system.model.TreeModel; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPositionService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPositionService.java index 1421f464..47aa8b5a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPositionService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPositionService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysPosition; +import org.jeecg.modules.base.entity.postgre.SysPosition; /** * @Description: 职务表 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 328f67c9..3b2fd053 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,6 +1,6 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysRoleIndex; +import org.jeecg.modules.base.entity.postgre.SysRoleIndex; import com.baomidou.mybatisplus.extension.service.IService; /** 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 80d91a0d..0f376aad 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,6 +1,6 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysRolePermission; +import org.jeecg.modules.base.entity.postgre.SysRolePermission; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java index e89f21ca..9f413d99 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleService.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.system.entity.SysRole; +import org.jeecg.modules.base.entity.postgre.SysRole; import org.jeecgframework.poi.excel.entity.ImportParams; import org.springframework.web.multipart.MultipartFile; 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 597b57f1..f61e4d18 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,16 +2,14 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.system.entity.SysTask; +import org.jeecg.modules.base.entity.postgre.SysTask; import org.jeecg.modules.system.entity.vo.ImportViewVo; import org.jeecg.modules.system.entity.vo.SysTaskChangeVo; import org.jeecg.modules.system.entity.vo.SysTaskExportVo; import org.jeecg.modules.system.entity.vo.SysTaskVo; -import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.time.LocalDate; 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/ISysTaskStationService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTaskStationService.java index 98bb915f..b7e296a5 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,7 +1,7 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysTaskStation; +import org.jeecg.modules.base.entity.postgre.SysTaskStation; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantPackService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantPackService.java index 54d7a4be..5dcef08c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantPackService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantPackService.java @@ -1,8 +1,8 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysTenantPack; -import org.jeecg.modules.system.entity.SysTenantPackUser; +import org.jeecg.modules.base.entity.postgre.SysTenantPack; +import org.jeecg.modules.base.entity.postgre.SysTenantPackUser; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantService.java index 0a858adf..804471b6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantService.java @@ -4,8 +4,8 @@ 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.common.api.vo.Result; -import org.jeecg.modules.system.entity.SysTenant; -import org.jeecg.modules.system.entity.SysTenantPackUser; +import org.jeecg.modules.base.entity.postgre.SysTenant; +import org.jeecg.modules.base.entity.postgre.SysTenantPackUser; import org.jeecg.modules.system.vo.tenant.TenantDepartAuthInfo; import org.jeecg.modules.system.vo.tenant.TenantPackModel; import org.jeecg.modules.system.vo.tenant.TenantPackUser; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysThirdAccountService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysThirdAccountService.java index 7d5c1731..7964ca90 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysThirdAccountService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysThirdAccountService.java @@ -1,8 +1,8 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.system.entity.SysThirdAccount; -import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.base.entity.postgre.SysThirdAccount; +import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.system.model.ThirdLoginModel; import java.util.List; 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 10e2e829..131b3fe0 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,6 +1,6 @@ package org.jeecg.modules.system.service; -import org.jeecg.modules.system.entity.SysUserAgent; +import org.jeecg.modules.base.entity.postgre.SysUserAgent; import com.baomidou.mybatisplus.extension.service.IService; /** 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 94fdc3d9..014548ba 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 @@ -4,8 +4,8 @@ package org.jeecg.modules.system.service; import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.jeecg.modules.system.entity.SysUser; -import org.jeecg.modules.system.entity.SysUserDepart; +import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.base.entity.postgre.SysUserDepart; import org.jeecg.modules.system.model.DepartIdModel; 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 e031449c..5aedf4e2 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,6 @@ package org.jeecg.modules.system.service; -import java.util.Map; - -import org.jeecg.modules.system.entity.SysUserRole; +import org.jeecg.modules.base.entity.postgre.SysUserRole; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java index e591b35f..da4acbea 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java @@ -2,15 +2,14 @@ package org.jeecg.modules.system.service; 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 com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.system.vo.SysUserCacheInfo; -import org.jeecg.modules.system.entity.SysRoleIndex; -import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.base.entity.postgre.SysRoleIndex; +import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.vo.lowapp.DepartAndUserInfo; import org.jeecg.modules.system.vo.lowapp.UpdateDepartInfo; 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 1a861f5b..59e79836 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,8 +2,8 @@ package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.jeecg.modules.system.entity.SysUser; -import org.jeecg.modules.system.entity.SysUserTenant; +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; 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 4fc84417..4a9ec46f 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.system.entity.GardsDetectors; +import org.jeecg.modules.base.entity.configuration.GardsDetectors; import org.jeecg.modules.system.mapper.GardsDetectorsMapper; import org.jeecg.modules.system.service.IGardsDetectorsService; import org.springframework.beans.factory.annotation.Autowired; @@ -18,7 +18,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclearfacilityServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclearfacilityServiceImpl.java index eaf034cc..48f2b0ca 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclearfacilityServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclearfacilityServiceImpl.java @@ -3,14 +3,13 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.system.entity.GardsNuclearfacility; +import org.jeecg.modules.base.entity.configuration.GardsNuclearfacility; import org.jeecg.modules.system.mapper.GardsNuclearfacilityMapper; import org.jeecg.modules.system.service.IGardsNuclearfacilityService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,7 +19,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; @Service("gardsNuclearfacilityService") @DS("ora") 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 245b42c8..101b6338 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,19 +10,14 @@ 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.system.entity.GardsDetectors; -import org.jeecg.modules.base.entity.GardsSampleData; -import org.jeecg.modules.system.entity.GardsStations; +import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecg.modules.system.mapper.GardsSampleDataMapper; -import org.jeecg.modules.system.service.IGardsDetectorsService; import org.jeecg.modules.system.service.IGardsSampleDataService; -import org.jeecg.modules.system.service.IGardsStationsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; -import java.util.List; import java.util.Objects; @Service("gardsSampleDataService") diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java index e455c69a..fcbc1cff 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java @@ -4,14 +4,13 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.system.entity.GardsStations; +import org.jeecg.modules.base.entity.configuration.GardsStations; import org.jeecg.modules.system.mapper.GardsStationsMapper; import org.jeecg.modules.system.service.IGardsStationsService; import org.springframework.beans.factory.annotation.Autowired; @@ -19,7 +18,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; 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 d07af817..8c610d70 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 @@ -4,7 +4,7 @@ import java.util.List; import javax.annotation.Resource; -import org.jeecg.modules.system.entity.SysAnnouncementSend; +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; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java index 0934d2e0..424214cd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java @@ -8,8 +8,8 @@ import org.apache.shiro.SecurityUtils; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysAnnouncement; -import org.jeecg.modules.system.entity.SysAnnouncementSend; +import org.jeecg.modules.base.entity.postgre.SysAnnouncement; +import org.jeecg.modules.base.entity.postgre.SysAnnouncementSend; import org.jeecg.modules.system.mapper.SysAnnouncementMapper; import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper; import org.jeecg.modules.system.service.ISysAnnouncementService; 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 24e1a7d0..c6537918 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 @@ -19,7 +19,6 @@ import org.jeecg.common.api.dto.OnlineAuthDTO; import org.jeecg.common.api.dto.message.*; import org.jeecg.common.aspect.UrlMatchEnum; import org.jeecg.common.constant.*; -import org.jeecg.common.constant.enums.MessageTypeEnum; import org.jeecg.common.desensitization.util.SensitiveInfoUtil; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.api.ISysBaseAPI; @@ -27,11 +26,13 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.*; import org.jeecg.common.util.*; import org.jeecg.common.util.dynamic.db.FreemarkerParseFactory; +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.service.ISysMessageTemplateService; import org.jeecg.modules.message.websocket.WebSocket; -import org.jeecg.modules.system.entity.*; +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/SysCategoryServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java index 437be4ef..3ef5a75b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java @@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.FillRuleConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.FillRuleUtil; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysCategory; +import org.jeecg.modules.base.entity.postgre.SysCategory; import org.jeecg.modules.system.mapper.SysCategoryMapper; import org.jeecg.modules.system.model.TreeSelectModel; import org.jeecg.modules.system.service.ISysCategoryService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCheckRuleServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCheckRuleServiceImpl.java index 300a57f0..4bec40db 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCheckRuleServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCheckRuleServiceImpl.java @@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang.StringUtils; -import org.jeecg.modules.system.entity.SysCheckRule; +import org.jeecg.modules.base.entity.postgre.SysCheckRule; import org.jeecg.modules.system.mapper.SysCheckRuleMapper; import org.jeecg.modules.system.service.ISysCheckRuleService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCommentServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCommentServiceImpl.java index 9516c737..ec4e58f0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCommentServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCommentServiceImpl.java @@ -13,9 +13,9 @@ import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.util.CommonUtils; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysComment; -import org.jeecg.modules.system.entity.SysFiles; -import org.jeecg.modules.system.entity.SysFormFile; +import org.jeecg.modules.base.entity.postgre.SysComment; +import org.jeecg.modules.base.entity.postgre.SysFiles; +import org.jeecg.modules.base.entity.postgre.SysFormFile; import org.jeecg.modules.system.mapper.SysCommentMapper; import org.jeecg.modules.system.mapper.SysFilesMapper; import org.jeecg.modules.system.mapper.SysFormFileMapper; 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 5f732376..0c1dd1c9 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,6 +1,6 @@ package org.jeecg.modules.system.service.impl; -import org.jeecg.modules.system.entity.SysDataLog; +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; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataSourceServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataSourceServiceImpl.java index f3052ec2..2e501a32 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataSourceServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataSourceServiceImpl.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.dynamic.db.DataSourceCachePool; -import org.jeecg.modules.system.entity.SysDataSource; +import org.jeecg.modules.base.entity.postgre.SysDataSource; import org.jeecg.modules.system.mapper.SysDataSourceMapper; import org.jeecg.modules.system.service.ISysDataSourceService; 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/SysDepartPermissionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartPermissionServiceImpl.java index 1c3afcca..210534e1 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 @@ -3,10 +3,10 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysDepartPermission; -import org.jeecg.modules.system.entity.SysDepartRole; -import org.jeecg.modules.system.entity.SysDepartRolePermission; -import org.jeecg.modules.system.entity.SysPermissionDataRule; +import org.jeecg.modules.base.entity.postgre.SysDepartPermission; +import org.jeecg.modules.base.entity.postgre.SysDepartRole; +import org.jeecg.modules.base.entity.postgre.SysDepartRolePermission; +import org.jeecg.modules.base.entity.postgre.SysPermissionDataRule; import org.jeecg.modules.system.mapper.SysDepartPermissionMapper; import org.jeecg.modules.system.mapper.SysDepartRoleMapper; import org.jeecg.modules.system.mapper.SysDepartRolePermissionMapper; 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 10c19db2..f87afb89 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 @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.jeecg.common.util.IpUtils; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysDepartRolePermission; +import org.jeecg.modules.base.entity.postgre.SysDepartRolePermission; import org.jeecg.modules.system.mapper.SysDepartRolePermissionMapper; import org.jeecg.modules.system.service.ISysDepartRolePermissionService; import org.springframework.stereotype.Service; 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 73d969d6..6d4e8bd0 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,6 +1,6 @@ package org.jeecg.modules.system.service.impl; -import org.jeecg.modules.system.entity.SysDepartRole; +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; 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 bf49e3aa..727c97b1 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 @@ -2,8 +2,8 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysDepartRole; -import org.jeecg.modules.system.entity.SysDepartRoleUser; +import org.jeecg.modules.base.entity.postgre.SysDepartRole; +import org.jeecg.modules.base.entity.postgre.SysDepartRoleUser; import org.jeecg.modules.system.mapper.SysDepartRoleMapper; import org.jeecg.modules.system.mapper.SysDepartRoleUserMapper; import org.jeecg.modules.system.service.ISysDepartRoleUserService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java index cc378b9c..201e624a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java @@ -20,14 +20,13 @@ import org.jeecg.common.util.FillRuleUtil; import org.jeecg.common.util.YouBianCodeUtil; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.base.entity.postgre.*; import org.jeecg.modules.system.mapper.*; import org.jeecg.modules.system.model.DepartIdModel; import org.jeecg.modules.system.model.SysDepartTreeModel; import org.jeecg.modules.system.service.ISysDepartService; import org.jeecg.modules.system.util.FindsDepartsChildrenUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; 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 973d6fcc..f27f67f4 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,7 +2,7 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import org.jeecg.modules.system.entity.SysDictItem; +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; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java index 10a7da09..eae476e5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java @@ -15,7 +15,6 @@ import org.jeecg.common.constant.DataBaseConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.system.util.ResourceUtil; import org.jeecg.common.system.vo.DictModel; import org.jeecg.common.system.vo.DictModelMany; @@ -24,10 +23,10 @@ import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.SqlInjectionUtil; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; +import org.jeecg.modules.base.entity.configuration.GardsStations; +import org.jeecg.modules.base.entity.postgre.SysDict; +import org.jeecg.modules.base.entity.postgre.SysDictItem; import org.jeecg.modules.system.dto.DatabaseTypeDto; -import org.jeecg.modules.system.entity.GardsStations; -import org.jeecg.modules.system.entity.SysDict; -import org.jeecg.modules.system.entity.SysDictItem; import org.jeecg.modules.system.mapper.SysDictItemMapper; import org.jeecg.modules.system.mapper.SysDictMapper; import org.jeecg.modules.system.model.TreeSelectModel; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFilesServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFilesServiceImpl.java index 50f45589..b88d3766 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFilesServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFilesServiceImpl.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.modules.system.entity.SysFiles; +import org.jeecg.modules.base.entity.postgre.SysFiles; import org.jeecg.modules.system.mapper.SysFilesMapper; import org.jeecg.modules.system.service.ISysFilesService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFillRuleServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFillRuleServiceImpl.java index 406b056c..ff0aac24 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFillRuleServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFillRuleServiceImpl.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.modules.system.entity.SysFillRule; +import org.jeecg.modules.base.entity.postgre.SysFillRule; import org.jeecg.modules.system.mapper.SysFillRuleMapper; import org.jeecg.modules.system.service.ISysFillRuleService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFormFileServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFormFileServiceImpl.java index acc217b9..0cea9720 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFormFileServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFormFileServiceImpl.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.modules.system.entity.SysFormFile; +import org.jeecg.modules.base.entity.postgre.SysFormFile; import org.jeecg.modules.system.mapper.SysFormFileMapper; import org.jeecg.modules.system.service.ISysFormFileService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysGatewayRouteServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysGatewayRouteServiceImpl.java index 18531039..72554d53 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysGatewayRouteServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysGatewayRouteServiceImpl.java @@ -8,10 +8,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.base.BaseMap; import org.jeecg.common.constant.CacheConstant; -import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.GlobalConstants; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysGatewayRoute; +import org.jeecg.modules.base.entity.postgre.SysGatewayRoute; import org.jeecg.modules.system.mapper.SysGatewayRouteMapper; import org.jeecg.modules.system.service.ISysGatewayRouteService; import org.springframework.beans.factory.annotation.Autowired; @@ -19,9 +18,7 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @Description: gateway路由管理 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 e226c3cb..11159a4e 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,6 +1,5 @@ package org.jeecg.modules.system.service.impl; -import java.sql.SQLException; import java.util.Date; import java.util.List; import java.util.Map; @@ -8,12 +7,10 @@ import java.util.Map; import javax.annotation.Resource; import com.baomidou.mybatisplus.annotation.DbType; -import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.util.CommonUtils; -import org.jeecg.modules.system.entity.SysLog; +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.beans.factory.annotation.Autowired; 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/SysPackPermissionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPackPermissionServiceImpl.java index e8f21694..7599526c 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,6 +1,6 @@ package org.jeecg.modules.system.service.impl; -import org.jeecg.modules.system.entity.SysPackPermission; +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; 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 be7c3f78..a76f0b1c 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 @@ -9,8 +9,8 @@ import javax.annotation.Resource; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysPermission; -import org.jeecg.modules.system.entity.SysPermissionDataRule; +import org.jeecg.modules.base.entity.postgre.SysPermission; +import org.jeecg.modules.base.entity.postgre.SysPermissionDataRule; import org.jeecg.modules.system.mapper.SysPermissionDataRuleMapper; import org.jeecg.modules.system.mapper.SysPermissionMapper; import org.jeecg.modules.system.service.ISysPermissionDataRuleService; 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 6c818a7b..250fba13 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 @@ -11,8 +11,8 @@ import org.jeecg.common.constant.CacheConstant; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysPermission; -import org.jeecg.modules.system.entity.SysPermissionDataRule; +import org.jeecg.modules.base.entity.postgre.SysPermission; +import org.jeecg.modules.base.entity.postgre.SysPermissionDataRule; import org.jeecg.modules.system.mapper.SysDepartPermissionMapper; import org.jeecg.modules.system.mapper.SysDepartRolePermissionMapper; import org.jeecg.modules.system.mapper.SysPermissionMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPositionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPositionServiceImpl.java index e88ccc1b..66e9175c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPositionServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPositionServiceImpl.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.modules.system.entity.SysPosition; +import org.jeecg.modules.base.entity.postgre.SysPosition; import org.jeecg.modules.system.mapper.SysPositionMapper; import org.jeecg.modules.system.service.ISysPositionService; import org.springframework.stereotype.Service; 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 60f63204..37ab5196 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,6 +1,6 @@ package org.jeecg.modules.system.service.impl; -import org.jeecg.modules.system.entity.SysRoleIndex; +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; 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 6103c56a..23d1f175 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 @@ -5,7 +5,7 @@ import java.util.*; import org.jeecg.common.util.IpUtils; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysRolePermission; +import org.jeecg.modules.base.entity.postgre.SysRolePermission; import org.jeecg.modules.system.mapper.SysRolePermissionMapper; import org.jeecg.modules.system.service.ISysRolePermissionService; 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 ed44954e..dd69c6cc 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 @@ -8,7 +8,7 @@ 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.system.entity.SysRole; +import org.jeecg.modules.base.entity.postgre.SysRole; import org.jeecg.modules.system.mapper.SysRoleMapper; import org.jeecg.modules.system.mapper.SysUserMapper; import org.jeecg.modules.system.service.ISysRoleService; 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 226810f3..57c1750c 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 @@ -17,10 +17,10 @@ import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.IpUtils; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.modules.system.entity.GardsStations; -import org.jeecg.modules.system.entity.SysTask; -import org.jeecg.modules.system.entity.SysTaskStation; -import org.jeecg.modules.system.entity.SysUser; +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.vo.*; import org.jeecg.modules.system.mapper.SysTaskMapper; import org.jeecg.modules.system.mapper.SysTaskStationMapper; @@ -29,7 +29,6 @@ import org.jeecg.modules.system.service.IGardsStationsService; import org.jeecg.modules.system.service.ISysTaskService; import org.jeecg.modules.system.service.ISysTaskStationService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -39,7 +38,6 @@ import java.io.IOException; import java.lang.reflect.Field; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.LocalDate; import java.util.*; import java.util.stream.Collectors; 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 999fb755..47dd052b 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.system.entity.SysTaskStation; +import org.jeecg.modules.base.entity.postgre.SysTaskStation; import org.jeecg.modules.system.mapper.SysTaskStationMapper; import org.jeecg.modules.system.service.ISysTaskStationService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java index c438fcac..b5f69369 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java @@ -9,9 +9,9 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.aop.TenantLog; -import org.jeecg.modules.system.entity.SysPackPermission; -import org.jeecg.modules.system.entity.SysTenantPack; -import org.jeecg.modules.system.entity.SysTenantPackUser; +import org.jeecg.modules.base.entity.postgre.SysPackPermission; +import org.jeecg.modules.base.entity.postgre.SysTenantPack; +import org.jeecg.modules.base.entity.postgre.SysTenantPackUser; import org.jeecg.modules.system.mapper.SysPackPermissionMapper; import org.jeecg.modules.system.mapper.SysTenantPackMapper; import org.jeecg.modules.system.mapper.SysTenantPackUserMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java index 330118a7..21bda9e3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java @@ -17,7 +17,7 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.aop.TenantLog; -import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.base.entity.postgre.*; import org.jeecg.modules.system.mapper.SysTenantMapper; import org.jeecg.modules.system.mapper.SysTenantPackUserMapper; import org.jeecg.modules.system.mapper.SysUserTenantMapper; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java index 8d2345c0..ca93b9f6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java @@ -8,10 +8,10 @@ import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.PasswordUtil; import org.jeecg.common.util.UUIDGenerator; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysRole; -import org.jeecg.modules.system.entity.SysThirdAccount; -import org.jeecg.modules.system.entity.SysUser; -import org.jeecg.modules.system.entity.SysUserRole; +import org.jeecg.modules.base.entity.postgre.SysRole; +import org.jeecg.modules.base.entity.postgre.SysThirdAccount; +import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.base.entity.postgre.SysUserRole; import org.jeecg.modules.system.mapper.SysRoleMapper; import org.jeecg.modules.system.mapper.SysThirdAccountMapper; import org.jeecg.modules.system.mapper.SysUserMapper; 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 d46c057f..6b42df84 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,6 +1,6 @@ package org.jeecg.modules.system.service.impl; -import org.jeecg.modules.system.entity.SysUserAgent; +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; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java index 86bf815d..6381970e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java @@ -8,13 +8,12 @@ import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.CommonConstant; -import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.jeecg.modules.system.entity.SysDepart; -import org.jeecg.modules.system.entity.SysUser; -import org.jeecg.modules.system.entity.SysUserDepart; +import org.jeecg.modules.base.entity.postgre.SysDepart; +import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.base.entity.postgre.SysUserDepart; import org.jeecg.modules.system.mapper.SysUserDepartMapper; import org.jeecg.modules.system.mapper.SysUserMapper; import org.jeecg.modules.system.mapper.SysUserTenantMapper; 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 9af6f772..78523612 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,17 +1,8 @@ package org.jeecg.modules.system.service.impl; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Map; - -import org.jeecg.modules.system.entity.SysRole; -import org.jeecg.modules.system.entity.SysUser; -import org.jeecg.modules.system.entity.SysUserRole; +import org.jeecg.modules.base.entity.postgre.SysUserRole; import org.jeecg.modules.system.mapper.SysUserRoleMapper; -import org.jeecg.modules.system.service.ISysRoleService; import org.jeecg.modules.system.service.ISysUserRoleService; -import org.jeecg.modules.system.service.ISysUserService; -import org.springframework.beans.factory.annotation.Autowired; 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 b3911180..3653b0ae 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 @@ -1,7 +1,6 @@ package org.jeecg.modules.system.service.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -29,8 +28,10 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.system.vo.SysUserCacheInfo; 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.system.entity.*; +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.model.SysUserSysDepartModel; import org.jeecg.modules.system.service.ISysUserService; @@ -40,12 +41,10 @@ import org.jeecg.modules.system.vo.lowapp.DepartAndUserInfo; import org.jeecg.modules.system.vo.lowapp.DepartInfo; import org.jeecg.modules.system.vo.lowapp.UpdateDepartInfo; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -344,7 +343,7 @@ public class SysUserServiceImpl extends ServiceImpl impl * @return */ @Override - public SysRoleIndex getDynamicIndexByUserRole(String username,String version) { + public SysRoleIndex getDynamicIndexByUserRole(String username, String version) { List roles = sysUserRoleMapper.getRoleByUserName(username); String componentUrl = RoleIndexConfigEnum.getIndexByRoles(roles); SysRoleIndex roleIndex = new SysRoleIndex(componentUrl); 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 40e7a679..8791b493 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 @@ -5,12 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang.StringUtils; import org.jeecg.common.constant.CacheConstant; -import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysUser; -import org.jeecg.modules.system.entity.SysUserTenant; +import org.jeecg.modules.base.entity.postgre.SysUser; +import org.jeecg.modules.base.entity.postgre.SysUserTenant; import org.jeecg.modules.system.mapper.SysUserMapper; import org.jeecg.modules.system.mapper.SysUserTenantMapper; import org.jeecg.modules.system.service.ISysUserTenantService; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java index a7be87d5..d919c30e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java @@ -32,7 +32,7 @@ import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.JeecgBaseConfig; import org.jeecg.config.thirdapp.ThirdAppConfig; import org.jeecg.config.thirdapp.ThirdAppTypeItemVo; -import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.base.entity.postgre.*; import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper; import org.jeecg.modules.system.mapper.SysUserMapper; import org.jeecg.modules.system.model.SysDepartTreeModel; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java index 4eab9290..cf2dfaa6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java @@ -23,7 +23,7 @@ import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.JeecgBaseConfig; import org.jeecg.config.thirdapp.ThirdAppConfig; -import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.base.entity.postgre.*; import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper; import org.jeecg.modules.system.mapper.SysUserMapper; import org.jeecg.modules.system.model.SysDepartTreeModel; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java index 4bf73bfc..e082d8a0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java @@ -1,12 +1,9 @@ package org.jeecg.modules.system.util; -import org.jeecg.common.constant.CommonConstant; -import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.base.entity.postgre.SysDepart; import org.jeecg.modules.system.model.DepartIdModel; import org.jeecg.modules.system.model.SysDepartTreeModel; -import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; import java.util.List; 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 211740af..1109f244 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 @@ -5,7 +5,7 @@ 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.system.entity.SysPermission; +import org.jeecg.modules.base.entity.postgre.SysPermission; /** * @Author: scott diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java index 2bd82a82..fc87b7ff 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.vo; import lombok.Data; -import org.jeecg.modules.system.entity.SysDictItem; +import org.jeecg.modules.base.entity.postgre.SysDictItem; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.ExcelCollection; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/UserAvatar.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/UserAvatar.java index d8c55f80..5fab8561 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/UserAvatar.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/UserAvatar.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.vo; import lombok.Data; -import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.base.entity.postgre.SysUser; /** * 用户名和头像信息 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/SysDictVo.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/SysDictVo.java index b2b48dd7..b048c795 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/SysDictVo.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/SysDictVo.java @@ -3,7 +3,7 @@ package org.jeecg.modules.system.vo.lowapp; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; -import org.jeecg.modules.system.entity.SysDictItem; +import org.jeecg.modules.base.entity.postgre.SysDictItem; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/UpdateDepartInfo.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/UpdateDepartInfo.java index 7f483429..570cfe02 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/UpdateDepartInfo.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/UpdateDepartInfo.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.vo.lowapp; import lombok.Data; -import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.base.entity.postgre.SysDepart; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantDepartAuthInfo.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantDepartAuthInfo.java index 70349ab4..cd835f93 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantDepartAuthInfo.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantDepartAuthInfo.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.vo.tenant; import lombok.Data; -import org.jeecg.modules.system.entity.SysTenant; +import org.jeecg.modules.base.entity.postgre.SysTenant; import java.util.List;