网关 端口

huimv-env-admin/src/main/java/com/huimv/env/admin/controller/TerminalController.java

@@ -10,6 +10,7 @@ import com.huimv.env.admin.entity.Gateway;
 import com.huimv.env.admin.entity.TerminalPort;
 import com.huimv.env.admin.entity.Terminal;
 import com.huimv.env.admin.entity.vo.*;
+import com.huimv.env.admin.mapper.TerminalMapper;
 import com.huimv.env.admin.service.IGatewayService;
 import com.huimv.env.admin.service.ITerminalPortService;
 import com.huimv.env.admin.service.ITerminalService;
@@ -39,6 +40,8 @@ public class TerminalController {
     private ITerminalService terminalService;
     @Autowired
     private ITerminalPortService portService;
+    @Autowired
+    private TerminalMapper terminalMapper;
 
     @PostMapping("/add")
     @Transactional
@@ -77,14 +80,9 @@ public class TerminalController {
 
     @PostMapping("/listByLocationId")
     public Result listByLocationId(@RequestBody TerminalListByLocationIdParam terminalListByLocationIdParam){
-        List<Gateway> list = gatewayService.list(new QueryWrapper<Gateway>().lambda().eq(Gateway::getLocationId, terminalListByLocationIdParam.getLocationId()));
-        List resultList = new ArrayList();
-        for (Gateway gateway : list) {
-            List<Terminal> terminals = terminalService.list(new QueryWrapper<Terminal>().lambda()
-                    .eq(Terminal::getGatewayId, gateway.getId()));
-            resultList.addAll(terminals);
-        }
-        return new Result(ResultCode.SUCCESS,resultList);
+        Page<TerminalPageResult> page = new Page<>(terminalListByLocationIdParam.getPageNum(),terminalListByLocationIdParam.getPageSize());
+        Page<TerminalPageResult> resultPage = terminalMapper.listByLocationId(page,terminalListByLocationIdParam.getLocationId());
+        return new Result(ResultCode.SUCCESS,resultPage);
     }
 
     @PostMapping("/page")

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

@@ -0,0 +1,8 @@
+package com.huimv.env.admin.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class GateWayListByLocationIdParam {
+    private Integer locationId;
+}

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

@@ -8,4 +8,10 @@ import javax.validation.constraints.NotNull;
 public class TerminalListByLocationIdParam {
     @NotNull(message = "locationId不能为空")
     private Integer locationId;
+
+    @NotNull(message = "pageNum不能为空")
+    private Integer pageNum;
+
+    @NotNull(message = "pageSize不能为空")
+    private Integer pageSize;
 }

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

@@ -0,0 +1,18 @@
+package com.huimv.env.admin.entity.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class TerminalPageResult {
+    private String deviceCode;
+    private String deviceName;
+    private String type;
+    private int status;
+
+    private String gatewayCode;
+    private String gatewayName;
+    private String gatewayType;
+    private String gatewayStatus;
+}

huimv-env-admin/src/main/java/com/huimv/env/admin/mapper/TerminalMapper.java

@@ -1,7 +1,9 @@
 package com.huimv.env.admin.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.env.admin.entity.Terminal;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.env.admin.entity.vo.TerminalPageResult;
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TerminalMapper extends BaseMapper<Terminal> {
 
+    Page<TerminalPageResult> listByLocationId(Page<TerminalPageResult> page, Integer locationId);
 }

huimv-env-admin/src/main/java/com/huimv/env/admin/service/ITerminalService.java

@@ -1,7 +1,9 @@
 package com.huimv.env.admin.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.env.admin.entity.Terminal;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.env.admin.entity.vo.TerminalPageResult;
 
 /**
  * <p>

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

@@ -6,5 +6,13 @@
     <sql id="Base_Column_List">
         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',
+        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
+        WHERE
+            b.id = #{locationId}
+    </select>
 
 </mapper>