将mapper改成service调用

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

@@ -6,16 +6,17 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.JWT;
 import com.diagbot.entity.Organization;
 import com.diagbot.entity.User;
+import com.diagbot.entity.UserAuthentication;
 import com.diagbot.entity.UserOrganization;
 import com.diagbot.entity.UserRole;
 import com.diagbot.entity.wrapper.MenuWrapper;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.exception.ServiceErrorCode;
-import com.diagbot.mapper.MenuMapper;
-import com.diagbot.mapper.OrganizationMapper;
-import com.diagbot.mapper.UserOrganizationMapper;
-import com.diagbot.mapper.UserRoleMapper;
+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;
@@ -52,13 +53,13 @@ public class UserFacade extends UserServiceImpl {
     @Autowired
     VerFacade verFacade;
     @Autowired
-    OrganizationMapper organizationMapper;
+    OrganizationService organizationService;
     @Autowired
-    UserOrganizationMapper userOrganizationMapper;
+    UserOrganizationService userOrganizationService;
     @Autowired
-    UserRoleMapper userRoleMapper;
+    UserRoleService userRoleService;
     @Autowired
-    MenuMapper menuMapper;
+    MenuService menuService;
 
     public User createUser(UserSaveVO userSaveVO){
         User user = new User();
@@ -76,23 +77,34 @@ 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);
 
         //权限相关业务
         doPermisson(userSaveVO, user);
+
+        //用户认证业务
+        doUserAuthentication(userSaveVO, user);
         return  user;
     }
 
+    //添加一条默认用户认证信息
+    public void doUserAuthentication(UserSaveVO userSaveVO, User user) {
+        UserAuthentication ua = new UserAuthentication();
+        ua.setGmtCreate(new Date());
+        ua.setUserId(user.getId());
+//        userAuthenticationService.save(ua);
+    }
+
     //如果机构已存在，只要添加用户与机构的映射即可;如果机构不存在，先添加机构信息
     public void doPermisson(UserSaveVO userSaveVO, User user) {
         UserRole  userRole = new UserRole();
         userRole.setUserId(user.getId());
         userRole.setRoleId(1L);
         userRole.setGmtCreate(new Date());
-        userRoleMapper.insert(userRole);
+        userRoleService.save(userRole);
     }
 
     //如果机构已存在，只要添加用户与机构的映射即可;如果机构不存在，先添加机构信息
@@ -101,12 +113,12 @@ public class UserFacade extends UserServiceImpl {
         String name = userSaveVO.getOrganization();
         paramMap.put("name", name);
         Long orgId = 0L;
-        List<Organization> list = organizationMapper.selectByMap(paramMap);
+        List<Organization> list = organizationService.selectByMap(paramMap);
         if(ListUtil.isEmpty(list)) {
             Organization org = new Organization();
             org.setName(name);
             org.setGmtCreate(new Date());
-            organizationMapper.insert(org);
+            organizationService.save(org);
             orgId = org.getId();
         } else {
             orgId = list.get(0).getId();
@@ -114,7 +126,7 @@ public class UserFacade extends UserServiceImpl {
             Map paramMap1 = new HashMap();
             paramMap1.put("organization_id", orgId);
             paramMap1.put("is_deleted", "N");
-            List<UserOrganization> res1 = userOrganizationMapper.selectByMap(paramMap1);
+            List<UserOrganization> res1 = userOrganizationService.selectByMap(paramMap1);
             if(ListUtil.isNotEmpty(res1)) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该机构下已存在用户，不能再添加别的用户！");
             }
@@ -124,7 +136,7 @@ public class UserFacade extends UserServiceImpl {
         userOrganization.setUserId(user.getId());
         userOrganization.setOrganizationId(orgId);
         userOrganization.setGmtCreate(new Date());
-        userOrganizationMapper.insert(userOrganization);
+        userOrganizationService.save(userOrganization);
     }
 
     //@Cacheable(value = "UserName", key = "'username:'+#p0")
@@ -152,10 +164,10 @@ public class UserFacade extends UserServiceImpl {
         //添加token
         loginDTO.setToken(jwt.getAccess_token());
         //添加机构信息
-        Organization org = organizationMapper.getByUserId(user.getId());
+        Organization org = organizationService.getById(user.getId());
         loginDTO.setOrganization(org);
         //添加菜单信息
-        List<MenuWrapper> menuList = menuMapper.getByRole(user.getId());
+        List<MenuWrapper> menuList = menuService.getByRole(user.getId());
         getMenuStruct(menuList);
         loginDTO.setMenuWrappers(menuList);
         return RespDTO.onSuc(loginDTO);
@@ -173,7 +185,7 @@ public class UserFacade extends UserServiceImpl {
     }
 
     public List<MenuWrapper> recursion(MenuWrapper m) {
-        List<MenuWrapper> subMenu = menuMapper.getSubMenuById(m.getId());
+        List<MenuWrapper> subMenu = menuService.getSubMenuById(m.getId());
         for (MenuWrapper sub : subMenu) {
             sub.setSubMenuList(recursion(sub));
         }

user-service/src/main/java/com/diagbot/service/MenuService.java

@@ -0,0 +1,30 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.Menu;
+import com.diagbot.entity.wrapper.MenuWrapper;
+
+import java.util.List;
+
+/**
+ * @Description: menuService
+ * @Author: ztg
+ * @Date: 2018/9/17 15:40
+ */
+public interface MenuService extends IService<Menu> {
+
+    /**
+     * @Description: 获取菜单信息
+     * @Author: ztg
+     * @Date: 2018/9/17 15:43
+     */
+    public List<MenuWrapper> getByRole(Long userId);
+
+
+    /**
+     * @Description: 获取子级菜单
+     * @Author: ztg
+     * @Date: 2018/9/17 15:44
+     */
+    public List<MenuWrapper> getSubMenuById(Long id);
+}

user-service/src/main/java/com/diagbot/service/OrganizationService.java

@@ -3,6 +3,9 @@ package com.diagbot.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.entity.Organization;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description: 机构service
  * @Author: ztg
@@ -10,4 +13,12 @@ import com.diagbot.entity.Organization;
  */
 public interface OrganizationService extends IService<Organization> {
 
+
+    /**
+     * @Description: 查询机构
+     * @Author: ztg
+     * @Date: 2018/9/17 15:16
+     */
+    public List<Organization> selectByMap(Map map);
+
 }

user-service/src/main/java/com/diagbot/service/UserOrganizationService.java

@@ -3,6 +3,9 @@ package com.diagbot.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.entity.UserOrganization;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description: 用户-组织机构service
  * @Author: ztg
@@ -10,4 +13,10 @@ import com.diagbot.entity.UserOrganization;
  */
 public interface UserOrganizationService extends IService<UserOrganization> {
 
+    /**
+     * @Description: 查询用户-机构
+     * @Author: ztg
+     * @Date: 2018/9/17 15:16
+     */
+    public List<UserOrganization> selectByMap(Map map);
 }

user-service/src/main/java/com/diagbot/service/impl/MenuServiceImpl.java

@@ -0,0 +1,35 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.entity.Menu;
+import com.diagbot.entity.wrapper.MenuWrapper;
+import com.diagbot.mapper.MenuMapper;
+import com.diagbot.service.MenuService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description: MenuService实现类
+ * @Author: ztg
+ * @Date: 2018/9/13 16:56
+ */
+@Service
+@Slf4j
+public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements MenuService {
+
+    @Autowired
+    MenuMapper menuMapper;
+
+    @Override
+    public List<MenuWrapper> getByRole(Long userId) {
+        return menuMapper.getByRole(userId);
+    }
+
+    @Override
+    public List<MenuWrapper> getSubMenuById(Long id) {
+        return menuMapper.getSubMenuById(id);
+    }
+}

user-service/src/main/java/com/diagbot/service/impl/OrganizationServiceImpl.java

@@ -5,8 +5,12 @@ import com.diagbot.entity.Organization;
 import com.diagbot.mapper.OrganizationMapper;
 import com.diagbot.service.OrganizationService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description: 机构Service实现类
  * @Author: ztg
@@ -16,5 +20,11 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Organization> implements OrganizationService {
 
+    @Autowired
+    OrganizationMapper organizationMapper;
 
+    @Override
+    public List<Organization> selectByMap(Map map) {
+        return organizationMapper.selectByMap(map);
+    }
 }

user-service/src/main/java/com/diagbot/service/impl/UserOrganizationServiceImpl.java

@@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.UserOrganization;
 import com.diagbot.mapper.UserOrganizationMapper;
 import com.diagbot.service.UserOrganizationService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description: 用户-组织机构serviceImpl
  * @Author: ztg
@@ -14,4 +18,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class UserOrganizationServiceImpl extends ServiceImpl<UserOrganizationMapper, UserOrganization> implements UserOrganizationService {
 
+    @Autowired
+    UserOrganizationMapper userOrganizationMapper;
+
+    @Override
+    public List<UserOrganization> selectByMap(Map map) {
+        return userOrganizationMapper.selectByMap(map);
+    }
 }