From 7ef593e1e3c35aaeecf9318f0b3941230d3ed002 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 09 十月 2024 11:22:54 +0800
Subject: [PATCH] 增加在数据点计算规则后数据点名称加_n的适配
---
collect/src/main/java/com/qianwen/mdc/collect/controller/CollectTestController.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/controller/CollectTestController.java b/collect/src/main/java/com/qianwen/mdc/collect/controller/CollectTestController.java
index 478fa7b..a88977d 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/controller/CollectTestController.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/controller/CollectTestController.java
@@ -1,4 +1,5 @@
package com.qianwen.mdc.collect.controller;
+import java.util.Arrays;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@@ -7,15 +8,22 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.qianwen.mdc.collect.config.IotDBSessionConfig;
+import com.qianwen.mdc.collect.dto.CalendarShiftInfoDTO;
import com.qianwen.mdc.collect.entity.iotdb.Output;
import com.qianwen.mdc.collect.entity.iotdb.ProcessParam;
import com.qianwen.mdc.collect.mapper.iotdb.OutputMapper;
import com.qianwen.mdc.collect.mapper.iotdb.ProcessParamMapper;
+import com.qianwen.mdc.collect.mapper.mgr.CalendarMapper;
import com.qianwen.mdc.collect.mqtt.MqttMessageSender;
+import com.qianwen.mdc.collect.service.DeviceStateFixPointService;
import com.qianwen.mdc.collect.service.IOTMqttReceiveService;
import com.qianwen.mdc.collect.service.IotDBCommonService;
import com.qianwen.mdc.collect.service.OutputAggregateService;
import com.qianwen.mdc.collect.utils.redis.RedisUtil;
+
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
@RestController
public class CollectTestController {
@@ -37,6 +45,11 @@
private OutputMapper outmapper;
@Autowired
private RedisUtil redisUtil;
+ @Autowired
+ private DeviceStateFixPointService fpService;
+
+ @Autowired
+ private CalendarMapper calendarMapper;
@GetMapping("/last")
public Object last() {
@@ -56,4 +69,17 @@
redisUtil.hset("workstation-appid-map", "174", 1656819188967653378L);
return 1;
}
+
+ @GetMapping("/fixpoint")
+ public Object fixpoint() {
+ //DateTime dateTime = DateTime.now().offset(DateField.DAY_OF_MONTH, 1);//+1澶╋紝鍗虫槑澶╃殑鏁版嵁
+ DateTime dateTime = DateTime.now();
+ fpService.deviceStateFixPoint(dateTime, null);
+ return 1;
+ }
+ @GetMapping("/shift")
+ public Object shift() {
+ Long val = calendarMapper.t1();
+ return val;
+ }
}
--
Gitblit v1.9.3