网关 终端

huimv-env-admin/pom.xml

@@ -128,6 +128,24 @@
             <version>2.1.7</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fhs-opensource</groupId>
+            <artifactId>easy-trans-spring-boot-starter</artifactId>
+            <version>2.1.7</version>
+        </dependency>
+
+        <!-- easy-trans-mybatis-plus-extend -->
+        <dependency>
+            <groupId>com.fhs-opensource</groupId>
+            <artifactId>easy-trans-mybatis-plus-extend</artifactId>
+            <version>2.1.7</version>
+        </dependency>
+
 
 
     </dependencies>

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

@@ -0,0 +1,92 @@
+package com.huimv.env.admin.controller;
+
+
+import cn.hutool.core.util.ObjectUtil;
+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.Terminal;
+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.ITerminalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 采集网关 前端控制器
+ * </p>
+ *
+ * @author newspaper
+ * @since 2024-05-07
+ */
+@RestController
+@CrossOrigin
+@RequestMapping("/gateway")
+public class GatewayController {
+    @Autowired
+    private IGatewayService gatewayService;
+    @Autowired
+    private ITerminalService terminalService;
+
+    @PostMapping("/add")
+    public Result add(@RequestBody GateWayAddParam gateWayAddParam){
+        List<Gateway> gatewayList = gatewayService.list(new QueryWrapper<Gateway>().lambda().eq(Gateway::getDeviceCode, gateWayAddParam.getDeviceCode()));
+        if (ObjectUtil.isEmpty(gatewayList)){
+            return new Result(10001,"网关编号已存在",false);
+        }
+        Gateway gateway = new Gateway();
+        gateway.setDeviceCode(gateWayAddParam.getDeviceCode());
+        gateway.setLocationId(gateWayAddParam.getLocationId());
+        gateway.setType(gateWayAddParam.getType());
+        gateway.setFarmId(gateWayAddParam.getFarmId());
+        gatewayService.save(gateway);
+
+        return Result.SUCCESS();
+    }
+
+
+    @PostMapping("/page")
+    public Result page(@RequestBody GateWayPageParam gateWayPageParam){
+        Page<Gateway> page = new Page<>(gateWayPageParam.getPageNum(),gateWayPageParam.getPageSize());
+        Page<Gateway> gatewayPage = gatewayService.page(page);
+        return new Result(ResultCode.SUCCESS,gatewayPage);
+    }
+
+    @PostMapping("/list")
+    public Result list(@RequestBody GateWayListParam gateWayListParam){
+        List<Gateway> gatewayList = gatewayService.list(new QueryWrapper<Gateway>().lambda().eq(ObjectUtil.isNotEmpty(gateWayListParam.getFarmId()), Gateway::getFarmId, gateWayListParam.getFarmId()));
+        return new Result(ResultCode.SUCCESS,gatewayList);
+    }
+
+    @PostMapping("/update")
+    public Result update(@RequestBody GateWayUpdateParam gateWayUpdateParam){
+        Gateway gateway = gatewayService.getById(gateWayUpdateParam.getId());
+        List<Gateway> gatewayList = gatewayService.list(new QueryWrapper<Gateway>().lambda().eq(Gateway::getDeviceCode, gateWayUpdateParam.getDeviceCode()).ne(Gateway::getId,gateWayUpdateParam.getId()));
+        if (ObjectUtil.isEmpty(gatewayList)){
+            return new Result(10001,"网关编号已存在",false);
+        }
+        gateway.setDeviceCode(gateWayUpdateParam.getDeviceCode());
+        gateway.setLocationId(gateWayUpdateParam.getLocationId());
+        gateway.setType(gateWayUpdateParam.getType());
+        gateway.setFarmId(gateWayUpdateParam.getFarmId());
+        gatewayService.updateById(gateway);
+        return Result.SUCCESS();
+    }
+
+    @PostMapping("/delete")
+    public Result delete(@RequestBody GateWayDeleteParam gateWayDeleteParam){
+        List<Terminal> terminalList = terminalService.list(new QueryWrapper<Terminal>().lambda().eq(Terminal::getGatewayId, gateWayDeleteParam.getId()));
+        if (ObjectUtil.isEmpty(terminalList)){
+            return new Result(10001,"网关存在下属终端",false);
+        }
+        gatewayService.removeById(gateWayDeleteParam.getId());
+        return Result.SUCCESS();
+    }
+
+
+}

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

@@ -0,0 +1,94 @@
+package com.huimv.env.admin.controller;
+
+
+import cn.hutool.core.util.ObjectUtil;
+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.Terminal;
+import com.huimv.env.admin.entity.vo.*;
+import com.huimv.env.admin.service.ITerminalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 监测终端 前端控制器
+ * </p>
+ *
+ * @author newspaper
+ * @since 2024-05-07
+ */
+@RestController
+@CrossOrigin
+@RequestMapping("/terminal")
+public class TerminalController {
+
+    @Autowired
+    private ITerminalService terminalService;
+
+    @PostMapping("/add")
+    public Result add(@RequestBody TerminalAddParam terminalAddParam){
+        List<Terminal> terminalList = terminalService.list(new QueryWrapper<Terminal>().lambda()
+                .eq(Terminal::getDeviceCode, terminalAddParam.getDeviceCode()));
+        if (ObjectUtil.isEmpty(terminalList)){
+            return new Result(10001,"终端编号已存在",false);
+        }
+        Terminal terminal = new Terminal();
+        terminal.setDeviceCode(terminalAddParam.getDeviceCode());
+        terminal.setGatewayId(terminalAddParam.getGatewayId());
+        terminal.setType(terminalAddParam.getType());
+        terminal.setFarmId(terminalAddParam.getFarmId());
+        terminalService.save(terminal);
+
+        return Result.SUCCESS();
+    }
+
+    @PostMapping("/list")
+    public Result list(@RequestBody TerminalListParam terminalListParam){
+        List<Terminal> terminalList = terminalService.list(new QueryWrapper<Terminal>().lambda()
+                .eq(ObjectUtil.isNotEmpty(terminalListParam.getGatewayId()), Terminal::getGatewayId, terminalListParam.getGatewayId()));
+        return new Result(ResultCode.SUCCESS,terminalList);
+    }
+
+    @PostMapping("/page")
+    public Result page(@RequestBody TerminalPageParam terminalPageParam){
+        Page<Terminal> page = new Page<>(terminalPageParam.getPageNum(),terminalPageParam.getPageSize());
+        Page<Terminal> terminalPage = terminalService.page(page);
+        return new Result(ResultCode.SUCCESS,terminalPage);
+    }
+
+    @PostMapping("/update")
+    public Result update(@RequestBody TerminalUpdateParam terminalUpdateParam){
+        List<Terminal> terminalList = terminalService.list(new QueryWrapper<Terminal>().lambda()
+                .eq(Terminal::getDeviceCode, terminalUpdateParam.getDeviceCode())
+                .ne(Terminal::getId,terminalUpdateParam.getId()));
+        if (ObjectUtil.isEmpty(terminalList)){
+            return new Result(10001,"终端编号已存在",false);
+        }
+        Terminal terminal = terminalService.getById(terminalUpdateParam.getId());
+        terminal.setDeviceCode(terminalUpdateParam.getDeviceCode());
+        terminal.setGatewayId(terminalUpdateParam.getGatewayId());
+        terminal.setType(terminalUpdateParam.getType());
+        terminal.setFarmId(terminalUpdateParam.getFarmId());
+        terminalService.updateById(terminal);
+        return Result.SUCCESS();
+    }
+
+    @PostMapping("/delete")
+    public Result delete(@RequestBody TerminalDeleteParam terminalDeleteParam){
+        //TODO 终端删除前判断端口是否存在
+//        List<Terminal> terminalList = terminalService.list(new QueryWrapper<Terminal>().lambda().eq(Terminal::getGatewayId, gateWayDeleteParam.getId()));
+//        if (ObjectUtil.isEmpty(terminalList)){
+//            return new Result(10001,"终端存在下属端口",false);
+//        }
+        terminalService.removeById(terminalDeleteParam.getId());
+        return Result.SUCCESS();
+    }
+
+
+}

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

@@ -4,6 +4,8 @@ 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.vo.TransPojo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -20,9 +22,8 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("base_farm")
-public class BaseFarm implements Serializable {
+public class BaseFarm implements TransPojo {
 
-    private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;

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

@@ -4,6 +4,8 @@ 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.vo.TransPojo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -20,9 +22,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("base_pigpen")
-public class BasePigpen implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class BasePigpen  implements TransPojo {
 
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;

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

@@ -0,0 +1,74 @@
+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 com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.fhs.core.trans.vo.TransPojo;
+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("gateway")
+public class Gateway implements TransPojo {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    @TableField("device_code")
+    private String deviceCode;
+
+    /**
+     * 型号
+     */
+    @TableField("type")
+    private String type;
+
+    /**
+     * 安装位置ID
+     */
+    @TableField("location_id")
+    @Trans(type = TransType.SIMPLE, target = BasePigpen.class, fields = {"buildName","lng","lna"}, alias = "build", refs = {"locationName","lng","lat"})
+    private Integer locationId;
+
+    @TableField(exist = false)
+    private String locationName;
+
+    @TableField(exist = false)
+    private String lng;
+
+    @TableField(exist = false)
+    private String lat;
+
+    /**
+     * 状态
+     */
+    @TableField("status")
+    private Integer status;
+
+    @TableField("farm_id")
+    @Trans(type = TransType.SIMPLE, target = BaseFarm.class, fields = "farmName", alias = "farm", ref = "farmName")
+    private Integer farmId;
+
+    @TableField(exist = false)
+    private String farmName;
+
+}

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

@@ -0,0 +1,69 @@
+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 com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.fhs.core.trans.vo.TransPojo;
+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("terminal")
+public class Terminal implements TransPojo {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 终端编号
+     */
+    @TableField("device_code")
+    private String deviceCode;
+
+    /**
+     * 型号
+     */
+    @TableField("type")
+    private String type;
+
+    /**
+     * 状态
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 网关ID
+     */
+    @TableField("gateway_id")
+    @Trans(type = TransType.SIMPLE, target = Gateway.class, fields = "deviceCode", alias = "gateWay", ref = "gateWayCode")
+    private Integer gatewayId;
+
+    @TableField(exist = false)
+    private String gateWayCode;
+
+    @TableField("farm_id")
+    @Trans(type = TransType.SIMPLE, target = BaseFarm.class, fields = "farmName", alias = "farm", ref = "farmName")
+    private Integer farmId;
+
+    @TableField(exist = false)
+    private String farmName;
+
+
+}

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

@@ -0,0 +1,21 @@
+package com.huimv.env.admin.entity.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class GateWayAddParam {
+    @NotBlank(message = "deviceCode不能为空")
+    private String deviceCode;
+
+    @NotBlank(message = "type不能为空")
+    private String type;
+
+    @NotNull(message = "type不能为空")
+    private Integer locationId;
+
+    @NotNull(message = "farmId不能为空")
+    private Integer farmId;
+}

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

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

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

@@ -0,0 +1,10 @@
+package com.huimv.env.admin.entity.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class GateWayListParam {
+    private Integer farmId;
+}

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

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

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

@@ -0,0 +1,24 @@
+package com.huimv.env.admin.entity.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class GateWayUpdateParam {
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+    @NotBlank(message = "deviceCode不能为空")
+    private String deviceCode;
+
+    @NotBlank(message = "type不能为空")
+    private String type;
+
+    @NotNull(message = "locationId不能为空")
+    private Integer locationId;
+
+    @NotNull(message = "farmId不能为空")
+    private Integer farmId;
+}

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

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

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

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

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

@@ -0,0 +1,10 @@
+package com.huimv.env.admin.entity.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class TerminalListParam {
+    private Integer gatewayId;
+}

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

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

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

@@ -0,0 +1,24 @@
+package com.huimv.env.admin.entity.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class TerminalUpdateParam {
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+    @NotBlank(message = "deviceCode不能为空")
+    private String deviceCode;
+
+    @NotBlank(message = "type不能为空")
+    private String type;
+
+    @NotNull(message = "gatewayId不能为空")
+    private Integer gatewayId;
+
+    @NotNull(message = "farmId不能为空")
+    private Integer farmId;
+}

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,20 @@
+package com.huimv.env.admin.service.impl;
+
+import com.huimv.env.admin.entity.Gateway;
+import com.huimv.env.admin.mapper.GatewayMapper;
+import com.huimv.env.admin.service.IGatewayService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 采集网关 服务实现类
+ * </p>
+ *
+ * @author newspaper
+ * @since 2024-05-07
+ */
+@Service
+public class GatewayServiceImpl extends ServiceImpl<GatewayMapper, Gateway> implements IGatewayService {
+
+}

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

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

huimv-env-admin/src/main/resources/application-prod.yml

@@ -21,6 +21,7 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
 
 
+
   #配置rabbitMq 服务器
 #  rabbitmq:
 #    host: 10.0.0.4
@@ -52,7 +53,10 @@ mybatis-plus:
 #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
-
+easy-trans:
+  is-enable-redis: false
+  is-enable-global: true
+  is-enable-tile: true
 
 #img:
 #  url: https://img.ifarmcloud.com/images/

huimv-env-admin/src/main/resources/mapper/GatewayMapper.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.GatewayMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, device_code, type, location_id, status
+    </sql>
+
+</mapper>

huimv-env-admin/src/main/resources/mapper/TerminalMapper.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.TerminalMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, device_code, type, status, gateway_id
+    </sql>
+
+</mapper>