From a33c33d48c2c16995130b825355b6883be4eb159 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 02 九月 2024 15:26:41 +0800
Subject: [PATCH] 加入定时任务,启动时打固定点 ,并且加入工位数据缓存

---
 collect/src/main/java/com/qianwen/mdc/collect/runner/InitRunner.java |   48 +++++++++++++++++++++++++++---------------------
 1 files changed, 27 insertions(+), 21 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..ea12d69 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,18 +1,10 @@
 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 com.qianwen.mdc.collect.service.DeviceStateFixPointService;
+import org.springframework.beans.factory.annotation.Autowired;
 /*
 import com.qianwen.core.redis.lock.RedisLock;
 import com.qianwen.posting.cache.TimeSliceCache;
@@ -25,21 +17,34 @@
 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 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;
 
 
     public void run(ApplicationArguments args) throws Exception {
-    	/*
+    	//鐢熸垚鏃堕棿鍒囩墖
         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 +52,19 @@
         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 <= 0) {
+            log.info("宸ヤ綅鏈墦杩囧浐瀹氱偣,鍚姩鏃舵墦鐐�....... ");
             //this.workStationStateFixPointService.workStationStateFixPoint(dateTime, null);
             stateFixPointService.deviceStateFixPoint(dateTime, null);
-            return;
+        }else {
+        	log.info("宸ヤ綅宸插瓨鍦ㄥ浐瀹氱偣");
         }
-        log.info("宸ヤ綅宸插瓨鍦ㄥ浐瀹氱偣");
     }
 }

--
Gitblit v1.9.3