【新增】用户，组织相关

src/main/java/com/keymobile/syncdata/actor/DataSyncActor.java

@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Slf4j
 public class DataSyncActor extends AbstractActor {
@@ -28,6 +29,7 @@ public class DataSyncActor extends AbstractActor {
 
     private Map<String, Map<String, Object>> urlMap = new HashMap<>();
     private List<Map<String, Object>> urlList = new ArrayList<Map<String, Object>>();
+    private Map<String, String> orgMapIdAndName = new HashMap<>();
 
     @Override
     public Receive createReceive() {
@@ -39,6 +41,7 @@ public class DataSyncActor extends AbstractActor {
 
 
     public void syncData(SyncDataMessage syncDataMessage) {
+        handleUserData();
         // 抽取所有数据
         getAllDataFromUrl(syncDataMessage);
         // 将list转为Map，key id， value
@@ -109,6 +112,9 @@ public class DataSyncActor extends AbstractActor {
                 Map<String, Object> map = null;
                 try {
                     map = objectMapper.readValue(rows.toString(), Map.class);
+                    String deptid = (String)map.get("DEPTID");
+                    String deptName = orgMapIdAndName.get(deptid);
+                    map.put("DEPT_NAME", deptName);
                     urlList.add(map);
                 } catch (JsonProcessingException e) {
                     throw new RuntimeException(e);
@@ -116,5 +122,18 @@ public class DataSyncActor extends AbstractActor {
             });
         }
     }
+    // 处理用户数据，根据机构编号，查机构名称DEPT_NAME
+    private void handleUserData() {
+        Query query = new Query();
+        query.fields().include("DEPT_ID");
+        query.fields().include("DEPT_DESC");
+        query.fields().exclude("_id");
+        List<Document> documentList = mongoTemplate.find(query, Document.class, "sync_organization_data");
+        if (documentList.isEmpty()) {
+            log.info("机构数据未同步，为空");
+            return;
+        }
+        orgMapIdAndName = documentList.stream().collect(Collectors.toMap(each->(String)each.get("DEPT_ID"), each->(String)each.get("DEPT_DESC"),(key1, key2)->key1));
+    }
 
 }

src/main/java/com/keymobile/syncdata/api/SyncDataController.java

@@ -123,12 +123,10 @@ public class SyncDataController {
     }
 
     @GetMapping("/getAllUser")
-    public List<Document> getAllUser() {
+    public List<Document> getAllSyncUser() {
         Query query = new Query();
         query.fields().exclude("_id");
-
-
-//        query.with(org.springframework.data.domain.Sort.by(org.springframework.data.domain.Sort.Direction.ASC, "DEPT_ID"));
-        return null;
+        List<Document> documents = mongoTemplate.find(query, Document.class, "sync_user_data");
+        return documents;
     }
 }