合并分支 'master' 到 'dev'

dev-library/src/main/java/com/tykj/dev/device/library/service/DeviceLibraryCacheService.java

@@ -3,7 +3,6 @@ package com.tykj.dev.device.library.service;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * DATE:2021-8-11
@@ -24,4 +23,7 @@ public interface DeviceLibraryCacheService {
      */
     List<DeviceLibrary> findByIds(List<Integer> ids);
 
+
+    void deletAllDeviceLibraryList();
+
 }

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/CacheLibraryServiceImpl.java

@@ -3,9 +3,10 @@ package com.tykj.dev.device.library.service.impl;
 import com.tykj.dev.device.library.repository.DeviceLibraryDao;
 import com.tykj.dev.device.library.service.DeviceLibraryCacheService;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
-import jdk.nashorn.internal.ir.IfNode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
@@ -55,4 +56,12 @@ public class CacheLibraryServiceImpl implements DeviceLibraryCacheService {
         );
         return libraryList;
     }
+
+    @Override
+    @CacheEvict(key = "'device'",allEntries=true)
+    public void deletAllDeviceLibraryList() {
+//        long l = System.currentTimeMillis();
+//        List<DeviceLibrary> all = deviceLibraryDao.findAll();
+//        System.out.println("更新缓存时间"+(System.currentTimeMillis()-l));
+    }
 }

dev-library/src/main/java/com/tykj/dev/device/library/task/DevideTask.java

@@ -22,6 +22,7 @@ public class DevideTask {
     @Scheduled(cron = "30 * * * * ? ")
     private void signUpDeadline() {
         log.info("定时device更新缓存开始");
+        deviceLibraryCacheService.deletAllDeviceLibraryList();
         deviceLibraryCacheService.getAllDeviceLibraryList();
         log.info("定时device更新缓存结束");
     }