数据运维相关

lab-plugin/lab-workflow/pom.xml

@@ -22,7 +22,7 @@
 
         <dependency>
             <groupId>org.springblade</groupId>
-            <artifactId>lab-lims-api</artifactId>
+            <artifactId>lab-dict-api</artifactId>
             <version>${bladex.project.version}</version>
         </dependency>
         <!-- Blade -->

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;
+}

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;
+
+}

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;
+
+}

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;
+}

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;
+}

lab-service/lab-user/pom.xml

@@ -39,12 +39,12 @@
             <version>${bladex.project.version}</version>
         </dependency>
 
-        <dependency>
+<!--        <dependency>-->
-            <groupId>org.springblade</groupId>
+<!--            <groupId>org.springblade</groupId>-->
-            <artifactId>lab-lims-api</artifactId>
+<!--            <artifactId>lab-lims-api</artifactId>-->
-            <version>2.8.1.RELEASE</version>
+<!--            <version>2.8.1.RELEASE</version>-->
-            <scope>compile</scope>
+<!--            <scope>compile</scope>-->
-        </dependency>
+<!--        </dependency>-->
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>lab-resource-api</artifactId>

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"),

lab-service/lab-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java

@@ -26,7 +26,7 @@ public interface UserMapper extends BaseMapper<User> {
 	 * @param tenantId
 	 * @return
 	 */
-	List<User> selectUserPage(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId, @Param("userIds") List<Long> userIds);
+	List<User> selectUserPage(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
 
 	/**
 	 * 获取用户

lab-service/lab-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -57,12 +57,6 @@
             </foreach>
             )
         </if>
-        <if test="userIds!=null and userIds.size>0">
-            and id not in
-            <foreach collection="userIds" index="index" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
         ORDER BY id
     </select>
 

lab-service/lab-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -196,29 +196,30 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 
     @Override
     public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
-        String roleIdsTemp = AuthUtil.getUser().getRoleId();
+//        String roleIdsTemp = AuthUtil.getUser().getRoleId();
-        String[] roleIds = roleIdsTemp.split(",");
+//        String[] roleIds = roleIdsTemp.split(",");
+//        List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+//        List<Long> 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<User> users = listRolebyId(roleName);
+//                List<Long> collect = users.stream().map(User::getId).collect(Collectors.toList());
+//                userIds.addAll(collect);
+//            }
+//        }
         List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
-        List<Long> userIds = new ArrayList<>();
+        return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
-        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<User> users = listRolebyId(roleName);
-                List<Long> collect = users.stream().map(User::getId).collect(Collectors.toList());
-                userIds.addAll(collect);
-            }
-        }
-        return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId, userIds));
     }
 
     @Override