更新配置接口

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblDataController.java

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
 import com.ruoyi.data.domain.*;
 import com.ruoyi.data.domain.bo.*;
 import com.ruoyi.data.domain.vo.*;
@@ -75,36 +77,36 @@ public class TblDataController extends BaseController {
 
     private List<SensorPoint> getSensorPointList(){
         List<SensorPoint> list = new ArrayList<>();
-        List<PointUnit> pointUnitlist = new ArrayList<>();
+        List<PointData> pointUnitlist = new ArrayList<>();
         TblSensorBo sensorBo = new TblSensorBo();
         List<TblSensorVo> tblSeneorVoList = iTblSensorService.queryList(sensorBo);
         TblDatapointBo tblDatapointBo = new TblDatapointBo();
         List<TblDatapointVo> tblDatapointVoList = iTblDatapointService.queryList(tblDatapointBo);
         TblUnitBo tblUnitBo = new TblUnitBo();
-        List<TblUnitVo> tblUnitVoList = iTblUnitService.queryList(tblUnitBo);
-        for(TblDatapointVo tblDatapointVo:tblDatapointVoList){
-            PointUnit pointUnit= new PointUnit();
-            pointUnit.setPointInfo(tblDatapointVo);
-            for(TblUnitVo tblUnitVo:tblUnitVoList){
-                if(tblDatapointVo.getDataType() == tblUnitVo.getId()){
-                    pointUnit.setUnitName(tblUnitVo.getUnitName());
-                    pointUnit.setUnitType(tblUnitVo.getUnitType());
-                    pointUnit.setUnitSymbol(tblUnitVo.getUnitSymbol());
-                    pointUnit.setName(tblDatapointVo.getValueType());
-                    pointUnitlist.add(pointUnit);
-                }
-            }
-        }
+
         for(TblSensorVo tblSensorVo:tblSeneorVoList){
             SensorPoint sensorPoint = new SensorPoint();
             sensorPoint.setTblSensorVo(tblSensorVo);
-            List<PointUnit> pointUnits = new ArrayList<PointUnit>();
-            for(PointUnit pointUnit:pointUnitlist){
-                if(tblSensorVo.getId() == pointUnit.getPointInfo().getSensorId()){
-                    pointUnits.add(pointUnit);
+            List<PointData> pointDatas = new ArrayList<PointData>();
+            JSONArray pointArry = new JSONArray(tblSensorVo.getDatapoints());
+            for(Object pointObject:pointArry){
+                JSONObject jsonObject = new JSONObject(pointObject);
+                Long pointId = Long.valueOf((String) jsonObject.get("dataPointId"));
+                System.out.println(pointId);
+                for(TblDatapointVo tblDatapointVo:tblDatapointVoList){
+                    System.out.println(tblDatapointVo.getId());
+                    if(pointId == tblDatapointVo.getId()) {
+                        PointData pointData = new PointData();
+                        pointData.setName((String) jsonObject.get("name"));
+                        pointData.setLabel((String) jsonObject.get("label"));
+                        pointData.setUnit((String) jsonObject.get("unit"));
+                        pointData.setUnitType((String) jsonObject.get("unitType"));
+                        pointData.setDataPointInfo(tblDatapointVo);
+                        pointDatas.add(pointData);
+                    }
                 }
             }
-            sensorPoint.setDataPoints(pointUnits);
+            sensorPoint.setDataPoints(pointDatas);
             list.add(sensorPoint);
         }
         return list;

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblSeneorController.java

@@ -1,108 +0,0 @@
-package com.ruoyi.data.controller;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.data.domain.vo.TblSeneorVo;
-import com.ruoyi.data.domain.bo.TblSeneorBo;
-import com.ruoyi.data.service.ITblSeneorService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 传感器列
- *
- * @author ruoyi
- * @date 2023-12-15
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/data/seneor")
-public class TblSeneorController extends BaseController {
-
-    private final ITblSeneorService iTblSeneorService;
-
-    /**
-     * 查询传感器列列表
-     */
-    @SaCheckPermission("data:seneor:list")
-    @GetMapping("/list")
-    public TableDataInfo<TblSeneorVo> list(TblSeneorBo bo, PageQuery pageQuery) {
-        return iTblSeneorService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出传感器列列表
-     */
-    @SaCheckPermission("data:seneor:export")
-    @Log(title = "传感器列", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(TblSeneorBo bo, HttpServletResponse response) {
-        List<TblSeneorVo> list = iTblSeneorService.queryList(bo);
-        ExcelUtil.exportExcel(list, "传感器列", TblSeneorVo.class, response);
-    }
-
-    /**
-     * 获取传感器列详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("data:seneor:query")
-    @GetMapping("/{id}")
-    public R<TblSeneorVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(iTblSeneorService.queryById(id));
-    }
-
-    /**
-     * 新增传感器列
-     */
-    @SaCheckPermission("data:seneor:add")
-    @Log(title = "传感器列", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody TblSeneorBo bo) {
-        return toAjax(iTblSeneorService.insertByBo(bo));
-    }
-
-    /**
-     * 修改传感器列
-     */
-    @SaCheckPermission("data:seneor:edit")
-    @Log(title = "传感器列", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TblSeneorBo bo) {
-        return toAjax(iTblSeneorService.updateByBo(bo));
-    }
-
-    /**
-     * 删除传感器列
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("data:seneor:remove")
-    @Log(title = "传感器列", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(iTblSeneorService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/data/domain/PointData.java

@@ -0,0 +1,18 @@
+package com.ruoyi.data.domain;
+
+import com.ruoyi.data.domain.vo.TblDatapointVo;
+import lombok.Data;
+
+@Data
+public class PointData {
+
+    private String name;
+
+    private String label;
+
+    private String unit;
+
+    private String unitType;
+
+    private TblDatapointVo dataPointInfo;
+}

ruoyi-system/src/main/java/com/ruoyi/data/domain/PointUnit.java

@@ -1,40 +0,0 @@
-package com.ruoyi.data.domain;
-
-import com.ruoyi.data.domain.vo.TblDatapointVo;
-import lombok.Data;
-
-@Data
-public class PointUnit {
-
-    private String name;
-    /**
-     *
-     */
-    private String unitSymbol;
-    /**
-     *
-     */
-    private String unitName;
-    /**
-     *
-     */
-    private String isStandard;
-    /**
-     *
-     */
-    private String unitType;
-    /**
-     *
-     */
-    private Long toStandardRatio;
-    /**
-     *
-     */
-    private Long toOffset;
-    /**
-     *
-     */
-    private String remark;
-
-    private TblDatapointVo pointInfo;
-}

ruoyi-system/src/main/java/com/ruoyi/data/domain/SensorPoint.java

@@ -11,7 +11,7 @@ public class SensorPoint {
 //    private TblSens
     private TblSensorVo tblSensorVo;
 
-    private List<PointUnit> dataPoints;
+    private List<PointData> dataPoints;
 
 }
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblSeneor.java

@@ -1,63 +0,0 @@
-package com.ruoyi.data.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 传感器列对象 tbl_seneor
- *
- * @author ruoyi
- * @date 2023-12-15
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("tbl_seneor")
-public class TblSeneor extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 
-     */
-    @TableId(value = "id")
-    private Long id;
-    /**
-     * 传感器名称
-     */
-    private String name;
-    /**
-     * 传感器编号
-     */
-    private String sn;
-    /**
-     * 设备id
-     */
-    private Long deviceId;
-    /**
-     * 传感器类型
-     */
-    private String sensorType;
-    /**
-     * 协议类型
-     */
-    private Long protocalType;
-    /**
-     * 描述
-     */
-    private String sensorDesc;
-    /**
-     * 状态
-     */
-    private String status;
-    /**
-     * 备注
-     */
-    private String remark;
-
-}

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblSensor.java

@@ -23,7 +23,7 @@ public class TblSensor extends BaseEntity {
     private static final long serialVersionUID=1L;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private Long id;
@@ -60,4 +60,6 @@ public class TblSensor extends BaseEntity {
      */
     private String remark;
 
+    private String datapoints;
+
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblSeneorBo.java

@@ -1,79 +0,0 @@
-package com.ruoyi.data.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 传感器列业务对象 tbl_seneor
- *
- * @author ruoyi
- * @date 2023-12-15
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class TblSeneorBo extends BaseEntity {
-
-    /**
-     * 
-     */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
-    private Long id;
-
-    /**
-     * 传感器名称
-     */
-    @NotBlank(message = "传感器名称不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String name;
-
-    /**
-     * 传感器编号
-     */
-    @NotBlank(message = "传感器编号不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String sn;
-
-    /**
-     * 设备id
-     */
-    @NotNull(message = "设备id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long deviceId;
-
-    /**
-     * 传感器类型
-     */
-    @NotBlank(message = "传感器类型不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String sensorType;
-
-    /**
-     * 协议类型
-     */
-    @NotNull(message = "协议类型不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long protocalType;
-
-    /**
-     * 描述
-     */
-    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String sensorDesc;
-
-    /**
-     * 状态
-     */
-    @NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String status;
-
-    /**
-     * 备注
-     */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String remark;
-
-
-}

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblSensorBo.java

@@ -22,7 +22,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblSensorBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
@@ -42,7 +42,7 @@ public class TblSensorBo extends BaseEntity {
     /**
      * 设备id
      */
-    @NotNull(message = "设备id不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "设备id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long deviceId;
 
     /**
@@ -60,20 +60,22 @@ public class TblSensorBo extends BaseEntity {
     /**
      * 描述
      */
-    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sensorDesc;
 
     /**
      * 状态
      */
-    @NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private String status;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
+    private String datapoints;
+
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblSeneorVo.java

@@ -1,79 +0,0 @@
-package com.ruoyi.data.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 传感器列视图对象 tbl_seneor
- *
- * @author ruoyi
- * @date 2023-12-15
- */
-@Data
-@ExcelIgnoreUnannotated
-public class TblSeneorVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     *
-     */
-    @ExcelProperty(value = "")
-    private Long id;
-
-    /**
-     * 传感器名称
-     */
-    @ExcelProperty(value = "传感器名称")
-    private String name;
-
-    /**
-     * 传感器编号
-     */
-    @ExcelProperty(value = "传感器编号")
-    private String sn;
-
-    /**
-     * 设备id
-     */
-    @ExcelProperty(value = "设备id")
-    private Long deviceId;
-
-    /**
-     * 传感器类型
-     */
-    @ExcelProperty(value = "传感器类型")
-    private String sensorType;
-
-    /**
-     * 协议类型
-     */
-    @ExcelProperty(value = "协议类型")
-    private Long protocalType;
-
-    /**
-     * 描述
-     */
-    @ExcelProperty(value = "描述")
-    private String sensorDesc;
-
-    /**
-     * 状态
-     */
-    @ExcelProperty(value = "状态")
-    private String status;
-
-    /**
-     * 备注
-     */
-    @ExcelProperty(value = "备注")
-    private String remark;
-
-
-}

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblSensorVo.java

@@ -22,7 +22,7 @@ public class TblSensorVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private Long id;
@@ -75,5 +75,9 @@ public class TblSensorVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
-
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "测点表")
+    private String datapoints;
 }

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblSeneorMapper.java

@@ -1,15 +0,0 @@
-package com.ruoyi.data.mapper;
-
-import com.ruoyi.data.domain.TblSeneor;
-import com.ruoyi.data.domain.vo.TblSeneorVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 传感器列Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-15
- */
-public interface TblSeneorMapper extends BaseMapperPlus<TblSeneorMapper, TblSeneor, TblSeneorVo> {
-
-}

ruoyi-system/src/main/java/com/ruoyi/data/service/ITblSeneorService.java

@@ -1,49 +0,0 @@
-package com.ruoyi.data.service;
-
-import com.ruoyi.data.domain.TblSeneor;
-import com.ruoyi.data.domain.vo.TblSeneorVo;
-import com.ruoyi.data.domain.bo.TblSeneorBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 传感器列Service接口
- *
- * @author ruoyi
- * @date 2023-12-15
- */
-public interface ITblSeneorService {
-
-    /**
-     * 查询传感器列
-     */
-    TblSeneorVo queryById(Long id);
-
-    /**
-     * 查询传感器列列表
-     */
-    TableDataInfo<TblSeneorVo> queryPageList(TblSeneorBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询传感器列列表
-     */
-    List<TblSeneorVo> queryList(TblSeneorBo bo);
-
-    /**
-     * 新增传感器列
-     */
-    Boolean insertByBo(TblSeneorBo bo);
-
-    /**
-     * 修改传感器列
-     */
-    Boolean updateByBo(TblSeneorBo bo);
-
-    /**
-     * 校验并批量删除传感器列信息
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblSeneorServiceImpl.java

@@ -1,115 +0,0 @@
-package com.ruoyi.data.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import com.ruoyi.data.domain.bo.TblSeneorBo;
-import com.ruoyi.data.domain.vo.TblSeneorVo;
-import com.ruoyi.data.domain.TblSeneor;
-import com.ruoyi.data.mapper.TblSeneorMapper;
-import com.ruoyi.data.service.ITblSeneorService;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * 传感器列Service业务层处理
- *
- * @author ruoyi
- * @date 2023-12-15
- */
-@RequiredArgsConstructor
-@Service
-public class TblSeneorServiceImpl implements ITblSeneorService {
-
-    private final TblSeneorMapper baseMapper;
-
-    /**
-     * 查询传感器列
-     */
-    @Override
-    public TblSeneorVo queryById(Long id){
-        return baseMapper.selectVoById(id);
-    }
-
-    /**
-     * 查询传感器列列表
-     */
-    @Override
-    public TableDataInfo<TblSeneorVo> queryPageList(TblSeneorBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<TblSeneor> lqw = buildQueryWrapper(bo);
-        Page<TblSeneorVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
-    }
-
-    /**
-     * 查询传感器列列表
-     */
-    @Override
-    public List<TblSeneorVo> queryList(TblSeneorBo bo) {
-        LambdaQueryWrapper<TblSeneor> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
-    }
-
-    private LambdaQueryWrapper<TblSeneor> buildQueryWrapper(TblSeneorBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<TblSeneor> lqw = Wrappers.lambdaQuery();
-        lqw.like(StringUtils.isNotBlank(bo.getName()), TblSeneor::getName, bo.getName());
-        lqw.eq(StringUtils.isNotBlank(bo.getSn()), TblSeneor::getSn, bo.getSn());
-        lqw.eq(bo.getDeviceId() != null, TblSeneor::getDeviceId, bo.getDeviceId());
-        lqw.eq(StringUtils.isNotBlank(bo.getSensorType()), TblSeneor::getSensorType, bo.getSensorType());
-        lqw.eq(bo.getProtocalType() != null, TblSeneor::getProtocalType, bo.getProtocalType());
-        lqw.eq(StringUtils.isNotBlank(bo.getSensorDesc()), TblSeneor::getSensorDesc, bo.getSensorDesc());
-        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), TblSeneor::getStatus, bo.getStatus());
-        return lqw;
-    }
-
-    /**
-     * 新增传感器列
-     */
-    @Override
-    public Boolean insertByBo(TblSeneorBo bo) {
-        TblSeneor add = BeanUtil.toBean(bo, TblSeneor.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
-        }
-        return flag;
-    }
-
-    /**
-     * 修改传感器列
-     */
-    @Override
-    public Boolean updateByBo(TblSeneorBo bo) {
-        TblSeneor update = BeanUtil.toBean(bo, TblSeneor.class);
-        validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
-    }
-
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(TblSeneor entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    /**
-     * 批量删除传感器列
-     */
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return baseMapper.deleteBatchIds(ids) > 0;
-    }
-}

ruoyi-system/src/main/resources/mapper/data/TblSeneorMapper.xml

@@ -1,24 +0,0 @@
-<?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.ruoyi.data.mapper.TblSeneorMapper">
-
-    <resultMap type="com.ruoyi.data.domain.TblSeneor" id="TblSeneorResult">
-        <result property="id" column="id"/>
-        <result property="name" column="name"/>
-        <result property="sn" column="sn"/>
-        <result property="deviceId" column="device_id"/>
-        <result property="sensorType" column="sensor_type"/>
-        <result property="protocalType" column="protocal_type"/>
-        <result property="sensorDesc" column="sensor_desc"/>
-        <result property="status" column="status"/>
-        <result property="remark" column="remark"/>
-        <result property="createTime" column="create_time"/>
-        <result property="createBy" column="create_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="updateBy" column="update_by"/>
-    </resultMap>
-
-
-</mapper>

ruoyi-system/src/main/resources/mapper/data/TblSensorMapper.xml

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createBy" column="create_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
+        <result property="datapoints" column="datapoints"/>
     </resultMap>