正在显示
14 个修改的文件
包含
59 行增加
和
19 行删除
@@ -39,8 +39,13 @@ public class BusServerController { | @@ -39,8 +39,13 @@ 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 | // 分页查询 | 47 | // 分页查询 |
43 | - PageInfo pageInfo = busServerService.selectBusServerList(new BusServer(serverName), pageNum, pageSize); | 48 | + PageInfo pageInfo = busServerService.selectBusServerList(busServer, pageNum, pageSize); |
44 | return pageInfo.getTotal() > 0 | 49 | return pageInfo.getTotal() > 0 |
45 | ? new ResultJson<>("200", "查询MQ服务器列表,成功!", pageInfo) | 50 | ? new ResultJson<>("200", "查询MQ服务器列表,成功!", pageInfo) |
46 | : new ResultJson<>("500", "查询MQ服务器列表,失败!"); | 51 | : new ResultJson<>("500", "查询MQ服务器列表,失败!"); |
@@ -73,8 +73,16 @@ public class MessageNoteController { | @@ -73,8 +73,16 @@ public class MessageNoteController { | ||
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 | - // 获取参数 | ||
77 | - MessageNote messageNote = new MessageNote(username, serverName, virtualHostName, exchangeName, queueName, routingKeyName, sendTime, receiveTime); | 76 | + MessageNote messageNote = MessageNote.builder() |
77 | + .username(username) | ||
78 | + .serverName(serverName) | ||
79 | + .virtualHostName(virtualHostName) | ||
80 | + .exchangeName(exchangeName) | ||
81 | + .queueName(queueName) | ||
82 | + .routingKeyName(routingKeyName) | ||
83 | + .sendTime(sendTime) | ||
84 | + .receiveTime(receiveTime) | ||
85 | + .build(); | ||
78 | // 分页查询 | 86 | // 分页查询 |
79 | PageInfo pageInfo = messageNoteService.selectMessageNoteList(messageNote, pageNum, pageSize); | 87 | PageInfo pageInfo = messageNoteService.selectMessageNoteList(messageNote, pageNum, pageSize); |
80 | return pageInfo.getTotal() > 0 | 88 | return pageInfo.getTotal() > 0 |
@@ -40,8 +40,13 @@ public class VirtualHostController { | @@ -40,8 +40,13 @@ 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 | // 分页查询 | 48 | // 分页查询 |
44 | - PageInfo pageInfo = virtualHostService.selectVirtualHostList(new VirtualHost(virtualHostName, serverId), pageNum, pageSize); | 49 | + PageInfo pageInfo = virtualHostService.selectVirtualHostList(virtualHost, pageNum, pageSize); |
45 | return pageInfo.getTotal() > 0 | 50 | return pageInfo.getTotal() > 0 |
46 | ? new ResultJson<>("200", "查询虚拟主机列表,成功!", pageInfo) | 51 | ? new ResultJson<>("200", "查询虚拟主机列表,成功!", pageInfo) |
47 | : new ResultJson<>("500", "查询虚拟主机列表,失败!"); | 52 | : new ResultJson<>("500", "查询虚拟主机列表,失败!"); |
@@ -85,8 +90,8 @@ public class VirtualHostController { | @@ -85,8 +90,8 @@ public class VirtualHostController { | ||
85 | String message = validateVirtualHost(virtualHost); | 90 | String message = validateVirtualHost(virtualHost); |
86 | return message == null | 91 | return message == null |
87 | ? virtualHostService.updateByPrimaryKeySelective(virtualHost) > 0 | 92 | ? virtualHostService.updateByPrimaryKeySelective(virtualHost) > 0 |
88 | - ? new ResultJson<>("200", "修改虚拟主机信息,成功") | ||
89 | - : new ResultJson<>("500", "修改虚拟主机信息,失败") | 93 | + ? new ResultJson<>("200", "修改虚拟主机信息,成功") |
94 | + : new ResultJson<>("500", "修改虚拟主机信息,失败") | ||
90 | : new ResultJson<>("400", message); | 95 | : new ResultJson<>("400", message); |
91 | } | 96 | } |
92 | 97 | ||
@@ -104,8 +109,8 @@ public class VirtualHostController { | @@ -104,8 +109,8 @@ public class VirtualHostController { | ||
104 | virtualHost.setId(IdUtils.generateId()); | 109 | virtualHost.setId(IdUtils.generateId()); |
105 | return message == null | 110 | return message == null |
106 | ? virtualHostService.insertSelective(virtualHost) > 0 | 111 | ? virtualHostService.insertSelective(virtualHost) > 0 |
107 | - ? new ResultJson<>("200", "新增虚拟主机信息,成功") | ||
108 | - : new ResultJson<>("500", "新增虚拟主机信息,失败") | 112 | + ? new ResultJson<>("200", "新增虚拟主机信息,成功") |
113 | + : new ResultJson<>("500", "新增虚拟主机信息,失败") | ||
109 | : new ResultJson<>("400", message); | 114 | : new ResultJson<>("400", message); |
110 | } | 115 | } |
111 | 116 |
@@ -2,6 +2,7 @@ package com.sunyo.wlpt.message.bus.service.domain; | @@ -2,6 +2,7 @@ package com.sunyo.wlpt.message.bus.service.domain; | ||
2 | 2 | ||
3 | import com.fasterxml.jackson.annotation.JsonFormat; | 3 | import com.fasterxml.jackson.annotation.JsonFormat; |
4 | import lombok.AllArgsConstructor; | 4 | import lombok.AllArgsConstructor; |
5 | +import lombok.Builder; | ||
5 | import lombok.Data; | 6 | import lombok.Data; |
6 | import lombok.NoArgsConstructor; | 7 | import lombok.NoArgsConstructor; |
7 | 8 | ||
@@ -15,6 +16,7 @@ import java.util.Date; | @@ -15,6 +16,7 @@ import java.util.Date; | ||
15 | */ | 16 | */ |
16 | 17 | ||
17 | @Data | 18 | @Data |
19 | +@Builder | ||
18 | @AllArgsConstructor | 20 | @AllArgsConstructor |
19 | @NoArgsConstructor | 21 | @NoArgsConstructor |
20 | public class BusExchange implements Serializable { | 22 | public class BusExchange implements Serializable { |
@@ -2,6 +2,7 @@ package com.sunyo.wlpt.message.bus.service.domain; | @@ -2,6 +2,7 @@ package com.sunyo.wlpt.message.bus.service.domain; | ||
2 | 2 | ||
3 | import com.fasterxml.jackson.annotation.JsonFormat; | 3 | import com.fasterxml.jackson.annotation.JsonFormat; |
4 | import lombok.AllArgsConstructor; | 4 | import lombok.AllArgsConstructor; |
5 | +import lombok.Builder; | ||
5 | import lombok.Data; | 6 | import lombok.Data; |
6 | import lombok.NoArgsConstructor; | 7 | import lombok.NoArgsConstructor; |
7 | 8 | ||
@@ -14,6 +15,7 @@ import java.util.Date; | @@ -14,6 +15,7 @@ import java.util.Date; | ||
14 | * 时间:2020/7/1 10:14 | 15 | * 时间:2020/7/1 10:14 |
15 | */ | 16 | */ |
16 | @Data | 17 | @Data |
18 | +@Builder | ||
17 | @AllArgsConstructor | 19 | @AllArgsConstructor |
18 | @NoArgsConstructor | 20 | @NoArgsConstructor |
19 | public class BusQueue implements Serializable { | 21 | public class BusQueue implements Serializable { |
@@ -2,6 +2,7 @@ package com.sunyo.wlpt.message.bus.service.domain; | @@ -2,6 +2,7 @@ package com.sunyo.wlpt.message.bus.service.domain; | ||
2 | 2 | ||
3 | import com.fasterxml.jackson.annotation.JsonFormat; | 3 | import com.fasterxml.jackson.annotation.JsonFormat; |
4 | import lombok.AllArgsConstructor; | 4 | import lombok.AllArgsConstructor; |
5 | +import lombok.Builder; | ||
5 | import lombok.Data; | 6 | import lombok.Data; |
6 | import lombok.NoArgsConstructor; | 7 | import lombok.NoArgsConstructor; |
7 | 8 | ||
@@ -15,6 +16,7 @@ import java.util.List; | @@ -15,6 +16,7 @@ import java.util.List; | ||
15 | * 时间:2020/7/1 10:02 | 16 | * 时间:2020/7/1 10:02 |
16 | */ | 17 | */ |
17 | @Data | 18 | @Data |
19 | +@Builder | ||
18 | @AllArgsConstructor | 20 | @AllArgsConstructor |
19 | @NoArgsConstructor | 21 | @NoArgsConstructor |
20 | public class BusServer implements Serializable { | 22 | public class BusServer implements Serializable { |
1 | package com.sunyo.wlpt.message.bus.service.domain; | 1 | package com.sunyo.wlpt.message.bus.service.domain; |
2 | 2 | ||
3 | -import java.io.Serializable; | ||
4 | -import java.util.Date; | ||
5 | - | ||
6 | import lombok.AllArgsConstructor; | 3 | import lombok.AllArgsConstructor; |
4 | +import lombok.Builder; | ||
7 | import lombok.Data; | 5 | import lombok.Data; |
8 | import lombok.NoArgsConstructor; | 6 | import lombok.NoArgsConstructor; |
9 | 7 | ||
8 | +import java.io.Serializable; | ||
9 | +import java.util.Date; | ||
10 | + | ||
10 | /** | 11 | /** |
11 | * @author 子诚 | 12 | * @author 子诚 |
12 | * Description:交换机、队列、routing_key绑定关系表 | 13 | * Description:交换机、队列、routing_key绑定关系表 |
@@ -14,6 +15,7 @@ import lombok.NoArgsConstructor; | @@ -14,6 +15,7 @@ import lombok.NoArgsConstructor; | ||
14 | */ | 15 | */ |
15 | 16 | ||
16 | @Data | 17 | @Data |
18 | +@Builder | ||
17 | @AllArgsConstructor | 19 | @AllArgsConstructor |
18 | @NoArgsConstructor | 20 | @NoArgsConstructor |
19 | public class ExchangeQueueRouting implements Serializable { | 21 | public class ExchangeQueueRouting implements Serializable { |
1 | package com.sunyo.wlpt.message.bus.service.domain; | 1 | package com.sunyo.wlpt.message.bus.service.domain; |
2 | 2 | ||
3 | import lombok.AllArgsConstructor; | 3 | import lombok.AllArgsConstructor; |
4 | +import lombok.Builder; | ||
4 | import lombok.Data; | 5 | import lombok.Data; |
5 | import lombok.NoArgsConstructor; | 6 | import lombok.NoArgsConstructor; |
6 | 7 | ||
@@ -14,6 +15,7 @@ import java.util.Date; | @@ -14,6 +15,7 @@ import java.util.Date; | ||
14 | */ | 15 | */ |
15 | 16 | ||
16 | @Data | 17 | @Data |
18 | +@Builder | ||
17 | @AllArgsConstructor | 19 | @AllArgsConstructor |
18 | @NoArgsConstructor | 20 | @NoArgsConstructor |
19 | public class MessageNote implements Serializable { | 21 | public class MessageNote implements Serializable { |
@@ -2,6 +2,7 @@ package com.sunyo.wlpt.message.bus.service.domain; | @@ -2,6 +2,7 @@ package com.sunyo.wlpt.message.bus.service.domain; | ||
2 | 2 | ||
3 | import com.fasterxml.jackson.annotation.JsonFormat; | 3 | import com.fasterxml.jackson.annotation.JsonFormat; |
4 | import lombok.AllArgsConstructor; | 4 | import lombok.AllArgsConstructor; |
5 | +import lombok.Builder; | ||
5 | import lombok.Data; | 6 | import lombok.Data; |
6 | import lombok.NoArgsConstructor; | 7 | import lombok.NoArgsConstructor; |
7 | 8 | ||
@@ -14,6 +15,7 @@ import java.util.Date; | @@ -14,6 +15,7 @@ import java.util.Date; | ||
14 | * 时间:2020/6/29 16:45 | 15 | * 时间:2020/6/29 16:45 |
15 | */ | 16 | */ |
16 | @Data | 17 | @Data |
18 | +@Builder | ||
17 | @AllArgsConstructor | 19 | @AllArgsConstructor |
18 | @NoArgsConstructor | 20 | @NoArgsConstructor |
19 | public class RoutingKey implements Serializable { | 21 | public class RoutingKey implements Serializable { |
1 | package com.sunyo.wlpt.message.bus.service.domain; | 1 | package com.sunyo.wlpt.message.bus.service.domain; |
2 | 2 | ||
3 | -import java.io.Serializable; | ||
4 | - | ||
5 | import lombok.AllArgsConstructor; | 3 | import lombok.AllArgsConstructor; |
4 | +import lombok.Builder; | ||
6 | import lombok.Data; | 5 | import lombok.Data; |
7 | import lombok.NoArgsConstructor; | 6 | import lombok.NoArgsConstructor; |
8 | 7 | ||
8 | +import java.io.Serializable; | ||
9 | + | ||
9 | /** | 10 | /** |
10 | * @author 子诚 | 11 | * @author 子诚 |
11 | * Description:自动定时删除的时间设置表 | 12 | * Description:自动定时删除的时间设置表 |
@@ -13,6 +14,7 @@ import lombok.NoArgsConstructor; | @@ -13,6 +14,7 @@ import lombok.NoArgsConstructor; | ||
13 | */ | 14 | */ |
14 | 15 | ||
15 | @Data | 16 | @Data |
17 | +@Builder | ||
16 | @AllArgsConstructor | 18 | @AllArgsConstructor |
17 | @NoArgsConstructor | 19 | @NoArgsConstructor |
18 | public class SchedulingDelete implements Serializable { | 20 | public class SchedulingDelete implements Serializable { |
1 | package com.sunyo.wlpt.message.bus.service.domain; | 1 | package com.sunyo.wlpt.message.bus.service.domain; |
2 | 2 | ||
3 | -import java.io.Serializable; | ||
4 | -import java.util.Date; | ||
5 | - | ||
6 | import com.fasterxml.jackson.annotation.JsonFormat; | 3 | import com.fasterxml.jackson.annotation.JsonFormat; |
7 | import lombok.AllArgsConstructor; | 4 | import lombok.AllArgsConstructor; |
5 | +import lombok.Builder; | ||
8 | import lombok.Data; | 6 | import lombok.Data; |
9 | import lombok.NoArgsConstructor; | 7 | import lombok.NoArgsConstructor; |
10 | 8 | ||
9 | +import java.io.Serializable; | ||
10 | +import java.util.Date; | ||
11 | + | ||
11 | /** | 12 | /** |
12 | * @author 子诚 | 13 | * @author 子诚 |
13 | * Description:MQ账户信息表 | 14 | * Description:MQ账户信息表 |
14 | * 时间:2020/6/29 17:17 | 15 | * 时间:2020/6/29 17:17 |
15 | */ | 16 | */ |
16 | @Data | 17 | @Data |
18 | +@Builder | ||
17 | @AllArgsConstructor | 19 | @AllArgsConstructor |
18 | @NoArgsConstructor | 20 | @NoArgsConstructor |
19 | public class UserInfo implements Serializable { | 21 | public class UserInfo implements Serializable { |
1 | package com.sunyo.wlpt.message.bus.service.domain; | 1 | package com.sunyo.wlpt.message.bus.service.domain; |
2 | 2 | ||
3 | import lombok.AllArgsConstructor; | 3 | import lombok.AllArgsConstructor; |
4 | +import lombok.Builder; | ||
4 | import lombok.Data; | 5 | import lombok.Data; |
5 | import lombok.NoArgsConstructor; | 6 | import lombok.NoArgsConstructor; |
6 | 7 | ||
@@ -13,6 +14,7 @@ import java.util.Date; | @@ -13,6 +14,7 @@ import java.util.Date; | ||
13 | * 时间:2020/7/15 10:37 | 14 | * 时间:2020/7/15 10:37 |
14 | */ | 15 | */ |
15 | @Data | 16 | @Data |
17 | +@Builder | ||
16 | @AllArgsConstructor | 18 | @AllArgsConstructor |
17 | @NoArgsConstructor | 19 | @NoArgsConstructor |
18 | public class UserMessageBinding implements Serializable { | 20 | public class UserMessageBinding implements Serializable { |
1 | package com.sunyo.wlpt.message.bus.service.domain; | 1 | package com.sunyo.wlpt.message.bus.service.domain; |
2 | 2 | ||
3 | -import java.io.Serializable; | ||
4 | -import java.util.Date; | ||
5 | - | ||
6 | import com.fasterxml.jackson.annotation.JsonFormat; | 3 | import com.fasterxml.jackson.annotation.JsonFormat; |
7 | import lombok.AllArgsConstructor; | 4 | import lombok.AllArgsConstructor; |
5 | +import lombok.Builder; | ||
8 | import lombok.Data; | 6 | import lombok.Data; |
9 | import lombok.NoArgsConstructor; | 7 | import lombok.NoArgsConstructor; |
10 | 8 | ||
9 | +import java.io.Serializable; | ||
10 | +import java.util.Date; | ||
11 | + | ||
11 | /** | 12 | /** |
12 | * @author 子诚 | 13 | * @author 子诚 |
13 | * Description:用户、服务器、虚拟机信息绑定关系表 | 14 | * Description:用户、服务器、虚拟机信息绑定关系表 |
@@ -15,6 +16,7 @@ import lombok.NoArgsConstructor; | @@ -15,6 +16,7 @@ import lombok.NoArgsConstructor; | ||
15 | */ | 16 | */ |
16 | 17 | ||
17 | @Data | 18 | @Data |
19 | +@Builder | ||
18 | @AllArgsConstructor | 20 | @AllArgsConstructor |
19 | @NoArgsConstructor | 21 | @NoArgsConstructor |
20 | public class UserServerVirtualHost implements Serializable { | 22 | public class UserServerVirtualHost implements Serializable { |
@@ -2,6 +2,7 @@ package com.sunyo.wlpt.message.bus.service.domain; | @@ -2,6 +2,7 @@ package com.sunyo.wlpt.message.bus.service.domain; | ||
2 | 2 | ||
3 | import com.fasterxml.jackson.annotation.JsonFormat; | 3 | import com.fasterxml.jackson.annotation.JsonFormat; |
4 | import lombok.AllArgsConstructor; | 4 | import lombok.AllArgsConstructor; |
5 | +import lombok.Builder; | ||
5 | import lombok.Data; | 6 | import lombok.Data; |
6 | import lombok.NoArgsConstructor; | 7 | import lombok.NoArgsConstructor; |
7 | 8 | ||
@@ -15,6 +16,7 @@ import java.util.List; | @@ -15,6 +16,7 @@ import java.util.List; | ||
15 | * 时间:2020/6/29 16:36 | 16 | * 时间:2020/6/29 16:36 |
16 | */ | 17 | */ |
17 | @Data | 18 | @Data |
19 | +@Builder | ||
18 | @AllArgsConstructor | 20 | @AllArgsConstructor |
19 | @NoArgsConstructor | 21 | @NoArgsConstructor |
20 | public class VirtualHost implements Serializable { | 22 | public class VirtualHost implements Serializable { |
-
请 注册 或 登录 后发表评论