diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DBUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DBUtil.java index 218dc18..704f867 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DBUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DBUtil.java @@ -10,22 +10,6 @@ public class DBUtil { public static final String ORACLE_URL_PREFIX = "jdbc:oracle:thin:@"; public static final String POSTGRES_URL_PREFIX = "jdbc:postgresql://"; - /*public static Connection getConnection(String url, String username, String password, String Driver) throws SQLException{ - try { - Class.forName(Driver); - Properties props = new Properties(); - props.put("user", username); - props.put("password", password); - props.put("oracle.net.CONNECT_TIMEOUT", "300000"); - props.put("oracle.jdbc.ReadTimeout", "600000"); - return DriverManager.getConnection(url, props); - } catch(ClassNotFoundException e){ - System.out.println("找不到驱动程序类 ，加载驱动失败！"); - e.printStackTrace() ; - } - return null; - }*/ - public static String getUrl(String ip, Integer port, String serveId){ return String.format("%s%s:%s%s", DBUtil.ORACLE_URL_PREFIX, ip, port, serveId); } @@ -55,35 +39,6 @@ public class DBUtil { return null; } - - /*public static List> queryToMapList(String sql) throws SQLException { - List> resultMapList = new ArrayList<>(); - try { - stmt = connection.createStatement(); - rs = stmt.executeQuery(sql); - ResultSetMetaData metaData = rs.getMetaData(); - int columnCount = metaData.getColumnCount(); - while (rs.next()) { - Map rsRow = new HashMap<>(); - for (int i = 1; i <= columnCount; i++) { - String columnName = metaData.getColumnName(i); - if (metaData.getColumnClassName(i).equals("java.sql.Timestamp")) { - if (rs.getObject(i) != null) - rsRow.put(columnName, new Date(rs.getDate(i).getTime())); - } else { - rsRow.put(columnName, rs.getObject(i)); - } - } - resultMapList.add(rsRow); - } - } catch (Exception e) { - throw e; - } finally { - close(); - } - return resultMapList; - }*/ - //释放资源 public static void close(Connection conn, Statement stmt, ResultSet rs){ diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasSyncLog.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasSyncLog.java index a7b8bf8..6592455 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasSyncLog.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasSyncLog.java @@ -30,14 +30,11 @@ public class StasSyncLog implements Serializable { @TableId(type = IdType.ASSIGN_ID) private String id; /**记录id*/ - @Excel(name = "记录id", width = 15) private String recordId; /**开始时间*/ - @Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date startTime; /**描述*/ - @Excel(name = "描述", width = 15) private String description; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasSyncNum.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasSyncNum.java index 703bf10..97dfeef 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasSyncNum.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasSyncNum.java @@ -26,12 +26,9 @@ public class StasSyncNum implements Serializable { @TableId(type = IdType.ASSIGN_ID) private String id; /**记录id*/ - @Excel(name = "记录id", width = 15) private String recordId; /**同步表名*/ - @Excel(name = "同步表名", width = 15) private String tableName; /**同步数据条数*/ - @Excel(name = "同步数据条数", width = 15) private Integer syncNum; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasSyncRecord.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasSyncRecord.java index 5846b32..827c58b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasSyncRecord.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasSyncRecord.java @@ -30,21 +30,16 @@ public class StasSyncRecord implements Serializable { @TableId(type = IdType.ASSIGN_ID) private String id; /**任务id*/ - @Excel(name = "任务id", width = 15) private String taskId; /**源库id*/ - @Excel(name = "源库id", width = 15) private String sourceId; /**目标库id*/ - @Excel(name = "目标库id", width = 15) private String targetId; /**开始时间*/ - @Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date startTime; /**结束时间*/ - @Excel(name = "结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date endTime; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasSyncStrategy.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasSyncStrategy.java index d50d894..b2ff227 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasSyncStrategy.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasSyncStrategy.java @@ -38,29 +38,21 @@ public class StasSyncStrategy implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date createTime; /**修改人*/ - @Excel(name = "修改人", width = 15) private String updateBy; /**修改时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @Excel(name = "修改时间", width = 15) private Date updateTime; /**任务id*/ - @Excel(name = "任务id", width = 15) private String taskId; /**源用户*/ - @Excel(name = "源用户", width = 15) private String sourceOwner; /**目标用户*/ - @Excel(name = "目标用户", width = 15) private String targetOwner; /**同步表名*/ - @Excel(name = "同步表名称", width = 15) private String tableName; /**依据字段*/ - @Excel(name = "依据字段", width = 15) private String columnName; /**同步位置*/ - @Excel(name = "同步位置", width = 15) private String syncOrigin; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasTaskConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasTaskConfig.java index 9b0751a..fb88915 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasTaskConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasTaskConfig.java @@ -50,39 +50,30 @@ public class StasTaskConfig implements Serializable { @Schema(description = "更新日期") private Date updateTime; /**任务名称*/ - @Excel(name = "任务名称", width = 15) @Schema(description = "任务名称") private String taskName; /**定时任务ID*/ - @Excel(name = "定时任务ID", width = 15) @Schema(description = "定时任务ID") private String quartzId; /**cron表达式*/ - @Excel(name = "cron表达式", width = 15) @Schema(description = "cron表达式") private String cron; /**源库id*/ - @Excel(name = "源库id", width = 15) @Schema(description = "源库id") private String sourceId; /**目标库id*/ - @Excel(name = "目标库id", width = 15) @Schema(description = "目标库id") private String targetId; /**单表批次获取数量*/ - @Excel(name = "单表批次获取数量", width = 15) @Schema(description = "单表批次获取数量") private Integer syncCount; /**单表批次获取天数*/ - @Excel(name = "单表批次获取天数", width = 15) @Schema(description = "单表批次获取天数") private Integer syncDay; /**任务状态*/ - @Excel(name = "任务状态", width = 15) @Schema(description = "任务状态") private Integer taskStatus; /**描述*/ - @Excel(name = "描述", width = 15) @Schema(description = "描述") private String description; diff --git a/jeecg-module-sync/src/main/java/org/jeecg/taskConfig/job/SyncDataJob.java b/jeecg-module-sync/src/main/java/org/jeecg/taskConfig/job/SyncDataJob.java index fdfb9ae..edcfaee 100644 --- a/jeecg-module-sync/src/main/java/org/jeecg/taskConfig/job/SyncDataJob.java +++ b/jeecg-module-sync/src/main/java/org/jeecg/taskConfig/job/SyncDataJob.java @@ -42,10 +42,6 @@ public class SyncDataJob implements Job { private String parameter; - public void setParameter(String parameter) { - this.parameter = parameter; - } - @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { try {