From 7d0e1ddfed577bdc8d4cd44cc18f8cf62186d00e Mon Sep 17 00:00:00 2001 From: lishangbu Date: Fri, 24 Dec 2021 09:24:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=8F=98=E6=9B=B4=E4=B8=BB=E9=94=AE=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E4=B8=BAASSIGN=5FID=E5=90=8E=E7=94=A8=E6=88=B7=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E5=A4=B1=E8=B4=A5=E4=BB=A5=E5=8F=8A=E6=97=A0=E6=B3=95?= =?UTF-8?q?Excel=E5=AF=BC=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java | 2 +- .../main/java/com/pig4cloud/pigx/admin/api/vo/UserExcelVO.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java index 85284ef55..12a633ca2 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java @@ -45,7 +45,7 @@ public class SysUser implements Serializable { /** * 主键ID */ - @TableId(value = "user_id", type = IdType.AUTO) + @TableId(value = "user_id", type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键id") private Long userId; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserExcelVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserExcelVO.java index dcbe2421c..d60109641 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserExcelVO.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserExcelVO.java @@ -24,7 +24,7 @@ public class UserExcelVO implements Serializable { * 主键ID */ @ExcelProperty("用户编号") - private Integer userId; + private Long userId; /** * 用户名 From 6f9259dc9bc0807f3f06458f23e3ee8cb7107d51 Mon Sep 17 00:00:00 2001 From: lishangbu Date: Fri, 24 Dec 2021 11:43:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?:bug:=20Fixing=20a=20bug.insertBatchSomeCol?= =?UTF-8?q?umn=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); } } From 1b26ef69c7ed421f3bc0b75302567bd3537bd8b6 Mon Sep 17 00:00:00 2001 From: lishangbu Date: Fri, 24 Dec 2021 22:19:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?:bug:=20Fixing=20a=20bug.close=20#3489=20lo?= =?UTF-8?q?g4j=E7=89=88=E6=9C=AC=E8=A6=86=E7=9B=96=E4=B8=8D=E5=AE=8C?= =?UTF-8?q?=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pigx-common/pigx-common-bom/pom.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index f0126105b..e2cf84ced 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -34,7 +34,7 @@ 2.3.0 3.0.52.ALL 1.11.543 - 2.15.0 + 2.17.0 0.0.23 0.33.0 1.0.0 @@ -237,13 +237,15 @@ org.apache.logging.log4j - log4j-api - ${log4j.version} + log4j-to-slf4j + ${log4j2.version} org.apache.logging.log4j - log4j-core - ${log4j.version} + log4j-bom + ${log4j2.version} + pom + import From 9a58c47093969bf1655207bf7d9014e0e95974be Mon Sep 17 00:00:00 2001 From: lishangbu Date: Sat, 25 Dec 2021 11:22:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?:boom:=20Introducing=20breaking=20changes.?= =?UTF-8?q?=E5=A4=84=E7=90=86upms=E4=B8=AD=E7=9A=84type=E4=B8=8Esort?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit xxx --- .../pigx/admin/api/entity/SysDept.java | 2 +- .../pigx/admin/api/entity/SysDict.java | 5 +- .../pigx/admin/api/entity/SysDictItem.java | 2 +- .../pigx/admin/api/entity/SysMenu.java | 4 +- .../service/impl/SysDeptServiceImpl.java | 4 +- .../service/impl/SysDictItemServiceImpl.java | 4 +- .../service/impl/SysDictServiceImpl.java | 4 +- .../service/impl/SysMenuServiceImpl.java | 16 +++---- .../service/impl/SysTenantServiceImpl.java | 4 +- .../main/resources/mapper/SysDeptMapper.xml | 24 ---------- .../resources/mapper/SysDictItemMapper.xml | 39 ---------------- .../main/resources/mapper/SysDictMapper.xml | 35 -------------- .../main/resources/mapper/SysFileMapper.xml | 26 ----------- .../main/resources/mapper/SysLogMapper.xml | 26 ----------- .../main/resources/mapper/SysMenuMapper.xml | 46 +++++++++++-------- .../mapper/SysOauthClientDetailsMapper.xml | 40 ---------------- .../resources/mapper/SysPublicParamMapper.xml | 38 --------------- .../main/resources/mapper/SysRoleMapper.xml | 21 ++++++--- .../resources/mapper/SysRoleMenuMapper.xml | 30 ------------ .../resources/mapper/SysRouteConfMapper.xml | 23 ---------- .../mapper/SysSocialDetailsMapper.xml | 37 --------------- .../main/resources/mapper/SysTenantMapper.xml | 37 --------------- .../main/resources/mapper/SysUserMapper.xml | 2 +- 23 files changed, 65 insertions(+), 404 deletions(-) delete mode 100644 pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml delete mode 100755 pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDictItemMapper.xml delete mode 100644 pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDictMapper.xml delete mode 100644 pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysFileMapper.xml delete mode 100644 pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml delete mode 100644 pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysOauthClientDetailsMapper.xml delete mode 100644 pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysPublicParamMapper.xml delete mode 100644 pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMenuMapper.xml delete mode 100755 pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRouteConfMapper.xml delete mode 100755 pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysSocialDetailsMapper.xml delete mode 100755 pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysTenantMapper.xml diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java index 9a802f371..70c4a4b48 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java @@ -61,7 +61,7 @@ public class SysDept extends Model { */ @NotNull(message = "排序值不能为空") @ApiModelProperty(value = "排序值") - private Integer sort; + private Integer sortOrder; /** * 创建时间 diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java index 28ddcb568..19c1552ae 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java @@ -49,7 +49,7 @@ public class SysDict extends Model { * 类型 */ @ApiModelProperty(value = "字典类型") - private String type; + private String dictType; /** * 描述 @@ -74,9 +74,8 @@ public class SysDict extends Model { /** * 是否是系统内置 */ - @TableField(value = "`system`") @ApiModelProperty(value = "是否系统内置") - private String system; + private String systemFlag; /** * 备注信息 diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java index 8ad453acd..330832111 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java @@ -79,7 +79,7 @@ public class SysDictItem extends Model { * 排序（升序） */ @ApiModelProperty(value = "排序值，默认升序") - private Integer sort; + private Integer sortOrder; /** * 创建时间 diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java index 34ff2d6d3..1fe8b8d7b 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java @@ -88,14 +88,14 @@ public class SysMenu extends Model { * 排序值 */ @ApiModelProperty(value = "排序值") - private Integer sort; + private Integer sortOrder; /** * 菜单类型 （0菜单 1按钮） */ @NotNull(message = "菜单类型不能为空") @ApiModelProperty(value = "菜单类型,0:菜单 1:按钮") - private String type; + private String menuType; /** * 路由缓冲 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java index 864dc9aa4..4161eab20 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java @@ -128,12 +128,12 @@ public class SysDeptServiceImpl extends ServiceImpl impl // 权限内部门 List> collect = deptAllList.stream() .filter(dept -> dept.getDeptId().intValue() != dept.getParentId()) - .sorted(Comparator.comparingInt(SysDept::getSort)).map(dept -> { + .sorted(Comparator.comparingInt(SysDept::getSortOrder)).map(dept -> { TreeNode treeNode = new TreeNode(); treeNode.setId(dept.getDeptId()); treeNode.setParentId(dept.getParentId()); treeNode.setName(dept.getName()); - treeNode.setWeight(dept.getSort()); + treeNode.setWeight(dept.getSortOrder()); // 有权限不返回标识 Map extra = new HashMap<>(8); extra.put("isLock", !deptOwnIdList.contains(dept.getDeptId())); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictItemServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictItemServiceImpl.java index 484d8c541..cf61ec4df 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictItemServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictItemServiceImpl.java @@ -53,7 +53,7 @@ public class SysDictItemServiceImpl extends ServiceImpl impl public R removeDict(Long id) { SysDict dict = this.getById(id); // 系统内置 - if (DictTypeEnum.SYSTEM.getType().equals(dict.getSystem())) { + if (DictTypeEnum.SYSTEM.getType().equals(dict.getSystemFlag())) { return R.failed("系统内置字典不能删除"); } @@ -73,7 +73,7 @@ public class SysDictServiceImpl extends ServiceImpl impl public R updateDict(SysDict dict) { SysDict sysDict = this.getById(dict.getId()); // 系统内置 - if (DictTypeEnum.SYSTEM.getType().equals(sysDict.getSystem())) { + if (DictTypeEnum.SYSTEM.getType().equals(sysDict.getSystemFlag())) { return R.failed("系统内置字典不能修改"); } return R.ok(this.updateById(dict)); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java index a1c45e1f9..a6f19e7a5 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java @@ -100,7 +100,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl public List> treeMenu(boolean lazy, Long parentId) { if (!lazy) { List> collect = baseMapper - .selectList(Wrappers.lambdaQuery().orderByAsc(SysMenu::getSort)).stream() + .selectList(Wrappers.lambdaQuery().orderByAsc(SysMenu::getSortOrder)).stream() .map(getNodeFunction()).collect(Collectors.toList()); return TreeUtil.build(collect, CommonConstants.MENU_TREE_ROOT_ID); @@ -109,8 +109,8 @@ public class SysMenuServiceImpl extends ServiceImpl impl Long parent = parentId == null ? CommonConstants.MENU_TREE_ROOT_ID : parentId; List> collect = baseMapper - .selectList( - Wrappers.lambdaQuery().eq(SysMenu::getParentId, parent).orderByAsc(SysMenu::getSort)) + .selectList(Wrappers.lambdaQuery().eq(SysMenu::getParentId, parent) + .orderByAsc(SysMenu::getSortOrder)) .stream().map(getNodeFunction()).collect(Collectors.toList()); return TreeUtil.build(collect, parent); @@ -138,15 +138,15 @@ public class SysMenuServiceImpl extends ServiceImpl impl node.setId(menu.getMenuId()); node.setName(menu.getName()); node.setParentId(menu.getParentId()); - node.setWeight(menu.getSort()); + node.setWeight(menu.getSortOrder()); // 扩展属性 Map extra = new HashMap<>(); extra.put("icon", menu.getIcon()); extra.put("path", menu.getPath()); - extra.put("type", menu.getType()); + extra.put("menuType", menu.getMenuType()); extra.put("permission", menu.getPermission()); extra.put("label", menu.getName()); - extra.put("sort", menu.getSort()); + extra.put("sortOrder", menu.getSortOrder()); extra.put("keepAlive", menu.getKeepAlive()); node.setExtra(extra); return node; @@ -161,10 +161,10 @@ public class SysMenuServiceImpl extends ServiceImpl impl private Predicate menuTypePredicate(String type) { return vo -> { if (MenuTypeEnum.TOP_MENU.getDescription().equals(type)) { - return MenuTypeEnum.TOP_MENU.getType().equals(vo.getType()); + return MenuTypeEnum.TOP_MENU.getType().equals(vo.getMenuType()); } // 其他查询 左侧 + 顶部 - return !MenuTypeEnum.BUTTON.getType().equals(vo.getType()); + return !MenuTypeEnum.BUTTON.getType().equals(vo.getMenuType()); }; } 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 b04856428..0c36073dd 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 @@ -171,8 +171,8 @@ public class SysTenantServiceImpl extends ServiceImpl d.setId(null)).collect(Collectors.toList())); // 处理字典项最新关联的字典ID - List itemList = dictList.stream().flatMap( - dict -> dictItemList.stream().filter(item -> item.getType().equals(dict.getType())).peek(item -> { + List itemList = dictList.stream().flatMap(dict -> dictItemList.stream() + .filter(item -> item.getType().equals(dict.getDictType())).peek(item -> { item.setDictId(dict.getId()); item.setId(null); })).collect(Collectors.toList()); diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml deleted file mode 100644 index 7f0befa96..000000000 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDictItemMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDictItemMapper.xml deleted file mode 100755 index 94c211c7a..000000000 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDictItemMapper.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDictMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDictMapper.xml deleted file mode 100644 index 0cd77cdb7..000000000 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDictMapper.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysFileMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysFileMapper.xml deleted file mode 100644 index 780530b31..000000000 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysFileMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml deleted file mode 100644 index e5894525c..000000000 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml index c61510f40..706d03a4a 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml @@ -20,7 +20,6 @@ - @@ -29,8 +28,8 @@ - - + + @@ -39,23 +38,32 @@ + SELECT sys_menu.menu_id, + sys_menu.name, + sys_menu.permission, + sys_menu.path, + sys_menu.parent_id, + sys_menu.icon, + sys_menu.sort_order, + sys_menu.keep_alive, + sys_menu.menu_type, + sys_menu.create_time, + sys_menu.update_time, + sys_menu.del_flag + FROM sys_menu + LEFT JOIN sys_role_menu ON sys_menu.menu_id = sys_role_menu.menu_id + WHERE sys_menu.del_flag = 0 + AND sys_role_menu.role_id = #{roleId} + ORDER BY sys_menu.sort_order DESC + + SELECT m.permission + FROM sys_menu m, + sys_role_menu rm + WHERE m.menu_id = rm.menu_id + AND m.del_flag = 0 + AND rm.role_id IN (#{roleIds}) + diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysOauthClientDetailsMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysOauthClientDetailsMapper.xml deleted file mode 100644 index ec0db5556..000000000 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysOauthClientDetailsMapper.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysPublicParamMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysPublicParamMapper.xml deleted file mode 100644 index a4995cde4..000000000 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysPublicParamMapper.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml index b48488340..f2052a7a5 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml @@ -20,7 +20,6 @@ - @@ -36,9 +35,19 @@ + SELECT sys_role.role_id, + sys_role.role_name, + sys_role.role_code, + sys_role.role_desc, + sys_role.ds_type, + sys_role.ds_scope, + sys_role.create_time, + sys_role.update_time, + sys_role.del_flag + FROM sys_role, + sys_user_role + WHERE sys_role.role_id = sys_user_role.role_id + AND sys_role.del_flag = 0 + and sys_user_role.user_id = #{userId} + diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMenuMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMenuMapper.xml deleted file mode 100644 index 9e3589622..000000000 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMenuMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRouteConfMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRouteConfMapper.xml deleted file mode 100755 index 2bd2e0264..000000000 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRouteConfMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysSocialDetailsMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysSocialDetailsMapper.xml deleted file mode 100755 index 698decb4e..000000000 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysSocialDetailsMapper.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysTenantMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysTenantMapper.xml deleted file mode 100755 index 5d238ff7d..000000000 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysTenantMapper.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml index 1b71bdce4..c79fcc1e7 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml @@ -58,7 +58,7 @@ - +