端口

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

@@ -53,7 +53,7 @@ public class GatewayController {
     @PostMapping("/page")
     public Result page(@RequestBody GateWayPageParam gateWayPageParam){
         Page<Gateway> page = new Page<>(gateWayPageParam.getPageNum(),gateWayPageParam.getPageSize());
-        Page<Gateway> gatewayPage = gatewayService.page(page);
+        Page<Gateway> gatewayPage = gatewayService.page(page,new QueryWrapper<Gateway>().lambda().eq(Gateway::getFarmId,gateWayPageParam.getFarmId()));
         return new Result(ResultCode.SUCCESS,gatewayPage);
     }
 

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

@@ -0,0 +1,22 @@
+package com.huimv.env.admin.controller;
+
+
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 端口 前端控制器
+ * </p>
+ *
+ * @author newspaper
+ * @since 2024-05-07
+ */
+@RestController
+@CrossOrigin
+@RequestMapping("/port")
+public class PortController {
+
+}

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

@@ -7,12 +7,16 @@ 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.Terminal;
 import com.huimv.env.admin.entity.vo.*;
+import com.huimv.env.admin.service.IPortService;
 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 java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -30,8 +34,11 @@ public class TerminalController {
 
     @Autowired
     private ITerminalService terminalService;
+    @Autowired
+    private IPortService portService;
 
     @PostMapping("/add")
+    @Transactional
     public Result add(@RequestBody TerminalAddParam terminalAddParam){
         List<Terminal> terminalList = terminalService.list(new QueryWrapper<Terminal>().lambda()
                 .eq(Terminal::getDeviceCode, terminalAddParam.getDeviceCode()));
@@ -45,6 +52,14 @@ public class TerminalController {
         terminal.setFarmId(terminalAddParam.getFarmId());
         terminalService.save(terminal);
 
+        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);
+        }
+        portService.saveBatch(portList);
         return Result.SUCCESS();
     }
 
@@ -58,7 +73,7 @@ public class TerminalController {
     @PostMapping("/page")
     public Result page(@RequestBody TerminalPageParam terminalPageParam){
         Page<Terminal> page = new Page<>(terminalPageParam.getPageNum(),terminalPageParam.getPageSize());
-        Page<Terminal> terminalPage = terminalService.page(page);
+        Page<Terminal> terminalPage = terminalService.page(page,new QueryWrapper<Terminal>().lambda().eq(Terminal::getFarmId,terminalPageParam.getFarmId()));
         return new Result(ResultCode.SUCCESS,terminalPage);
     }
 

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

@@ -0,0 +1,48 @@
+package com.huimv.env.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 端口
+ * </p>
+ *
+ * @author newspaper
+ * @since 2024-05-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("port")
+public class Port  {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 端口编号
+     */
+    @TableField("device_code")
+    private String deviceCode;
+
+    /**
+     * 终端ID
+     */
+    @TableField("terminal_id")
+    private Integer terminalId;
+
+    /**
+     * 小区ID
+     */
+    @TableField("farm_id")
+    private Integer farmId;
+
+
+}

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

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

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

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

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

@@ -0,0 +1,16 @@
+package com.huimv.env.admin.mapper;
+
+import com.huimv.env.admin.entity.Port;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 端口 Mapper 接口
+ * </p>
+ *
+ * @author newspaper
+ * @since 2024-05-07
+ */
+public interface PortMapper extends BaseMapper<Port> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.huimv.env.admin.service;
+
+import com.huimv.env.admin.entity.Port;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 端口 服务类
+ * </p>
+ *
+ * @author newspaper
+ * @since 2024-05-07
+ */
+public interface IPortService extends IService<Port> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huimv.env.admin.service.impl;
+
+import com.huimv.env.admin.entity.Port;
+import com.huimv.env.admin.mapper.PortMapper;
+import com.huimv.env.admin.service.IPortService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 端口 服务实现类
+ * </p>
+ *
+ * @author newspaper
+ * @since 2024-05-07
+ */
+@Service
+public class PortServiceImpl extends ServiceImpl<PortMapper, Port> implements IPortService {
+
+}

huimv-env-admin/src/main/resources/mapper/PortMapper.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.env.admin.mapper.PortMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, device_code, terminal_id, farm_id
+    </sql>
+
+</mapper>