Browse Source

指定数据源

skyline 2 years ago
parent
commit
e08fbf978e
19 changed files with 40 additions and 60 deletions
  1. 2 0
      service/src/main/java/com/kym/service/admin/impl/AdminUserRoleServiceImpl.java
  2. 2 0
      service/src/main/java/com/kym/service/admin/impl/AdminUserServiceImpl.java
  3. 2 0
      service/src/main/java/com/kym/service/admin/impl/CompanyServiceImpl.java
  4. 2 0
      service/src/main/java/com/kym/service/admin/impl/ConnectorInfoServiceImpl.java
  5. 2 5
      service/src/main/java/com/kym/service/admin/impl/EquipmentInfoServiceImpl.java
  6. 3 1
      service/src/main/java/com/kym/service/admin/impl/PermissionServiceImpl.java
  7. 3 1
      service/src/main/java/com/kym/service/admin/impl/RolePermissionServiceImpl.java
  8. 2 0
      service/src/main/java/com/kym/service/admin/impl/RoleServiceImpl.java
  9. 3 1
      service/src/main/java/com/kym/service/admin/impl/SystemLogServiceImpl.java
  10. 0 12
      service/src/main/java/com/kym/service/miniapp/PaymentService.java
  11. 2 0
      service/src/main/java/com/kym/service/miniapp/impl/CarsServiceImpl.java
  12. 2 0
      service/src/main/java/com/kym/service/miniapp/impl/ChargeOrderServiceImpl.java
  13. 2 0
      service/src/main/java/com/kym/service/miniapp/impl/ChargeServiceImpl.java
  14. 2 0
      service/src/main/java/com/kym/service/miniapp/impl/CollectServiceImpl.java
  15. 2 0
      service/src/main/java/com/kym/service/miniapp/impl/DataDictServiceImpl.java
  16. 2 0
      service/src/main/java/com/kym/service/miniapp/impl/PayLogServiceImpl.java
  17. 0 35
      service/src/main/java/com/kym/service/miniapp/impl/PaymentServiceImpl.java
  18. 5 5
      service/src/main/java/com/kym/service/miniapp/impl/UserServiceImpl.java
  19. 2 0
      service/src/main/java/com/kym/service/miniapp/impl/WalletDetailServiceImpl.java

+ 2 - 0
service/src/main/java/com/kym/service/admin/impl/AdminUserRoleServiceImpl.java

@@ -1,5 +1,6 @@
 package com.kym.service.admin.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.kym.entity.admin.AdminUserRole;
 import com.kym.mapper.admin.AdminUserRoleMapper;
 import com.kym.service.admin.AdminUserRoleService;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
  * @since 2023-07-12
  */
 @Service
+@DS("db-admin")
 public class AdminUserRoleServiceImpl extends ServiceImpl<AdminUserRoleMapper, AdminUserRole> implements AdminUserRoleService {
 
 }

+ 2 - 0
service/src/main/java/com/kym/service/admin/impl/AdminUserServiceImpl.java

@@ -1,6 +1,7 @@
 package com.kym.service.admin.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kym.mapper.admin.AdminUserMapper;
@@ -25,6 +26,7 @@ import java.util.Map;
  * @since 2023-07-11
  */
 @Service
+@DS("db-admin")
 public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser> implements AdminUserService {
     private static final Logger LOGGER = LoggerFactory.getLogger(AdminUserServiceImpl.class);
 

+ 2 - 0
service/src/main/java/com/kym/service/admin/impl/CompanyServiceImpl.java

@@ -1,5 +1,6 @@
 package com.kym.service.admin.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.kym.entity.admin.Company;
 import com.kym.mapper.admin.CompanyMapper;
 import com.kym.service.admin.CompanyService;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
  * @since 2023-07-12
  */
 @Service
+@DS("db-admin")
 public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements CompanyService {
 
 }

+ 2 - 0
service/src/main/java/com/kym/service/admin/impl/ConnectorInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.kym.service.admin.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.kym.entity.admin.ConnectorInfo;
 import com.kym.mapper.admin.ConnectorInfoMapper;
 import com.kym.service.admin.ConnectorInfoService;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
  * @since 2023-08-05
  */
 @Service
+@DS("db-admin")
 public class ConnectorInfoServiceImpl extends ServiceImpl<ConnectorInfoMapper, ConnectorInfo> implements ConnectorInfoService {
 
 }

+ 2 - 5
service/src/main/java/com/kym/service/admin/impl/EquipmentInfoServiceImpl.java

@@ -1,14 +1,10 @@
 package com.kym.service.admin.impl;
 
-import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.kym.common.enums.EnPlusApi;
-import com.kym.common.utils.AESUtil;
 import com.kym.entity.admin.EquipmentInfo;
 import com.kym.mapper.admin.EquipmentInfoMapper;
 import com.kym.service.admin.EquipmentInfoService;
-import com.kym.service.enplus.EnPlusService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -20,6 +16,7 @@ import org.springframework.stereotype.Service;
  * @since 2023-08-05
  */
 @Service
+@DS("db-admin")
 public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, EquipmentInfo> implements EquipmentInfoService {
 
 

+ 3 - 1
service/src/main/java/com/kym/service/admin/impl/PermissionServiceImpl.java

@@ -1,9 +1,10 @@
 package com.kym.service.admin.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kym.entity.admin.Permission;
 import com.kym.mapper.admin.PermissionMapper;
 import com.kym.service.admin.PermissionService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
  * @since 2023-07-12
  */
 @Service
+@DS("db-admin")
 public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permission> implements PermissionService {
 
 }

+ 3 - 1
service/src/main/java/com/kym/service/admin/impl/RolePermissionServiceImpl.java

@@ -1,9 +1,10 @@
 package com.kym.service.admin.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kym.entity.admin.RolePermission;
 import com.kym.mapper.admin.RolePermissionMapper;
 import com.kym.service.admin.RolePermissionService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
  * @since 2023-07-12
  */
 @Service
+@DS("db-admin")
 public class RolePermissionServiceImpl extends ServiceImpl<RolePermissionMapper, RolePermission> implements RolePermissionService {
 
 }

+ 2 - 0
service/src/main/java/com/kym/service/admin/impl/RoleServiceImpl.java

@@ -1,5 +1,6 @@
 package com.kym.service.admin.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.kym.entity.admin.Role;
 import com.kym.mapper.admin.RoleMapper;
 import com.kym.service.admin.RoleService;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
  * @since 2023-07-12
  */
 @Service
+@DS("db-admin")
 public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
 
 }

+ 3 - 1
service/src/main/java/com/kym/service/admin/impl/SystemLogServiceImpl.java

@@ -1,9 +1,10 @@
 package com.kym.service.admin.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kym.entity.admin.SystemLog;
 import com.kym.mapper.admin.SystemLogMapper;
 import com.kym.service.admin.SystemLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
  * @since 2023-07-10
  */
 @Service
+@DS("db-admin")
 public class SystemLogServiceImpl extends ServiceImpl<SystemLogMapper, SystemLog> implements SystemLogService {
 
 }

+ 0 - 12
service/src/main/java/com/kym/service/miniapp/PaymentService.java

@@ -1,12 +0,0 @@
-package com.kym.service.miniapp;
-
-import com.kym.common.R;
-
-/**
- * @author skyline
- * @description
- * @date 2023-07-22 20:47
- */
-public interface PaymentService {
-    R recharge(Long userId);
-}

+ 2 - 0
service/src/main/java/com/kym/service/miniapp/impl/CarsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.kym.service.miniapp.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.kym.entity.miniapp.Cars;
 import com.kym.mapper.miniapp.CarsMapper;
 import com.kym.service.miniapp.CarsService;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
  * @since 2023-07-26
  */
 @Service
+@DS("db-miniapp")
 public class CarsServiceImpl extends ServiceImpl<CarsMapper, Cars> implements CarsService {
 
 }

+ 2 - 0
service/src/main/java/com/kym/service/miniapp/impl/ChargeOrderServiceImpl.java

@@ -1,5 +1,6 @@
 package com.kym.service.miniapp.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.kym.entity.miniapp.ChargeOrder;
 import com.kym.mapper.miniapp.ChargeOrderMapper;
 import com.kym.service.miniapp.ChargeOrderService;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
  * @since 2023-08-08
  */
 @Service
+@DS("db-miniapp")
 public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, ChargeOrder> implements ChargeOrderService {
     @Override
     public ChargeOrder getChargingOrderByUserId(Long userId) {

+ 2 - 0
service/src/main/java/com/kym/service/miniapp/impl/ChargeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.kym.service.miniapp.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.kym.common.constant.ResponseEnum;
 import com.kym.common.exception.BusinessException;
 import com.kym.common.utils.OrderUtils;
@@ -25,6 +26,7 @@ import java.util.Map;
  * @date 2023-07-29 14:24
  */
 @Service
+@DS("db-miniapp")
 public class ChargeServiceImpl implements ChargeService {
     private static final Logger LOGGER = LoggerFactory.getLogger(ChargeServiceImpl.class);
 

+ 2 - 0
service/src/main/java/com/kym/service/miniapp/impl/CollectServiceImpl.java

@@ -1,6 +1,7 @@
 package com.kym.service.miniapp.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kym.entity.enplus.EnStationStatusInfo;
 import com.kym.entity.miniapp.Collect;
@@ -22,6 +23,7 @@ import java.util.List;
  * @since 2023-07-31
  */
 @Service
+@DS("db-miniapp")
 public class CollectServiceImpl extends ServiceImpl<CollectMapper, Collect> implements CollectService {
 
     @Autowired

+ 2 - 0
service/src/main/java/com/kym/service/miniapp/impl/DataDictServiceImpl.java

@@ -2,6 +2,7 @@ package com.kym.service.miniapp.impl;
 
 import cn.hutool.core.util.ClassUtil;
 import cn.hutool.core.util.ReflectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
@@ -28,6 +29,7 @@ import java.lang.reflect.Modifier;
  * @since 2023-08-13
  */
 @Service
+@DS("db-miniapp")
 public class DataDictServiceImpl extends ServiceImpl<DataDictMapper, DataDict> implements DataDictService {
 
     @Override

+ 2 - 0
service/src/main/java/com/kym/service/miniapp/impl/PayLogServiceImpl.java

@@ -1,5 +1,6 @@
 package com.kym.service.miniapp.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.kym.entity.miniapp.PayLog;
 import com.kym.mapper.miniapp.PayLogMapper;
 import com.kym.service.miniapp.PayLogService;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
  * @since 2023-08-12
  */
 @Service
+@DS("db-miniapp")
 public class PayLogServiceImpl extends ServiceImpl<PayLogMapper, PayLog> implements PayLogService {
 
 }

+ 0 - 35
service/src/main/java/com/kym/service/miniapp/impl/PaymentServiceImpl.java

@@ -1,35 +0,0 @@
-package com.kym.service.miniapp.impl;
-
-import com.kym.common.R;
-import com.kym.service.miniapp.PaymentService;
-import org.springframework.stereotype.Service;
-
-/**
- * @author skyline
- * @description 支付控制器
- * @date 2023-07-22 20:48
- */
-@Service
-public class PaymentServiceImpl implements PaymentService {
-    @Override
-    public R recharge(Long userId) {
-
-
-        return null;
-    }
-
-
-    /*
-     * 充值流程
-     */
-
-    // 创建充值订单 t_wallet_detail
-
-    // 调用支付接口
-
-    // 更新余额 t_account
-
-    // 更新充电费用最大阈值
-
-
-}

+ 5 - 5
service/src/main/java/com/kym/service/miniapp/impl/UserServiceImpl.java

@@ -1,6 +1,7 @@
 package com.kym.service.miniapp.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
@@ -44,13 +45,12 @@ import static java.util.Map.of;
  * @since 2023-06-27
  */
 @Service
+@DS("db-miniapp")
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
     private static final Logger LOGGER = LoggerFactory.getLogger(UserServiceImpl.class);
     @Autowired
     WxConfig wxConfig;
     @Autowired
-    private UserMapper userMapper;
-    @Autowired
     private AccountService accountService;
 
     @Autowired
@@ -94,7 +94,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 newUser.setMobilePhone(mobilePhone);
                 newUser.setAvatar(params.getAvatar());
                 newUser.setNickname(params.getNickname());
-                userMapper.insert(newUser);
+                baseMapper.insert(newUser);
                 // 创建用户账户
                 var account = new Account();
                 account.setUserId(newUser.getId());
@@ -118,7 +118,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Override
     public UserVo getMe() {
         var userId = StpUtil.getLoginIdAsLong();
-        var userVo = userMapper.getMe(userId);
+        var userVo = baseMapper.getMe(userId);
         var car = carsService.lambdaQuery().eq(Cars::getUserId, userId).eq(Cars::getIsDefault, 1).one();
         if (car != null) {
             userVo.setDefaultPlateNo(car.getPlateNo());
@@ -169,7 +169,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         userVo.setId(StpUtil.getSession().getLong("userId"));
         var user = new User();
         BeanUtils.copyProperties(userVo, user);
-        userMapper.updateById(user);
+        baseMapper.updateById(user);
         // 更新车牌信息
         if (userVo.getDefaultPlateNo() != null) {
             var car = new Cars();

+ 2 - 0
service/src/main/java/com/kym/service/miniapp/impl/WalletDetailServiceImpl.java

@@ -1,6 +1,7 @@
 package com.kym.service.miniapp.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kym.entity.miniapp.WalletDetail;
 import com.kym.mapper.miniapp.WalletDetailMapper;
@@ -18,6 +19,7 @@ import java.util.List;
  * @since 2023-08-09
  */
 @Service
+@DS("db-miniapp")
 public class WalletDetailServiceImpl extends ServiceImpl<WalletDetailMapper, WalletDetail> implements WalletDetailService {