Merge branch 'develop' of 192.168.1.249:LJJ/encrypted-file-system into develop

efs-user/src/main/java/com/zjty/efs/user/subject/controller/UserController.java

@@ -200,4 +200,10 @@ public class UserController {
         return ResponseEntity.ok(userService.findByUnit(unit));
     }
 
+    @GetMapping("/unit/allUU")
+    @ApiOperation(value = "查询所有单位和人员")
+    public ResponseEntity getUnitMeb2(@RequestParam(value = "id") String id) {
+        return ResponseEntity.ok(userService.findDepUserI(id));
+    }
+
 }

efs-user/src/main/java/com/zjty/efs/user/subject/entity/DepUser.java

+package com.zjty.efs.user.subject.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author LJJ cnljj1995@gmail.com
+ * on 2020-04-03
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DepUser {
+
+    private String unit;
+
+    private List<OneUser> data;
+}

efs-user/src/main/java/com/zjty/efs/user/subject/entity/OneUser.java

+package com.zjty.efs.user.subject.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author LJJ cnljj1995@gmail.com
+ * on 2020-04-03
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OneUser {
+
+    private String name;
+
+    private String id;
+}

efs-user/src/main/java/com/zjty/efs/user/subject/service/UserService.java

@@ -93,4 +93,11 @@ public interface UserService {
      */
     List<UnitMemVo> findByUnit(String unit);
 
+    /**
+     * 查找单位及用户
+     * @param id 当前用户id
+     * @return
+     */
+    List<DepUser> findDepUserI(String id);
+
 }

efs-user/src/main/java/com/zjty/efs/user/subject/service/impl/UserServiceImpl.java

@@ -15,10 +15,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 /**
  * @author LJJ cnljj1995@gmail.com
@@ -184,7 +181,9 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public List<Unit> findUnit() {
-        return unitDao.findAll();
+
+        Sort sort = Sort.by("name");
+        return unitDao.findAll(sort);
     }
 
     @Override
@@ -198,4 +197,31 @@ public class UserServiceImpl implements UserService {
         );
         return rs;
     }
+
+    @Override
+    public List<DepUser> findDepUserI(String id) {
+        List<DepUser> rs = new ArrayList<>();
+        Map<String,List<OneUser>> map = new HashMap<>();
+
+
+
+        userDao.findAll().forEach(o -> {
+            if (!o.getId().equals(id)) {
+
+                if(map.get(o.getUnit()) == null) {
+                    List<OneUser> one = new ArrayList<>();
+                    one.add(new OneUser(o.getName(),o.getId()));
+                    map.put(o.getUnit(), one);
+                } else {
+                    List<OneUser> oneUsers = map.get(o.getUnit());
+                    oneUsers.add(new OneUser(o.getName(),o.getId()));
+                    map.put(o.getUnit(),oneUsers);
+                }
+            }
+        });
+        map.forEach((k,v) -> {
+            rs.add(new DepUser(k,v));
+        });
+        return rs;
+    }
 }