网关 端口

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

@@ -7,13 +7,18 @@ 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.Terminal;
+import com.huimv.env.admin.entity.TerminalPort;
 import com.huimv.env.admin.entity.vo.*;
 import com.huimv.env.admin.entity.Gateway;
 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;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -32,21 +37,44 @@ public class GatewayController {
     private IGatewayService gatewayService;
     @Autowired
     private ITerminalService terminalService;
+    @Autowired
+    private ITerminalPortService portService;
 
     @PostMapping("/add")
+    @Transactional
     public Result add(@RequestBody GateWayAddParam gateWayAddParam){
-        List<Gateway> gatewayList = gatewayService.list(new QueryWrapper<Gateway>().lambda().eq(Gateway::getDeviceCode, gateWayAddParam.getDeviceCode()));
+        String deviceCode = gateWayAddParam.getDeviceCode();
+        List<Gateway> gatewayList = gatewayService.list(new QueryWrapper<Gateway>().lambda().eq(Gateway::getDeviceCode, deviceCode));
         if (ObjectUtil.isNotEmpty(gatewayList)){
             return new Result(10001,"网关编号已存在",false);
         }
         Gateway gateway = new Gateway();
-        gateway.setDeviceCode(gateWayAddParam.getDeviceCode());
+        gateway.setDeviceCode(deviceCode);
         gateway.setDeviceName(gateWayAddParam.getDeviceName());
         gateway.setLocationId(gateWayAddParam.getLocationId());
         gateway.setType(gateWayAddParam.getType());
         gateway.setFarmId(gateWayAddParam.getFarmId());
         gatewayService.save(gateway);
 
+        List terminalList = new ArrayList();
+        for (int i = 1; i <= gateWayAddParam.getTerminalNum(); i++){
+            Terminal terminal = new Terminal();
+            terminal.setDeviceCode(deviceCode + i);
+            terminal.setGatewayId(gateway.getId());
+            terminal.setFarmId(gateWayAddParam.getFarmId());
+            terminalList.add(terminal);
+            List portList = new ArrayList();
+            for (int j = 1; j < 9; j++){
+                TerminalPort terminalPort = new TerminalPort();
+                terminalPort.setDeviceCode(terminal.getDeviceCode()+j);
+                terminalPort.setTerminalId(terminal.getId());
+                terminalPort.setFarmId(terminal.getFarmId());
+                portList.add(terminalPort);
+            }
+            portService.saveBatch(portList);
+        }
+        terminalService.saveBatch(terminalList);
+
         return Result.SUCCESS();
     }
 

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

@@ -43,33 +43,35 @@ public class TerminalController {
     @Autowired
     private TerminalMapper terminalMapper;
 
-    @PostMapping("/add")
-    @Transactional
-    public Result add(@RequestBody TerminalAddParam terminalAddParam){
-        List<Terminal> terminalList = terminalService.list(new QueryWrapper<Terminal>().lambda()
-                .eq(Terminal::getDeviceCode, terminalAddParam.getDeviceCode()));
-        if (ObjectUtil.isNotEmpty(terminalList)){
-            return new Result(10001,"终端编号已存在",false);
-        }
-        Terminal terminal = new Terminal();
-        terminal.setDeviceCode(terminalAddParam.getDeviceCode());
-        terminal.setDeviceName(terminalAddParam.getDeviceName());
-        terminal.setGatewayId(terminalAddParam.getGatewayId());
-        terminal.setType(terminalAddParam.getType());
-        terminal.setFarmId(terminalAddParam.getFarmId());
-        terminalService.save(terminal);
-
-        List portList = new ArrayList();
-        for (int i = 1; i < 9; i++){
-            TerminalPort terminalPort = new TerminalPort();
-            terminalPort.setDeviceCode(terminal.getDeviceCode()+i);
-            terminalPort.setTerminalId(terminal.getId());
-            terminalPort.setFarmId(terminal.getFarmId());
-            portList.add(terminalPort);
-        }
-        portService.saveBatch(portList);
-        return Result.SUCCESS();
-    }
+//    @PostMapping("/add")
+//    @Transactional
+//    public Result add(@RequestBody TerminalAddParam terminalAddParam){
+//        List<Terminal> terminalList = terminalService.list(new QueryWrapper<Terminal>().lambda()
+//                .eq(Terminal::getDeviceCode, terminalAddParam.getDeviceCode()));
+//        if (ObjectUtil.isNotEmpty(terminalList)){
+//            return new Result(10001,"终端编号已存在",false);
+//        }
+//        Gateway gateway = gatewayService.getById(terminalAddParam.getGatewayId());
+//
+//        Terminal terminal = new Terminal();
+//        terminal.setDeviceCode(terminalAddParam.getDeviceCode());
+//        terminal.setDeviceName(terminalAddParam.getDeviceName());
+//        terminal.setGatewayId(terminalAddParam.getGatewayId());
+//        terminal.setType(terminalAddParam.getType());
+//        terminal.setFarmId(terminalAddParam.getFarmId());
+//        terminalService.save(terminal);
+//
+//        List portList = new ArrayList();
+//        for (int i = 1; i < 9; i++){
+//            TerminalPort terminalPort = new TerminalPort();
+//            terminalPort.setDeviceCode(gateway.getDeviceCode()+terminal.getDeviceCode()+i);
+//            terminalPort.setTerminalId(terminal.getId());
+//            terminalPort.setFarmId(terminal.getFarmId());
+//            portList.add(terminalPort);
+//        }
+//        portService.saveBatch(portList);
+//        return Result.SUCCESS();
+//    }
 
     @PostMapping("/list")
     public Result list(@RequestBody TerminalListParam terminalListParam){

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

@@ -21,4 +21,7 @@ public class GateWayAddParam {
 
     @NotNull(message = "farmId不能为空")
     private Integer farmId;
+
+    @NotNull(message = "terminalNum不能为空")
+    private Integer terminalNum;
 }