zhoutg 6 лет назад
Родитель
Сommit
5b317697f6

+ 6 - 9
diagbotman-service/src/main/java/com/diagbot/service/impl/OpenedProductsServiceImpl.java

@@ -9,7 +9,6 @@ import com.diagbot.entity.OpenedProductsIndex;
 import com.diagbot.entity.wrapper.OpendProductWrapper;
 import com.diagbot.mapper.OpenedProductsMapper;
 import com.diagbot.service.OpenedProductsService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -26,8 +25,6 @@ import java.util.Map;
 @Service
 public class OpenedProductsServiceImpl extends ServiceImpl<OpenedProductsMapper, OpenedProducts> implements OpenedProductsService {
 
-    @Autowired
-    OpenedProductsMapper openedProductsMapper;
 
     @Override
     public IPage<OpenedProducts> selectOpendInfoByUserId(Page<OpenedProducts> page, Long userId) {
@@ -46,31 +43,31 @@ public class OpenedProductsServiceImpl extends ServiceImpl<OpenedProductsMapper,
 
     @Override
     public List<OpenedProducts> getByAppkeyAndSecret(Map<String, Object> map) {
-        return openedProductsMapper.getByAppkeyAndSecret(map);
+        return baseMapper.getByAppkeyAndSecret(map);
     }
 
     @Override
     public List<UserAndProdutDTO> getInformationAvailableByUserId(OpenedProducts openedProducts) {
         // TODO Auto-generated method stub
-        return openedProductsMapper.getInformationAvailableByUserId(openedProducts);
+        return baseMapper.getInformationAvailableByUserId(openedProducts);
     }
 
     @Override
     public boolean startAndendByuserId(OpenedProducts openedProducts) {
         // TODO Auto-generated method stub
-        return openedProductsMapper.startAndendByuserId(openedProducts);
+        return baseMapper.startAndendByuserId(openedProducts);
     }
 
     @Override
     public boolean delInformationAvailable(OpenedProducts openedProducts) {
         // TODO Auto-generated method stub
-        return openedProductsMapper.delInformationAvailable(openedProducts);
+        return baseMapper.delInformationAvailable(openedProducts);
     }
 
     @Override
     public boolean modifyOpeningTime(OpenedProducts openedProducts) {
         // TODO Auto-generated method stub
-        return openedProductsMapper.modifyOpeningTime(openedProducts);
+        return baseMapper.modifyOpeningTime(openedProducts);
     }
 
     @Override
@@ -84,7 +81,7 @@ public class OpenedProductsServiceImpl extends ServiceImpl<OpenedProductsMapper,
     }
     @Override
     public List<UserAndProdutDTO> getInformationAvailableByUserIds(List<Long> userIds){
-    	return openedProductsMapper.getInformationAvailableByUserIds(userIds);
+    	return baseMapper.getInformationAvailableByUserIds(userIds);
     }
 
     @Override

+ 2 - 7
diagbotman-service/src/main/java/com/diagbot/service/impl/ServiceFilterServiceImpl.java

@@ -5,7 +5,6 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ServiceFilter;
 import com.diagbot.mapper.ServiceFilterMapper;
 import com.diagbot.service.ServiceFilterService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -19,10 +18,6 @@ import java.util.List;
 @Service
 public class ServiceFilterServiceImpl extends ServiceImpl<ServiceFilterMapper, ServiceFilter> implements ServiceFilterService {
 
-    @Autowired
-    ServiceFilterMapper serviceFilterMapper;
-
-
     /**
      * 获取需要appkey和secret的服务信息
      *
@@ -30,13 +25,13 @@ public class ServiceFilterServiceImpl extends ServiceImpl<ServiceFilterMapper, S
      */
     @Override
     public RespDTO<List<ServiceFilter>> getAll() {
-        List<ServiceFilter> list = serviceFilterMapper.getAll();
+        List<ServiceFilter> list = baseMapper.getAll();
         return RespDTO.onSuc(list);
     }
 
 
     public RespDTO<List<String>> getPermissonUrl(String appkey, String secret) {
-        List<ServiceFilter> list = serviceFilterMapper.getAll();
+        List<ServiceFilter> list = baseMapper.getAll();
         List<String> service = new ArrayList<>();
         for (ServiceFilter bean : list) {
             service.add(bean.getName());

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

@@ -6,7 +6,6 @@ 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;
@@ -20,8 +19,6 @@ import java.util.List;
 @Slf4j
 public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements MenuService {
 
-    @Autowired
-    MenuMapper menuMapper;
 
     /**
      * 根据用户id获取菜单信息
@@ -31,7 +28,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
      */
     @Override
     public List<MenuWrapper> getByRole(Long userId) {
-        return menuMapper.getByRole(userId);
+        return baseMapper.getByRole(userId);
     }
 
 
@@ -43,6 +40,6 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
      */
     @Override
     public List<MenuWrapper> getSubMenuById(Long id) {
-        return menuMapper.getSubMenuById(id);
+        return baseMapper.getSubMenuById(id);
     }
 }

+ 1 - 5
user-service/src/main/java/com/diagbot/service/impl/PermissionServiceImpl.java

@@ -5,7 +5,6 @@ import com.diagbot.entity.Permission;
 import com.diagbot.mapper.PermissionMapper;
 import com.diagbot.service.PermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -19,11 +18,8 @@ import java.util.List;
 @Slf4j
 public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permission> implements PermissionService {
 
-    @Autowired
-    PermissionMapper permissionMapper;
-
     @Override
     public List<Permission> getPermissionByUserId(Long userId) {
-        return permissionMapper.getByUserId(userId);
+        return baseMapper.getByUserId(userId);
     }
 }

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

@@ -4,7 +4,6 @@ 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;
@@ -18,8 +17,6 @@ import java.util.Map;
 @Service
 public class UserOrganizationServiceImpl extends ServiceImpl<UserOrganizationMapper, UserOrganization> implements UserOrganizationService {
 
-    @Autowired
-    UserOrganizationMapper userOrganizationMapper;
 
     /**
      * 根据参数获取机构信息
@@ -29,12 +26,12 @@ public class UserOrganizationServiceImpl extends ServiceImpl<UserOrganizationMap
      */
     @Override
     public List<UserOrganization> selectByMap(Map map) {
-        return userOrganizationMapper.selectByMap(map);
+        return baseMapper.selectByMap(map);
     }
 
     @Override
     public List<UserOrganization> getAgencyPersonnel(UserOrganization userORG) {
-        return userOrganizationMapper.getAgencyPersonnel(userORG);
+        return baseMapper.getAgencyPersonnel(userORG);
 
     }
 }

+ 2 - 7
user-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -8,13 +8,11 @@ import com.diagbot.dto.CustomerDTO;
 import com.diagbot.dto.OrganizationDTO;
 import com.diagbot.dto.UserAllDTO;
 import com.diagbot.dto.UserInfoDTO;
-import com.diagbot.dto.UserInfoExportDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.dto.UserOrgizationProductDTO;
 import com.diagbot.entity.User;
 import com.diagbot.mapper.UserMapper;
 import com.diagbot.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -31,9 +29,6 @@ import java.util.Map;
 @Service
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
 
-    @Autowired
-    UserMapper userMapper;
-
     /**
      * 根据用户查找信息
      *
@@ -81,7 +76,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     @Override
     public List<User> getByIds(List<Long> ids) {
-        return userMapper.getByIds(ids);
+        return baseMapper.getByIds(ids);
     }
 
 
@@ -93,7 +88,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
      */
     @Override
     public List<UserOrgDTO> getUserOrgByIds(List<Long> userIds) {
-        return userMapper.getUserOrgDTOByIds(userIds);
+        return baseMapper.getUserOrgDTOByIds(userIds);
     }
 
     @Override