网关 端口

huimv-env-admin/src/main/java/com/huimv/env/admin/entity/vo/TerminalPageResult.java

@@ -6,6 +6,7 @@ import javax.validation.constraints.NotNull;
 
 @Data
 public class TerminalPageResult {
+    private Integer id;
     private String deviceCode;
     private String deviceName;
     private String type;

huimv-env-admin/src/main/resources/mapper/TerminalMapper.xml

@@ -7,7 +7,7 @@
         id, device_code, type, status, gateway_id
     </sql>
     <select id="listByLocationId" resultType="com.huimv.env.admin.entity.vo.TerminalPageResult">
-        SELECT t.device_code AS 'deviceCode',t.device_name AS 'deviceName',t.type AS 'type',t.status AS 'status',
+        SELECT t.id as 'id',t.device_code AS 'deviceCode',t.device_name AS 'deviceName',t.type AS 'type',t.status AS 'status',
         g.device_code AS 'gatewayCode',g.device_name AS 'gatewayName',g.type AS 'gatewayType',g.status AS 'gatewayStatus'
         FROM
             `base_pigpen` b LEFT JOIN `gateway` g ON b.id = g.location_id LEFT JOIN `terminal` t ON g.id = t.gateway_id