Procházet zdrojové kódy

同步数据区分根据环境切换库名

mac před 2 roky
rodič
revize
d51dd79ac0

+ 7 - 4
kxs-transfer/src/main/java/com/kxs/transfer/api/controller/DtsController.java

@@ -22,6 +22,7 @@ import com.kxs.user.api.model.KxsPartner;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.exception.ExceptionUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -71,6 +72,8 @@ public class DtsController {
     private final KxsWarehouseService kxsWarehouseService;
     private final KxsMachineRecycleService kxsMachineRecycleService;
 
+    @Value("${spring.profiles.active}")
+    private String active;
 
     @DtsMsgListener
     public void dtsListener(Long dataId, DMLData dmlData, DefaultUserRecord record) {
@@ -131,7 +134,7 @@ public class DtsController {
                 kxsUserAddressService.changeData(dmlData);
             }
             //用户账户
-            if ("UserAccount".equals(dmlData.getTableName()) && "KxsProfitServer".equals(dmlData.getDatabaseName())) {
+            if ("UserAccount".equals(dmlData.getTableName()) && ("dev".equals(active) || "test".equals(active) ? "KxsMainServer":"KxsProfitServer").equals(dmlData.getDatabaseName())) {
                 kxsUserAmountService.changeData(dmlData);
             }
             //用户预扣款表
@@ -143,7 +146,7 @@ public class DtsController {
                 kxsUserAmountLogService.changeData(dmlData);
             }
             //用户提现申请记录
-            if ("UserCashRecord".equals(dmlData.getTableName()) && "KxsProfitServer".equals(dmlData.getDatabaseName())) {
+            if ("UserCashRecord".equals(dmlData.getTableName()) && ("dev".equals(active) || "test".equals(active) ? "KxsMainServer":"KxsProfitServer").equals(dmlData.getDatabaseName())) {
                 kxsUserWithdrawalService.changeData(dmlData);
             }
             //盟主表
@@ -189,11 +192,11 @@ public class DtsController {
                 kxsWarehouseService.changeCreditData(dmlData);
             }
             //仓库额度表
-            if ("UserAccount".equals(dmlData.getTableName()) && "KxsProfitServer".equals(dmlData.getDatabaseName())) {
+            if ("UserAccount".equals(dmlData.getTableName()) && ("dev".equals(active) || "test".equals(active) ? "KxsMainServer":"KxsProfitServer").equals(dmlData.getDatabaseName())) {
                 kxsWarehouseService.changeAccountData(dmlData);
             }
             //小仓库额度表
-            if ("UserAccount".equals(dmlData.getTableName()) && "KxsProfitServer".equals(dmlData.getDatabaseName())) {
+            if ("UserAccount".equals(dmlData.getTableName()) && ("dev".equals(active) || "test".equals(active) ? "KxsMainServer":"KxsProfitServer").equals(dmlData.getDatabaseName())) {
                 kxsWarehouseService.changeAccountMinData(dmlData);
             }
             //机具表

+ 2 - 0
kxs-transfer/src/main/java/com/kxs/transfer/api/mapper/store/KxsWarehouseCreditAmountMapper.java

@@ -1,5 +1,6 @@
 package com.kxs.transfer.api.mapper.store;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kxs.store.api.model.KxsWarehouseCreditAmount;
 import org.apache.ibatis.annotations.Mapper;
@@ -11,6 +12,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2024-01-08 09:46:02
  */
 @Mapper
+@DS("store")
 public interface KxsWarehouseCreditAmountMapper extends BaseMapper<KxsWarehouseCreditAmount> {
 
 }

+ 2 - 0
kxs-transfer/src/main/java/com/kxs/transfer/api/mapper/store/KxsWarehouseLimitMapper.java

@@ -1,5 +1,6 @@
 package com.kxs.transfer.api.mapper.store;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kxs.store.api.model.KxsWarehouseLimit;
 import org.apache.ibatis.annotations.Mapper;
@@ -11,6 +12,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2024-01-08 09:46:02
  */
 @Mapper
+@DS("store")
 public interface KxsWarehouseLimitMapper extends BaseMapper<KxsWarehouseLimit> {
 
 }

+ 2 - 0
kxs-transfer/src/main/java/com/kxs/transfer/api/service/store/impl/KxsWarehouseServiceImpl.java

@@ -302,6 +302,7 @@ public class KxsWarehouseServiceImpl extends ServiceImpl<KxsWarehouseMapper, Kxs
                     .eq(KxsWarehouseLimit::getWarehouseType, 0)
                     .eq(KxsWarehouseLimit::getUserId, userId));
             if (kxsWarehouseLimit == null) {
+                warehouseLimit.setUserId(userId);
                 kxsWarehouseLimitMapper.insert(warehouseLimit);
             }else{
                 warehouseLimit.setId(kxsWarehouseLimit.getId());
@@ -358,6 +359,7 @@ public class KxsWarehouseServiceImpl extends ServiceImpl<KxsWarehouseMapper, Kxs
                     .eq(KxsWarehouseLimit::getWarehouseType, 1)
                     .eq(KxsWarehouseLimit::getUserId, userId));
             if (kxsWarehouseLimit == null) {
+                warehouseLimit.setUserId(userId);
                 kxsWarehouseLimitMapper.insert(warehouseLimit);
             }else{
                 warehouseLimit.setId(kxsWarehouseLimit.getId());