diff --git a/lab-plugin/lab-workflow/pom.xml b/lab-plugin/lab-workflow/pom.xml index 4ddbd69..531b58a 100644 --- a/lab-plugin/lab-workflow/pom.xml +++ b/lab-plugin/lab-workflow/pom.xml @@ -22,7 +22,7 @@ org.springblade - lab-lims-api + lab-dict-api ${bladex.project.version} diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/entity/DataBase.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/entity/DataBase.java new file mode 100644 index 0000000..74e654c --- /dev/null +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/entity/DataBase.java @@ -0,0 +1,64 @@ +package org.springblade.plugin.operation.database.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +@Data +@TableName("t_data_base") +@EqualsAndHashCode(callSuper = true) +public class DataBase extends TenantEntity { + + private static final long serialVersionUID = 1L; + + /** + * 数据库名称 + */ + private String dataBaseName; + + /** + * 数据库中文别名 + */ + private String dataBaseAlias; + + /** + * 数据库类型 + */ + private Integer dataBaseType; + + /** + * 数据库版本 + */ + private String dataBaseVersion; + + /** + * 数据库ip + */ + private String dataBaseIp; + + /** + * 数据库端口 + */ + private String dataBasePort; + + /** + * 系统名称 + */ + private String systemName; + + /** + * 模块名称 + */ + private String systemModuleName; + + /** + * 表名称 + */ + private String dataTableName; + + /** + * 中文别名 + */ + private String dataTableAlias; +} diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/excel/DatabaseExcel.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/excel/DatabaseExcel.java new file mode 100644 index 0000000..37ab3f2 --- /dev/null +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/database/excel/DatabaseExcel.java @@ -0,0 +1,62 @@ +package org.springblade.plugin.operation.database.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class DatabaseExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + @ColumnWidth(20) + @ExcelProperty("序号") + private String number; + + @ColumnWidth(20) + @ExcelProperty("IP地址") + private String ip; + + @ColumnWidth(20) + @ExcelProperty("端口号") + private String port; + + @ColumnWidth(20) + @ExcelProperty("数据库实例") + private String databaseInstance; + + @ColumnWidth(20) + @ExcelProperty("数据库类型") + private String databaseType; + + @ColumnWidth(20) + @ExcelProperty("数据库中文名") + private String databaseChineseName; + + @ColumnWidth(20) + @ExcelProperty("系统名称") + private String code1; + + @ColumnWidth(20) + @ExcelProperty("模块名称") + private String code2; + + @ColumnWidth(20) + @ExcelProperty("管理部门") + private String code3; + + @ColumnWidth(20) + @ExcelProperty("运维公司") + private String code4; + + @ColumnWidth(20) + @ExcelProperty("表名") + private String code5; + + @ColumnWidth(20) + @ExcelProperty("中文表别名") + private String code6; + +} diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/system/entity/ModuleInfo.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/system/entity/ModuleInfo.java new file mode 100644 index 0000000..4102e79 --- /dev/null +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/system/entity/ModuleInfo.java @@ -0,0 +1,25 @@ +package org.springblade.plugin.operation.system.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +@Data +@TableName("t_module_info") +@EqualsAndHashCode(callSuper = true) +public class ModuleInfo extends TenantEntity { + + private static final long serialVersionUID = 1L; + + /** + * 主表id + */ + private String projectInfoId; + + /** + * 模块名称 + */ + private String moduleName; + +} diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/system/entity/ProjectInfo.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/system/entity/ProjectInfo.java new file mode 100644 index 0000000..862a0ba --- /dev/null +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/system/entity/ProjectInfo.java @@ -0,0 +1,29 @@ +package org.springblade.plugin.operation.system.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +@Data +@TableName("t_project_info") +@EqualsAndHashCode(callSuper = true) +public class ProjectInfo extends TenantEntity { + + private static final long serialVersionUID = 1L; + + /** + * 任务分类名称 + */ + private String name; + + /** + * 上级id + */ + private Long pid; + + /** + * 排序 + */ + private Integer sort; +} diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/task/entity/TaskInfo.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/task/entity/TaskInfo.java new file mode 100644 index 0000000..6612583 --- /dev/null +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/task/entity/TaskInfo.java @@ -0,0 +1,29 @@ +package org.springblade.plugin.operation.task.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +@Data +@TableName("t_task_info") +@EqualsAndHashCode(callSuper = true) +public class TaskInfo extends TenantEntity { + + private static final long serialVersionUID = 1L; + + /** + * 任务种类名称 + */ + private String taskTypeName; + + /** + * 任务父类，字典id + */ + private String taskParentId; + + /** + * 人物等级，字典id + */ + private String taskLevel; +} diff --git a/lab-service/lab-user/pom.xml b/lab-service/lab-user/pom.xml index 86cc882..431c34b 100644 --- a/lab-service/lab-user/pom.xml +++ b/lab-service/lab-user/pom.xml @@ -39,12 +39,12 @@ ${bladex.project.version} - - org.springblade - lab-lims-api - 2.8.1.RELEASE - compile - + + + + + + org.springblade lab-resource-api diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java index ed1bb8e..71ce12d 100644 --- a/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java +++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java @@ -100,7 +100,7 @@ public class UserController { /** * 用户列表 */ - @ApiLog("查看用户列表") + @GetMapping("/list") @ApiImplicitParams({ @ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"), @@ -142,6 +142,7 @@ public class UserController { /** * 自定义用户列表 */ + @ApiLog("查看用户列表") @GetMapping("/page") @ApiImplicitParams({ @ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"), diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java index 0968db0..b1ef14f 100644 --- a/lab-service/lab-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java +++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java @@ -26,7 +26,7 @@ public interface UserMapper extends BaseMapper { * @param tenantId * @return */ - List selectUserPage(IPage page, @Param("user") User user, @Param("deptIdList") List deptIdList, @Param("tenantId") String tenantId, @Param("userIds") List userIds); + List selectUserPage(IPage page, @Param("user") User user, @Param("deptIdList") List deptIdList, @Param("tenantId") String tenantId); /** * 获取用户 diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml b/lab-service/lab-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml index 98b9a1c..85fba58 100644 --- a/lab-service/lab-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml +++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml @@ -57,12 +57,6 @@ ) - - and id not in - - #{item} - - ORDER BY id diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java index fe553e0..4a783e9 100644 --- a/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java +++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java @@ -196,29 +196,30 @@ public class UserServiceImpl extends BaseServiceImpl implement @Override public IPage selectUserPage(IPage page, User user, Long deptId, String tenantId) { - String roleIdsTemp = AuthUtil.getUser().getRoleId(); - String[] roleIds = roleIdsTemp.split(","); +// String roleIdsTemp = AuthUtil.getUser().getRoleId(); +// String[] roleIds = roleIdsTemp.split(","); +// List deptIdList = SysCache.getDeptChildIds(deptId); +// List userIds = new ArrayList<>(); +// for (String myRoleId : roleIds) { +// String data = sysClient.getRoleAlias(Long.valueOf(myRoleId)).getData(); +// // 拿系统参数角色别名 +// String roleAlais = sysClient.getParamValue("hide_role_alias").getData(); +// if (!roleAlais.equals(data)) { +// System.out.println("=========================================================="); +// System.out.println("tenantId: " + tenantId); +// String roleId = sysClient.getRoleIdByAlias(tenantId, roleAlais).getData(); +// System.out.println("=========================================================="); +// System.out.println("roleId: " + roleId); +// String roleName = sysClient.getRoleName(Long.valueOf(roleId)).getData(); +// System.out.println("=========================================================="); +// System.out.println("roleName: " + roleName); +// List users = listRolebyId(roleName); +// List collect = users.stream().map(User::getId).collect(Collectors.toList()); +// userIds.addAll(collect); +// } +// } List deptIdList = SysCache.getDeptChildIds(deptId); - List userIds = new ArrayList<>(); - for (String myRoleId : roleIds) { - String data = sysClient.getRoleAlias(Long.valueOf(myRoleId)).getData(); - // 拿系统参数角色别名 - String roleAlais = sysClient.getParamValue("hide_role_alias").getData(); - if (!roleAlais.equals(data)) { - System.out.println("=========================================================="); - System.out.println("tenantId: " + tenantId); - String roleId = sysClient.getRoleIdByAlias(tenantId, roleAlais).getData(); - System.out.println("=========================================================="); - System.out.println("roleId: " + roleId); - String roleName = sysClient.getRoleName(Long.valueOf(roleId)).getData(); - System.out.println("=========================================================="); - System.out.println("roleName: " + roleName); - List users = listRolebyId(roleName); - List collect = users.stream().map(User::getId).collect(Collectors.toList()); - userIds.addAll(collect); - } - } - return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId, userIds)); + return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId)); } @Override