网关 终端

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

@@ -6,8 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.Gateway;
-import com.huimv.env.admin.entity.Port;
+import com.huimv.env.admin.entity.TerminalPort;
 import com.huimv.env.admin.entity.Terminal;
 import com.huimv.env.admin.entity.vo.*;
 import com.huimv.env.admin.service.IPortService;
@@ -55,10 +54,11 @@ public class TerminalController {
 
         List portList = new ArrayList();
         for (int i = 1; i < 9; i++){
-            Port port = new Port();
-            port.setDeviceCode(terminal.getDeviceCode()+i);
-            port.setFarmId(terminal.getFarmId());
-            portList.add(port);
+            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();

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

@@ -17,6 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @CrossOrigin
 @RequestMapping("/port")
-public class PortController {
+public class TerminalPortController {
 
 }

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

@@ -20,8 +20,8 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("port")
-public class Port  {
+@TableName("terminal_port")
+public class TerminalPort {
 
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;

huimv-env-admin/src/main/java/com/huimv/env/admin/mapper/PortMapper.java

@@ -1,6 +1,6 @@
 package com.huimv.env.admin.mapper;
 
-import com.huimv.env.admin.entity.Port;
+import com.huimv.env.admin.entity.TerminalPort;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author newspaper
  * @since 2024-05-07
  */
-public interface PortMapper extends BaseMapper<Port> {
+public interface PortMapper extends BaseMapper<TerminalPort> {
 
 }

huimv-env-admin/src/main/java/com/huimv/env/admin/service/IPortService.java

@@ -1,6 +1,6 @@
 package com.huimv.env.admin.service;
 
-import com.huimv.env.admin.entity.Port;
+import com.huimv.env.admin.entity.TerminalPort;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author newspaper
  * @since 2024-05-07
  */
-public interface IPortService extends IService<Port> {
+public interface IPortService extends IService<TerminalPort> {
 
 }

huimv-env-admin/src/main/java/com/huimv/env/admin/service/impl/PortServiceImpl.java

@@ -1,6 +1,6 @@
 package com.huimv.env.admin.service.impl;
 
-import com.huimv.env.admin.entity.Port;
+import com.huimv.env.admin.entity.TerminalPort;
 import com.huimv.env.admin.mapper.PortMapper;
 import com.huimv.env.admin.service.IPortService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2024-05-07
  */
 @Service
-public class PortServiceImpl extends ServiceImpl<PortMapper, Port> implements IPortService {
+public class PortServiceImpl extends ServiceImpl<PortMapper, TerminalPort> implements IPortService {
 
 }