网关 终端

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

@@ -83,7 +83,7 @@ public class GatewayController {
     @PostMapping("/delete")
     public Result delete(@RequestBody GateWayDeleteParam gateWayDeleteParam){
         List<Terminal> terminalList = terminalService.list(new QueryWrapper<Terminal>().lambda().eq(Terminal::getGatewayId, gateWayDeleteParam.getId()));
-        if (ObjectUtil.isEmpty(terminalList)){
+        if (ObjectUtil.isNotEmpty(terminalList)){
             return new Result(10001,"网关存在下属终端",false);
         }
         gatewayService.removeById(gateWayDeleteParam.getId());

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

@@ -37,6 +37,12 @@ public class Gateway implements TransPojo {
     private String deviceCode;
 
     /**
+     * 设备名称
+     */
+    @TableField("device_name")
+    private String deviceName;
+
+    /**
      * 型号
      */
     @TableField("type")

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

@@ -52,12 +52,15 @@ public class Terminal implements TransPojo {
      * 网关ID
      */
     @TableField("gateway_id")
-    @Trans(type = TransType.SIMPLE, target = Gateway.class, fields = "deviceCode", alias = "gateWay", ref = "gateWayCode")
+    @Trans(type = TransType.SIMPLE, target = Gateway.class, fields = {"deviceCode","deviceName"}, alias = "gateWay", refs = {"gateWayCode","gatewayName"})
     private Integer gatewayId;
 
     @TableField(exist = false)
     private String gateWayCode;
 
+    @TableField(exist = false)
+    private String gateWayName;
+
     @TableField("farm_id")
     @Trans(type = TransType.SIMPLE, target = BaseFarm.class, fields = "farmName", alias = "farm", ref = "farmName")
     private Integer farmId;