message_bus / message_bus_service · 提交

转到一个项目

作者 王勇
提交 41e6cbc1546e0ac2d316accaca50de9dad3d74d2 1 个父辈 b270b25f

简单优化Controller层代码

内嵌 并排对比
正在显示 3 个修改的文件 包含 48 行增加 和 72 行删除
... ... @@ -14,4 +14,6 @@ public class Constant {
public static final String EXIST_EXCHANGE_INFO = "该-交换机（交换机名称）-信息已存在，请谨慎输入";
public static final String EXIST_QUEUE_INFO = "该-消息队列-信息已存在，请谨慎输入";
public static final String EXIST_ROUTINGKEY_INFO = "该-路由键（路由键名称）-信息已存在，请谨慎输入";
}
... ...
... ... @@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
import static com.sunyo.wlpt.message.bus.service.common.Constant.EXIST_ROUTINGKEY_INFO;
/**
* @author 子诚
* Description：关于路由键的控制器
... ... @@ -34,28 +36,16 @@ public class RoutingKeyController {
*/
@GetMapping("/list")
public ResultJson<PageInfo> selectRoutingKeyList(
@RequestParam(value = "exchangeId", required = false) String exchangeId,
@RequestParam(value = "routingKeyName", required = false) String routingKeyName,
@RequestParam(value = "exchangeId", required = false) String exchangeId,
@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
ResultJson<PageInfo> result = new ResultJson<>();
RoutingKey routingKey = new RoutingKey();
// 获取参数，虚拟机id
routingKey.setExchangeId(exchangeId);
// 获取参数，路由键名称
routingKey.setRoutingKeyName(routingKeyName);
// 分页查询
PageInfo pageInfo = routingKeyService.selectRoutingKeyList(routingKey, pageNum, pageSize);
if (pageInfo.getTotal() > 0) {
result.setCode("200");
result.setData(pageInfo);
result.setMsg("查询路由键列表,成功!");
} else {
result.setCode("500");
result.setMsg("查询路由键列表,失败!");
}
return result;
PageInfo pageInfo = routingKeyService.selectRoutingKeyList(new RoutingKey(routingKeyName, exchangeId), pageNum, pageSize);
return pageInfo.getTotal() > 0
? new ResultJson<>("200", "查询路由键列表,成功!", pageInfo)
: new ResultJson<>("500", "查询路由键列表,失败!");
}
/**
... ... @@ -66,16 +56,10 @@ public class RoutingKeyController {
*/
@DeleteMapping("/delete")
public ResultJson deleteRoutingKey(@RequestBody RoutingKey routingKey) {
ResultJson result = new ResultJson<>();
int num = routingKeyService.deleteByPrimaryKey(routingKey.getId());
if (num > 0) {
result.setCode("200");
result.setMsg("删除路由键，成功");
} else {
result.setCode("500");
result.setMsg("删除路由键，失败");
}
return result;
return routingKeyService.deleteByPrimaryKey(routingKey.getId()) > 0
? new ResultJson<>("200", "删除路由键，成功")
: new ResultJson<>("500", "删除路由键，失败");
}
/**
... ... @@ -86,70 +70,49 @@ public class RoutingKeyController {
*/
@GetMapping("/batchRemove")
public ResultJson batchRemoveRoutingKey(String ids) {
ResultJson result = new ResultJson<>();
int num = routingKeyService.deleteByPrimaryKey(ids);
if (num > 0) {
result.setCode("200");
result.setMsg("批量删除路由键,成功!");
} else {
result.setCode("500");
result.setMsg("批量删除路由键,失败!");
}
return result;
return routingKeyService.deleteByPrimaryKey(ids) > 0
? new ResultJson<>("200", "删除路由键，成功")
: new ResultJson<>("500", "删除路由键，失败");
}
/**
* 修改路由键信息
* 编辑路由键信息
*
* @param routingKey {@link RoutingKey}
* @return {@link ResultJson}
*/
@PutMapping("/update")
public ResultJson updateRoutingKey(@RequestBody RoutingKey routingKey) {
//先验证，修改好的核心信息（路由键名称）是否已存在
String message = validateRoutingKey(routingKey);
//验证通过
if (message == null) {
ResultJson result = new ResultJson<>();
int num = routingKeyService.updateByPrimaryKeySelective(routingKey);
if (num > 0) {
result.setCode("200");
result.setMsg("修改路由键信息，成功");
} else {
result.setCode("500");
result.setMsg("修改路由键信息，失败");
}
return result;
}
return new ResultJson("400", message != null ? message : "修改路由键信息,失败!");
return message == null
? routingKeyService.updateByPrimaryKeySelective(routingKey) > 0
? new ResultJson<>("200", "编辑路由键信息，成功")
: new ResultJson<>("500", "编辑路由键信息，失败")
: new ResultJson<>("400", message);
}
/**
* 新增路由键
* 增加路由键信息
*
* @param routingKey {@link RoutingKey}
* @return {@link ResultJson}
*/
@PostMapping("/insert")
public ResultJson insertRoutingKey(@RequestBody RoutingKey routingKey) {
//先验证，增加的服务器的核心信息（ip和port，同时存在）是否已存在
String message = validateRoutingKey(routingKey);
//验证通过
if (message == null) {
ResultJson result = new ResultJson<>();
// 设置id
routingKey.setId(IdUtils.generateId());
int num = routingKeyService.insertSelective(routingKey);
if (num > 0) {
result.setCode("200");
result.setMsg("添加路由键信息，成功!");
} else {
result.setCode("500");
result.setMsg("添加路由键信息，失败!");
}
return result;
}
return new ResultJson("400", message != null ? message : "添加路由键信息,失败!");
return message == null
? routingKeyService.insertSelective(routingKey) > 0
? new ResultJson<>("200", "增加路由键信息，成功")
: new ResultJson<>("500", "增加路由键信息，失败")
: new ResultJson<>("400", message);
}
/**
... ... @@ -174,7 +137,7 @@ public class RoutingKeyController {
List<RoutingKey> info = routingKeyService.validateRoutingKey(routingKey);
// 多于0个，则代表已存在；否则则是，校验通过
if (info.size() > 0) {
return "该-路由键（路由键名称）-信息已存在，请谨慎输入";
return EXIST_ROUTINGKEY_INFO;
}
return null;
}
... ... @@ -187,7 +150,7 @@ public class RoutingKeyController {
List<RoutingKey> info = routingKeyService.validateRoutingKey(routingKey);
// 多于0个，则代表已存在；否则则是，校验通过
if (info.size() > 0) {
return "该-路由键（路由键名称）-信息已存在，请谨慎输入";
return EXIST_ROUTINGKEY_INFO;
}
return null;
}
... ...
package com.sunyo.wlpt.message.bus.service.domain;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
* @author 子诚
* Description：Routing key静态配置表/二级类
... ... @@ -61,4 +61,15 @@ public class RoutingKey implements Serializable {
* 一个路由键对应一个交换机
*/
private BusExchange busExchange;
/**
* 定义有参构造器，封装 RoutingKeyController 的查询参数
*
* @param routingKeyName 路由键名称
* @param exchangeId 所属交换机ID
*/
public RoutingKey(String routingKeyName, String exchangeId) {
this.routingKeyName = routingKeyName;
this.exchangeId = exchangeId;
}
}
... ...