From 727ed43cf3025f3743142ee084989b7ca596acff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Tue, 25 Aug 2020 09:18:35 +0800
Subject: [PATCH] =?UTF-8?q?:rewind:=20Reverting=20changes.=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=83=A8=E5=88=86=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=EF=BC=8C=20mybatisplus=20=E7=A9=BA=E5=B1=9E=E6=80=A7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=BB=98=E8=AE=A4=E5=80=BC=E8=A6=86=E7=9B=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/service/impl/SysLogServiceImpl.java |  3 +-
 .../service/impl/SysRouteConfServiceImpl.java |  2 +-
 .../service/impl/SysTenantServiceImpl.java    | 63 +++++++++----------
 3 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java
index 883ce17d9..c3e622393 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java
@@ -60,8 +60,7 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
 			log.setCreateBy(pre.getUser());
 			return log;
 		}).collect(Collectors.toList());
-		baseMapper.insertBatchSomeColumn(sysLogs);
-		return Boolean.TRUE;
+		return this.saveBatch(sysLogs);
 	}
 
 }
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java
index e95ea94f1..eae902f43 100755
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java
@@ -138,7 +138,7 @@ public class SysRouteConfServiceImpl extends ServiceImpl<SysRouteConfMapper, Sys
 				routeConf.setUri(vo.getUri().toString());
 				return routeConf;
 			}).collect(Collectors.toList());
-			baseMapper.insertBatchSomeColumn(routeConfList);
+			this.saveBatch(routeConfList);
 			log.debug("更新网关路由结束 ");
 
 			this.applicationEventPublisher.publishEvent(new RefreshRoutesEvent(this));
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 c3ab5f1f5..d5a35af63 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
@@ -22,9 +22,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pig4cloud.pigx.admin.api.dto.MenuTree;
 import com.pig4cloud.pigx.admin.api.entity.*;
 import com.pig4cloud.pigx.admin.api.vo.TreeUtil;
-import com.pig4cloud.pigx.admin.mapper.*;
-import com.pig4cloud.pigx.admin.service.SysDeptRelationService;
-import com.pig4cloud.pigx.admin.service.SysTenantService;
+import com.pig4cloud.pigx.admin.mapper.SysRoleMenuMapper;
+import com.pig4cloud.pigx.admin.mapper.SysTenantMapper;
+import com.pig4cloud.pigx.admin.service.*;
 import com.pig4cloud.pigx.common.core.constant.CacheConstants;
 import com.pig4cloud.pigx.common.core.constant.CommonConstants;
 import com.pig4cloud.pigx.common.data.resolver.ParamResolver;
@@ -54,27 +54,27 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 
 	private static final PasswordEncoder ENCODER = new BCryptPasswordEncoder();
 
-	private final SysOauthClientDetailsMapper clientDetailsMapper;
+	private final SysOauthClientDetailsService clientServices;
 
 	private final SysDeptRelationService deptRelationService;
 
+	private final SysUserRoleService userRoleService;
+
 	private final SysRoleMenuMapper roleMenuMapper;
 
-	private final SysDictItemMapper dictItemMapper;
+	private final SysDictItemService dictItemService;
 
-	private final SysPublicParamMapper paramMapper;
+	private final SysPublicParamService paramService;
 
-	private final SysUserRoleMapper userRoleMapper;
+	private final SysUserService userService;
 
-	private final SysMenuMapper menuMapper;
+	private final SysRoleService roleService;
 
-	private final SysDictMapper dictMapper;
+	private final SysMenuService menuService;
 
-	private final SysDeptMapper deptMapper;
+	private final SysDeptService deptService;
 
-	private final SysUserMapper userMapper;
-
-	private final SysRoleMapper roleMapper;
+	private final SysDictService dictService;
 
 	/**
 	 * 获取正常状态租户
@@ -119,17 +119,17 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 
 		TenantBroker.runAs(defaultId, (id) -> {
 			// 查询系统内置字典
-			dictList.addAll(dictMapper.selectList(Wrappers.emptyWrapper()));
+			dictList.addAll(dictService.list());
 			// 查询系统内置字典项目
 			dictIdList.addAll(dictList.stream().map(SysDict::getId).collect(Collectors.toList()));
-			dictItemList.addAll(dictItemMapper
-					.selectList(Wrappers.<SysDictItem>lambdaQuery().in(SysDictItem::getDictId, dictIdList)));
+			dictItemList.addAll(
+					dictItemService.list(Wrappers.<SysDictItem>lambdaQuery().in(SysDictItem::getDictId, dictIdList)));
 			// 查询当前租户菜单
-			menuList.addAll(menuMapper.selectList(Wrappers.emptyWrapper()));
+			menuList.addAll(menuService.list());
 			// 查询客户端配置
-			clientDetailsList.addAll(clientDetailsMapper.selectList(Wrappers.emptyWrapper()));
+			clientDetailsList.addAll(clientServices.list());
 			// 查询系统参数配置
-			publicParamList.addAll(paramMapper.selectList(Wrappers.emptyWrapper()));
+			publicParamList.addAll(paramService.list());
 		});
 
 		// 保证插入租户为新的租户
@@ -139,7 +139,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 			SysDept dept = new SysDept();
 			dept.setName(defaultDeptName);
 			dept.setParentId(0);
-			deptMapper.insert(dept);
+			deptService.save(dept);
 			// 维护部门关系
 			deptRelationService.insertDeptRelation(dept);
 			// 构造初始化用户
@@ -147,43 +147,42 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 			user.setUsername(defaultUsername);
 			user.setPassword(ENCODER.encode(defaultPassword));
 			user.setDeptId(dept.getDeptId());
-			userMapper.insert(user);
+			userService.save(user);
 			// 构造新角色
 			SysRole role = new SysRole();
 			role.setRoleCode(defaultRoleCode);
 			role.setRoleName(defaultRoleName);
-			roleMapper.insert(role);
+			roleService.save(role);
 			// 用户角色关系
 			SysUserRole userRole = new SysUserRole();
 			userRole.setUserId(user.getUserId());
 			userRole.setRoleId(role.getRoleId());
-			userRoleMapper.insert(userRole);
+			userRoleService.save(userRole);
 			// 插入新的菜单
 			saveTenantMenu(TreeUtil.buildTree(menuList, CommonConstants.MENU_TREE_ROOT_ID),
 					CommonConstants.MENU_TREE_ROOT_ID);
-			List<SysMenu> newMenuList = menuMapper.selectList(Wrappers.emptyWrapper());
+			List<SysMenu> newMenuList = menuService.list();
 
 			// 查询全部菜单,构造角色菜单关系
-			List<SysRoleMenu> collect = newMenuList.stream().map(menu -> {
+			List<SysRoleMenu> roleMenuList = newMenuList.stream().map(menu -> {
 				SysRoleMenu roleMenu = new SysRoleMenu();
 				roleMenu.setRoleId(role.getRoleId());
 				roleMenu.setMenuId(menu.getMenuId());
 				return roleMenu;
 			}).collect(Collectors.toList());
-			roleMenuMapper.insertBatchSomeColumn(collect);
+			roleMenuMapper.insertBatchSomeColumn(roleMenuList);
 			// 插入系统字典
-			dictMapper.insertBatchSomeColumn(dictList);
+			dictService.saveBatch(dictList);
 			// 处理字典项最新关联的字典ID
 			List<SysDictItem> itemList = dictList.stream().flatMap(dict -> dictItemList.stream()
 					.filter(item -> item.getType().equals(dict.getType())).peek(item -> item.setDictId(dict.getId())))
 					.collect(Collectors.toList());
 
 			// 插入客户端
-			clientDetailsMapper.insertBatchSomeColumn(clientDetailsList);
+			clientServices.saveBatch(clientDetailsList);
 			// 插入系统配置
-			paramMapper.insertBatchSomeColumn(publicParamList);
-			dictItemMapper.insertBatchSomeColumn(itemList);
-			return Boolean.TRUE;
+			paramService.saveBatch(publicParamList);
+			return dictItemService.saveBatch(itemList);
 		}));
 
 	}
@@ -198,7 +197,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 			SysMenu menu = new SysMenu();
 			BeanUtils.copyProperties(node, menu, "parentId");
 			menu.setParentId(parent);
-			menuMapper.insert(menu);
+			menuService.save(menu);
 			if (CollUtil.isNotEmpty(node.getChildren())) {
 				List<MenuTree> childrenList = node.getChildren().stream().map(treeNode -> (MenuTree) treeNode)
 						.collect(Collectors.toList());