简单优化Controller层代码

王勇
src/main/java/com/sunyo/wlpt/message/bus/service/common/Constant.java
src/main/java/com/sunyo/wlpt/message/bus/service/controller/BusServerController.java
src/main/java/com/sunyo/wlpt/message/bus/service/controller/VirtualHostController.java
src/main/java/com/sunyo/wlpt/message/bus/service/domain/BusServer.java
src/main/java/com/sunyo/wlpt/message/bus/service/domain/VirtualHost.java
--- a/src/main/java/com/sunyo/wlpt/message/bus/service/common/Constant.java
查看文件 @0dfd37d
+++ b/src/main/java/com/sunyo/wlpt/message/bus/service/common/Constant.java
查看文件 @0dfd37d
@@ -7,4 +7,8 @@ package com.sunyo.wlpt.message.bus.service.common;
  */
 public class Constant {
     public static final String EXIST_SERVERNAME = "MQ服务器名称已存在";
+    public static final String EXIST_SERVER_INFO = "该-MQ服务器（ServerIp以及ServerPort）-信息已存在，请谨慎输入";
+
+    public static final String EXIST_HOST_INFO = "该-虚拟主机（虚拟主机名称）-信息已存在，请谨慎输入";
+
 }
--- a/src/main/java/com/sunyo/wlpt/message/bus/service/controller/BusServerController.java
查看文件 @0dfd37d
+++ b/src/main/java/com/sunyo/wlpt/message/bus/service/controller/BusServerController.java
查看文件 @0dfd37d
@@ -10,6 +10,7 @@ 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_SERVER_INFO;
 import static com.sunyo.wlpt.message.bus.service.common.Constant.EXIST_SERVERNAME;
 /**
@@ -38,12 +39,11 @@ public class BusServerController {
             @RequestParam(value = "serverName", required = false) String serverName,
             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
-        BusServer busServer = new BusServer();
-        // 获取参数，服务器名称
-        busServer.setServerName(serverName);
         // 分页查询
-        PageInfo pageInfo = busServerService.selectBusServerList(busServer, pageNum, pageSize);
-        return pageInfo.getTotal() > 0 ? new ResultJson<>("200", "查询MQ服务器列表,成功!", pageInfo) : new ResultJson<>("500", "查询MQ服务器列表,失败!");
+        PageInfo pageInfo = busServerService.selectBusServerList(new BusServer(serverName), pageNum, pageSize);
+        return pageInfo.getTotal() > 0
+                ? new ResultJson<>("200", "查询MQ服务器列表,成功!", pageInfo)
+                : new ResultJson<>("500", "查询MQ服务器列表,失败!");
     }
     /**
@@ -54,8 +54,9 @@ public class BusServerController {
      */
     @DeleteMapping("/delete")
     public ResultJson deleteBusServer(@RequestBody BusServer busServer) {
-        int num = busServerService.deleteByPrimaryKey(busServer.getId());
-        return num > 0 ? new ResultJson<>("200", "删除MQ服务器，成功") : new ResultJson<>("500", "删除MQ服务器，失败");
+        return busServerService.deleteByPrimaryKey(busServer.getId()) > 0
+                ? new ResultJson<>("200", "删除MQ服务器，成功")
+                : new ResultJson<>("500", "删除MQ服务器，失败");
     }
     /**
@@ -66,8 +67,9 @@ public class BusServerController {
      */
     @GetMapping("/batchRemove")
     public ResultJson batchRemoveBusServer(String ids) {
-        int num = busServerService.deleteByPrimaryKey(ids);
-        return num > 0 ? new ResultJson<>("200", "批量删除服务器，成功") : new ResultJson<>("500", "批量删除服务器，失败");
+        return busServerService.deleteByPrimaryKey(ids) > 0
+                ? new ResultJson<>("200", "批量删除服务器，成功")
+                : new ResultJson<>("500", "批量删除服务器，失败");
     }
     /**
@@ -85,8 +87,9 @@ public class BusServerController {
         }
         //验证通过
         if (message == null) {
-            int num = busServerService.updateByPrimaryKeySelective(busServer);
-            return num > 0 ? new ResultJson<>("200", "修改服务器信息，成功") : new ResultJson<>("500", "修改服务器信息，失败");
+            return busServerService.updateByPrimaryKeySelective(busServer) > 0
+                    ? new ResultJson<>("200", "修改服务器信息，成功")
+                    : new ResultJson<>("500", "修改服务器信息，失败");
         }
         return new ResultJson<>("400", message);
     }
@@ -108,8 +111,9 @@ public class BusServerController {
         if (message == null) {
             // 设置id
             busServer.setId(IdUtils.generateId());
-            int num = busServerService.insertSelective(busServer);
-            return num > 0 ? new ResultJson<>("200", "添加服务器信息，成功") : new ResultJson<>("500", "添加服务器信息，失败");
+            return busServerService.insertSelective(busServer) > 0
+                    ? new ResultJson<>("200", "添加服务器信息，成功")
+                    : new ResultJson<>("500", "添加服务器信息，失败");
         }
         return new ResultJson<>("400", message);
     }
@@ -158,7 +162,7 @@ public class BusServerController {
                 List<BusServer> info = busServerService.validateBusServer(busServer);
                 // 多于0个，则代表已存在；等于0个，校验通过
                 if (info.size() > 0) {
-                    return "该-MQ服务器（ServerIp以及ServerPort）-信息已存在，请谨慎输入";
+                    return EXIST_SERVER_INFO;
                 }
                 return null;
             }
@@ -176,7 +180,7 @@ public class BusServerController {
             List<BusServer> info = busServerService.validateBusServer(busServer);
             // 多于0个，则代表已存在；否则则是，校验通过
             if (info.size() > 0) {
-                return "该-MQ服务器（ServerIp以及ServerPort）-信息已存在，请谨慎输入";
+                return EXIST_SERVER_INFO;
             }
             return null;
         }
--- a/src/main/java/com/sunyo/wlpt/message/bus/service/controller/VirtualHostController.java
查看文件 @0dfd37d
+++ b/src/main/java/com/sunyo/wlpt/message/bus/service/controller/VirtualHostController.java
查看文件 @0dfd37d
 package com.sunyo.wlpt.message.bus.service.controller;
 import com.github.pagehelper.PageInfo;
-import com.sunyo.wlpt.message.bus.service.domain.BusQueue;
 import com.sunyo.wlpt.message.bus.service.domain.VirtualHost;
 import com.sunyo.wlpt.message.bus.service.response.ResultJson;
 import com.sunyo.wlpt.message.bus.service.service.VirtualHostService;
@@ -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_HOST_INFO;
+
 /**
  * @author 子诚
  * Description：关于MQ虚拟主机信息的控制器
@@ -34,28 +35,16 @@ public class VirtualHostController {
      * @return 成功返回，虚拟主机列表
      */
     @GetMapping("/list")
-    public ResultJson<PageInfo> selectVirtualHostList(
-            @RequestParam(value = "serverId", required = false) String serverId,
+    public ResultJson selectVirtualHostList(
             @RequestParam(value = "virtualHostName", required = false) String virtualHostName,
+            @RequestParam(value = "serverId", required = false) String serverId,
             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
-        ResultJson<PageInfo> result = new ResultJson<>();
-        VirtualHost virtualHost = new VirtualHost();
-        // 获取参数，所属服务器ID
-        virtualHost.setServerId(serverId);
-        // 获取参数，虚拟主机名称
-        virtualHost.setVirtualHostName(virtualHostName);
         // 分页查询
-        PageInfo pageInfo = virtualHostService.selectVirtualHostList(virtualHost, pageNum, pageSize);
-        if (pageInfo.getTotal() > 0) {
-            result.setCode("200");
-            result.setData(pageInfo);
-            result.setMsg("查询虚拟主机列表,成功!");
-        } else {
-            result.setCode("500");
-            result.setMsg("查询虚拟主机列表,失败!");
-        }
-        return result;
+        PageInfo pageInfo = virtualHostService.selectVirtualHostList(new VirtualHost(virtualHostName, serverId), pageNum, pageSize);
+        return pageInfo.getTotal() > 0
+                ? new ResultJson<>("200", "查询虚拟主机列表,成功!", pageInfo)
+                : new ResultJson<>("500", "查询虚拟主机列表,失败!");
     }
     /**
@@ -66,17 +55,9 @@ public class VirtualHostController {
      */
     @DeleteMapping("/delete")
     public ResultJson deleteVirtualHost(@RequestBody VirtualHost virtualHost) {
-
-        ResultJson result = new ResultJson<>();
-        int num = virtualHostService.deleteByPrimaryKey(virtualHost.getId());
-        if (num > 0) {
-            result.setCode("200");
-            result.setMsg("删除虚拟主机信息，成功");
-        } else {
-            result.setCode("500");
-            result.setMsg("删除虚拟主机信息，失败");
-        }
-        return result;
+        return virtualHostService.deleteByPrimaryKey(virtualHost.getId()) > 0
+                ? new ResultJson<>("200", "删除虚拟主机信息，成功")
+                : new ResultJson<>("500", "删除虚拟主机信息，失败");
     }
     /**
@@ -87,16 +68,9 @@ public class VirtualHostController {
      */
     @GetMapping("/batchRemove")
     public ResultJson batchRemoveVirtualHost(String ids) {
-        ResultJson result = new ResultJson<>();
-        int num = virtualHostService.deleteByPrimaryKey(ids);
-        if (num > 0) {
-            result.setCode("200");
-            result.setMsg("批量删除虚拟主机,成功!");
-        } else {
-            result.setCode("500");
-            result.setMsg("批量删除虚拟主机,失败!");
-        }
-        return result;
+        return virtualHostService.deleteByPrimaryKey(ids) > 0
+                ? new ResultJson<>("200", "批量删除虚拟主机，成功")
+                : new ResultJson<>("500", "批量删除虚拟主机，失败");
     }
     /**
@@ -107,23 +81,13 @@ public class VirtualHostController {
      */
     @PutMapping("/update")
     public ResultJson updateVirtualHost(@RequestBody VirtualHost virtualHost) {
-
         //先验证，修改好的核心信息（虚拟主机名称）是否已存在
         String message = validateVirtualHost(virtualHost);
-        //验证通过
-        if (message == null) {
-            ResultJson result = new ResultJson<>();
-            int num = virtualHostService.updateByPrimaryKeySelective(virtualHost);
-            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
+                ? virtualHostService.updateByPrimaryKeySelective(virtualHost) > 0
+                    ? new ResultJson<>("200", "修改虚拟主机信息，成功")
+                    : new ResultJson<>("500", "修改虚拟主机信息，失败")
+                : new ResultJson<>("400", message);
     }
     /**
@@ -138,20 +102,13 @@ public class VirtualHostController {
         String message = validateVirtualHost(virtualHost);
         //验证通过
         if (message == null) {
-            ResultJson result = new ResultJson<>();
             // 设置id
             virtualHost.setId(IdUtils.generateId());
-            int num = virtualHostService.insertSelective(virtualHost);
-            if (num > 0) {
-                result.setCode("200");
-                result.setMsg("添加虚拟主机信息，成功!");
-            } else {
-                result.setCode("500");
-                result.setMsg("添加虚拟主机信息，失败!");
-            }
-            return result;
+            return virtualHostService.insertSelective(virtualHost) > 0
+                    ? new ResultJson<>("200", "添加虚拟主机信息，成功")
+                    : new ResultJson<>("500", "添加虚拟主机信息，失败");
         }
-        return new ResultJson("400", message != null ? message : "添加虚拟主机信息,失败!");
+        return new ResultJson<>("400", message);
     }
     /**
@@ -175,7 +132,7 @@ public class VirtualHostController {
                 List<VirtualHost> info = virtualHostService.validateVirtualHost(virtualHost);
                 // 多于0个，则代表已存在；否则则是，校验通过
                 if (info.size() > 0) {
-                    return "该-虚拟主机（虚拟主机名称）-信息已存在，请谨慎输入";
+                    return EXIST_HOST_INFO;
                 }
                 return null;
             }
@@ -188,7 +145,7 @@ public class VirtualHostController {
             List<VirtualHost> info = virtualHostService.validateVirtualHost(virtualHost);
             // 多于0个，则代表已存在；否则则是，校验通过
             if (info.size() > 0) {
-                return "该-虚拟主机（虚拟主机名称）-信息已存在，请谨慎输入";
+                return EXIST_HOST_INFO;
             }
             return null;
         }
--- a/src/main/java/com/sunyo/wlpt/message/bus/service/domain/BusServer.java
查看文件 @0dfd37d
+++ b/src/main/java/com/sunyo/wlpt/message/bus/service/domain/BusServer.java
查看文件 @0dfd37d
 package com.sunyo.wlpt.message.bus.service.domain;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author 子诚
  * Description：MQ服务器静态信息表
@@ -72,4 +72,14 @@ public class BusServer implements Serializable {
      * 服务器名称的别名
      */
     private String aliasName;
+
+    /**
+     * 定义有参构造器
+     * 封装 BusController 的查询参数
+     *
+     * @param serverName 服务器名称
+     */
+    public BusServer(String serverName) {
+        this.serverName = serverName;
+    }
 }
--- a/src/main/java/com/sunyo/wlpt/message/bus/service/domain/VirtualHost.java
查看文件 @0dfd37d
+++ b/src/main/java/com/sunyo/wlpt/message/bus/service/domain/VirtualHost.java
查看文件 @0dfd37d
 package com.sunyo.wlpt.message.bus.service.domain;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author 子诚
  * Description：MQ虚拟主机名称表
@@ -73,4 +73,15 @@ public class VirtualHost implements Serializable {
      */
     private List<BusExchange> aliasList;
+    /**
+     * 定义有参构造器
+     * 封装 VirtualHostController 的查询参数
+     *
+     * @param serverId        所属服务器ID
+     * @param virtualHostName 虚拟机名称
+     */
+    public VirtualHost(String virtualHostName, String serverId) {
+        this.virtualHostName = virtualHostName;
+        this.serverId = serverId;
+    }
 }