修改serverPort的类型

王勇
src/main/java/com/sunyo/wlpt/message/bus/service/controller/BusServerController.java
src/main/java/com/sunyo/wlpt/message/bus/service/controller/RabbitController.java
src/main/java/com/sunyo/wlpt/message/bus/service/domain/BusServer.java
src/main/java/com/sunyo/wlpt/message/bus/service/domain/XmlData.java
src/main/java/com/sunyo/wlpt/message/bus/service/rabbit/utils/DirectUtils.java
src/main/java/com/sunyo/wlpt/message/bus/service/service/UserInfoService.java
src/main/java/com/sunyo/wlpt/message/bus/service/service/impl/UserInfoServiceImpl.java
src/main/java/com/sunyo/wlpt/message/bus/service/utils/XmlUtils.java
src/main/resources/mapper/BusServerMapper.xml
--- a/src/main/java/com/sunyo/wlpt/message/bus/service/controller/BusServerController.java
查看文件 @fa5753b
+++ b/src/main/java/com/sunyo/wlpt/message/bus/service/controller/BusServerController.java
查看文件 @fa5753b
@@ -38,7 +38,8 @@ public class BusServerController {
     public ResultJson selectBusServerList(
             @RequestParam(value = "serverName", required = false) String serverName,
             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize)
+    {
         // 获取查询参数
         BusServer busServer = BusServer.builder().serverName(serverName).build();
         // 分页查询
@@ -55,7 +56,8 @@ public class BusServerController {
      * @return {@link ResultJson}
      */
     @DeleteMapping("/delete")
-    public ResultJson deleteBusServer(@RequestBody BusServer busServer) {
+    public ResultJson deleteBusServer(@RequestBody BusServer busServer)
+    {
         return busServerService.deleteByPrimaryKey(busServer.getId()) > 0
                 ? new ResultJson<>("200", "删除MQ服务器，成功")
                 : new ResultJson<>("500", "删除MQ服务器，失败");
@@ -68,7 +70,8 @@ public class BusServerController {
      * @return {@link ResultJson}
      */
     @GetMapping("/batchRemove")
-    public ResultJson batchRemoveBusServer(String ids) {
+    public ResultJson batchRemoveBusServer(String ids)
+    {
         return busServerService.deleteByPrimaryKey(ids) > 0
                 ? new ResultJson<>("200", "批量删除服务器，成功")
                 : new ResultJson<>("500", "批量删除服务器，失败");
@@ -81,7 +84,8 @@ public class BusServerController {
      * @return {@link ResultJson}
      */
     @PutMapping("/update")
-    public ResultJson updateBusServer(@RequestBody BusServer busServer) {
+    public ResultJson updateBusServer(@RequestBody BusServer busServer)
+    {
         //先验证，修改好的核心信息（ip和port，同时存在）是否已存在
         String message = validateBusServer(busServer);
         if (EXIST_SERVERNAME.equals(message)) {
@@ -101,7 +105,8 @@ public class BusServerController {
      * @return {@link ResultJson}
      */
     @PostMapping("/insert")
-    public ResultJson insertBusServer(@RequestBody BusServer busServer) {
+    public ResultJson insertBusServer(@RequestBody BusServer busServer)
+    {
         //先验证，增加的服务器的核心信息（ip和port，同时存在）是否已存在
         String message = validateBusServer(busServer);
         if (EXIST_SERVERNAME.equals(message)) {
@@ -122,14 +127,15 @@ public class BusServerController {
      * @param busServer {@link BusServer}
      * @return 通过，无返回消息
      */
-    private String validateBusServer(BusServer busServer) {
+    private String validateBusServer(BusServer busServer)
+    {
         if ("".equals(busServer.getServerName()) || busServer.getServerName() == null) {
             return "该服务器信息中，没有服务器名称";
         }
         if ("".equals(busServer.getServerIp()) || busServer.getServerIp() == null) {
             return "该服务器信息中，没有服务器IP";
         }
-        if ("".equals(busServer.getServerPort()) || busServer.getServerPort() == null) {
+        if (busServer.getServerPort() == null) {
             return "该服务器信息中，没有服务器Port";
         }
@@ -153,7 +159,7 @@ public class BusServerController {
              * 则校验 该 ServerIp以及ServerPort（同时） 是否已存在
              */
             if (
-                    !oldBusServer.getServerPort().equals(busServer.getServerPort()) ||
+                    oldBusServer.getServerPort().equals(busServer.getServerPort()) ||
                             !oldBusServer.getServerIp().equals(busServer.getServerIp())) {
                 // 根据 ServerIp以及ServerPort（同时），进行查询校验
--- a/src/main/java/com/sunyo/wlpt/message/bus/service/controller/RabbitController.java
查看文件 @fa5753b
+++ b/src/main/java/com/sunyo/wlpt/message/bus/service/controller/RabbitController.java
查看文件 @fa5753b
@@ -66,13 +66,17 @@ public class RabbitController {
     }
     @PostMapping("/product/new")
-    public ResultJson productNew(String SNDR,
-                                 @RequestParam(value = "queueName", required = false) String RCVR,
-                                 @DateTimeFormat(pattern = "yyyyMMddHHmmss") Date DDTM,
-                                 String TYPE, String STYP,
-                                 String TOKN, String SEQN,
-                                 String VSHT, String SERV,
-                                 String content)
+    public ResultJson productNew(@RequestParam(value = "SNDR") String SNDR,
+                                 @RequestParam(value = "RCVR", required = false) String RCVR,
+                                 @DateTimeFormat(pattern = "yyyyMMddHHmmss")
+                                 @RequestParam(value = "DDTM") Date DDTM,
+                                 @RequestParam(value = "TYPE") String TYPE,
+                                 @RequestParam(value = "STYP") String STYP,
+                                 @RequestParam(value = "TOKN", required = false) String TOKN,
+                                 @RequestParam(value = "SEQN", required = false) String SEQN,
+                                 @RequestParam(value = "VSHT") String VSHT,
+                                 @RequestParam(value = "SERV") String SERV,
+                                 @RequestParam(value = "content") String content)
     {
         // 1、获取数据
         XmlData xmlData = XmlData.builder()
@@ -92,15 +96,15 @@ public class RabbitController {
         if (!"200".equals(resultJson.getCode())) {
             return resultJson;
         }
-
+        XmlData sentData = (XmlData) resultJson.getData();
         // 3、通过格式校验之后，进行配置校验
-        Boolean binding = userMessageBindingService.validateXmlBinding(xmlData);
+        Boolean binding = userMessageBindingService.validateXmlBinding(sentData);
         if (!binding) {
             return ResultJson.error(CustomExceptionType.BINDING_ERROR);
         }
         // 4、mq发送消息，数据库中保存消息
         ResultJson result = directUtils.sendMessage();
-        return ResultJson.success("发送成功", xmlData);
+        return ResultJson.success("发送成功", sentData);
     }
 }
--- a/src/main/java/com/sunyo/wlpt/message/bus/service/domain/BusServer.java
查看文件 @fa5753b
+++ b/src/main/java/com/sunyo/wlpt/message/bus/service/domain/BusServer.java
查看文件 @fa5753b
@@ -41,7 +41,7 @@ public class BusServer implements Serializable {
     /**
      * 服务器端口号
      */
-    private String serverPort;
+    private Integer serverPort;
     /**
      * 服务器相关描述
--- a/src/main/java/com/sunyo/wlpt/message/bus/service/domain/XmlData.java
查看文件 @fa5753b
+++ b/src/main/java/com/sunyo/wlpt/message/bus/service/domain/XmlData.java
查看文件 @fa5753b
 package com.sunyo.wlpt.message.bus.service.domain;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -70,6 +71,7 @@ public class XmlData implements Serializable {
      * 对应：标签 DDTM -> 发送报文时间
      */
     private String sendTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date sendDateTime;
     /**
      * 对应：标签 TYPE -> （一级）交换机名称
@@ -100,4 +102,10 @@ public class XmlData implements Serializable {
      * 对应：标签 SERV -> 指定的服务器
      */
     private String serverName;
+
+    private String password;
+
+    private String hostIp;
+
+    private Integer hostPort;
 }
--- a/src/main/java/com/sunyo/wlpt/message/bus/service/rabbit/utils/DirectUtils.java
查看文件 @fa5753b
+++ b/src/main/java/com/sunyo/wlpt/message/bus/service/rabbit/utils/DirectUtils.java
查看文件 @fa5753b
@@ -169,6 +169,7 @@ public class DirectUtils {
         closeConnectionAndChanel(channel, connection);
     }
+
     /**
      * DirectExchange的 消息消费者
      *
@@ -220,6 +221,7 @@ public class DirectUtils {
         channel.basicConsume(queueName, false, consumer);
     }
+
     public ResultJson sendMessage()
     {
         return new ResultJson<>();
--- a/src/main/java/com/sunyo/wlpt/message/bus/service/service/UserInfoService.java
查看文件 @fa5753b
+++ b/src/main/java/com/sunyo/wlpt/message/bus/service/service/UserInfoService.java
查看文件 @fa5753b
@@ -70,9 +70,9 @@ public interface UserInfoService {
      * 判断该用户名是否存在
      *
      * @param username 用户登录名
-     * @return true or false
+     * @return List<UserInfo>
      */
-    Boolean selectUserExist(String username);
+    List<UserInfo> selectUserExist(String username);
 }
--- a/src/main/java/com/sunyo/wlpt/message/bus/service/service/impl/UserInfoServiceImpl.java
查看文件 @fa5753b
+++ b/src/main/java/com/sunyo/wlpt/message/bus/service/service/impl/UserInfoServiceImpl.java
查看文件 @fa5753b
@@ -62,10 +62,9 @@ public class UserInfoServiceImpl implements UserInfoService {
     }
     @Override
-    public Boolean selectUserExist(String username)
+    public List<UserInfo>  selectUserExist(String username)
     {
-        List<UserInfo> list = userInfoMapper.selectUserExist(username);
-        return list.size() > 0;
+        return userInfoMapper.selectUserExist(username);
     }
 }
--- a/src/main/java/com/sunyo/wlpt/message/bus/service/utils/XmlUtils.java
查看文件 @fa5753b
+++ b/src/main/java/com/sunyo/wlpt/message/bus/service/utils/XmlUtils.java
查看文件 @fa5753b
@@ -37,6 +37,7 @@ public class XmlUtils {
     @Resource
     private BusExchangeService busExchangeService;
+    @Resource
     private RoutingKeyService routingKeyService;
     @Value("${path.dir}")
@@ -104,7 +105,8 @@ public class XmlUtils {
             // token为空
             return ResultJson.error(CustomExceptionType.TOKEN_ERROR);
         }
-        if (!userInfoService.selectUserExist(xmlData.getSender())) {
+        List<UserInfo> userList = userInfoService.selectUserExist(xmlData.getSender());
+        if (userList.size() == 0) {
             // 发送者不存在
             return ResultJson.error(CustomExceptionType.SENDER_NO_EXIST);
         }
@@ -137,6 +139,9 @@ public class XmlUtils {
             // 路由键不存在
             return ResultJson.error(CustomExceptionType.ROUTING_KEY_NO_EXIST);
         }
-        return ResultJson.success();
+        // 获取密码
+        xmlData.setPassword(userList.get(0).getPassword());
+        ResultJson<XmlData> result = new ResultJson<>("200","通过格式与数据校验",xmlData);
+        return result;
     }
 }
--- a/src/main/resources/mapper/BusServerMapper.xml
查看文件 @fa5753b
+++ b/src/main/resources/mapper/BusServerMapper.xml
查看文件 @fa5753b
@@ -8,7 +8,7 @@
         <result column="server_name" jdbcType="VARCHAR" property="serverName"/>
         <result column="server_name" jdbcType="VARCHAR" property="aliasName"/>
         <result column="server_ip" jdbcType="VARCHAR" property="serverIp"/>
-        <result column="server_port" jdbcType="VARCHAR" property="serverPort"/>
+        <result column="server_port" jdbcType="INTEGER" property="serverPort"/>
         <result column="description" jdbcType="VARCHAR" property="description"/>
         <result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate"/>
         <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified"/>
@@ -123,7 +123,7 @@
             </if>
             <!-- 服务器的port -->
             <if test="serverPort != null and serverPort != ''">
-                AND server_port = #{serverPort,jdbcType=VARCHAR}
+                AND server_port = #{serverPort,jdbcType=INTEGER}
             </if>
         </where>
     </select>
@@ -140,7 +140,7 @@
                                 server_port, description, gmt_create,
                                 gmt_modified)
         values (#{id,jdbcType=VARCHAR}, #{serverName,jdbcType=VARCHAR}, #{serverIp,jdbcType=VARCHAR},
-                #{serverPort,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP},
+                #{serverPort,jdbcType=INTEGER}, #{description,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP},
                 #{gmtModified,jdbcType=TIMESTAMP})
     </insert>
     <insert id="insertSelective" parameterType="com.sunyo.wlpt.message.bus.service.domain.BusServer">
@@ -180,7 +180,7 @@
                 #{serverIp,jdbcType=VARCHAR},
             </if>
             <if test="serverPort != null">
-                #{serverPort,jdbcType=VARCHAR},
+                #{serverPort,jdbcType=INTEGER},
             </if>
             <if test="description != null">
                 #{description,jdbcType=VARCHAR},
@@ -204,7 +204,7 @@
                 server_ip = #{serverIp,jdbcType=VARCHAR},
             </if>
             <if test="serverPort != null">
-                server_port = #{serverPort,jdbcType=VARCHAR},
+                server_port = #{serverPort,jdbcType=INTEGER},
             </if>
             <if test="description != null">
                 description = #{description,jdbcType=VARCHAR},
@@ -223,7 +223,7 @@
         update bus_server
         set `server_name` = #{serverName,jdbcType=VARCHAR},
             server_ip     = #{serverIp,jdbcType=VARCHAR},
-            server_port   = #{serverPort,jdbcType=VARCHAR},
+            server_port   = #{serverPort,jdbcType=INTEGER},
             description   = #{description,jdbcType=VARCHAR},
             gmt_create    = #{gmtCreate,jdbcType=TIMESTAMP},
             gmt_modified  = #{gmtModified,jdbcType=TIMESTAMP}