Ver código fonte

feat(environment-hj212-service): 新增小时数据接口并修改分钟数据和实时数据接口

- 新增 HourDataInfoController 类,实现小时数据的分页查询和条件查询
- 修改 MinuteDataInfoController 和 PsMonitorSzController 的接口名称,使其更符合实际业务含义
- 注释掉 ServerHandler 中的测试代码
林仔 1 ano atrás
pai
commit
2bdee2661e

+ 2 - 2
environment-hj212-service/src/main/java/com/zksy/environmentHJ212/config/ServerHandler.java

@@ -36,13 +36,13 @@ public class ServerHandler extends ChannelInboundHandlerAdapter {
         /**
          * 往客户端发送消息
          */
-        String helo = "QN=20250530141057223;ST=32;CN=2031;PW=123456;MN=0152316A279055;Flag=5;CP=&&BeginTime=20250529000000;EndTime=20250530000000&&";
+        /*String helo = "QN=20250530141057223;ST=32;CN=2031;PW=123456;MN=0152316A279055;Flag=5;CP=&&BeginTime=20250529000000;EndTime=20250530000000&&";
         ByteBuf byteBuf = Unpooled.wrappedBuffer(helo.getBytes());
         ctx.channel().writeAndFlush(byteBuf);
         System.out.println("首次连接完成!"+byteBuf);
         String helo2 = "QN=20250530141057223;ST=32;CN=2031;PW=123456;MN=1234567901234;Flag=5;CP=&&BeginTime=20250529000000;EndTime=20250530000000&&";
         ByteBuf byteBuf3 = Unpooled.wrappedBuffer(helo2.getBytes());
-        ctx.channel().writeAndFlush(byteBuf3);
+        ctx.channel().writeAndFlush(byteBuf3);*/
     }
 
     /**

+ 45 - 0
environment-hj212-service/src/main/java/com/zksy/environmentHJ212/controller/HourDataInfoController.java

@@ -0,0 +1,45 @@
+package com.zksy.environmentHJ212.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.common.core.domain.Result;
+import com.zksy.common.utils.SearchUtil;
+import com.zksy.environmentHJ212.domain.HourDataInfo;
+import com.zksy.environmentHJ212.domain.po.MinuteDataInfo;
+import com.zksy.environmentHJ212.service.HourDataInfoService;
+import com.zksy.environmentHJ212.service.MinuteDataInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project zksy-iot-service
+ * @description HJ212小时数据
+ * @date 2025/5/6 16:51:27
+ */
+@RestController
+@RequestMapping("/minuteDataInfo")
+@Api(tags = "环境小时数据", description = "环境小时数据")
+public class HourDataInfoController {
+    @Autowired
+    private HourDataInfoService service;
+
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "分页查询")
+    public Result getHourDataDataPage(long pageNum, long pageSize, String conditionJson) throws Exception {
+        Page<HourDataInfo> page = service.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(page);
+    }
+    @GetMapping("/getAll")
+    @ApiOperation(value = "查询所有")
+    public Result getAllByConditionJson(String conditionJson) throws Exception {
+        List<HourDataInfo> list = service.list(SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(list);
+    }
+}

+ 2 - 2
environment-hj212-service/src/main/java/com/zksy/environmentHJ212/controller/MinuteDataInfoController.java

@@ -18,7 +18,7 @@ import java.util.List;
  * @author Administrator
  * @version 1.0
  * @project zksy-iot-service
- * @description 倾斜角度变送器数据
+ * @description HJ212分钟数据
  * @date 2025/5/6 16:51:27
  */
 @RestController
@@ -30,7 +30,7 @@ public class MinuteDataInfoController {
 
     @GetMapping("/findByPage")
     @ApiOperation(value = "分页查询")
-    public Result getGasTransmitterDataPage(long pageNum, long pageSize, String conditionJson) throws Exception {
+    public Result getMinuteDataPage(long pageNum, long pageSize, String conditionJson) throws Exception {
         Page<MinuteDataInfo> page = service.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
         return Result.ok(page);
     }

+ 2 - 2
environment-hj212-service/src/main/java/com/zksy/environmentHJ212/controller/PsMonitorSzController.java

@@ -20,7 +20,7 @@ import java.util.List;
  * @author Administrator
  * @version 1.0
  * @project zksy-iot-service
- * @description 倾斜角度变送器数据
+ * @description HJ212实时数据
  * @date 2025/5/6 16:51:27
  */
 @RestController
@@ -32,7 +32,7 @@ public class PsMonitorSzController {
 
     @GetMapping("/findByPage")
     @ApiOperation(value = "分页查询")
-    public Result getGasTransmitterDataPage(long pageNum, long pageSize, String conditionJson) throws Exception {
+    public Result getPsMonitorSzPage(long pageNum, long pageSize, String conditionJson) throws Exception {
         Page<PsMonitorSz> page = service.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
         return Result.ok(page);
     }