message_bus / message_bus_service · 提交

转到一个项目

作者 王勇
提交 529028120a15f12cf1085c89405909f317353bcb 1 个父辈 7929a52d

简单优化Controller层代码

内嵌 并排对比
正在显示 8 个修改的文件 包含 40 行增加 和 43 行删除
@@ -40,8 +40,10 @@ public class BusExchangeController { @@ -40,8 +40,10 @@ public class BusExchangeController {
40 @RequestParam(value = "virtualHostId", required = false) String virtualHostId, 40 @RequestParam(value = "virtualHostId", required = false) String virtualHostId,
41 @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, 41 @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
42 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { 42 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
  43 + // 获取查询参数
  44 + BusExchange busExchange = BusExchange.builder().exchangeName(exchangeName).virtualHostId(virtualHostId).build();
43 // 分页查询 45 // 分页查询
44 - PageInfo pageInfo = busExchangeService.selectBusExchangeList(new BusExchange(exchangeName, virtualHostId), pageNum, pageSize); 46 + PageInfo pageInfo = busExchangeService.selectBusExchangeList(busExchange, pageNum, pageSize);
45 return pageInfo.getTotal() > 0 47 return pageInfo.getTotal() > 0
46 ? new ResultJson<>("200", "查询MQ交换机列表,成功!", pageInfo) 48 ? new ResultJson<>("200", "查询MQ交换机列表,成功!", pageInfo)
47 : new ResultJson<>("500", "查询MQ交换机列表,失败!"); 49 : new ResultJson<>("500", "查询MQ交换机列表,失败!");
@@ -40,9 +40,10 @@ public class BusQueueController { @@ -40,9 +40,10 @@ public class BusQueueController {
40 @RequestParam(value = "virtualHostId", required = false) String virtualHostId, 40 @RequestParam(value = "virtualHostId", required = false) String virtualHostId,
41 @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, 41 @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
42 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { 42 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
43 - 43 + // 获取查询参数
  44 + BusQueue busQueue = BusQueue.builder().queueName(queueName).virtualHostId(virtualHostId).build();
44 // 分页查询 45 // 分页查询
45 - PageInfo pageInfo = busQueueService.selectBusQueueList(new BusQueue(queueName, virtualHostId), pageNum, pageSize); 46 + PageInfo pageInfo = busQueueService.selectBusQueueList(busQueue, pageNum, pageSize);
46 return pageInfo.getTotal() > 0 47 return pageInfo.getTotal() > 0
47 ? new ResultJson<>("200", "查询-消息队列-列表,成功!", pageInfo) 48 ? new ResultJson<>("200", "查询-消息队列-列表,成功!", pageInfo)
48 : new ResultJson<>("500", "查询-消息队列-列表,失败!"); 49 : new ResultJson<>("500", "查询-消息队列-列表,失败!");
@@ -88,8 +89,8 @@ public class BusQueueController { @@ -88,8 +89,8 @@ public class BusQueueController {
88 String message = validateBusQueue(busQueue); 89 String message = validateBusQueue(busQueue);
89 return message == null 90 return message == null
90 ? busQueueService.updateByPrimaryKeySelective(busQueue) > 0 91 ? busQueueService.updateByPrimaryKeySelective(busQueue) > 0
91 - ? new ResultJson<>("200", "编辑消息队列信息，成功")  
92 - : new ResultJson<>("500", "编辑消息队列信息，失败") 92 + ? new ResultJson<>("200", "编辑消息队列信息，成功")
  93 + : new ResultJson<>("500", "编辑消息队列信息，失败")
93 : new ResultJson<>("400", message); 94 : new ResultJson<>("400", message);
94 } 95 }
95 96
@@ -108,8 +109,8 @@ public class BusQueueController { @@ -108,8 +109,8 @@ public class BusQueueController {
108 //验证通过 109 //验证通过
109 return message == null 110 return message == null
110 ? busQueueService.insertSelective(busQueue) > 0 111 ? busQueueService.insertSelective(busQueue) > 0
111 - ? new ResultJson<>("200", "添加消息队列，成功")  
112 - : new ResultJson<>("500", "添加消息队列，失败") 112 + ? new ResultJson<>("200", "添加消息队列，成功")
  113 + : new ResultJson<>("500", "添加消息队列，失败")
113 : new ResultJson<>("400", message); 114 : new ResultJson<>("400", message);
114 } 115 }
115 116
@@ -39,11 +39,8 @@ public class BusServerController { @@ -39,11 +39,8 @@ public class BusServerController {
39 @RequestParam(value = "serverName", required = false) String serverName, 39 @RequestParam(value = "serverName", required = false) String serverName,
40 @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, 40 @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
41 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { 41 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
42 -  
43 - BusServer busServer = BusServer.builder()  
44 - // 获取参数，服务器名称  
45 - .serverName(serverName)  
46 - .build(); 42 + // 获取查询参数
  43 + BusServer busServer = BusServer.builder().serverName(serverName).build();
47 // 分页查询 44 // 分页查询
48 PageInfo pageInfo = busServerService.selectBusServerList(busServer, pageNum, pageSize); 45 PageInfo pageInfo = busServerService.selectBusServerList(busServer, pageNum, pageSize);
49 return pageInfo.getTotal() > 0 46 return pageInfo.getTotal() > 0
@@ -56,11 +56,8 @@ public class CascadeController { @@ -56,11 +56,8 @@ public class CascadeController {
56 */ 56 */
57 @GetMapping("/host") 57 @GetMapping("/host")
58 public ResultJson getVirtualHostList(@RequestParam(value = "serverId", required = false) String serverId) { 58 public ResultJson getVirtualHostList(@RequestParam(value = "serverId", required = false) String serverId) {
59 -  
60 - VirtualHost virtualHost = new VirtualHost();  
61 - // 获取参数，所属服务器ID  
62 - virtualHost.setServerId(serverId);  
63 - 59 + // 获取查询参数
  60 + VirtualHost virtualHost = VirtualHost.builder().serverId(serverId).build();
64 List<VirtualHost> virtualHosts = virtualHostService.getVirtualHostList(virtualHost); 61 List<VirtualHost> virtualHosts = virtualHostService.getVirtualHostList(virtualHost);
65 return virtualHosts.size() > 0 62 return virtualHosts.size() > 0
66 ? new ResultJson<>("200", "查询虚拟主机，成功", virtualHosts) 63 ? new ResultJson<>("200", "查询虚拟主机，成功", virtualHosts)
@@ -75,11 +72,8 @@ public class CascadeController { @@ -75,11 +72,8 @@ public class CascadeController {
75 */ 72 */
76 @GetMapping("/exchange") 73 @GetMapping("/exchange")
77 public ResultJson getExchangeList(@RequestParam(value = "virtualHostId", required = false) String virtualHostId) { 74 public ResultJson getExchangeList(@RequestParam(value = "virtualHostId", required = false) String virtualHostId) {
78 -  
79 - BusExchange busExchange = new BusExchange();  
80 - // 获取参数，所属虚拟主机ID  
81 - busExchange.setVirtualHostId(virtualHostId);  
82 - 75 + // 获取查询参数
  76 + BusExchange busExchange = BusExchange.builder().virtualHostId(virtualHostId).build();
83 List<BusExchange> busExchanges = busExchangeService.getExchangeList(busExchange); 77 List<BusExchange> busExchanges = busExchangeService.getExchangeList(busExchange);
84 return busExchanges.size() > 0 78 return busExchanges.size() > 0
85 ? new ResultJson<>("200", "查询交换机列表，成功", busExchanges) 79 ? new ResultJson<>("200", "查询交换机列表，成功", busExchanges)
@@ -94,11 +88,8 @@ public class CascadeController { @@ -94,11 +88,8 @@ public class CascadeController {
94 */ 88 */
95 @GetMapping("/queue") 89 @GetMapping("/queue")
96 public ResultJson getQueueList(@RequestParam(value = "virtualHostId", required = false) String virtualHostId) { 90 public ResultJson getQueueList(@RequestParam(value = "virtualHostId", required = false) String virtualHostId) {
97 -  
98 - BusQueue busQueue = new BusQueue();  
99 - // 获取参数，所属虚拟主机ID  
100 - busQueue.setVirtualHostId(virtualHostId);  
101 - 91 + // 获取查询参数
  92 + BusQueue busQueue = BusQueue.builder().virtualHostId(virtualHostId).build();
102 List<BusQueue> busQueues = busQueueService.getQueueList(busQueue); 93 List<BusQueue> busQueues = busQueueService.getQueueList(busQueue);
103 return busQueues.size() > 0 94 return busQueues.size() > 0
104 ? new ResultJson<>("200", "查询队列列表，成功", busQueues) 95 ? new ResultJson<>("200", "查询队列列表，成功", busQueues)
@@ -113,9 +104,8 @@ public class CascadeController { @@ -113,9 +104,8 @@ public class CascadeController {
113 */ 104 */
114 @GetMapping("/routing") 105 @GetMapping("/routing")
115 public ResultJson getRoutingKeyList(@RequestParam(value = "exchangeId", required = false) String exchangeId) { 106 public ResultJson getRoutingKeyList(@RequestParam(value = "exchangeId", required = false) String exchangeId) {
116 - RoutingKey routingKey = new RoutingKey();  
117 - // 获取参数，交换机ID  
118 - routingKey.setExchangeId(exchangeId); 107 + // 获取查询参数
  108 + RoutingKey routingKey = RoutingKey.builder().exchangeId(exchangeId).build();
119 List<RoutingKey> routingKeys = routingKeyService.getRoutingKeyList(routingKey); 109 List<RoutingKey> routingKeys = routingKeyService.getRoutingKeyList(routingKey);
120 return routingKeys.size() > 0 110 return routingKeys.size() > 0
121 ? new ResultJson<>("200", "查询路由键列表，成功", routingKeys) 111 ? new ResultJson<>("200", "查询路由键列表，成功", routingKeys)
@@ -146,6 +136,7 @@ public class CascadeController { @@ -146,6 +136,7 @@ public class CascadeController {
146 */ 136 */
147 @GetMapping("/server_host_exchange") 137 @GetMapping("/server_host_exchange")
148 public ResultJson getServerAndHostAndExchangeList() { 138 public ResultJson getServerAndHostAndExchangeList() {
  139 +
149 List<BusServer> servers = busServerService.getServerAndHostAndExchangeList(); 140 List<BusServer> servers = busServerService.getServerAndHostAndExchangeList();
150 return servers.size() > 0 141 return servers.size() > 0
151 ? new ResultJson<>("200", "查询服务器、虚拟主机、交换机信息，成功", servers) 142 ? new ResultJson<>("200", "查询服务器、虚拟主机、交换机信息，成功", servers)
@@ -72,7 +72,7 @@ public class MessageNoteController { @@ -72,7 +72,7 @@ public class MessageNoteController {
72 @RequestParam(value = "receiveTime", required = false) Date receiveTime, 72 @RequestParam(value = "receiveTime", required = false) Date receiveTime,
73 @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, 73 @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
74 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { 74 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
75 - 75 + // 获取查询参数
76 MessageNote messageNote = MessageNote.builder() 76 MessageNote messageNote = MessageNote.builder()
77 .username(username) 77 .username(username)
78 .serverName(serverName) 78 .serverName(serverName)
@@ -40,9 +40,10 @@ public class RoutingKeyController { @@ -40,9 +40,10 @@ public class RoutingKeyController {
40 @RequestParam(value = "exchangeId", required = false) String exchangeId, 40 @RequestParam(value = "exchangeId", required = false) String exchangeId,
41 @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, 41 @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
42 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { 42 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
43 - 43 + // 获取查询参数
  44 + RoutingKey routingKey = RoutingKey.builder().routingKeyName(routingKeyName).exchangeId(exchangeId).build();
44 // 分页查询 45 // 分页查询
45 - PageInfo pageInfo = routingKeyService.selectRoutingKeyList(new RoutingKey(routingKeyName, exchangeId), pageNum, pageSize); 46 + PageInfo pageInfo = routingKeyService.selectRoutingKeyList(routingKey, pageNum, pageSize);
46 return pageInfo.getTotal() > 0 47 return pageInfo.getTotal() > 0
47 ? new ResultJson<>("200", "查询路由键列表,成功!", pageInfo) 48 ? new ResultJson<>("200", "查询路由键列表,成功!", pageInfo)
48 : new ResultJson<>("500", "查询路由键列表,失败!"); 49 : new ResultJson<>("500", "查询路由键列表,失败!");
@@ -89,8 +90,8 @@ public class RoutingKeyController { @@ -89,8 +90,8 @@ public class RoutingKeyController {
89 String message = validateRoutingKey(routingKey); 90 String message = validateRoutingKey(routingKey);
90 return message == null 91 return message == null
91 ? routingKeyService.updateByPrimaryKeySelective(routingKey) > 0 92 ? routingKeyService.updateByPrimaryKeySelective(routingKey) > 0
92 - ? new ResultJson<>("200", "编辑路由键信息，成功")  
93 - : new ResultJson<>("500", "编辑路由键信息，失败") 93 + ? new ResultJson<>("200", "编辑路由键信息，成功")
  94 + : new ResultJson<>("500", "编辑路由键信息，失败")
94 : new ResultJson<>("400", message); 95 : new ResultJson<>("400", message);
95 } 96 }
96 97
@@ -110,8 +111,8 @@ public class RoutingKeyController { @@ -110,8 +111,8 @@ public class RoutingKeyController {
110 111
111 return message == null 112 return message == null
112 ? routingKeyService.insertSelective(routingKey) > 0 113 ? routingKeyService.insertSelective(routingKey) > 0
113 - ? new ResultJson<>("200", "增加路由键信息，成功")  
114 - : new ResultJson<>("500", "增加路由键信息，失败") 114 + ? new ResultJson<>("200", "增加路由键信息，成功")
  115 + : new ResultJson<>("500", "增加路由键信息，失败")
115 : new ResultJson<>("400", message); 116 : new ResultJson<>("400", message);
116 } 117 }
117 118
@@ -65,7 +65,15 @@ public class UserMessageBindingController { @@ -65,7 +65,15 @@ public class UserMessageBindingController {
65 @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, 65 @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
66 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { 66 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
67 // 获取查询参数 67 // 获取查询参数
68 - UserMessageBinding userMessageBinding = new UserMessageBinding(username, serverName, virtualHostName, exchangeName, queueName, routingKeyName, subscriber); 68 + UserMessageBinding userMessageBinding = UserMessageBinding.builder()
  69 + .username(username)
  70 + .serverName(serverName)
  71 + .virtualHostName(virtualHostName)
  72 + .exchangeName(exchangeName)
  73 + .queueName(queueName)
  74 + .routingKeyName(routingKeyName)
  75 + .subscriber(subscriber)
  76 + .build();
69 // 分页查询 77 // 分页查询
70 PageInfo pageInfo = userMessageBindingService.selectUserMessageBindingList(userMessageBinding, pageNum, pageSize); 78 PageInfo pageInfo = userMessageBindingService.selectUserMessageBindingList(userMessageBinding, pageNum, pageSize);
71 return pageInfo.getTotal() > 0 79 return pageInfo.getTotal() > 0
@@ -40,11 +40,8 @@ public class VirtualHostController { @@ -40,11 +40,8 @@ public class VirtualHostController {
40 @RequestParam(value = "serverId", required = false) String serverId, 40 @RequestParam(value = "serverId", required = false) String serverId,
41 @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, 41 @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
42 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { 42 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
43 -  
44 - VirtualHost virtualHost = VirtualHost.builder()  
45 - .virtualHostName(virtualHostName)  
46 - .serverId(serverId)  
47 - .build(); 43 + // 获取查询参数
  44 + VirtualHost virtualHost = VirtualHost.builder().virtualHostName(virtualHostName).serverId(serverId).build();
48 // 分页查询 45 // 分页查询
49 PageInfo pageInfo = virtualHostService.selectVirtualHostList(virtualHost, pageNum, pageSize); 46 PageInfo pageInfo = virtualHostService.selectVirtualHostList(virtualHost, pageNum, pageSize);
50 return pageInfo.getTotal() > 0 47 return pageInfo.getTotal() > 0