Newspaper 1 anno fa
parent
commit
300da28455

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

@@ -6,9 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.env.admin.common.utils.Result;
 import com.huimv.env.admin.common.utils.ResultCode;
+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.service.IGatewayService;
 import com.huimv.env.admin.service.ITerminalPortService;
 import com.huimv.env.admin.service.ITerminalService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +34,8 @@ import java.util.List;
 public class TerminalController {
 
     @Autowired
+    private IGatewayService gatewayService;
+    @Autowired
     private ITerminalService terminalService;
     @Autowired
     private ITerminalPortService portService;
@@ -71,6 +75,18 @@ public class TerminalController {
         return new Result(ResultCode.SUCCESS,terminalList);
     }
 
+    @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);
+    }
+
     @PostMapping("/page")
     public Result page(@RequestBody TerminalPageParam terminalPageParam){
         Page<Terminal> page = new Page<>(terminalPageParam.getPageNum(),terminalPageParam.getPageSize());

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

@@ -0,0 +1,11 @@
+package com.huimv.env.admin.entity.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class TerminalListByLocationIdParam {
+    @NotNull(message = "locationId不能为空")
+    private Integer locationId;
+}