diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTBks.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTBks.java index 85ed32fb..8d89e73a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTBks.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTBks.java @@ -59,7 +59,7 @@ public class SyncTBks extends BaseSync { errorMessage = e.getMessage(); } Xxhbbks xxhbbks = xxhbbksService.getSumnum(); - int mysqlnum=xxhbbks.getMysqlnum(); + int mysqlnum = xxhbbks.getMysqlnum(); Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); xxhbsynclog.setOratabname("T_BKS");//oracle表名 diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTDw.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTDw.java index 6159f87c..8405bce9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTDw.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTDw.java @@ -4,10 +4,8 @@ import cn.hutool.core.bean.BeanUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.compress.utils.Lists; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; -import org.jeecg.modules.kc.grab.exports.entity.TBks; import org.jeecg.modules.kc.grab.exports.entity.TDw; import org.jeecg.modules.kc.grab.exports.service.ITDwService; -import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; import org.jeecg.modules.kc.grab.imports.entity.Xxhbdw; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; import org.jeecg.modules.kc.grab.imports.service.IXxhbdwService; @@ -61,7 +59,7 @@ public class SyncTDw extends BaseSync { errorMessage = e.getMessage(); } Xxhbdw xxhbdw = impService.getSumnum(); - int mysqlnum=xxhbdw.getMysqlnum(); + int mysqlnum = xxhbdw.getMysqlnum(); Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); xxhbsynclog.setOratabname("T_DW");//oracle表名 diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtBkjxtkpj.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtBkjxtkpj.java index 6ed0e5e2..8f72b03e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtBkjxtkpj.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtBkjxtkpj.java @@ -380,7 +380,18 @@ public class SyncTFwdtBkjxtkpj extends BaseSync { } + Xxhbbkjxtkpj xxhbshryxx = xxhbbkjxtkpjService.getSumnum(); + int mysqlnum = xxhbshryxx.getMysqlnum(); + + Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); + xxhbsynclog.setTablename("附加定时任务，清洗服务大厅数据"); + xxhbsynclog.setOratabname("T_ZZB_LDXX");//oracle表名 + xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 + xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 + xxhbsynclog.setSyncnum(outDataList.size());//本次同步数据量 + xxhbsynclog.setSynctype("1");//同步类型 0全量 1增量 +// xxhbsynclog.setErrormessage(""); xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); saveLog(xxhbsynclog,Xxhbbkjxtkpj.class); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtShryxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtShryxx.java index fd0bab0b..1de39120 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtShryxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtShryxx.java @@ -81,17 +81,6 @@ public class SyncTFwdtShryxx extends BaseSync { e.printStackTrace(); errorMessage = e.getMessage(); } - Xxhbshryxx xxhbshryxx = impService.getSumnum(); - int mysqlnum=xxhbshryxx.getMysqlnum(); - Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); - xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); - xxhbsynclog.setOratabname("t_fwdt_shryxx");//oracle表名 - xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 - xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 - xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 - xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量 - xxhbsynclog.setErrormessage(errorMessage); - saveLog(xxhbsynclog,Xxhbshryxx.class); @@ -106,9 +95,18 @@ public class SyncTFwdtShryxx extends BaseSync { kcTksfrzbService.saveBatch(saveList); -// Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); -// xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); -// saveLog(xxhbsynclog, Xxhbshryxx.class); + Xxhbshryxx xxhbshryxx = impService.getSumnum(); + int mysqlnum=xxhbshryxx.getMysqlnum(); + Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); + xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); + xxhbsynclog.setOratabname("t_fwdt_shryxx");//oracle表名 + xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 + xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 + xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 + xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量 + xxhbsynclog.setErrormessage(errorMessage); + saveLog(xxhbsynclog,Xxhbshryxx.class); + } /** diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJsjbxxb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJsjbxxb.java index 2124a04b..0a892dde 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJsjbxxb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJsjbxxb.java @@ -5,15 +5,10 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.compress.utils.Lists; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.grab.exports.entity.TJwJsjbxx; -import org.jeecg.modules.kc.grab.exports.entity.TJwKckb; import org.jeecg.modules.kc.grab.exports.service.ITJwJsjbxxService; -import org.jeecg.modules.kc.grab.exports.service.ITJwKckbService; -import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; import org.jeecg.modules.kc.grab.imports.entity.Xxhbjsjbxx; -import org.jeecg.modules.kc.grab.imports.entity.Xxhbkckb; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; import org.jeecg.modules.kc.grab.imports.service.IXxhbjsjbxxService; -import org.jeecg.modules.kc.grab.imports.service.IXxhbkckbService; import org.quartz.JobExecutionContext; import org.springframework.beans.factory.annotation.Autowired; @@ -74,7 +69,7 @@ public class SyncTJwJsjbxxb extends BaseSync { xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量 xxhbsynclog.setErrormessage(errorMessage); - saveLog(xxhbsynclog,Xxhbbks.class); + saveLog(xxhbsynclog,Xxhbjsjbxx.class); } /** diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJxljbxxb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJxljbxxb.java index 3d0086cb..145c70b9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJxljbxxb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJxljbxxb.java @@ -6,7 +6,8 @@ import org.apache.commons.compress.utils.Lists; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.grab.exports.entity.TJwJxljbxx; import org.jeecg.modules.kc.grab.exports.service.ITJwJxljbxxService; -import org.jeecg.modules.kc.grab.imports.entity.*; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbjxljbxx; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; import org.jeecg.modules.kc.grab.imports.service.IXxhbjxljbxxService; import org.quartz.JobExecutionContext; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKcapzb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKcapzb.java index 9193706d..5878d840 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKcapzb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKcapzb.java @@ -6,8 +6,6 @@ import org.apache.commons.compress.utils.Lists; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.grab.exports.entity.TJwKcapzb; import org.jeecg.modules.kc.grab.exports.service.ITJwKcapzbService; -import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; -import org.jeecg.modules.kc.grab.imports.entity.Xxhbjsjbxx; import org.jeecg.modules.kc.grab.imports.entity.Xxhbkcapzb; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; import org.jeecg.modules.kc.grab.imports.service.IXxhbkcapzbService; @@ -70,7 +68,7 @@ public class SyncTJwKcapzb extends BaseSync { xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 xxhbsynclog.setSynctype("0");//同步类型 0全量 1增量 xxhbsynclog.setErrormessage(errorMessage); - saveLog(xxhbsynclog, Xxhbbks.class); + saveLog(xxhbsynclog, Xxhbkcapzb.class); } /** diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKckb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKckb.java index f10aa2db..c1c109c7 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKckb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKckb.java @@ -6,8 +6,6 @@ import org.apache.commons.compress.utils.Lists; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.grab.exports.entity.TJwKckb; import org.jeecg.modules.kc.grab.exports.service.ITJwKckbService; -import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; -import org.jeecg.modules.kc.grab.imports.entity.Xxhbjsjbxx; import org.jeecg.modules.kc.grab.imports.entity.Xxhbkckb; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; import org.jeecg.modules.kc.grab.imports.service.IXxhbkckbService; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKcxxb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKcxxb.java index 06221b57..6eacad7f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKcxxb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwKcxxb.java @@ -6,8 +6,6 @@ import org.apache.commons.compress.utils.Lists; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.grab.exports.entity.TJwKcxxb; import org.jeecg.modules.kc.grab.exports.service.ITJwKcxxbService; -import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; -import org.jeecg.modules.kc.grab.imports.entity.Xxhbjsjbxx; import org.jeecg.modules.kc.grab.imports.entity.Xxhbkcxxb; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; import org.jeecg.modules.kc.grab.imports.service.IXxhbkcxxbService; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkkcb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkkcb.java index e1700b67..19d8f696 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkkcb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkkcb.java @@ -6,8 +6,6 @@ import org.apache.commons.compress.utils.Lists; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.grab.exports.entity.TJwTkkcb; import org.jeecg.modules.kc.grab.exports.service.ITJwTkkcbService; -import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; -import org.jeecg.modules.kc.grab.imports.entity.Xxhbjsjbxx; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; import org.jeecg.modules.kc.grab.imports.entity.Xxhbtkkcb; import org.jeecg.modules.kc.grab.imports.service.IXxhbtkkcbService; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkxx.java index a4f653f4..a1aff8a1 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwTkxx.java @@ -6,7 +6,6 @@ import org.apache.commons.compress.utils.Lists; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.grab.exports.entity.TJwTkxx; import org.jeecg.modules.kc.grab.exports.service.ITJwTkxxService; -import org.jeecg.modules.kc.grab.imports.entity.Xxhbdw; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; import org.jeecg.modules.kc.grab.imports.entity.Xxhbtkxx; import org.jeecg.modules.kc.grab.imports.service.IXxhbtkxxService; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwXsxkb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwXsxkb.java index 8421a231..65f7025c 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwXsxkb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwXsxkb.java @@ -8,7 +8,6 @@ import org.apache.commons.compress.utils.Lists; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.grab.exports.entity.TJwXsxkb; import org.jeecg.modules.kc.grab.exports.service.ITJwXsxkbService; -import org.jeecg.modules.kc.grab.imports.entity.Xxhbdw; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; import org.jeecg.modules.kc.grab.imports.entity.Xxhbxsxkb; import org.jeecg.modules.kc.grab.imports.service.IXxhbxsxkbService; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTZzbLdxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTZzbLdxx.java index ed326fd8..fb8ed383 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTZzbLdxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTZzbLdxx.java @@ -4,18 +4,10 @@ import cn.hutool.core.bean.BeanUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.compress.utils.Lists; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; -import org.jeecg.modules.kc.grab.exports.entity.TBks; -import org.jeecg.modules.kc.grab.exports.entity.TDw; import org.jeecg.modules.kc.grab.exports.entity.TZzbLdxx; -import org.jeecg.modules.kc.grab.exports.service.ITBksService; -import org.jeecg.modules.kc.grab.exports.service.ITDwService; import org.jeecg.modules.kc.grab.exports.service.ITZzbLdxxService; -import org.jeecg.modules.kc.grab.imports.entity.Xxhbbks; -import org.jeecg.modules.kc.grab.imports.entity.Xxhbdw; import org.jeecg.modules.kc.grab.imports.entity.Xxhbldxx; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; -import org.jeecg.modules.kc.grab.imports.service.IXxhbbksService; -import org.jeecg.modules.kc.grab.imports.service.IXxhbdwService; import org.jeecg.modules.kc.grab.imports.service.IXxhbldxxService; import org.quartz.JobExecutionContext; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZwdtEvaluation.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZwdtEvaluation.java index 7a82aa19..f023be18 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZwdtEvaluation.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZwdtEvaluation.java @@ -11,6 +11,7 @@ import org.apache.commons.lang3.StringUtils; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi; import org.jeecg.modules.kc.grab.imports.entity.Xxhbbkjxtkpj; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbldxx; import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; import org.jeecg.modules.kc.grab.imports.service.IXxhbbkjxtkpjService; import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao; @@ -92,13 +93,8 @@ public class SyncZwdtEvaluation extends BaseSync { public void run(Map param){ initOptionMap(); - //旧版本 washOldData(param); - - Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); - xxhbsynclog.setSyncRowNum("1"); - saveLog(xxhbsynclog, KcOldEvaluationque.class); } /** @@ -386,6 +382,17 @@ public class SyncZwdtEvaluation extends BaseSync { //有ID了，清洗数据 + Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); + xxhbsynclog.setTablename("附加定时任务，清洗服务大厅数据"); + xxhbsynclog.setOratabname("T_ZZB_LDXX");//oracle表名 + xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 +// xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 + xxhbsynclog.setSyncnum(saveMainList.size());//本次同步数据量 + xxhbsynclog.setSynctype(isAll?"0":"1");//同步类型 0全量 1增量 +// xxhbsynclog.setErrormessage(""); + saveLog(xxhbsynclog); + + } public static void main(String[] args) { diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/base/BaseSync.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/base/BaseSync.java index 40140aa5..a87910bf 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/base/BaseSync.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/base/BaseSync.java @@ -65,12 +65,23 @@ public abstract class BaseSync implements Job { public abstract void run(); + public void saveLog(Xxhbsynclog xxhbsynclog) { + saveLog(xxhbsynclog,null); + } + public void saveLog(Xxhbsynclog xxhbsynclog, Class clazz) { - DateTime now = DateTime.now(); - xxhbsynclog.setSyncdate(now.toDateStr());//日期 - xxhbsynclog.setSynctime(now.toTimeStr());//时间 - xxhbsynclog.setTablename(SqlHelper.table(clazz).getTableName()); - xxhbsynclogService.save(xxhbsynclog); + try { + DateTime now = DateTime.now(); + xxhbsynclog.setSyncdate(now.toDateStr());//日期 + xxhbsynclog.setSynctime(now.toTimeStr());//时间 + if(clazz != null){ + xxhbsynclog.setTablename(SqlHelper.table(clazz).getTableName()); + } + xxhbsynclogService.save(xxhbsynclog); + }catch (Exception e){ + log.error("同步数据出现未知错误!!!"); + log.error(e.getMessage(),e); + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbbkjxtkpj.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbbkjxtkpj.java index 93565e5e..86f68830 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbbkjxtkpj.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbbkjxtkpj.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -136,4 +134,7 @@ public class Xxhbbkjxtkpj implements Serializable { private java.util.Date timestamps; private String kbbh; + + @TableField(exist = false) + private Integer mysqlnum; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbsynclog.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbsynclog.java index 1c472e8d..b6ee36fb 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbsynclog.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbsynclog.java @@ -58,10 +58,18 @@ public class Xxhbsynclog implements Serializable { @ApiModelProperty(value = "同步行数量") private java.lang.String errormessage; + /**oracle表名*/ private java.lang.String oratabname; + + /**mysql表数量*/ private Integer tablenum; + + /**oracle表数量*/ private Integer oratabnum; + + /**本次同步数据量*/ private Integer syncnum; + /**同步类型 0全量 1增量*/ private java.lang.String synctype; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbbkjxtkpjMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbbkjxtkpjMapper.java index fc1e3003..0b7fd916 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbbkjxtkpjMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbbkjxtkpjMapper.java @@ -14,4 +14,5 @@ import org.jeecg.modules.kc.grab.imports.entity.Xxhbbkjxtkpj; */ public interface XxhbbkjxtkpjMapper extends BaseMapper { + Xxhbbkjxtkpj getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbkjxtkpjMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbkjxtkpjMapper.xml index c049a0ad..8921661a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbkjxtkpjMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbbkjxtkpjMapper.xml @@ -2,4 +2,8 @@ + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbbkjxtkpjService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbbkjxtkpjService.java index 02806109..1c39e835 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbbkjxtkpjService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbbkjxtkpjService.java @@ -6,6 +6,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Collection; import java.util.List; +import java.util.Map; /** * @Description: xxhbbkjxtkpj @@ -19,4 +20,6 @@ public interface IXxhbbkjxtkpjService extends IService { @Transactional(rollbackFor = {Exception.class}) boolean syncList(Collection entityList, boolean isDelete); + + Xxhbbkjxtkpj getSumnum(); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbbkjxtkpjServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbbkjxtkpjServiceImpl.java index e1d488e8..f8acb499 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbbkjxtkpjServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbbkjxtkpjServiceImpl.java @@ -35,4 +35,9 @@ public class XxhbbkjxtkpjServiceImpl extends ServiceImpl exportList = kcEvaluationService.selectKkdwExportList(kcEvaluation); + Map sourceDictMap = Maps.newHashMap(); + //0：门户添加，1：老系统，2：政务大厅，3后台导入 + sourceDictMap.put(0,"门户添加"); + sourceDictMap.put(1,"老系统"); + sourceDictMap.put(2,"政务大厅"); + sourceDictMap.put(3,"后台导入"); + //更改字典项 + exportList.forEach(x -> { + x.setSourceName(sourceDictMap.get(x.getSource())); + }); // Step.3 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); @@ -331,7 +343,7 @@ public class KcEvaluationController extends JeecgController exportList = kcEvaluationService.selectPkmxExportList(kcEvaluationPkmx); + Map sourceDictMap = Maps.newHashMap(); + //0：门户添加，1：老系统，2：政务大厅，3后台导入 + sourceDictMap.put(0,"门户添加"); + sourceDictMap.put(1,"老系统"); + sourceDictMap.put(2,"政务大厅"); + sourceDictMap.put(3,"后台导入"); + //更改字典项 + exportList.forEach(x -> { + x.setSourceName(sourceDictMap.get(x.getSource())); + }); + // Step.3 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); //此处设置的filename无效 ,前端会重更新设置一下 diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java index 87627233..4755cb88 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java @@ -98,6 +98,10 @@ public class KcEvaluation implements Serializable { @ApiModelProperty(value = "数据来源（0：课程中心，1：老系统，2：政务大厅，3：纸质评价）") private java.lang.Integer source; + @Excel(name = "评价来源", width = 15) + @TableField(exist = false) + private String sourceName; + @Excel(name = "职工号", width = 15) @TableField(exist = false) private java.lang.String userid; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluationPkmx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluationPkmx.java index 8aee9f56..aa2be227 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluationPkmx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluationPkmx.java @@ -55,7 +55,7 @@ public class KcEvaluationPkmx implements Serializable { private String upDate; @Excel(name = "评课时间", width = 15) private String upTime; - @Excel(name = "评课标准", width = 15) +// @Excel(name = "评课标准", width = 15) private String bz; @@ -63,4 +63,10 @@ public class KcEvaluationPkmx implements Serializable { private String startTime; private String endTime; + /**数据来源（0：门户添加，1：老系统，2：政务大厅，3后台导入）*/ + private java.lang.Integer source; + + @Excel(name = "评价来源", width = 15) + private String sourceName; + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml index f1c4d343..f5eaabfb 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml @@ -48,7 +48,8 @@ ( SELECT k.id,c.USER as userid, c.cn as username, c.college, k.kkdw, k.kcmc, k.kcxz, k.skjs, k.week as zc, k.hh as jc, p.up_date, p.up_time, p.id AS evaId, p.evaluationver, - k.bz + k.bz, + p.source FROM kc_ketangbiao k, kc_evaluation p, kc_casusers c WHERE k.id = p.minkcid @@ -264,7 +265,7 @@