Merge remote-tracking branch 'origin/feature-cluster' into feature-cluster

client/src/main/java/com/wecloud/imserver/client/api/ImApplicationProductsConfig.java → client/src/main/java/com/wecloud/imserver/client/api/ImApplicationProductsConfigFacade.java

@@ -9,7 +9,7 @@ import com.wecloud.imserver.client.model.dto.Result;
  * @date 2022/6/9
  * @date 2022/6/9
  * @apiNote
  * @apiNote
  */
  */
-public interface ImApplicationProductsConfig {
+public interface ImApplicationProductsConfigFacade {
 
 
     /**
     /**
      * 创建即使通讯产品应用配置
      * 创建即使通讯产品应用配置
@@ -21,10 +21,10 @@ public interface ImApplicationProductsConfig {
 
 
     /**
     /**
      * 查看即使通讯产品应用配置
      * 查看即使通讯产品应用配置
-     * @param id
+     * @param appId
      * @return
      * @return
      */
      */
-    Result<ImApplicationProductsConfigDTO> getImApplicationProductsConfig(Long id);
+    Result<ImApplicationProductsConfigDTO> getImApplicationProductsConfig(Long appId);
 
 
 
 
 }
 }

client/src/main/java/com/wecloud/imserver/client/api/RtcApplicationProductsConfig.java → client/src/main/java/com/wecloud/imserver/client/api/RtcApplicationProductsConfigFacades.java

@@ -9,7 +9,7 @@ import com.wecloud.imserver.client.model.dto.RtcApplicationProductsConfigDTO;
  * @date 2022/6/9
  * @date 2022/6/9
  * @apiNote
  * @apiNote
  */
  */
-public interface RtcApplicationProductsConfig {
+public interface RtcApplicationProductsConfigFacades {
 
 
 
 
     /**
     /**
@@ -22,8 +22,8 @@ public interface RtcApplicationProductsConfig {
 
 
     /**
     /**
      * 查看rtc产品应用配置
      * 查看rtc产品应用配置
-     * @param id
+     * @param appId
      * @return
      * @return
      */
      */
-    Result<RtcApplicationProductsConfigDTO> getRtcApplicationProductsConfig(Long id);
+    Result<RtcApplicationProductsConfigDTO> getRtcApplicationProductsConfig(Long appId);
 }
 }

client/src/main/java/com/wecloud/imserver/client/model/ao/BaseAO.java

@@ -12,5 +12,10 @@ import java.io.Serializable;
 @Data
 @Data
 public class BaseAO implements Serializable {
 public class BaseAO implements Serializable {
 
 
+    private static final long serialVersionUID = -5900782600599879551L;
+
+    /**
+     * 操作者id
+     */
     private String operationId;
     private String operationId;
 }
 }

client/src/main/java/com/wecloud/imserver/client/model/ao/CreateApplicationAO.java

@@ -14,7 +14,9 @@ import java.io.Serializable;
 @Getter
 @Getter
 @Setter
 @Setter
 @ToString
 @ToString
-public class CreateApplicationAO extends BaseAO implements Serializable {
+public class CreateApplicationAO extends BaseAO {
+
+    private static final long serialVersionUID = -5946291690043099493L;
 
 
     private Long id;
     private Long id;
     private String appName;
     private String appName;

client/src/main/java/com/wecloud/imserver/client/model/ao/ImApplicationProductsConfigAO.java

@@ -4,7 +4,6 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.ToString;
 
 
-import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 
 
 /**
 /**
@@ -15,8 +14,9 @@ import java.time.LocalDateTime;
 @Getter
 @Getter
 @Setter
 @Setter
 @ToString
 @ToString
-public class ImApplicationProductsConfigAO implements Serializable {
+public class ImApplicationProductsConfigAO extends BaseAO {
 
 
+    private static final long serialVersionUID = -5277932689556028232L;
     /**
     /**
      * 主键id
      * 主键id
      */
      */

client/src/main/java/com/wecloud/imserver/client/model/ao/ListApplicationQueryAO.java

-package com.wecloud.imserver.client.model.ao;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.io.Serializable;
-
-/**
- * @author nanqianhao
- * @date 2022/5/26
- * @apiNote
- */
-@Getter
-@Setter
-@ToString
-public class ListApplicationQueryAO implements Serializable {
-
-    private Long tenantId;
-}

client/src/main/java/com/wecloud/imserver/client/model/ao/RtcApplicationProductsConfigAO.java

@@ -4,7 +4,6 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.ToString;
 
 
-import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 
 
 /**
 /**
@@ -15,7 +14,9 @@ import java.time.LocalDateTime;
 @Getter
 @Getter
 @Setter
 @Setter
 @ToString
 @ToString
-public class RtcApplicationProductsConfigAO implements Serializable {
+public class RtcApplicationProductsConfigAO extends BaseAO {
+
+    private static final long serialVersionUID = 914250330526225921L;
 
 
     /**
     /**
      * 主键id
      * 主键id

client/src/main/java/com/wecloud/imserver/client/model/ao/UpdateAppSecretAO.java

@@ -4,8 +4,6 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.ToString;
 
 
-import java.io.Serializable;
-
 /**
 /**
  * @author nanqianhao
  * @author nanqianhao
  * @date 2022/5/26
  * @date 2022/5/26
@@ -14,9 +12,22 @@ import java.io.Serializable;
 @Getter
 @Getter
 @Setter
 @Setter
 @ToString
 @ToString
-public class UpdateAppSecretAO extends BaseAO implements Serializable {
+public class UpdateAppSecretAO extends BaseAO  {
+
+    private static final long serialVersionUID = 5970447569934702115L;
 
 
+    /**
+     * 主键id
+     */
     private Long id;
     private Long id;
+
+    /**
+     * app_key
+     */
     private String appKey;
     private String appKey;
+
+    /**
+     * app密匙
+     */
     private String appSecret;
     private String appSecret;
 }
 }

client/src/main/java/com/wecloud/imserver/client/model/dto/ApplicationDTO.java

-package com.wecloud.imserver.client.model.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author nanqianhao
- * @date 2022/5/26
- * @apiNote
- */
-@Getter
-@Setter
-@ToString
-public class ApplicationDTO implements Serializable {
-    private Long id;
-    private String appName;
-    private Date createTime;
-}

client/src/main/java/com/wecloud/imserver/client/model/dto/ImApplicationProductsConfigDTO.java

@@ -17,6 +17,8 @@ import java.time.LocalDateTime;
 @ToString
 @ToString
 public class ImApplicationProductsConfigDTO implements Serializable {
 public class ImApplicationProductsConfigDTO implements Serializable {
 
 
+    private static final long serialVersionUID = 2949246769587717425L;
+
     /**
     /**
      * 应用id
      * 应用id
      */
      */

client/src/main/java/com/wecloud/imserver/client/model/dto/RtcApplicationProductsConfigDTO.java

@@ -17,6 +17,8 @@ import java.time.LocalDateTime;
 @ToString
 @ToString
 public class RtcApplicationProductsConfigDTO implements Serializable {
 public class RtcApplicationProductsConfigDTO implements Serializable {
 
 
+    private static final long serialVersionUID = 306040760030445655L;
+
     /**
     /**
      * 应用id
      * 应用id
      */
      */

client/src/main/java/com/wecloud/imserver/client/model/dto/UpdateAppSecretDTO.java

@@ -16,7 +16,20 @@ import java.io.Serializable;
 @ToString
 @ToString
 public class UpdateAppSecretDTO implements Serializable {
 public class UpdateAppSecretDTO implements Serializable {
 
 
+    private static final long serialVersionUID = 2897714552501459897L;
+
+    /**
+     * 主键id
+     */
     private Long id;
     private Long id;
+
+    /**
+     * app_key
+     */
     private String appKey;
     private String appKey;
+
+    /**
+     * 新的app密匙
+     */
     private String newAppSecret;
     private String newAppSecret;
 }
 }

client/src/main/java/com/wecloud/imserver/client/model/dto/UpdateApplicationDTO.java

-package com.wecloud.imserver.client.model.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-/**
- * @author nanqianhao
- * @date 2022/5/26
- * @apiNote
- */
-@Getter
-@Setter
-@ToString
-public class UpdateApplicationDTO {
-}

core/src/main/java/com/wecloud/im/productsconfig/ImApplicationProductsConfigImpl.java

 package com.wecloud.im.productsconfig;
 package com.wecloud.im.productsconfig;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.wecloud.im.entity.ApplicationProductsImConfig;
 import com.wecloud.im.entity.ApplicationProductsImConfig;
 import com.wecloud.im.service.IApplicationProductsImConfigService;
 import com.wecloud.im.service.IApplicationProductsImConfigService;
-import com.wecloud.imserver.client.api.ImApplicationProductsConfig;
+import com.wecloud.imserver.client.api.ImApplicationProductsConfigFacade;
 import com.wecloud.imserver.client.model.ao.ImApplicationProductsConfigAO;
 import com.wecloud.imserver.client.model.ao.ImApplicationProductsConfigAO;
 import com.wecloud.imserver.client.model.dto.ImApplicationProductsConfigDTO;
 import com.wecloud.imserver.client.model.dto.ImApplicationProductsConfigDTO;
 import com.wecloud.imserver.client.model.dto.Result;
 import com.wecloud.imserver.client.model.dto.Result;
@@ -20,7 +21,7 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @Slf4j
 @Service
 @Service
 @DubboService
 @DubboService
-public class ImApplicationProductsConfigImpl implements ImApplicationProductsConfig {
+public class ImApplicationProductsConfigImpl implements ImApplicationProductsConfigFacade {
 
 
     @Autowired
     @Autowired
     private IApplicationProductsImConfigService applicationProductsImConfigService;
     private IApplicationProductsImConfigService applicationProductsImConfigService;
@@ -41,9 +42,11 @@ public class ImApplicationProductsConfigImpl implements ImApplicationProductsCon
     }
     }
 
 
     @Override
     @Override
-    public Result<ImApplicationProductsConfigDTO> getImApplicationProductsConfig(Long id) {
-        log.info("查看即时通讯应用配置传入appid为{}",id);
-        ApplicationProductsImConfig applicationProductsImConfig = applicationProductsImConfigService.getById(id);
+    public Result<ImApplicationProductsConfigDTO> getImApplicationProductsConfig(Long appId) {
+        log.info("查看即时通讯应用配置传入appid为{}",appId);
+        ApplicationProductsImConfig applicationProductsImConfig = applicationProductsImConfigService.getOne(
+                new LambdaQueryWrapper<ApplicationProductsImConfig>().eq(ApplicationProductsImConfig::getFkAppid,appId)
+        );
         if (applicationProductsImConfig==null||applicationProductsImConfig.getIsDeleted().equals(true)){
         if (applicationProductsImConfig==null||applicationProductsImConfig.getIsDeleted().equals(true)){
             return Result.getBusinessException("查无此应用配置", null);
             return Result.getBusinessException("查无此应用配置", null);
         }
         }

core/src/main/java/com/wecloud/rtc/productsconfig/RtcApplicationProductsConfigImpl.java

 package com.wecloud.rtc.productsconfig;
 package com.wecloud.rtc.productsconfig;
 
 
-import com.wecloud.imserver.client.api.RtcApplicationProductsConfig;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.wecloud.imserver.client.api.RtcApplicationProductsConfigFacades;
 import com.wecloud.imserver.client.model.ao.RtcApplicationProductsConfigAO;
 import com.wecloud.imserver.client.model.ao.RtcApplicationProductsConfigAO;
 import com.wecloud.imserver.client.model.dto.Result;
 import com.wecloud.imserver.client.model.dto.Result;
 import com.wecloud.imserver.client.model.dto.RtcApplicationProductsConfigDTO;
 import com.wecloud.imserver.client.model.dto.RtcApplicationProductsConfigDTO;
@@ -20,7 +21,7 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @Slf4j
 @Service
 @Service
 @DubboService
 @DubboService
-public class RtcApplicationProductsConfigImpl implements RtcApplicationProductsConfig {
+public class RtcApplicationProductsConfigImpl implements RtcApplicationProductsConfigFacades {
 
 
     @Autowired
     @Autowired
     private IApplicationProductsRtcConfigService applicationProductsRtcConfigService;
     private IApplicationProductsRtcConfigService applicationProductsRtcConfigService;
@@ -41,9 +42,11 @@ public class RtcApplicationProductsConfigImpl implements RtcApplicationProductsC
     }
     }
 
 
     @Override
     @Override
-    public Result<RtcApplicationProductsConfigDTO> getRtcApplicationProductsConfig(Long id) {
-        log.info("查看即时通讯应用配置传入appid为{}",id);
-        ApplicationProductsRtcConfig applicationProductsRtcConfig = applicationProductsRtcConfigService.getById(id);
+    public Result<RtcApplicationProductsConfigDTO> getRtcApplicationProductsConfig(Long appId) {
+        log.info("查看即时通讯应用配置传入appid为{}",appId);
+        ApplicationProductsRtcConfig applicationProductsRtcConfig = applicationProductsRtcConfigService.getOne(
+                new LambdaQueryWrapper<ApplicationProductsRtcConfig>().eq(ApplicationProductsRtcConfig::getFkAppid,appId)
+        );
         if (applicationProductsRtcConfig==null||applicationProductsRtcConfig.getIsDeleted().equals(true)){
         if (applicationProductsRtcConfig==null||applicationProductsRtcConfig.getIsDeleted().equals(true)){
             return Result.getBusinessException("查无此应用配置", null);
             return Result.getBusinessException("查无此应用配置", null);
         }
         }