统计迁移

fs-service/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -612,7 +612,7 @@ public class CompanyServiceImpl implements ICompanyService
         // 8. 构建公司节点
         DeptDataVO companyNode = new DeptDataVO();
         companyNode.setLabel(company.getCompanyName());
-        companyNode.setId(company.getCompanyId());
+        companyNode.setId("company_"+company.getCompanyId());
 
         // 9. 构建部门树（仅包含可见部门）
         // 先找到当前部门对象
@@ -720,7 +720,7 @@ public class CompanyServiceImpl implements ICompanyService
                             if (user.getUserId().equals(currentCompanyUserId)) {
                                 DeptDataVO userNode = new DeptDataVO();
                                 userNode.setLabel(user.getNickName() + "_" + user.getUserName());
-                                userNode.setId(user.getUserId());
+                                userNode.setId("user_"+user.getUserId());
                                 userNode.setChildren(null);
                                 userNodes.add(userNode);
                             }
@@ -728,7 +728,7 @@ public class CompanyServiceImpl implements ICompanyService
                             // 非当前部门，显示所有用户
                             DeptDataVO userNode = new DeptDataVO();
                             userNode.setLabel(user.getNickName() + "_" + user.getUserName());
-                            userNode.setId(user.getUserId());
+                            userNode.setId("user_"+user.getUserId());
                             userNode.setChildren(null);
                             userNodes.add(userNode);
                         }
@@ -744,14 +744,14 @@ public class CompanyServiceImpl implements ICompanyService
             if (!children.isEmpty()) {
                 DeptDataVO deptNode = new DeptDataVO();
                 deptNode.setLabel(dept.getDeptName());
-                deptNode.setId(dept.getDeptId());
+                deptNode.setId("dept_"+dept.getDeptId());
                 deptNode.setChildren(children);
                 result.add(deptNode);
             } else if (deptPath.contains(dept.getDeptId())) {
                 // 即使没有子部门和用户，如果是部门路径上的节点，仍然需要添加
                 DeptDataVO deptNode = new DeptDataVO();
                 deptNode.setLabel(dept.getDeptName());
-                deptNode.setId(dept.getDeptId());
+                deptNode.setId("dept_"+dept.getDeptId());
                 deptNode.setChildren(null);
                 result.add(deptNode);
             }
@@ -797,7 +797,7 @@ public class CompanyServiceImpl implements ICompanyService
                                         Map<Long, List<CompanyDept>> deptGroupByParentId) {
         DeptDataVO companyNode = new DeptDataVO();
         companyNode.setLabel(company.getCompanyName());
-        companyNode.setId(company.getCompanyId());
+        companyNode.setId("company_"+company.getCompanyId());
 
         // 获取公司下的顶级部门（parentId为null或为公司ID的部门）
         List<CompanyDept> topLevelDepts = companyDeptGroupByCompanyId.get(company.getCompanyId());
@@ -825,7 +825,7 @@ public class CompanyServiceImpl implements ICompanyService
                                         ) {
         DeptDataVO companyNode = new DeptDataVO();
         companyNode.setLabel(company.getCompanyName());
-        companyNode.setId(company.getCompanyId());
+        companyNode.setId("company_"+company.getCompanyId());
 
         // 获取公司下的顶级部门（parentId为null或为公司ID的部门）
         List<CompanyDept> topLevelDepts = companyDeptGroupByCompanyId.get(company.getCompanyId());
@@ -856,7 +856,7 @@ public class CompanyServiceImpl implements ICompanyService
         for (CompanyDept dept : depts) {
             DeptDataVO deptNode = new DeptDataVO();
             deptNode.setLabel(dept.getDeptName());
-            deptNode.setId(dept.getDeptId());
+            deptNode.setId("dept_"+dept.getDeptId());
 
             List<DeptDataVO> children = new ArrayList<>();
 
@@ -873,7 +873,7 @@ public class CompanyServiceImpl implements ICompanyService
                 for (CompanyUser user : deptUsers) {
                     DeptDataVO userNode = new DeptDataVO();
                     userNode.setLabel(user.getNickName()+"_"+user.getUserName());
-                    userNode.setId(user.getUserId());
+                    userNode.setId("user_"+user.getUserId());
                     userNode.setChildren(null);
                     children.add(userNode);
                 }
@@ -911,7 +911,7 @@ public class CompanyServiceImpl implements ICompanyService
         for (CompanyDept dept : depts) {
             DeptDataVO deptNode = new DeptDataVO();
             deptNode.setLabel(dept.getDeptName());
-            deptNode.setId(dept.getDeptId());
+            deptNode.setId("dept_"+dept.getDeptId());
 
             List<DeptDataVO> children = new ArrayList<>();
 
@@ -931,14 +931,14 @@ public class CompanyServiceImpl implements ICompanyService
                         if(ObjectUtils.equals(user.getUserId(),currentCompanyUserId)) {
                             DeptDataVO userNode = new DeptDataVO();
                             userNode.setLabel(user.getNickName()+"_"+user.getUserName());
-                            userNode.setId(user.getUserId());
+                            userNode.setId("user_"+user.getUserId());
                             userNode.setChildren(null);
                             children.add(userNode);
                         }
                     } else {
                         DeptDataVO userNode = new DeptDataVO();
                         userNode.setLabel(user.getNickName()+"_"+user.getUserName());
-                        userNode.setId(user.getUserId());
+                        userNode.setId("user_"+user.getUserId());
                         userNode.setChildren(null);
                         children.add(userNode);
                     }

fs-service/src/main/java/com/fs/company/vo/DeptDataVO.java

@@ -14,7 +14,7 @@ public class DeptDataVO implements Serializable {
     /**
      * 节点id
      */
-    private Long id;
+    private String id;
     /**
      * 子节点
      */

fs-service/src/main/java/com/fs/statis/dto/StatsWatchLogPageListDTO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Data
 public class StatsWatchLogPageListDTO implements Serializable {
@@ -13,6 +14,29 @@ public class StatsWatchLogPageListDTO implements Serializable {
      */
     private List<String> userIds;
 
+    public List<String> getUserIds() {
+        if (userIds == null || userIds.isEmpty()) {
+            return userIds;
+        }
+
+        return userIds.stream()
+                .map(id -> {
+                    if (id == null) {
+                        return null;
+                    }
+                    // 去除前缀
+                    if (id.startsWith("dept_")) {
+                        return id.substring(5);
+                    } else if (id.startsWith("company_")) {
+                        return id.substring(8);
+                    } else if (id.startsWith("user_")) {
+                        return id.substring(5);
+                    }
+                    return id;
+                })
+                .collect(Collectors.toList());
+    }
+
     /**
      * 开始时间
      */

fs-service/src/main/resources/mapper/statis/FsStatisQwWatchMapper.xml

@@ -252,7 +252,7 @@
                 AND data_date between #{startDate} and #{endDate}
             </if>
             <if test="userIds != null and userIds.size() > 0">
-                AND company_user in
+                AND company_user_id in
                 <foreach collection="userIds" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>