feature: 默认租户问题

pom.xml

@@ -85,7 +85,7 @@
             </properties>
             <activation>
                 <!-- 默认环境 -->
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
         </profile>
         <profile>

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/DefaultConfig.java

@@ -0,0 +1,22 @@
+package org.dromara.common.core.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+
+/**
+ * name: LockConfig
+ * package: org.dromara.backstage.config
+ * description: 酒店门锁系统API配置
+ * date: 2024-11-20 08:46:52 08:46
+ *
+ * @author luoyibo
+ * @version 0.1
+ * @since JDK 1.8
+ */
+@AutoConfiguration
+@Data
+public class DefaultConfig {
+    @Value("${system.default-config.tenantId}")
+    private String tenantId;
+}

ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -3,3 +3,4 @@ org.dromara.common.core.config.ApplicationConfig
 org.dromara.common.core.config.ValidatorConfig
 org.dromara.common.core.config.ThreadPoolConfig
 org.dromara.common.core.config.AsyncConfig
+org.dromara.common.core.config.DefaultConfig

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/controller/CardApiController.java

@@ -12,6 +12,7 @@ import org.dromara.backstage.domain.vo.card.InitCardVo;
 import org.dromara.backstage.domain.vo.card.PtCardVo;
 import org.dromara.common.core.api.ResponseResult;
 import org.dromara.common.core.api.ReturnResult;
+import org.dromara.common.core.config.DefaultConfig;
 import org.dromara.common.core.constant.DefaultConstants;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.domain.model.ResultInfo;
@@ -49,6 +50,7 @@ import static org.dromara.common.message.kafka.constant.MessageEventTypeConstant
 public class CardApiController extends BaseController {
     private final CardBusiness cardBusiness;
     private final IPtCardService cardService;
+    private final DefaultConfig defaultConfig;
 
     @PostMapping({"/api/v1/new", "/api/v1/init","/api/v1/change","/api/v1/reissue"})
     public ReturnResult initNewCard(@RequestBody Map<String, Object> initParam) {
@@ -99,9 +101,12 @@ public class CardApiController extends BaseController {
     @PostMapping("/api/v1/lock")
     @SyncDataToLocal(eventType = CARD_LOCK, sender = CARD_CENTER_SENDER)
     public ReturnResult lockCard(@RequestBody Map<String, String> mapParams){
+        String defaultTenantId = defaultConfig.getTenantId();
         Long cardNo = Long.parseLong(mapParams.get("cardNo"));
         Long FactorId = Long.parseLong(mapParams.get("factoryFixId"));
+        String tenantId = ObjectUtil.isEmpty(mapParams.get("tenantId")) ? defaultTenantId : mapParams.get("tenantId");
         PtCardBo bo = new PtCardBo().setCardNo(cardNo).setFactoryId(FactorId);
+        bo.setTenantId(tenantId);
         PtCardVo vo = cardService.lockCardByBo(bo);
         if(ObjUtil.isNotEmpty(vo)) {
             return ReturnResult.success(YcVoConvert.cardVoConvert(vo));
@@ -117,13 +122,16 @@ public class CardApiController extends BaseController {
      */
     @PostMapping("/api/v1/recycle")
     public ReturnResult recycleCard(@RequestBody Map<String, String> mapParams){
+        String defaultTenantId = defaultConfig.getTenantId();
         Long cardNo = Long.parseLong(mapParams.get("cardNo"));
         Long FactorId = Long.parseLong(mapParams.get("factoryFixId"));
         Long operatorId = Long.parseLong((mapParams.get("operatorId")));
+        String tenantId = ObjectUtil.isEmpty(mapParams.get("tenantId")) ? defaultTenantId : mapParams.get("tenantId");
         PtCardBo bo = new PtCardBo();
         bo.setCardNo(cardNo);
         bo.setFactoryId(FactorId);
         bo.setOperatorId(operatorId);
+        bo.setTenantId(tenantId);
         R<Void> result = cardBusiness.recycleCard(bo);
         if(R.isSuccess(result)){
             return ReturnResult.success();
@@ -132,6 +140,7 @@ public class CardApiController extends BaseController {
         }
     }
     private PtCardBo getInitInfo(Map<String, Object> initParam) {
+        String defaultTenantId = defaultConfig.getTenantId();
         PtCardBo bo = new PtCardBo();
         bo.setCardId(ObjUtil.isNotEmpty(initParam.get("cardId")) ? Long.parseLong(initParam.get("cardId").toString()) : null);
         bo.setUserId(ObjUtil.isNotEmpty(initParam.get("userId")) ? Long.parseLong(initParam.get("userId").toString()) : 0);
@@ -153,7 +162,7 @@ public class CardApiController extends BaseController {
             bo.setOperateType(CardOperateEnum.ISSUE);
         }
         bo.setStationNumb(ObjUtil.isNotEmpty(initParam.get("workStationNumb")) ? Long.parseLong(initParam.get("workStationNumb").toString()) : 0);
-        bo.setTenantId(ObjUtil.isNotEmpty(initParam.get("tenantId")) ? initParam.get("tenantId").toString() : DefaultConstants.TENANT_ID);
+        bo.setTenantId(ObjUtil.isNotEmpty(initParam.get("tenantId")) ? initParam.get("tenantId").toString() : defaultTenantId);
         bo.setOldCardNo(ObjUtil.isNotEmpty(initParam.get("oldCardNo")) ? Long.parseLong(initParam.get("oldCardNo").toString()) : 0);
         bo.setOldFactoryId(ObjUtil.isNotEmpty(initParam.get("oldFactoryFixId")) ? Long.parseLong(initParam.get("oldFactoryFixId").toString()) : 0);
         bo.setOldCardId(ObjUtil.isNotEmpty(initParam.get("oldCardId")) ? Long.parseLong(initParam.get("oldCardId").toString()) : 0);

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/domain/bo/PtCardBo.java

@@ -99,6 +99,11 @@ public class PtCardBo extends BaseEntity {
      */
     private Long lastMeal;
 
+    /**
+     * 租户Id
+     */
+    private String tenantId;
+
     // region 以下字段为发卡时需要传入
     /**
     * 卡片操作类型
@@ -109,10 +114,6 @@ public class PtCardBo extends BaseEntity {
      * 工作站编号,发卡时需要
      */
     private Long stationNumb;
-    /**
-    * 租户Id
-    */
-    private String tenantId;
 
     /**
      * 原卡卡流水号

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/config/DefaultConfig.java

@@ -0,0 +1,22 @@
+package org.dromara.backstage.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * name: LockConfig
+ * package: org.dromara.backstage.config
+ * description: 酒店门锁系统API配置
+ * date: 2024-11-20 08:46:52 08:46
+ *
+ * @author luoyibo
+ * @version 0.1
+ * @since JDK 1.8
+ */
+@Configuration
+@Data
+public class DefaultConfig {
+    @Value("${system.default-config.tenantId}")
+    private String tenantId;
+}

ruoyi-modules/ruoyi-system/pom.xml

@@ -145,6 +145,10 @@
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-ratelimiter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka</artifactId>
+        </dependency>
     </dependencies>
 
     <build>