message_bus / message_bus_service · 提交

转到一个项目

作者 王勇
提交 64569a8842698256a8c5dd4008b5ff4a579e7e33 1 个父辈 db4dde36

简单优化Controller层代码

内嵌 并排对比
正在显示 2 个修改的文件 包含 40 行增加 和 61 行删除
... ... @@ -41,18 +41,10 @@ public class CascadeController {
@GetMapping("/server")
public ResultJson getServerList() {
ResultJson result = new ResultJson();
List<BusServer> busServers = busServerService.getServerList();
int num = busServers.size();
if (num > 0) {
result.setCode("200");
result.setData(busServers);
result.setMsg("查询服务器列表，成功");
} else {
result.setCode("500");
result.setMsg("查询服务器列表，失败");
}
return result;
return busServers.size() > 0
? new ResultJson<>("200", "查询服务器列表，成功", busServers)
: new ResultJson<>("500", "查询服务器列表，失败");
}
... ... @@ -64,21 +56,15 @@ public class CascadeController {
*/
@GetMapping("/host")
public ResultJson getVirtualHostList(@RequestParam(value = "serverId", required = false) String serverId) {
ResultJson result = new ResultJson();
VirtualHost virtualHost = new VirtualHost();
// 获取参数，所属服务器ID
virtualHost.setServerId(serverId);
List<VirtualHost> virtualHosts = virtualHostService.getVirtualHostList(virtualHost);
int num = virtualHosts.size();
if (num > 0) {
result.setCode("200");
result.setData(virtualHosts);
result.setMsg("查询虚拟主机，成功");
} else {
result.setCode("500");
result.setMsg("查询虚拟主机，失败");
}
return result;
return virtualHosts.size() > 0
? new ResultJson<>("200", "查询虚拟主机，成功", virtualHosts)
: new ResultJson<>("500", "查询虚拟主机，失败");
}
/**
... ... @@ -89,16 +75,15 @@ public class CascadeController {
*/
@GetMapping("/exchange")
public ResultJson getExchangeList(@RequestParam(value = "virtualHostId", required = false) String virtualHostId) {
BusExchange busExchange = new BusExchange();
// 获取参数，所属虚拟主机ID
busExchange.setVirtualHostId(virtualHostId);
List<BusExchange> busExchanges = busExchangeService.getExchangeList(busExchange);
int num = busExchanges.size();
if (num > 0) {
return new ResultJson("200", "查询交换机列表，成功", busExchanges);
} else {
return new ResultJson("500", "查询交换机列表，失败");
}
return busExchanges.size() > 0
? new ResultJson<>("200", "查询交换机列表，成功", busExchanges)
: new ResultJson<>("500", "查询交换机列表，失败");
}
/**
... ... @@ -109,16 +94,15 @@ public class CascadeController {
*/
@GetMapping("/queue")
public ResultJson getQueueList(@RequestParam(value = "virtualHostId", required = false) String virtualHostId) {
BusQueue busQueue = new BusQueue();
// 获取参数，所属虚拟主机ID
busQueue.setVirtualHostId(virtualHostId);
List<BusQueue> busQueues = busQueueService.getQueueList(busQueue);
int num = busQueues.size();
if (num > 0) {
return new ResultJson("200", "查询队列列表，成功", busQueues);
} else {
return new ResultJson("500", "查询队列列表，失败");
}
return busQueues.size() > 0
? new ResultJson<>("200", "查询队列列表，成功", busQueues)
: new ResultJson<>("500", "查询队列列表，失败");
}
/**
... ... @@ -133,16 +117,11 @@ public class CascadeController {
// 获取参数，交换机ID
routingKey.setExchangeId(exchangeId);
List<RoutingKey> routingKeys = routingKeyService.getRoutingKeyList(routingKey);
int num = routingKeys.size();
if (num > 0) {
return new ResultJson("200", "查询路由键列表，成功", routingKeys);
} else {
return new ResultJson("500", "查询路由键列表，失败");
}
return routingKeys.size() > 0
? new ResultJson<>("200", "查询路由键列表，成功", routingKeys)
: new ResultJson<>("500", "查询路由键列表，失败");
}
/**
* 服务器与虚拟主机是1：n的关系
* 查询，服务器列表（包含虚拟机）
... ... @@ -151,14 +130,11 @@ public class CascadeController {
*/
@GetMapping("/server_host")
public ResultJson getServerAndHostList() {
ResultJson result = new ResultJson();
List<BusServer> servers = busServerService.getServerAndHostList();
int num = servers.size();
if (num > 0) {
return new ResultJson("200", "查询服务器与虚拟主机信息，成功", servers);
} else {
return new ResultJson("500", "查询服务器与虚拟主机信息，失败");
}
return servers.size() > 0
? new ResultJson<>("200", "查询服务器与虚拟主机信息，成功", servers)
: new ResultJson<>("500", "查询服务器与虚拟主机信息，失败");
}
/**
... ... @@ -170,13 +146,9 @@ public class CascadeController {
*/
@GetMapping("/server_host_exchange")
public ResultJson getServerAndHostAndExchangeList() {
ResultJson result = new ResultJson();
List<BusServer> servers = busServerService.getServerAndHostAndExchangeList();
int num = servers.size();
if (num > 0) {
return new ResultJson("200", "查询服务器与虚拟主机信息，成功", servers);
} else {
return new ResultJson("500", "查询服务器与虚拟主机信息，失败");
}
return servers.size() > 0
? new ResultJson<>("200", "查询服务器、虚拟主机、交换机信息，成功", servers)
: new ResultJson<>("500", "查询服务器、虚拟主机、交换机信息，失败");
}
}
... ...
... ... @@ -29,7 +29,9 @@ public class SchedulingDeleteController {
@GetMapping("/get")
public ResultJson getDeleteTime() {
SchedulingDelete schedulingDelete = getSchedulingDelete();
return schedulingDelete.getDeleteTime() > 0 ? new ResultJson("200", "获取删除时间，成功", schedulingDelete) : new ResultJson("500", "获取删除时间，失败");
return schedulingDelete.getDeleteTime() > 0
? new ResultJson<>("200", "获取删除时间，成功", schedulingDelete)
: new ResultJson<>("500", "获取删除时间，失败");
}
... ... @@ -43,15 +45,20 @@ public class SchedulingDeleteController {
public ResultJson setDeleteTime(Integer deleteTime) {
SchedulingDelete schedulingDelete = getSchedulingDelete();
schedulingDelete.setDeleteTime(deleteTime);
int num = schedulingDeleteService.updateByPrimaryKeySelective(schedulingDelete);
return num > 0 ? new ResultJson("200", "修改删除时间,成功") : new ResultJson("500", "修改删除时间,失败");
return schedulingDeleteService.updateByPrimaryKeySelective(schedulingDelete) > 0
? new ResultJson<>("200", "修改删除时间,成功")
: new ResultJson<>("500", "修改删除时间,失败");
}
/**
* 获取 message_note 类型的删除设置
*
* @return SchedulingDelete {@link SchedulingDelete}
*/
private SchedulingDelete getSchedulingDelete() {
// 类型
String deleteType = "message_note";
// 首先获取可自主设置的默认时间
SchedulingDelete schedulingDelete = schedulingDeleteService.selectByType(deleteType);
return schedulingDelete;
return schedulingDeleteService.selectByType(deleteType);
}
}
... ...