message_bus / message_bus_service · 提交

转到一个项目

作者 王勇
提交 81d93605dc07c96be3c804c0183ac5904662e0b3 1 个父辈 0dfd37d8

简单优化Controller层代码

内嵌 并排对比
正在显示 3 个修改的文件 包含 43 行增加 和 69 行删除
@@ -11,4 +11,7 @@ public class Constant { @@ -11,4 +11,7 @@ public class Constant {
11 11
12 public static final String EXIST_HOST_INFO = "该-虚拟主机（虚拟主机名称）-信息已存在，请谨慎输入"; 12 public static final String EXIST_HOST_INFO = "该-虚拟主机（虚拟主机名称）-信息已存在，请谨慎输入";
13 13
  14 + public static final String EXIST_EXCHANGE_INFO = "该-交换机（交换机名称）-信息已存在，请谨慎输入";
  15 +
  16 +
14 } 17 }
@@ -2,7 +2,6 @@ package com.sunyo.wlpt.message.bus.service.controller; @@ -2,7 +2,6 @@ package com.sunyo.wlpt.message.bus.service.controller;
2 2
3 import com.github.pagehelper.PageInfo; 3 import com.github.pagehelper.PageInfo;
4 import com.sunyo.wlpt.message.bus.service.domain.BusExchange; 4 import com.sunyo.wlpt.message.bus.service.domain.BusExchange;
5 -import com.sunyo.wlpt.message.bus.service.domain.BusQueue;  
6 import com.sunyo.wlpt.message.bus.service.response.ResultJson; 5 import com.sunyo.wlpt.message.bus.service.response.ResultJson;
7 import com.sunyo.wlpt.message.bus.service.service.BusExchangeService; 6 import com.sunyo.wlpt.message.bus.service.service.BusExchangeService;
8 import com.sunyo.wlpt.message.bus.service.utils.IdUtils; 7 import com.sunyo.wlpt.message.bus.service.utils.IdUtils;
@@ -11,6 +10,8 @@ import org.springframework.web.bind.annotation.*; @@ -11,6 +10,8 @@ import org.springframework.web.bind.annotation.*;
11 import javax.annotation.Resource; 10 import javax.annotation.Resource;
12 import java.util.List; 11 import java.util.List;
13 12
  13 +import static com.sunyo.wlpt.message.bus.service.common.Constant.EXIST_EXCHANGE_INFO;
  14 +
14 /** 15 /**
15 * @author 子诚 16 * @author 子诚
16 * Description：关于MQ交换机的控制器 17 * Description：关于MQ交换机的控制器
@@ -35,28 +36,15 @@ public class BusExchangeController { @@ -35,28 +36,15 @@ public class BusExchangeController {
35 */ 36 */
36 @GetMapping("/list") 37 @GetMapping("/list")
37 public ResultJson<PageInfo> selectBusExchangeList( 38 public ResultJson<PageInfo> selectBusExchangeList(
38 - @RequestParam(value = "virtualHostId", required = false) String virtualHostId,  
39 @RequestParam(value = "exchangeName", required = false) String exchangeName, 39 @RequestParam(value = "exchangeName", required = false) String exchangeName,
  40 + @RequestParam(value = "virtualHostId", required = false) String virtualHostId,
40 @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, 41 @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
41 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { 42 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
42 - ResultJson<PageInfo> result = new ResultJson<>();  
43 - BusExchange busExchange = new BusExchange();  
44 - // 获取参数，所属虚拟主机ID  
45 - busExchange.setVirtualHostId(virtualHostId);  
46 - // 获取参数，交换机名称  
47 - busExchange.setExchangeName(exchangeName);  
48 -  
49 // 分页查询 43 // 分页查询
50 - PageInfo pageInfo = busExchangeService.selectBusExchangeList(busExchange, pageNum, pageSize);  
51 - if (pageInfo.getTotal() > 0) {  
52 - result.setCode("200");  
53 - result.setData(pageInfo);  
54 - result.setMsg("查询MQ交换机列表,成功!");  
55 - } else {  
56 - result.setCode("500");  
57 - result.setMsg("查询MQ交换机列表,失败!");  
58 - }  
59 - return result; 44 + PageInfo pageInfo = busExchangeService.selectBusExchangeList(new BusExchange(exchangeName, virtualHostId), pageNum, pageSize);
  45 + return pageInfo.getTotal() > 0
  46 + ? new ResultJson<>("200", "查询MQ交换机列表,成功!", pageInfo)
  47 + : new ResultJson<>("500", "查询MQ交换机列表,失败!");
60 } 48 }
61 49
62 /** 50 /**
@@ -67,16 +55,10 @@ public class BusExchangeController { @@ -67,16 +55,10 @@ public class BusExchangeController {
67 */ 55 */
68 @DeleteMapping("/delete") 56 @DeleteMapping("/delete")
69 public ResultJson deleteBusExchange(@RequestBody BusExchange busExchange) { 57 public ResultJson deleteBusExchange(@RequestBody BusExchange busExchange) {
70 - ResultJson result = new ResultJson<>();  
71 - int num = busExchangeService.deleteByPrimaryKey(busExchange.getId());  
72 - if (num > 0) {  
73 - result.setCode("200");  
74 - result.setMsg("删除MQ交换机，成功");  
75 - } else {  
76 - result.setCode("500");  
77 - result.setMsg("删除MQ交换机，失败");  
78 - }  
79 - return result; 58 +
  59 + return busExchangeService.deleteByPrimaryKey(busExchange.getId()) > 0
  60 + ? new ResultJson<>("200", "删除MQ交换机，成功")
  61 + : new ResultJson<>("500", "删除MQ交换机，失败");
80 } 62 }
81 63
82 /** 64 /**
@@ -87,16 +69,10 @@ public class BusExchangeController { @@ -87,16 +69,10 @@ public class BusExchangeController {
87 */ 69 */
88 @GetMapping("/batchRemove") 70 @GetMapping("/batchRemove")
89 public ResultJson batchRemoveBusExchange(String ids) { 71 public ResultJson batchRemoveBusExchange(String ids) {
90 - ResultJson result = new ResultJson<>();  
91 - int num = busExchangeService.deleteByPrimaryKey(ids);  
92 - if (num > 0) {  
93 - result.setCode("200");  
94 - result.setMsg("批量删除交换机,成功!");  
95 - } else {  
96 - result.setCode("500");  
97 - result.setMsg("批量删除交换机,失败!");  
98 - }  
99 - return result; 72 +
  73 + return busExchangeService.deleteByPrimaryKey(ids) > 0
  74 + ? new ResultJson<>("200", "批量删除MQ交换机，成功")
  75 + : new ResultJson<>("500", "批量删除MQ交换机，失败");
100 } 76 }
101 77
102 /** 78 /**
@@ -110,20 +86,11 @@ public class BusExchangeController { @@ -110,20 +86,11 @@ public class BusExchangeController {
110 86
111 // 先验证，修改好的核心信息（交换机名称）是否已存在 87 // 先验证，修改好的核心信息（交换机名称）是否已存在
112 String message = validateBusExchange(busExchange); 88 String message = validateBusExchange(busExchange);
113 - // 验证通过  
114 - if (message == null) {  
115 - ResultJson result = new ResultJson<>();  
116 - int num = busExchangeService.updateByPrimaryKeySelective(busExchange);  
117 - if (num > 0) {  
118 - result.setCode("200");  
119 - result.setMsg("编辑交换机信息，成功");  
120 - } else {  
121 - result.setCode("500");  
122 - result.setMsg("编辑交换机信息，失败");  
123 - }  
124 - return result;  
125 - }  
126 - return new ResultJson("400", message != null ? message : "编辑交换机信息,失败!"); 89 + return message == null
  90 + ? busExchangeService.updateByPrimaryKeySelective(busExchange) > 0
  91 + ? new ResultJson<>("200", "编辑MQ交换机信息，成功")
  92 + : new ResultJson<>("500", "编辑MQ交换机信息，失败")
  93 + : new ResultJson<>("400", message);
127 } 94 }
128 95
129 /** 96 /**
@@ -138,20 +105,13 @@ public class BusExchangeController { @@ -138,20 +105,13 @@ public class BusExchangeController {
138 String message = validateBusExchange(busExchange); 105 String message = validateBusExchange(busExchange);
139 //验证通过 106 //验证通过
140 if (message == null) { 107 if (message == null) {
141 - ResultJson result = new ResultJson<>();  
142 // 设置id 108 // 设置id
143 busExchange.setId(IdUtils.generateId()); 109 busExchange.setId(IdUtils.generateId());
144 - int num = busExchangeService.insertSelective(busExchange);  
145 - if (num > 0) {  
146 - result.setCode("200");  
147 - result.setMsg("添加交换机信息，成功!");  
148 - } else {  
149 - result.setCode("500");  
150 - result.setMsg("添加交换机信息，失败!");  
151 - }  
152 - return result; 110 + return busExchangeService.insertSelective(busExchange) > 0
  111 + ? new ResultJson<>("200", "添加交换机信息，成功")
  112 + : new ResultJson<>("500", "添加交换机信息，失败");
153 } 113 }
154 - return new ResultJson("400", message != null ? message : "添加交换机信息,失败!"); 114 + return new ResultJson<>("400", message);
155 } 115 }
156 116
157 117
@@ -177,7 +137,7 @@ public class BusExchangeController { @@ -177,7 +137,7 @@ public class BusExchangeController {
177 List<BusExchange> info = busExchangeService.validateBusExchange(busExchange); 137 List<BusExchange> info = busExchangeService.validateBusExchange(busExchange);
178 // 多于0个，则代表已存在；否则则是，校验通过 138 // 多于0个，则代表已存在；否则则是，校验通过
179 if (info.size() > 0) { 139 if (info.size() > 0) {
180 - return "该-交换机（交换机名称）-信息已存在，请谨慎输入"; 140 + return EXIST_EXCHANGE_INFO;
181 } 141 }
182 return null; 142 return null;
183 } 143 }
@@ -190,7 +150,7 @@ public class BusExchangeController { @@ -190,7 +150,7 @@ public class BusExchangeController {
190 List<BusExchange> info = busExchangeService.validateBusExchange(busExchange); 150 List<BusExchange> info = busExchangeService.validateBusExchange(busExchange);
191 // 多于0个，则代表已存在；否则则是，校验通过 151 // 多于0个，则代表已存在；否则则是，校验通过
192 if (info.size() > 0) { 152 if (info.size() > 0) {
193 - return "该-交换机（交换机名称）-信息已存在，请谨慎输入"; 153 + return EXIST_EXCHANGE_INFO;
194 } 154 }
195 return null; 155 return null;
196 } 156 }
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;
8 import lombok.Data; 5 import lombok.Data;
9 import lombok.NoArgsConstructor; 6 import lombok.NoArgsConstructor;
10 7
  8 +import java.io.Serializable;
  9 +import java.util.Date;
  10 +
11 /** 11 /**
12 * @author 子诚 12 * @author 子诚
13 * Description：MQ路由交换表 13 * Description：MQ路由交换表
@@ -84,4 +84,15 @@ public class BusExchange implements Serializable { @@ -84,4 +84,15 @@ public class BusExchange implements Serializable {
84 * 交换机名称的别名 84 * 交换机名称的别名
85 */ 85 */
86 private String aliasName; 86 private String aliasName;
  87 +
  88 + /**
  89 + * 定义有参构造器，封装 BusExchangeController 的查询参数
  90 + *
  91 + * @param exchangeName 交换机名称
  92 + * @param virtualHostId 所属虚拟主机ID
  93 + */
  94 + public BusExchange(String exchangeName, String virtualHostId) {
  95 + this.exchangeName = exchangeName;
  96 + this.virtualHostId = virtualHostId;
  97 + }
87 } 98 }