Newspaper před 1 rokem
rodič
revize
cba36ef55e

+ 28 - 3
huimv-env-admin/src/main/java/com/huimv/env/admin/controller/TerminalPortController.java

@@ -1,10 +1,18 @@
 package com.huimv.env.admin.controller;
 
 
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.env.admin.common.utils.Result;
+import com.huimv.env.admin.common.utils.ResultCode;
+import com.huimv.env.admin.entity.TerminalPort;
+import com.huimv.env.admin.entity.vo.PortListByGatewayIdParam;
+import com.huimv.env.admin.entity.vo.TerminalPortConfigParam;
+import com.huimv.env.admin.service.ITerminalPortService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * <p>
@@ -18,5 +26,22 @@ import org.springframework.web.bind.annotation.RestController;
 @CrossOrigin
 @RequestMapping("/port")
 public class TerminalPortController {
+    @Autowired
+    private ITerminalPortService portService;
+
+    @PostMapping("/listByTerminalId")
+    public Result list(@RequestBody PortListByGatewayIdParam portListByGatewayIdParam){
+        Integer gatewayId = portListByGatewayIdParam.getGatewayId();
+        List<TerminalPort> terminalPorts = portService.list(new QueryWrapper<TerminalPort>().lambda()
+                .eq(TerminalPort::getTerminalId, gatewayId));
+        return new Result(ResultCode.SUCCESS,terminalPorts);
+    }
+
+    @PostMapping("/config")
+    public Result config(@RequestBody TerminalPortConfigParam terminalPortConfigParam){
+        TerminalPort terminalPort = portService.getById(terminalPortConfigParam.getPortId());
+        terminalPort.setLocationId(terminalPortConfigParam.getLocationId());
+        return Result.SUCCESS();
+    }
 
 }

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

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -39,6 +42,16 @@ public class TerminalPort {
     private Integer terminalId;
 
     /**
+     * 终端ID
+     */
+    @TableField("location_id")
+    @Trans(type = TransType.SIMPLE, target = BasePigpen.class, fields = "buildName", alias = "build", ref = "locationName")
+    private Integer locationId;
+
+    @TableField(exist = false)
+    private String locationName;
+
+    /**
      * 小区ID
      */
     @TableField("farm_id")

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

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

+ 15 - 0
huimv-env-admin/src/main/java/com/huimv/env/admin/entity/vo/TerminalPortConfigParam.java

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