`fix`

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblGateway.java

@@ -59,10 +59,12 @@ public class TblGateway extends BaseEntity {
      * 所属服务
      */
     private String belongService;
+
+
+    private Long protocalId;
     /**
      * 版本
      */
-    @Version
     private String version;
     /**
      * 描述

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblGatewayBo.java

@@ -83,12 +83,15 @@ public class TblGatewayBo extends BaseEntity {
 //    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String description;
 
+    private Long protocalId;
+
     /**
      * 备注
      */
 //    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
+    private String version;
 
     private Integer protocalType;
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblGatewayVo.java

@@ -88,12 +88,16 @@ public class TblGatewayVo implements Serializable {
     private String remark;
 
 
+    private String version;
     /**
      *协议类型
      */
     @ExcelProperty(value = "协议类型")
     private Integer protocalType;
 
+
+    private Long protocalId;
+
     @ExcelProperty(value = "经度")
     private String longitude;
 

ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblGatewayServiceImpl.java

@@ -69,6 +69,7 @@ public class TblGatewayServiceImpl implements ITblGatewayService {
         lqw.eq(bo.getFlowControl() != null, TblGateway::getFlowControl, bo.getFlowControl());
         lqw.eq(StringUtils.isNotBlank(bo.getFlowControlType()), TblGateway::getFlowControlType, bo.getFlowControlType());
         lqw.eq(StringUtils.isNotBlank(bo.getBelongService()), TblGateway::getBelongService, bo.getBelongService());
+        lqw.eq(StringUtils.isNotBlank(bo.getVersion()), TblGateway::getBelongService, bo.getVersion());
         lqw.eq(StringUtils.isNotBlank(bo.getDescription()), TblGateway::getDescription, bo.getDescription());
         return lqw;
     }

ruoyi-system/src/main/resources/mapper/data/TblGatewayMapper.xml

@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="protocalType" column="protocal_type"/>
+        <result property="protocalId" column="protocal_id"/>
     </resultMap>