网关 端口

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

@@ -50,7 +50,6 @@ public class GatewayController {
         return Result.SUCCESS();
     }
 
-
     @PostMapping("/page")
     public Result page(@RequestBody GateWayPageParam gateWayPageParam){
         Page<Gateway> page = new Page<>(gateWayPageParam.getPageNum(),gateWayPageParam.getPageSize());

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

@@ -116,11 +116,11 @@ public class TerminalController {
 
     @PostMapping("/delete")
     public Result delete(@RequestBody TerminalDeleteParam terminalDeleteParam){
-        //TODO 终端删除前判断端口是否存在
-//        List<Terminal> terminalList = terminalService.list(new QueryWrapper<Terminal>().lambda().eq(Terminal::getGatewayId, gateWayDeleteParam.getId()));
-//        if (ObjectUtil.isEmpty(terminalList)){
-//            return new Result(10001,"终端存在下属端口",false);
-//        }
+        List<TerminalPort> terminalList = portService.list(new QueryWrapper<TerminalPort>().lambda()
+                .eq(TerminalPort::getTerminalId, terminalDeleteParam.getId()).isNotNull(TerminalPort::getLocationId));
+        if (ObjectUtil.isNotEmpty(terminalList)){
+            return new Result(10001,"下属端口已绑定住户",false);
+        }
         terminalService.removeById(terminalDeleteParam.getId());
         return Result.SUCCESS();
     }

huimv-env-admin/src/main/java/com/huimv/env/admin/entity/TerminalPort.java

@@ -45,7 +45,7 @@ public class TerminalPort {
      * 终端ID
      */
     @TableField("location_id")
-    @Trans(type = TransType.SIMPLE, target = BasePigpen.class, fields = "buildName", alias = "build", ref = "locationName")
+    @Trans(type = TransType.SIMPLE, target = BasePigpen.class, fields = "buildName", alias = "build", refs = "locationName")
     private Integer locationId;
 
     @TableField(exist = false)