增加推送原始数据、历史数据、实时数据基础接口

application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java

@@ -76,7 +76,7 @@ public class ThingsboardSecurityConfiguration extends WebSecurityConfigurerAdapt
     public static final String CODE_BASED_LOGIN_ENTRY_POINT = "/api/yt/auth/code/login";
     public static final String[] YT_NOT_AUTH_API = new String[]{"/api/yt/auth/code/login","/api/yt/third/bind","/api/yt/third/login/*"
             ,"/api/yt/third/login/id/*", "/api/yt/third/authorize","/api/yt/platform/get","/api/yt/app_design/get", "/api/yt/noauth/**"
-            , "/api/yt/device/list", "/api/test/**", "/api/yt/nxRescueCar/**"};
+            , "/api/yt/device/list", "/api/test/**", "/api/yt/nxRescueCar/**","/api/scadaDeviceData/**","/api/scadaHistory/**","/api/scadaMonitor/**"};
 
     public static final String PUBLIC_LOGIN_ENTRY_POINT = "/api/auth/login/public";
     public static final String TOKEN_REFRESH_ENTRY_POINT = "/api/auth/token";

application/src/main/java/org/thingsboard/server/controller/nanxi/ScadaDeviceDataController.java

@@ -0,0 +1,100 @@
+package org.thingsboard.server.controller.nanxi;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.domain.BaseOutput;
+import org.thingsboard.server.domain.ScadaDeviceData;
+import org.thingsboard.server.service.nanxi.ScadaDeviceDataService;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author hs
+ * @date 2023-05-17
+ *
+ * @description
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/scadaDeviceData")
+@Api(value = "scadaDeviceData", tags = "物联网推送数据模块")
+public class ScadaDeviceDataController {
+
+    @Resource
+    private ScadaDeviceDataService scadaDeviceDataService;
+
+    /**
+     * 分页查询
+     * @param scadaDeviceData 分页对象
+     * @return IPage
+     */
+    @ApiOperation(value = "分页查询", notes = "分页查询")
+    @GetMapping("/page")
+    public BaseOutput<Page<ScadaDeviceData>> pageList(Page page, @ModelAttribute ScadaDeviceData scadaDeviceData) {
+        return BaseOutput.success(scadaDeviceDataService.page(page, Wrappers.query(scadaDeviceData)));
+    }
+
+
+    /**
+     * 列表查询
+     */
+    @ApiOperation(value = "列表查询", notes = "列表查询")
+    @GetMapping("/list")
+    public BaseOutput<List<ScadaDeviceData>> pageList(@ModelAttribute ScadaDeviceData scadaDeviceData) {
+        return BaseOutput.success(scadaDeviceDataService.list(Wrappers.query(scadaDeviceData)));
+    }
+
+    /**
+     * 通过id查询
+     * @param id id
+     * @return Result
+     */
+    @ApiOperation(value = "通过id获取", notes = "通过id获取")
+    @GetMapping("/{id}")
+    public BaseOutput<ScadaDeviceData> getById(@PathVariable Integer id) {
+        return BaseOutput.success(scadaDeviceDataService.getById(id));
+    }
+
+    /**
+     * 新增
+     * @param scadaDeviceData
+     * @return Result
+     */
+    @ApiOperation(value = "新增", notes = "新增")
+    @PostMapping
+    public BaseOutput save(@RequestBody ScadaDeviceData scadaDeviceData) {
+        return scadaDeviceDataService.save(scadaDeviceData) ? BaseOutput.successMsg("添加成功") : BaseOutput.failure("添加失败");
+
+    }
+
+    /**
+     * 修改
+     * @param ScadaDeviceData
+     * @return Result
+     */
+    @ApiOperation(value = "修改", notes = "修改")
+    @PutMapping
+    public BaseOutput updateById(@RequestBody ScadaDeviceData scadaDeviceData) {
+        return scadaDeviceDataService.updateById(scadaDeviceData) ? BaseOutput.successMsg("修改成功") : BaseOutput.failure("修改失败");
+
+    }
+
+    /**
+     * 通过id删除
+     * @param id id
+     * @return Result
+     */
+    @ApiOperation(value = "通过id删除", notes = "通过id删除")
+    @DeleteMapping("/{id}")
+    public BaseOutput removeById(@PathVariable Integer id) {
+        return scadaDeviceDataService.removeById(id) ? BaseOutput.successMsg("删除成功") : BaseOutput.failure("删除失败");
+    }
+}
+
+

application/src/main/java/org/thingsboard/server/controller/nanxi/ScadaHistoryController.java

@@ -0,0 +1,99 @@
+package org.thingsboard.server.controller.nanxi;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.domain.BaseOutput;
+import org.thingsboard.server.domain.ScadaHistory;
+import org.thingsboard.server.service.nanxi.ScadaHistoryService;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author Mu
+ * @date 2023-05-15
+ *
+ * @description
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/scadaHistory")
+@Api(value = "scadaHistory", tags = "历史数据模块")
+public class ScadaHistoryController {
+
+    @Resource
+    private ScadaHistoryService scadaHistoryService;
+
+    /**
+     * 分页查询
+     * @param scadaHistory 分页对象
+     * @return IPage
+     */
+    @ApiOperation(value = "分页查询", notes = "分页查询")
+    @GetMapping("/page")
+    public BaseOutput<Page<ScadaHistory>> pageList(Page page, @ModelAttribute ScadaHistory scadaHistory) {
+        return BaseOutput.success(scadaHistoryService.page(page, Wrappers.query(scadaHistory)));
+    }
+
+
+    /**
+     * 列表查询
+     */
+    @ApiOperation(value = "列表查询", notes = "列表查询")
+    @GetMapping("/list")
+    public BaseOutput<List<ScadaHistory>> pageList(@ModelAttribute ScadaHistory scadaHistory) {
+        return BaseOutput.success(scadaHistoryService.list(Wrappers.query(scadaHistory)));
+    }
+
+    /**
+     * 通过id查询
+     * @param id id
+     * @return Result
+     */
+    @ApiOperation(value = "通过id获取", notes = "通过id获取")
+    @GetMapping("/{id}")
+    public BaseOutput<ScadaHistory> getById(@PathVariable Integer id) {
+        return BaseOutput.success(scadaHistoryService.getById(id));
+    }
+
+    /**
+     * 新增
+     * @param scadaHistory
+     * @return Result
+     */
+    @ApiOperation(value = "新增", notes = "新增")
+    @PostMapping
+    public BaseOutput save(@RequestBody ScadaHistory scadaHistory) {
+        return scadaHistoryService.save(scadaHistory) ? BaseOutput.successMsg("添加成功") : BaseOutput.failure("添加失败");
+
+    }
+
+    /**
+     * 修改
+     * @param scadaHistory
+     * @return Result
+     */
+    @ApiOperation(value = "修改", notes = "修改")
+    @PutMapping
+    public BaseOutput updateById(@RequestBody ScadaHistory scadaHistory) {
+        return scadaHistoryService.updateById(scadaHistory) ? BaseOutput.successMsg("修改成功") : BaseOutput.failure("修改失败");
+
+    }
+
+    /**
+     * 通过id删除
+     * @param id id
+     * @return Result
+     */
+    @ApiOperation(value = "通过id删除", notes = "通过id删除")
+    @DeleteMapping("/{id}")
+    public BaseOutput removeById(@PathVariable Integer id) {
+        return scadaHistoryService.removeById(id) ? BaseOutput.successMsg("删除成功") : BaseOutput.failure("删除失败");
+    }
+}
+
+

application/src/main/java/org/thingsboard/server/controller/nanxi/ScadaMonitorController.java

@@ -0,0 +1,99 @@
+package org.thingsboard.server.controller.nanxi;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.domain.BaseOutput;
+import org.thingsboard.server.domain.ScadaMonitor;
+import org.thingsboard.server.service.nanxi.ScadaMonitorService;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author Mu
+ * @date 2023-05-15
+ *
+ * @description
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/scadaMonitor")
+@Api(value = "scadaMonitor", tags = "实时数据管理模块")
+public class ScadaMonitorController {
+
+    @Resource
+    private ScadaMonitorService scadaMonitorService;
+
+    /**
+     * 分页查询
+     * @param scadaMonitor 分页对象
+     * @return IPage
+     */
+    @ApiOperation(value = "分页查询", notes = "分页查询")
+    @GetMapping("/page")
+    public BaseOutput<Page<ScadaMonitor>> pageList(Page page, @ModelAttribute ScadaMonitor scadaMonitor) {
+        return BaseOutput.success(scadaMonitorService.page(page, Wrappers.query(scadaMonitor)));
+    }
+
+
+    /**
+     * 列表查询
+     */
+    @ApiOperation(value = "列表查询", notes = "列表查询")
+    @GetMapping("/list")
+    public BaseOutput<List<ScadaMonitor>> pageList(@ModelAttribute ScadaMonitor scadaMonitor) {
+        return BaseOutput.success(scadaMonitorService.list(Wrappers.query(scadaMonitor)));
+    }
+
+    /**
+     * 通过id查询
+     * @param id id
+     * @return Result
+     */
+    @ApiOperation(value = "通过id获取", notes = "通过id获取")
+    @GetMapping("/{id}")
+    public BaseOutput<ScadaMonitor> getById(@PathVariable Integer id) {
+        return BaseOutput.success(scadaMonitorService.getById(id));
+    }
+
+    /**
+     * 新增
+     * @param scadaMonitor
+     * @return Result
+     */
+    @ApiOperation(value = "新增", notes = "新增")
+    @PostMapping
+    public BaseOutput save(@RequestBody ScadaMonitor scadaMonitor) {
+        return scadaMonitorService.save(scadaMonitor) ? BaseOutput.successMsg("添加成功") : BaseOutput.failure("添加失败");
+
+    }
+
+    /**
+     * 修改
+     * @param scadaMonitor
+     * @return Result
+     */
+    @ApiOperation(value = "修改", notes = "修改")
+    @PutMapping
+    public BaseOutput updateById(@RequestBody ScadaMonitor scadaMonitor) {
+        return scadaMonitorService.updateById(scadaMonitor) ? BaseOutput.successMsg("修改成功") : BaseOutput.failure("修改失败");
+
+    }
+
+    /**
+     * 通过id删除
+     * @param id id
+     * @return Result
+     */
+    @ApiOperation(value = "通过id删除", notes = "通过id删除")
+    @DeleteMapping("/{id}")
+    public BaseOutput removeById(@PathVariable Integer id) {
+        return scadaMonitorService.removeById(id) ? BaseOutput.successMsg("删除成功") : BaseOutput.failure("删除失败");
+    }
+}
+
+

application/src/main/java/org/thingsboard/server/domain/ScadaHistory.java

@@ -26,7 +26,7 @@ import java.util.Objects;
 @NoArgsConstructor
 @KeySequence(value = "scada_history")
 @TableName(value = "scada_history", resultMap = "ScadaHistoryMap")
-@ApiModel(value = "ScadaHistory对象", description = "存储历史值")
+@ApiModel(value = "ScadaHistory对象", description = "历史数据表")
 public class ScadaHistory extends Model<ScadaHistory> implements Serializable {
 
     private static final long serialVersionUID = -72437169083884867L;

application/src/main/resources/mapper/ScadaMonitorMapper.xml

@@ -5,7 +5,7 @@
     <resultMap type="org.thingsboard.server.domain.ScadaMonitor" id="scadaMonitorMap">
         <result property="id" column="ID" jdbcType="INTEGER"/>
         <result property="code" column="CODE" jdbcType="VARCHAR"/>
-        <result property="bz" column="VALUE" jdbcType="VARCHAR"/>
+        <result property="bz" column="BZ" jdbcType="VARCHAR"/>
         <result property="value" column="VALUE" jdbcType="VARCHAR"/>
         <result property="scadaTime" column="SCADA_TIME" jdbcType="TIMESTAMP"/>
         <result property="updateTime" column="UPDATE_TIME" jdbcType="TIMESTAMP"/>