From 6f9259dc9bc0807f3f06458f23e3ee8cb7107d51 Mon Sep 17 00:00:00 2001 From: lishangbu Date: Fri, 24 Dec 2021 11:43:56 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.insertBatchSomeColumn?= =?UTF-8?q?=E6=98=AFmysql=E7=89=B9=E6=9C=89=E8=AF=AD=E6=B3=95,=E4=B8=8D?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=B7=A8=E6=95=B0=E6=8D=AE=E5=BA=93=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/datascope/DataScopeSqlInjector.java | 2 -- .../common/data/datascope/PigxBaseMapper.java | 7 ------- .../service/impl/SysDeptRelationServiceImpl.java | 2 +- .../service/impl/SysRoleMenuServiceImpl.java | 3 +-- .../admin/service/impl/SysTenantServiceImpl.java | 2 +- .../service/impl/ReportDashboardServiceImpl.java | 16 ++++++---------- .../dataset/service/impl/DataSetServiceImpl.java | 6 +----- 7 files changed, 10 insertions(+), 28 deletions(-) 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..58a44aeb7 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,7 +2,6 @@ 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.extension.injector.methods.InsertBatchSomeColumn; import java.util.List; @@ -20,7 +19,6 @@ public class DataScopeSqlInjector extends DefaultSqlInjector { methodList.add(new SelectListByScope()); methodList.add(new SelectPageByScope()); methodList.add(new SelectCountByScope()); - methodList.add(new InsertBatchSomeColumn()); return methodList; } diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxBaseMapper.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxBaseMapper.java index 9c3e28f16..304e1eb98 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxBaseMapper.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxBaseMapper.java @@ -42,11 +42,4 @@ public interface PigxBaseMapper extends BaseMapper { */ Integer selectCountByScope(@Param(Constants.WRAPPER) Wrapper queryWrapper, DataScope scope); - /** - * 批量插入 仅适用于 mysql - * @param entityList 实体列表 - * @return 影响行数 - */ - Integer insertBatchSomeColumn(List entityList); - } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java index 4e7dd22b2..4fb0373ea 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java @@ -63,7 +63,7 @@ public class SysDeptRelationServiceImpl extends ServiceImpl baseMapper.insert(ele)); } // 自己也要维护到关系表中 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java index 42ef38b19..a2173029f 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java @@ -74,8 +74,7 @@ public class SysRoleMenuServiceImpl extends ServiceImpl baseMapper.insert(ele)); return Boolean.TRUE; } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java index 7ed1f526d..b04856428 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java @@ -167,7 +167,7 @@ public class SysTenantServiceImpl extends ServiceImpl roleMenuMapper.insert(ele)); // 插入系统字典 dictService.saveBatch(dictList.stream().peek(d -> d.setId(null)).collect(Collectors.toList())); // 处理字典项最新关联的字典ID diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java index 4b6fb9427..ab99a788c 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java @@ -11,20 +11,20 @@ import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.Char import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ReportDashboardDto; import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ReportDashboardObjectDto; import com.anjiplus.template.gaea.business.modules.dashboard.dao.ReportDashboardMapper; +import com.anjiplus.template.gaea.business.modules.dashboard.dao.entity.ReportDashboard; import com.anjiplus.template.gaea.business.modules.dashboard.service.ChartStrategy; import com.anjiplus.template.gaea.business.modules.dashboard.service.ReportDashboardService; -import com.anjiplus.template.gaea.business.modules.file.entity.GaeaFile; -import com.anjiplus.template.gaea.business.modules.file.service.GaeaFileService; -import com.anjiplus.template.gaea.business.modules.file.util.FileUtils; -import com.anjiplus.template.gaea.business.util.DateUtil; import com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto.ReportDashboardWidgetDto; import com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto.ReportDashboardWidgetValueDto; -import com.anjiplus.template.gaea.business.modules.dashboard.dao.entity.ReportDashboard; import com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.entity.ReportDashboardWidget; import com.anjiplus.template.gaea.business.modules.dashboardwidget.service.ReportDashboardWidgetService; import com.anjiplus.template.gaea.business.modules.dataset.controller.dto.DataSetDto; import com.anjiplus.template.gaea.business.modules.dataset.controller.dto.OriginalDataDto; import com.anjiplus.template.gaea.business.modules.dataset.service.DataSetService; +import com.anjiplus.template.gaea.business.modules.file.entity.GaeaFile; +import com.anjiplus.template.gaea.business.modules.file.service.GaeaFileService; +import com.anjiplus.template.gaea.business.modules.file.util.FileUtils; +import com.anjiplus.template.gaea.business.util.DateUtil; import com.anjiplus.template.gaea.business.util.FileUtil; import com.anjiplus.template.gaea.business.util.UuidUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -48,7 +48,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.net.URLEncoder; import java.text.SimpleDateFormat; import java.util.*; @@ -84,7 +83,7 @@ public class ReportDashboardServiceImpl implements ReportDashboardService, Initi private final static String JSON_PATH = "dashboard.json"; - private Map queryServiceImplMap = new HashMap<>(); + private final Map queryServiceImplMap = new HashMap<>(); private ApplicationContext applicationContext; @@ -185,10 +184,7 @@ public class ReportDashboardServiceImpl implements ReportDashboardService, Initi // 兼容底层，不采用批量插入 reportDashboardWidgetService.insert(reportDashboardWidget); - - // reportDashboardWidgetList.add(reportDashboardWidget); } - // reportDashboardWidgetService.insertBatch(reportDashboardWidgetList); } diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java index 1e8afc211..7fa2f506e 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java @@ -8,8 +8,8 @@ import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper; import com.anji.plus.gaea.exception.BusinessExceptionBuilder; import com.anji.plus.gaea.utils.GaeaBeanUtils; import com.anjiplus.template.gaea.business.code.ResponseCode; -import com.anjiplus.template.gaea.business.modules.dataset.controller.dto.OriginalDataDto; import com.anjiplus.template.gaea.business.modules.dataset.controller.dto.DataSetDto; +import com.anjiplus.template.gaea.business.modules.dataset.controller.dto.OriginalDataDto; import com.anjiplus.template.gaea.business.modules.dataset.dao.DataSetMapper; import com.anjiplus.template.gaea.business.modules.dataset.dao.entity.DataSet; import com.anjiplus.template.gaea.business.modules.dataset.service.DataSetService; @@ -296,9 +296,7 @@ public class DataSetServiceImpl implements DataSetService { dataSetParam.setSetCode(setCode); // 不采用批量 dataSetParamService.insert(dataSetParam); - // dataSetParamList.add(dataSetParam); }); - // dataSetParamService.insertBatch(dataSetParamList); } @@ -316,9 +314,7 @@ public class DataSetServiceImpl implements DataSetService { dataSetTransform.setSetCode(setCode); // 不采用批量 dataSetTransformService.insert(dataSetTransform); - // dataSetTransformList.add(dataSetTransform); } - // dataSetTransformService.insertBatch(dataSetTransformList); } }