网关 端口

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

@@ -56,12 +56,12 @@ public class TerminalController {
         Gateway gateway = gatewayService.getById(gatewayId);
 
         Integer maxOrder = terminalMapper.getMaxOrder(gatewayId);
-
+        maxOrder += 1;
         Terminal terminal = new Terminal();
-        terminal.setDeviceCode(terminalAddParam.getDeviceCode());
+        terminal.setDeviceCode(gateway.getDeviceCode()+maxOrder);
         terminal.setDeviceName(terminalAddParam.getDeviceName());
         terminal.setGatewayId(gatewayId);
-        terminal.setOrders(maxOrder + 1);
+        terminal.setOrders(maxOrder);
         terminal.setType(terminalAddParam.getType());
         terminal.setFarmId(terminalAddParam.getFarmId());
         terminalService.save(terminal);
@@ -69,6 +69,7 @@ public class TerminalController {
         gateway.setTerminalNum(gateway.getTerminalNum()+1);
         gatewayService.updateById(gateway);
 
+
         List portList = new ArrayList();
         for (int i = 1; i < 9; i++){
             TerminalPort terminalPort = new TerminalPort();