将service改为facade

user-service/src/main/java/com/diagbot/facade/MenuFacade.java

@@ -0,0 +1,16 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MenuServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description: 菜单
+ * @Author: ztg
+ * @Date: 2018/9/17 18:32
+ */
+@Component
+public class MenuFacade extends MenuServiceImpl {
+
+   
+
+}

user-service/src/main/java/com/diagbot/facade/OrganizationFacade.java

@@ -0,0 +1,16 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.OrganizationServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description: 组织机构
+ * @Author: ztg
+ * @Date: 2018/9/17 18:32
+ */
+@Component
+public class OrganizationFacade extends OrganizationServiceImpl {
+
+   
+
+}

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -13,10 +13,6 @@ import com.diagbot.entity.wrapper.MenuWrapper;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.exception.ServiceErrorCode;
-import com.diagbot.service.MenuService;
-import com.diagbot.service.OrganizationService;
-import com.diagbot.service.UserOrganizationService;
-import com.diagbot.service.UserRoleService;
 import com.diagbot.service.impl.UserServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
@@ -53,13 +49,16 @@ public class UserFacade extends UserServiceImpl {
     @Autowired
     VerFacade verFacade;
     @Autowired
-    OrganizationService organizationService;
+    OrganizationFacade organizationFacade;
     @Autowired
-    UserOrganizationService userOrganizationService;
+    UserOrganizationFacade userOrganizationFacade;
     @Autowired
-    UserRoleService userRoleService;
+    UserRoleFacade userRoleFacade;
     @Autowired
-    MenuService menuService;
+    MenuFacade menuFacade;
+    @Autowired
+    UserAuthenticationFacade userAuthenticationFacade;
+
 
     public User createUser(UserSaveVO userSaveVO){
         User user = new User();
@@ -77,7 +76,7 @@ public class UserFacade extends UserServiceImpl {
         PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         String entryPassword= passwordEncoder.encode(user.getPassword());
         user.setPassword(entryPassword);
-        this.save(user);
+//        this.save(user);
 
         // 机构相关业务
         doOrganization(userSaveVO, user);
@@ -95,7 +94,7 @@ public class UserFacade extends UserServiceImpl {
         UserAuthentication ua = new UserAuthentication();
         ua.setGmtCreate(new Date());
         ua.setUserId(user.getId());
-//        userAuthenticationService.save(ua);
+        userAuthenticationFacade.save(ua);
     }
 
     //如果机构已存在，只要添加用户与机构的映射即可;如果机构不存在，先添加机构信息
@@ -104,7 +103,7 @@ public class UserFacade extends UserServiceImpl {
         userRole.setUserId(user.getId());
         userRole.setRoleId(1L);
         userRole.setGmtCreate(new Date());
-        userRoleService.save(userRole);
+        userRoleFacade.save(userRole);
     }
 
     //如果机构已存在，只要添加用户与机构的映射即可;如果机构不存在，先添加机构信息
@@ -113,12 +112,12 @@ public class UserFacade extends UserServiceImpl {
         String name = userSaveVO.getOrganization();
         paramMap.put("name", name);
         Long orgId = 0L;
-        List<Organization> list = organizationService.selectByMap(paramMap);
+        List<Organization> list = organizationFacade.selectByMap(paramMap);
         if(ListUtil.isEmpty(list)) {
             Organization org = new Organization();
             org.setName(name);
             org.setGmtCreate(new Date());
-            organizationService.save(org);
+            organizationFacade.save(org);
             orgId = org.getId();
         } else {
             orgId = list.get(0).getId();
@@ -126,7 +125,7 @@ public class UserFacade extends UserServiceImpl {
             Map paramMap1 = new HashMap();
             paramMap1.put("organization_id", orgId);
             paramMap1.put("is_deleted", "N");
-            List<UserOrganization> res1 = userOrganizationService.selectByMap(paramMap1);
+            List<UserOrganization> res1 = userOrganizationFacade.selectByMap(paramMap1);
             if(ListUtil.isNotEmpty(res1)) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该机构下已存在用户，不能再添加别的用户！");
             }
@@ -136,7 +135,7 @@ public class UserFacade extends UserServiceImpl {
         userOrganization.setUserId(user.getId());
         userOrganization.setOrganizationId(orgId);
         userOrganization.setGmtCreate(new Date());
-        userOrganizationService.save(userOrganization);
+        userOrganizationFacade.save(userOrganization);
     }
 
     //@Cacheable(value = "UserName", key = "'username:'+#p0")
@@ -164,10 +163,10 @@ public class UserFacade extends UserServiceImpl {
         //添加token
         loginDTO.setToken(jwt.getAccess_token());
         //添加机构信息
-        Organization org = organizationService.getById(user.getId());
+        Organization org = organizationFacade.getById(user.getId());
         loginDTO.setOrganization(org);
         //添加菜单信息
-        List<MenuWrapper> menuList = menuService.getByRole(user.getId());
+        List<MenuWrapper> menuList = menuFacade.getByRole(user.getId());
         getMenuStruct(menuList);
         loginDTO.setMenuWrappers(menuList);
         return RespDTO.onSuc(loginDTO);
@@ -185,7 +184,7 @@ public class UserFacade extends UserServiceImpl {
     }
 
     public List<MenuWrapper> recursion(MenuWrapper m) {
-        List<MenuWrapper> subMenu = menuService.getSubMenuById(m.getId());
+        List<MenuWrapper> subMenu = menuFacade.getSubMenuById(m.getId());
         for (MenuWrapper sub : subMenu) {
             sub.setSubMenuList(recursion(sub));
         }

user-service/src/main/java/com/diagbot/facade/UserOrganizationFacade.java

@@ -0,0 +1,16 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.UserOrganizationServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description: 用户-组织机构
+ * @Author: ztg
+ * @Date: 2018/9/17 18:32
+ */
+@Component
+public class UserOrganizationFacade extends UserOrganizationServiceImpl {
+
+   
+
+}

user-service/src/main/java/com/diagbot/facade/UserRoleFacade.java

@@ -0,0 +1,16 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.UserRoleServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description: 用户-角色
+ * @Author: ztg
+ * @Date: 2018/9/17 18:32
+ */
+@Component
+public class UserRoleFacade extends UserRoleServiceImpl {
+
+   
+
+}