group-four
/
cloud-car
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test:()去除重复的企业对象

dev.business^2
袁子龙 2024-10-09 17:16:17 +08:00
parent acd7ad9fb4
commit 4cbfb65109
3 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/Datasource.java
View File

@ -1,26 +0,0 @@
package com.muyu.common.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "datasource", autoResultMap = true)
public class Datasource {
@TableId(value = "id",type = IdType.AUTO)
private Integer id;
public String firmName;
public String databaseName;
}

9
cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteSaaSService.java
View File

@ -1,13 +1,10 @@
package com.muyu.common.system.remote;
import com.muyu.common.core.constant.SecurityConstants;
import com.muyu.common.core.constant.ServiceNameConstants;
import com.muyu.common.core.domain.Result;
import com.muyu.common.system.domain.Datasource;
import com.muyu.common.system.domain.LoginUser;
import com.muyu.common.system.domain.SysUser;
import com.muyu.common.system.domain.Business;
import com.muyu.common.system.remote.factory.RemoteSaaSFallbackFactory;
import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@ -22,7 +19,7 @@ import java.util.List;
public interface RemoteSaaSService {
@GetMapping("/saas/findDatabaseList")
Result<List<Datasource>> findDatabaseList();
Result<List<Business>> findDatabaseList();

9
cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteSaaSFallbackFactory.java
View File

@ -1,13 +1,8 @@
package com.muyu.common.system.remote.factory;
import com.muyu.common.core.domain.Result;
import com.muyu.common.system.domain.Datasource;
import com.muyu.common.system.domain.LoginUser;
import com.muyu.common.system.domain.SysUser;
import com.muyu.common.system.domain.Business;
import com.muyu.common.system.remote.RemoteSaaSService;
import com.muyu.common.system.remote.RemoteUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
@ -25,7 +20,7 @@ public class RemoteSaaSFallbackFactory implements FallbackFactory<RemoteSaaSServ
public RemoteSaaSService create(Throwable cause) {
return new RemoteSaaSService() {
@Override
public Result<List<Datasource>> findDatabaseList() {
public Result<List<Business>> findDatabaseList() {
return Result.error("查询数据库失败:" + cause.getMessage());
}
};