message_bus / message_bus_service · 提交

转到一个项目

作者 王勇
提交 db4dde360c42a1a8397ac3d8e2f1c4d71bae594d 1 个父辈 5e9c81de

简单优化Controller层代码

内嵌 并排对比
正在显示 3 个修改的文件 包含 57 行增加 和 74 行删除
@@ -59,7 +59,7 @@ public class MessageNoteController { @@ -59,7 +59,7 @@ public class MessageNoteController {
59 * @return 消息收发记录-列表 59 * @return 消息收发记录-列表
60 */ 60 */
61 @GetMapping("/list") 61 @GetMapping("/list")
62 - public ResultJson<PageInfo> selectMessageNoteList( 62 + public ResultJson selectMessageNoteList(
63 @RequestParam(value = "username", required = false) String username, 63 @RequestParam(value = "username", required = false) String username,
64 @RequestParam(value = "serverName", required = false) String serverName, 64 @RequestParam(value = "serverName", required = false) String serverName,
65 @RequestParam(value = "virtualHostName", required = false) String virtualHostName, 65 @RequestParam(value = "virtualHostName", required = false) String virtualHostName,
@@ -73,35 +73,13 @@ public class MessageNoteController { @@ -73,35 +73,13 @@ 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 - ResultJson<PageInfo> result = new ResultJson<>();  
77 - MessageNote messageNote = new MessageNote();  
78 - // 获取参数，用户登陆名称  
79 - messageNote.setUsername(username);  
80 - // 获取参数，MQ服务器名称  
81 - messageNote.setServerName(serverName);  
82 - // 获取参数，虚拟主机名称  
83 - messageNote.setVirtualHostName(virtualHostName);  
84 - // 获取参数，交换机名称  
85 - messageNote.setExchangeName(exchangeName);  
86 - // 获取参数，队列名称  
87 - messageNote.setQueueName(queueName);  
88 - // 获取参数，路由键名称  
89 - messageNote.setRoutingKeyName(routingKeyName);  
90 - // 获取参数，发送消息时间  
91 - messageNote.setSendTime(sendTime);  
92 - // 获取参数，接收消息时间  
93 - messageNote.setReceiveTime(receiveTime); 76 + // 获取参数
  77 + MessageNote messageNote = new MessageNote(username, serverName, virtualHostName, exchangeName, queueName, routingKeyName, sendTime, receiveTime);
94 // 分页查询 78 // 分页查询
95 PageInfo pageInfo = messageNoteService.selectMessageNoteList(messageNote, pageNum, pageSize); 79 PageInfo pageInfo = messageNoteService.selectMessageNoteList(messageNote, pageNum, pageSize);
96 - if (pageInfo.getTotal() > 0) {  
97 - result.setCode("200");  
98 - result.setData(pageInfo);  
99 - result.setMsg("查询MQ服务器列表,成功!");  
100 - } else {  
101 - result.setCode("500");  
102 - result.setMsg("查询MQ服务器列表,失败!");  
103 - }  
104 - return result; 80 + return pageInfo.getTotal() > 0
  81 + ? new ResultJson<>("200", "查询MQ服务器列表,成功!", pageInfo)
  82 + : new ResultJson<>("500", "查询MQ服务器列表,失败!");
105 } 83 }
106 84
107 /** 85 /**
@@ -112,16 +90,10 @@ public class MessageNoteController { @@ -112,16 +90,10 @@ public class MessageNoteController {
112 */ 90 */
113 @DeleteMapping("/delete") 91 @DeleteMapping("/delete")
114 public ResultJson deleteMessageNote(@RequestBody MessageNote messageNote) { 92 public ResultJson deleteMessageNote(@RequestBody MessageNote messageNote) {
115 - ResultJson result = new ResultJson<>();  
116 - int num = messageNoteService.deleteByPrimaryKey(messageNote.getId());  
117 - if (num > 0) {  
118 - result.setCode("200");  
119 - result.setMsg("删除-消息收发记录，成功");  
120 - } else {  
121 - result.setCode("500");  
122 - result.setMsg("删除-消息收发记录，失败");  
123 - }  
124 - return result; 93 +
  94 + return messageNoteService.deleteByPrimaryKey(messageNote.getId()) > 0
  95 + ? new ResultJson<>("200", "删除-消息收发记录，成功")
  96 + : new ResultJson<>("500", "删除-消息收发记录，失败");
125 } 97 }
126 98
127 /** 99 /**
@@ -132,16 +104,10 @@ public class MessageNoteController { @@ -132,16 +104,10 @@ public class MessageNoteController {
132 */ 104 */
133 @GetMapping("/batchRemove") 105 @GetMapping("/batchRemove")
134 public ResultJson batchRemoveMessageNote(String ids) { 106 public ResultJson batchRemoveMessageNote(String ids) {
135 - ResultJson result = new ResultJson<>();  
136 - int num = messageNoteService.deleteByPrimaryKey(ids);  
137 - if (num > 0) {  
138 - result.setCode("200");  
139 - result.setMsg("批量删除-消息收发记录,成功!");  
140 - } else {  
141 - result.setCode("500");  
142 - result.setMsg("批量删除-消息收发记录,失败!");  
143 - }  
144 - return result; 107 +
  108 + return messageNoteService.deleteByPrimaryKey(ids) > 0
  109 + ? new ResultJson<>("200", "删除-消息收发记录，成功")
  110 + : new ResultJson<>("500", "删除-消息收发记录，失败");
145 } 111 }
146 112
147 /** 113 /**
@@ -152,16 +118,10 @@ public class MessageNoteController { @@ -152,16 +118,10 @@ public class MessageNoteController {
152 */ 118 */
153 @PutMapping("/update") 119 @PutMapping("/update")
154 public ResultJson updateMessageNote(@RequestBody MessageNote messageNote) { 120 public ResultJson updateMessageNote(@RequestBody MessageNote messageNote) {
155 - ResultJson result = new ResultJson<>();  
156 - int num = messageNoteService.updateByPrimaryKeySelective(note_fillName(messageNote));  
157 - if (num > 0) {  
158 - result.setCode("200");  
159 - result.setMsg("编辑-消息收发记录，成功");  
160 - } else {  
161 - result.setCode("500");  
162 - result.setMsg("编辑-消息收发记录，失败");  
163 - }  
164 - return result; 121 +
  122 + return messageNoteService.updateByPrimaryKeySelective(note_fillName(messageNote)) > 0
  123 + ? new ResultJson<>("200", "编辑-消息收发记录，成功")
  124 + : new ResultJson<>("500", "编辑-消息收发记录，失败");
165 } 125 }
166 126
167 /** 127 /**
@@ -172,21 +132,11 @@ public class MessageNoteController { @@ -172,21 +132,11 @@ public class MessageNoteController {
172 */ 132 */
173 @PostMapping("/insert") 133 @PostMapping("/insert")
174 public ResultJson insertMessageNote(@RequestBody MessageNote messageNote) { 134 public ResultJson insertMessageNote(@RequestBody MessageNote messageNote) {
175 - ResultJson result = new ResultJson<>();  
176 // 设置id 135 // 设置id
177 messageNote.setId(IdUtils.generateId()); 136 messageNote.setId(IdUtils.generateId());
178 - if (!"".equals(messageNote.getAlias_sendContent()) && messageNote.getAlias_sendContent() != null) {  
179 - messageNote.setSendContent(messageNote.getAlias_sendContent().getBytes());  
180 - }  
181 - int num = messageNoteService.insertSelective(note_fillName(messageNote));  
182 - if (num > 0) {  
183 - result.setCode("200");  
184 - result.setMsg("添加-消息收发记录，成功");  
185 - } else {  
186 - result.setCode("500");  
187 - result.setMsg("添加-消息收发记录，失败");  
188 - }  
189 - return result; 137 + return messageNoteService.insertSelective(note_fillName(messageNote)) > 0
  138 + ? new ResultJson<>("200", "编辑-消息收发记录，成功")
  139 + : new ResultJson<>("500", "编辑-消息收发记录，失败");
190 } 140 }
191 141
192 /** 142 /**
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;
7 import lombok.Data; 4 import lombok.Data;
8 import lombok.NoArgsConstructor; 5 import lombok.NoArgsConstructor;
9 6
  7 +import java.io.Serializable;
  8 +import java.util.Date;
  9 +
10 /** 10 /**
11 * @author 子诚 11 * @author 子诚
12 * Description：消息收发记录表(默认存储七天) 12 * Description：消息收发记录表(默认存储七天)
@@ -120,4 +120,26 @@ public class MessageNote implements Serializable { @@ -120,4 +120,26 @@ public class MessageNote implements Serializable {
120 */ 120 */
121 private Date gmtModified; 121 private Date gmtModified;
122 122
  123 + /**
  124 + * 自定义有参构造器，封装 MessageNoteController 的查询参数
  125 + *
  126 + * @param username 用户登陆名称
  127 + * @param serverName MQ服务器名称
  128 + * @param virtualHostName 虚拟主机名称
  129 + * @param exchangeName 交换机名称
  130 + * @param queueName 队列名称
  131 + * @param routingKeyName 路由键名称
  132 + * @param sendTime 发送消息时间
  133 + * @param receiveTime 接收消息时间
  134 + */
  135 + public MessageNote(String username, String serverName, String virtualHostName, String exchangeName, String queueName, String routingKeyName, Date sendTime, Date receiveTime) {
  136 + this.username = username;
  137 + this.serverName = serverName;
  138 + this.virtualHostName = virtualHostName;
  139 + this.exchangeName = exchangeName;
  140 + this.queueName = queueName;
  141 + this.routingKeyName = routingKeyName;
  142 + this.sendTime = sendTime;
  143 + this.receiveTime = receiveTime;
  144 + }
123 } 145 }
@@ -104,6 +104,17 @@ public class UserMessageBinding implements Serializable { @@ -104,6 +104,17 @@ public class UserMessageBinding implements Serializable {
104 */ 104 */
105 private Date gmtModified; 105 private Date gmtModified;
106 106
  107 + /**
  108 + * 自定义有参构造器，封装 UserMessageBindingController 的查询参数
  109 + *
  110 + * @param username 用户名称
  111 + * @param serverName 服务器名称
  112 + * @param virtualHostName 虚拟主机名称
  113 + * @param exchangeName 交换机名称
  114 + * @param queueName 队列名称
  115 + * @param routingKeyName 路由键名称
  116 + * @param subscriber 订阅者
  117 + */
107 public UserMessageBinding(String username, String serverName, String virtualHostName, String exchangeName, String queueName, String routingKeyName, String subscriber) { 118 public UserMessageBinding(String username, String serverName, String virtualHostName, String exchangeName, String queueName, String routingKeyName, String subscriber) {
108 this.username = username; 119 this.username = username;
109 this.serverName = serverName; 120 this.serverName = serverName;