message_bus / message_bus_service · 提交

转到一个项目

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

简单优化Controller层代码

内嵌 并排对比
正在显示 3 个修改的文件 包含 43 行增加 和 69 行删除
... ... @@ -11,4 +11,7 @@ public class Constant {
public static final String EXIST_HOST_INFO = "该-虚拟主机（虚拟主机名称）-信息已存在，请谨慎输入";
public static final String EXIST_EXCHANGE_INFO = "该-交换机（交换机名称）-信息已存在，请谨慎输入";
}
... ...
... ... @@ -2,7 +2,6 @@ package com.sunyo.wlpt.message.bus.service.controller;
import com.github.pagehelper.PageInfo;
import com.sunyo.wlpt.message.bus.service.domain.BusExchange;
import com.sunyo.wlpt.message.bus.service.domain.BusQueue;
import com.sunyo.wlpt.message.bus.service.response.ResultJson;
import com.sunyo.wlpt.message.bus.service.service.BusExchangeService;
import com.sunyo.wlpt.message.bus.service.utils.IdUtils;
... ... @@ -11,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_EXCHANGE_INFO;
/**
* @author 子诚
* Description：关于MQ交换机的控制器
... ... @@ -35,28 +36,15 @@ public class BusExchangeController {
*/
@GetMapping("/list")
public ResultJson<PageInfo> selectBusExchangeList(
@RequestParam(value = "virtualHostId", required = false) String virtualHostId,
@RequestParam(value = "exchangeName", required = false) String exchangeName,
@RequestParam(value = "virtualHostId", required = false) String virtualHostId,
@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
ResultJson<PageInfo> result = new ResultJson<>();
BusExchange busExchange = new BusExchange();
// 获取参数，所属虚拟主机ID
busExchange.setVirtualHostId(virtualHostId);
// 获取参数，交换机名称
busExchange.setExchangeName(exchangeName);
// 分页查询
PageInfo pageInfo = busExchangeService.selectBusExchangeList(busExchange, pageNum, pageSize);
if (pageInfo.getTotal() > 0) {
result.setCode("200");
result.setData(pageInfo);
result.setMsg("查询MQ交换机列表,成功!");
} else {
result.setCode("500");
result.setMsg("查询MQ交换机列表,失败!");
}
return result;
PageInfo pageInfo = busExchangeService.selectBusExchangeList(new BusExchange(exchangeName, virtualHostId), pageNum, pageSize);
return pageInfo.getTotal() > 0
? new ResultJson<>("200", "查询MQ交换机列表,成功!", pageInfo)
: new ResultJson<>("500", "查询MQ交换机列表,失败!");
}
/**
... ... @@ -67,16 +55,10 @@ public class BusExchangeController {
*/
@DeleteMapping("/delete")
public ResultJson deleteBusExchange(@RequestBody BusExchange busExchange) {
ResultJson result = new ResultJson<>();
int num = busExchangeService.deleteByPrimaryKey(busExchange.getId());
if (num > 0) {
result.setCode("200");
result.setMsg("删除MQ交换机，成功");
} else {
result.setCode("500");
result.setMsg("删除MQ交换机，失败");
}
return result;
return busExchangeService.deleteByPrimaryKey(busExchange.getId()) > 0
? new ResultJson<>("200", "删除MQ交换机，成功")
: new ResultJson<>("500", "删除MQ交换机，失败");
}
/**
... ... @@ -87,16 +69,10 @@ public class BusExchangeController {
*/
@GetMapping("/batchRemove")
public ResultJson batchRemoveBusExchange(String ids) {
ResultJson result = new ResultJson<>();
int num = busExchangeService.deleteByPrimaryKey(ids);
if (num > 0) {
result.setCode("200");
result.setMsg("批量删除交换机,成功!");
} else {
result.setCode("500");
result.setMsg("批量删除交换机,失败!");
}
return result;
return busExchangeService.deleteByPrimaryKey(ids) > 0
? new ResultJson<>("200", "批量删除MQ交换机，成功")
: new ResultJson<>("500", "批量删除MQ交换机，失败");
}
/**
... ... @@ -110,20 +86,11 @@ public class BusExchangeController {
// 先验证，修改好的核心信息（交换机名称）是否已存在
String message = validateBusExchange(busExchange);
// 验证通过
if (message == null) {
ResultJson result = new ResultJson<>();
int num = busExchangeService.updateByPrimaryKeySelective(busExchange);
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
? busExchangeService.updateByPrimaryKeySelective(busExchange) > 0
? new ResultJson<>("200", "编辑MQ交换机信息，成功")
: new ResultJson<>("500", "编辑MQ交换机信息，失败")
: new ResultJson<>("400", message);
}
/**
... ... @@ -138,20 +105,13 @@ public class BusExchangeController {
String message = validateBusExchange(busExchange);
//验证通过
if (message == null) {
ResultJson result = new ResultJson<>();
// 设置id
busExchange.setId(IdUtils.generateId());
int num = busExchangeService.insertSelective(busExchange);
if (num > 0) {
result.setCode("200");
result.setMsg("添加交换机信息，成功!");
} else {
result.setCode("500");
result.setMsg("添加交换机信息，失败!");
}
return result;
return busExchangeService.insertSelective(busExchange) > 0
? new ResultJson<>("200", "添加交换机信息，成功")
: new ResultJson<>("500", "添加交换机信息，失败");
}
return new ResultJson("400", message != null ? message : "添加交换机信息,失败!");
return new ResultJson<>("400", message);
}
... ... @@ -177,7 +137,7 @@ public class BusExchangeController {
List<BusExchange> info = busExchangeService.validateBusExchange(busExchange);
// 多于0个，则代表已存在；否则则是，校验通过
if (info.size() > 0) {
return "该-交换机（交换机名称）-信息已存在，请谨慎输入";
return EXIST_EXCHANGE_INFO;
}
return null;
}
... ... @@ -190,7 +150,7 @@ public class BusExchangeController {
List<BusExchange> info = busExchangeService.validateBusExchange(busExchange);
// 多于0个，则代表已存在；否则则是，校验通过
if (info.size() > 0) {
return "该-交换机（交换机名称）-信息已存在，请谨慎输入";
return EXIST_EXCHANGE_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：MQ路由交换表
... ... @@ -84,4 +84,15 @@ public class BusExchange implements Serializable {
* 交换机名称的别名
*/
private String aliasName;
/**
* 定义有参构造器，封装 BusExchangeController 的查询参数
*
* @param exchangeName 交换机名称
* @param virtualHostId 所属虚拟主机ID
*/
public BusExchange(String exchangeName, String virtualHostId) {
this.exchangeName = exchangeName;
this.virtualHostId = virtualHostId;
}
}
... ...