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/runner/InitRunner.java | 65 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/runner/InitRunner.java b/collect/src/main/java/com/qianwen/mdc/collect/runner/InitRunner.java
index 7a07f9f..4bc3d32 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/runner/InitRunner.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/runner/InitRunner.java
@@ -1,45 +1,48 @@
package com.qianwen.mdc.collect.runner;
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateTime;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.Sets;
-import java.lang.invoke.SerializedLambda;
import java.time.LocalDate;
-import javax.annotation.Resource;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.qianwen.mdc.collect.service.DeviceStateFixPointService;
-/*
-import com.qianwen.core.redis.lock.RedisLock;
-import com.qianwen.posting.cache.TimeSliceCache;
-import com.qianwen.posting.dto.CacheBuildDTO;
-import com.qianwen.posting.entity.tdengine.WorkstationState;
-import com.qianwen.posting.mapper.tdengine.WorkstationStateMapper;
-import com.qianwen.posting.service.IWorkstationStateFixPointService;
-*/
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
+import com.google.common.collect.Sets;
+import com.qianwen.mdc.collect.cache.TimeSliceCache;
+import com.qianwen.mdc.collect.dto.CacheBuildDTO;
+import com.qianwen.mdc.collect.mapper.iotdb.DeviceStateMapper;
+import com.qianwen.mdc.collect.service.DeviceStateFixPointService;
+import com.qianwen.mdc.collect.service.WorkstationAppMappingService;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateTime;
+
@Component
public class InitRunner implements ApplicationRunner {
private static final Logger log = LoggerFactory.getLogger(InitRunner.class);
- @Resource
+
+ @Autowired
private DeviceStateFixPointService stateFixPointService;
- //@Resource
- //private WorkstationStateMapper workstationStateMapper;
-
-
+ @Autowired
+ private TimeSliceCache timeSliceCache;
+ @Autowired
+ private DeviceStateMapper deviceStateMapper;
+ @Autowired
+ private WorkstationAppMappingService mappingService;;
+
+ @Override
public void run(ApplicationArguments args) throws Exception {
- /*
+
+ mappingService.saveToCache();
+
+ //鐢熸垚鏃堕棿鍒囩墖
CacheBuildDTO cacheBuildDTO = CacheBuildDTO.builder().tenantIds(Sets.newHashSet(new String[]{"000000"})).targetDate(LocalDate.now()).build();
- TimeSliceCache.build(cacheBuildDTO);
+ timeSliceCache.build(cacheBuildDTO);
+
checkNeedStateFixPoint();
- */
}
//@RedisLock("posting:lock:initStateFixPoint")
@@ -47,18 +50,20 @@
DateTime dateTime = DateTime.now();
log.info("杩涘叆绋嬪簭鍚姩鏍￠獙鏄惁瀛樺湪宸ヤ綅鎵撹繃鍥哄畾鐐�....... ");
+ Long count = deviceStateMapper.fixPointCountByDate(Integer.valueOf(DatePattern.PURE_DATE_FORMAT.format(dateTime)));
/*
Long result = this.workstationStateMapper.selectCount(Wrappers.<WorkstationState>lambdaQuery()
.eq(WorkstationState::getFactoryDate, Integer.valueOf(DatePattern.PURE_DATE_FORMAT.format(dateTime)))
.eq(WorkstationState::getIsFixPoint, Boolean.TRUE));
*/
- Long result = 1L;
- if (result == null || result.longValue() <= 0) {
- log.info("宸ヤ綅鏈墦杩囧浐瀹氱偣....... ");
+ //Long result = 1L;
+ if(count == null || count == 0) {
+ //if (count <= 0) {
+ log.info("璁惧鏈墦杩囬敋鐐�,鍚姩鏃舵墦鐐�....... ");
//this.workStationStateFixPointService.workStationStateFixPoint(dateTime, null);
stateFixPointService.deviceStateFixPoint(dateTime, null);
- return;
+ }else {
+ log.info("璁惧宸插瓨鍦ㄩ敋鐐�");
}
- log.info("宸ヤ綅宸插瓨鍦ㄥ浐瀹氱偣");
}
}
--
Gitblit v1.9.3