修改代码

efs-union/src/main/java/com/zjty/efs/union/UnionApplication.java

@@ -32,30 +32,30 @@ public class UnionApplication {
         SpringApplication.run(UnionApplication.class, args);
     }
 
-    @Bean
-    public ServletWebServerFactory servletContainer() {
-        TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory() {
-            @Override
-            protected void postProcessContext(Context context) {
-                SecurityConstraint securityConstraint = new SecurityConstraint();
-                securityConstraint.setUserConstraint("CONFIDENTIAL");
-                SecurityCollection collection = new SecurityCollection();
-                collection.addPattern("/*");
-                securityConstraint.addCollection(collection);
-                context.addConstraint(securityConstraint);
-            }
-        };
-        tomcat.addAdditionalTomcatConnectors(createHTTPConnector());
-        return tomcat;
-    }
-
-    private Connector createHTTPConnector() {
-        Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
-        connector.setScheme("http");
-        connector.setPort(8081);
-        connector.setSecure(false);
-        connector.setRedirectPort(8082);
-        connector.setMaxPostSize(100*1024*1024);
-        return connector;
-    }
+//    @Bean
+//    public ServletWebServerFactory servletContainer() {
+//        TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory() {
+//            @Override
+//            protected void postProcessContext(Context context) {
+//                SecurityConstraint securityConstraint = new SecurityConstraint();
+//                securityConstraint.setUserConstraint("CONFIDENTIAL");
+//                SecurityCollection collection = new SecurityCollection();
+//                collection.addPattern("/*");
+//                securityConstraint.addCollection(collection);
+//                context.addConstraint(securityConstraint);
+//            }
+//        };
+//        tomcat.addAdditionalTomcatConnectors(createHTTPConnector());
+//        return tomcat;
+//    }
+//
+//    private Connector createHTTPConnector() {
+//        Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
+//        connector.setScheme("http");
+//        connector.setPort(8081);
+//        connector.setSecure(false);
+//        connector.setRedirectPort(8082);
+//        connector.setMaxPostSize(100*1024*1024);
+//        return connector;
+//    }
 }

efs-union/src/main/java/com/zjty/efs/union/config/UserInit.java

@@ -36,7 +36,7 @@ public class UserInit implements CommandLineRunner {
 
 
         if (rs.isEmpty()) {
-            userDao.save(new UserDo(null, "admin","123","admin","admin","admin","admin","admin",MD5Untils.getMD5Str("admin"),1,"admin",new Date()));
+            userDao.save(new UserDo("", "admin","123","admin","admin","admin","admin","admin",MD5Untils.getMD5Str("admin"),1,"admin",new Date()));
             return;
         }
         UserDo admin = rs.get(0);

efs-union/src/main/resources/application.properties

@@ -8,7 +8,7 @@ logging.file=./log/efs.log
 spring.datasource.url=jdbc:mysql://localhost:3306/ty_efs?useSSL=false&serverTimezone=UTC&characterEncoding=UTF-8
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.password=ljj123456
 
 # spring.jpa.properties.hibernate.format_sql=true
 spring.jpa.hibernate.ddl-auto=update
@@ -24,11 +24,11 @@ server.tomcat.max-http-form-post-size=0
 
 file.address=/Users/ljj/software/ftp
 
-# SSL config f
-server.ssl.key-store=classpath:3725333_filetransfer.products.zjtys.com.cn.pfx
-# 证书密码，请修改为您自己证书的密码.
-server.ssl.key-store-password=lR4072XF
-# 秘钥库类型
-server.ssl.keyStoreType=PKCS12
-# 证书别名
-server.ssl.keyAlias= alias
+## SSL config f
+#server.ssl.key-store=classpath:3725333_filetransfer.products.zjtys.com.cn.pfx
+## 证书密码，请修改为您自己证书的密码.
+#server.ssl.key-store-password=lR4072XF
+## 秘钥库类型
+#server.ssl.keyStoreType=PKCS12
+## 证书别名
+#server.ssl.keyAlias= alias
\ No newline at end of file

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

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

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

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

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

@@ -22,6 +22,7 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author LJJ cnljj1995@gmail.com
@@ -231,4 +232,23 @@ public class UserServiceImpl implements UserService {
         map.forEach((k, v) -> rs.add(new DepUser(k, v)));
         return rs;
     }
+
+    @Override
+    public List<DepUser> findDepUserII(String id) {
+        List<DepUser> list = findDepUserI(id);
+        UserDo one = findById(id);
+
+        log.info("{}", list);
+        log.info("{}", one);
+        List<DepUser> collect = list.stream().filter(o -> o.getUnit().equals(one.getUnit())).collect(Collectors.toList());
+
+        List<DepUser> rs = new ArrayList<>();
+        if (collect.size() != 0) {
+            rs.add(collect.get(0));
+            log.info("{}",collect);
+            return rs;
+        } else {
+            return Collections.emptyList();
+        }
+    }
 }