Skip to content

W
wecloud_im_server
Commit faaf07d6 by 南千昊
Options

应用管理中间层接口联调修改

parent eeeaf71a
Showing with 71 additions and 54 deletions
client/src/main/java/com/wecloud/imserver/client/api/ImApplicationFacade.java
package com.wecloud.imserver.client.api; package com.wecloud.imserver.client.api;
import com.wecloud.imserver.client.model.ao.CreateApplicationAO; import com.wecloud.imserver.client.model.ao.CreateApplicationAO;
import com.wecloud.imserver.client.model.ao.ListApplicationQueryAO;
import com.wecloud.imserver.client.model.ao.UpdateAppSecretAO; import com.wecloud.imserver.client.model.ao.UpdateAppSecretAO;
import com.wecloud.imserver.client.model.dto.ApplicationDTO;
import com.wecloud.imserver.client.model.dto.Result; import com.wecloud.imserver.client.model.dto.Result;
import com.wecloud.imserver.client.model.dto.UpdateAppSecretDTO;
import java.util.List;
/** /**
* @author nanqianhao * @author nanqianhao
...@@ -21,7 +16,7 @@ public interface ImApplicationFacade { ...@@ -21,7 +16,7 @@ public interface ImApplicationFacade {
* @param updateSecretAO * @param updateSecretAO
* @return * @return
*/ */
Result<UpdateAppSecretDTO> updateAppSecret(UpdateAppSecretAO updateSecretAO); Result<Boolean> updateAppSecret(UpdateAppSecretAO updateSecretAO);
/** /**
* 创建应用 * 创建应用
...@@ -35,7 +30,7 @@ public interface ImApplicationFacade { ...@@ -35,7 +30,7 @@ public interface ImApplicationFacade {
* @param listApplicationQueryAO * @param listApplicationQueryAO
* @return * @return
*/ */
Result<List<ApplicationDTO>> listApplications(ListApplicationQueryAO listApplicationQueryAO); //Result<List<ApplicationDTO>> listApplications(ListApplicationQueryAO listApplicationQueryAO);
/** /**
* 编辑应用 * 编辑应用
...@@ -43,4 +38,11 @@ public interface ImApplicationFacade { ...@@ -43,4 +38,11 @@ public interface ImApplicationFacade {
* @return * @return
*/ */
Result<Boolean> updateApplication(CreateApplicationAO createApplicationAO); Result<Boolean> updateApplication(CreateApplicationAO createApplicationAO);
/**
* 删除应用
* @param applicationId
* @return
*/
Result<Boolean> deleteApplication(Long applicationId);
} }
client/src/main/java/com/wecloud/imserver/client/model/ao/CreateApplicationAO.java
...@@ -18,8 +18,8 @@ public class CreateApplicationAO extends BaseAO implements Serializable { ...@@ -18,8 +18,8 @@ public class CreateApplicationAO extends BaseAO implements Serializable {
private Long id; private Long id;
private String appName; private String appName;
//private String description; private String appKey;
//private Integer appType; private String appSecret;
//private Integer dataCenter; private Long ownerId;
private Long tenantId; private Long companyId;
} }
client/src/main/java/com/wecloud/imserver/client/model/ao/UpdateAppSecretAO.java
...@@ -16,7 +16,7 @@ import java.io.Serializable; ...@@ -16,7 +16,7 @@ import java.io.Serializable;
@ToString @ToString
public class UpdateAppSecretAO extends BaseAO implements Serializable { public class UpdateAppSecretAO extends BaseAO implements Serializable {
private Long id;
private String appKey; private String appKey;
private String appSecret;
//private String appSecret;
} }
client/src/main/java/com/wecloud/imserver/client/model/dto/UpdateAppSecretDTO.java
...@@ -16,5 +16,7 @@ import java.io.Serializable; ...@@ -16,5 +16,7 @@ import java.io.Serializable;
@ToString @ToString
public class UpdateAppSecretDTO implements Serializable { public class UpdateAppSecretDTO implements Serializable {
private Long id;
private String appKey;
private String newAppSecret; private String newAppSecret;
} }
core/src/main/java/com/wecloud/im/appmanager/ImApplicationFacadeImpl.java
package com.wecloud.im.appmanager; package com.wecloud.im.appmanager;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.wecloud.im.entity.ImApplication; import com.wecloud.im.entity.ImApplication;
import com.wecloud.im.service.ImApplicationService; import com.wecloud.im.service.ImApplicationService;
import com.wecloud.im.ws.utils.KeyGenerator;
import com.wecloud.imserver.client.api.ImApplicationFacade; import com.wecloud.imserver.client.api.ImApplicationFacade;
import com.wecloud.imserver.client.model.ao.CreateApplicationAO; import com.wecloud.imserver.client.model.ao.CreateApplicationAO;
import com.wecloud.imserver.client.model.ao.ListApplicationQueryAO;
import com.wecloud.imserver.client.model.ao.UpdateAppSecretAO; import com.wecloud.imserver.client.model.ao.UpdateAppSecretAO;
import com.wecloud.imserver.client.model.dto.ApplicationDTO;
import com.wecloud.imserver.client.model.dto.Result; import com.wecloud.imserver.client.model.dto.Result;
import com.wecloud.imserver.client.model.dto.UpdateAppSecretDTO; import com.wecloud.imserver.client.model.dto.UpdateAppSecretDTO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.config.annotation.DubboService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* @author nanqianhao * @author nanqianhao
...@@ -38,56 +31,59 @@ public class ImApplicationFacadeImpl implements ImApplicationFacade { ...@@ -38,56 +31,59 @@ public class ImApplicationFacadeImpl implements ImApplicationFacade {
@Override @Override
public Result<UpdateAppSecretDTO> updateAppSecret(UpdateAppSecretAO updateSecretAO) { public Result<Boolean> updateAppSecret(UpdateAppSecretAO updateSecretAO) {
log.info("更新Secret传入参数为{}",updateSecretAO); log.info("更新Secret传入参数为{}",updateSecretAO);
String appKey = updateSecretAO.getAppKey(); ImApplication application = imApplicationService.getOne(new LambdaQueryWrapper<ImApplication>().eq(ImApplication::getId, updateSecretAO.getId()).eq(ImApplication::getAppKey,updateSecretAO.getAppKey()));
ImApplication application = imApplicationService.getOne(new LambdaQueryWrapper<ImApplication>().eq(ImApplication::getAppKey, appKey));
String appSecret = KeyGenerator.getAppSecret();
UpdateAppSecretDTO updateAppSecretDTO = new UpdateAppSecretDTO(); UpdateAppSecretDTO updateAppSecretDTO = new UpdateAppSecretDTO();
updateAppSecretDTO.setNewAppSecret(appSecret); updateAppSecretDTO.setId(updateSecretAO.getId());
application.setAppSecret(appSecret); updateAppSecretDTO.setAppKey(updateSecretAO.getAppKey());
imApplicationService.updateById(application); updateAppSecretDTO.setNewAppSecret(updateSecretAO.getAppSecret());
application.setAppSecret(updateSecretAO.getAppSecret());
application.setUpdateTime(new Date());
boolean result = imApplicationService.updateById(application);
log.info("更新Secret返回结果为{}",updateAppSecretDTO); log.info("更新Secret返回结果为{}",updateAppSecretDTO);
return Result.getSuccessResult(updateAppSecretDTO); return Result.getSuccessResult(result);
} }
@Override @Override
public Result<Boolean> createApplication(CreateApplicationAO createApplicationAO) { public Result<Boolean> createApplication(CreateApplicationAO createApplicationAO) {
log.info("创建应用传入的参数为{}",createApplicationAO); log.info("创建应用传入的参数为{}",createApplicationAO);
String appKey = KeyGenerator.getRandomString();
String appSecret = KeyGenerator.getAppSecret();
ImApplication imApplication = new ImApplication(); ImApplication imApplication = new ImApplication();
if (createApplicationAO.getTenantId()==null||"".equals(createApplicationAO.getTenantId())){ if (createApplicationAO.getOwnerId()==null||"".equals(createApplicationAO.getOwnerId())){
return Result.getBusinessException("请传入租户id", null); return Result.getBusinessException("请传入使用用户id", null);
}
if (createApplicationAO.getId()==null){
return Result.getBusinessException("请传入新增应用id", null);
} }
long id = IdWorker.getId(); imApplication.setId(createApplicationAO.getId());
imApplication.setId(id);
imApplication.setTenantId(createApplicationAO.getTenantId());
imApplication.setAppKey(appKey);
imApplication.setAppSecret(appSecret);
imApplication.setAppName(createApplicationAO.getAppName()); imApplication.setAppName(createApplicationAO.getAppName());
imApplication.setAppKey(createApplicationAO.getAppKey());
imApplication.setAppSecret(createApplicationAO.getAppSecret());
imApplication.setOwnerId(createApplicationAO.getOwnerId());
imApplication.setCompanyId(createApplicationAO.getCompanyId());
imApplication.setStatus(1);
imApplication.setCreateTime(new Date()); imApplication.setCreateTime(new Date());
log.info("新建的应用信息为{}",imApplication); log.info("新建的应用信息为{}",imApplication);
boolean saveResult = imApplicationService.save(imApplication); boolean saveResult = imApplicationService.save(imApplication);
return Result.getSuccessResult(saveResult); return Result.getSuccessResult(saveResult);
} }
@Override //@Override
public Result<List<ApplicationDTO>> listApplications(ListApplicationQueryAO listApplicationQueryAO) { //public Result<List<ApplicationDTO>> listApplications(ListApplicationQueryAO listApplicationQueryAO) {
log.info("查看应用列表传入的参数为{}",listApplicationQueryAO); // log.info("查看应用列表传入的参数为{}",listApplicationQueryAO);
if (listApplicationQueryAO.getTenantId()==null||"".equals(listApplicationQueryAO.getTenantId())){ // if (listApplicationQueryAO.getTenantId()==null||"".equals(listApplicationQueryAO.getTenantId())){
return Result.getBusinessException("请传入租户id", null); // return Result.getBusinessException("请传入租户id", null);
} // }
List<ImApplication> list = imApplicationService.list(new LambdaQueryWrapper<ImApplication>().eq(ImApplication::getTenantId, listApplicationQueryAO.getTenantId())); // //List<ImApplication> list = imApplicationService.list(new LambdaQueryWrapper<ImApplication>().eq(ImApplication::getTenantId, listApplicationQueryAO.getTenantId()));
List<ApplicationDTO> applicationDTOs = new ArrayList<>(); // //List<ApplicationDTO> applicationDTOs = new ArrayList<>();
list.forEach(ImApplication->{ // //list.forEach(ImApplication->{
ApplicationDTO applicationDTO = new ApplicationDTO(); // // ApplicationDTO applicationDTO = new ApplicationDTO();
BeanUtils.copyProperties(ImApplication,applicationDTO); // // BeanUtils.copyProperties(ImApplication,applicationDTO);
applicationDTOs.add(applicationDTO); // // applicationDTOs.add(applicationDTO);
}); // //});
log.info("返回的应用列表为{}",applicationDTOs); // log.info("返回的应用列表为{}",applicationDTOs);
return Result.getSuccessResult(applicationDTOs); // return Result.getSuccessResult(applicationDTOs);
} //}
@Override @Override
public Result<Boolean> updateApplication(CreateApplicationAO createApplicationAO) { public Result<Boolean> updateApplication(CreateApplicationAO createApplicationAO) {
...@@ -99,4 +95,15 @@ public class ImApplicationFacadeImpl implements ImApplicationFacade { ...@@ -99,4 +95,15 @@ public class ImApplicationFacadeImpl implements ImApplicationFacade {
log.info("编辑的应用信息为{}",application); log.info("编辑的应用信息为{}",application);
return Result.getSuccessResult(updateResult); return Result.getSuccessResult(updateResult);
} }
@Override
public Result<Boolean> deleteApplication(Long applicationId) {
log.info("删除应用传入应用id参数为{}",applicationId);
ImApplication application = imApplicationService.getOne(new LambdaQueryWrapper<ImApplication>().eq(ImApplication::getId, applicationId));
application.setStatus(3);
application.setUpdateTime(new Date());
log.info("删除应用信息为{}",application);
boolean deleteResult = imApplicationService.updateById(application);
return Result.getSuccessResult(deleteResult);
}
} }
core/src/main/java/com/wecloud/im/entity/ImApplication.java
...@@ -74,7 +74,13 @@ public class ImApplication extends BaseEntity implements Application { ...@@ -74,7 +74,13 @@ public class ImApplication extends BaseEntity implements Application {
private String fullMessageSubscribeUrl; private String fullMessageSubscribeUrl;
@ApiModelProperty("租户id") @ApiModelProperty("租户id")
private Long tenantId; private Long ownerId;
@ApiModelProperty("公司id")
private Long companyId;
@ApiModelProperty("状态 1-正常 2-异常 3-删除")
private Integer status;
@Override @Override
public Boolean isActive() { public Boolean isActive() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment