diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index e95d4243d..9e391ef44 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -6,7 +6,7 @@ group.springframework spring-cloud-dependencies-parent - 2020.0.3 + 2020.0.4 @@ -17,10 +17,10 @@ pigx 公共版本控制 - 4.1.0 - 3.4.3 + 4.2.0 + 3.4.3.4 3.4.1 - 1.2.5 + 1.2.8 8.0.23 1.5.22 3.9.0 @@ -226,12 +226,6 @@ jsoup ${jsoup.version} - - - com.pig4cloud.excel - excel-spring-boot-starter - ${excel.version} - diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeSqlInjector.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeSqlInjector.java index 9ccf7f1f7..bcc6898b6 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeSqlInjector.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeSqlInjector.java @@ -2,6 +2,7 @@ package com.pig4cloud.pigx.common.data.datascope; import com.baomidou.mybatisplus.core.injector.AbstractMethod; import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector; +import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.extension.injector.methods.InsertBatchSomeColumn; import java.util.List; @@ -15,8 +16,8 @@ import java.util.List; public class DataScopeSqlInjector extends DefaultSqlInjector { @Override - public List getMethodList(Class mapperClass) { - List methodList = super.getMethodList(mapperClass); + public List getMethodList(Class mapperClass, TableInfo tableInfo) { + List methodList = super.getMethodList(mapperClass, tableInfo); methodList.add(new SelectListByScope()); methodList.add(new SelectPageByScope()); methodList.add(new SelectCountByScope()); diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/SelectCountByScope.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/SelectCountByScope.java index 603fdbbcf..3ece0999e 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/SelectCountByScope.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/SelectCountByScope.java @@ -23,7 +23,7 @@ public class SelectCountByScope extends AbstractMethod { this.sqlComment()); SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass); - return this.addSelectMappedStatementForOther(mapperClass, "selectCountByScope", sqlSource, Integer.class); + return this.addSelectMappedStatementForOther(mapperClass, "selectCountByScope", sqlSource, Long.class); } } diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java index c3e9d46c9..1717ffcfc 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java @@ -149,7 +149,7 @@ public class SysJobController { @ApiOperation(value = "暂停全部定时任务") public R shutdownJobs() { taskUtil.pauseJobs(scheduler); - int count = this.sysJobService + long count = this.sysJobService .count(new LambdaQueryWrapper().eq(SysJob::getJobStatus, JOB_STATUS_RUNNING.getType())); if (count <= 0) { return R.ok("无正在运行定时任务");