合并分支 'dev' 到 'master'

dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryController.java

@@ -438,9 +438,10 @@ public class DeviceLibraryController {
         Boolean hasTypeDim = deviceLibrarySelectVo.getTypeDim() != null;
 
         Map<String,Object> map = new HashMap<>();
+        List<DeviceLibrary> resultList = deviceLibraryService.getList(deviceLibrarySelectVo);
+//        List<DeviceLibrary> resultList = new ArrayList<>();
+//        resultList = deviceLibraryService.getAlldevList(deviceLibrarySelectVo);
 //        List<DeviceLibrary> resultList = deviceLibraryService.getList(deviceLibrarySelectVo);
-        List<DeviceLibrary> resultList = new ArrayList<>();
-        resultList = deviceLibraryService.getAlldevList(deviceLibrarySelectVo);
 
         resultList.forEach(DeviceLibrary::setConfigName);
 

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

-//package com.tykj.dev.device.library.task;
-//
-//import com.tykj.dev.device.library.service.DeviceLibraryCacheService;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.scheduling.annotation.Scheduled;
-//import org.springframework.stereotype.Service;
-//
-///**
-// * @author zjm
-// * @version 1.0.0
-// * @ClassName TrainTask.java
-// * @Description 培训定时任务 主要是 判断报名截止以及培训开始、培训结束
-// * @createTime 2020年08月17日 23:20:00
-// */
-//@Service
-//@Slf4j
-//public class DevideTask {
-//    @Autowired
-//    DeviceLibraryCacheService deviceLibraryCacheService;
-//
-//    @Scheduled(cron = "30 * * * * ? ")
-//    private void signUpDeadline() {
-//        log.info("定时device更新缓存开始");
-//        deviceLibraryCacheService.deletAllDeviceLibraryList();
-//        deviceLibraryCacheService.getAllDeviceLibraryList();
-//        log.info("定时device更新缓存结束");
-//    }
-//}
+package com.tykj.dev.device.library.task;
+
+import com.tykj.dev.device.library.service.DeviceLibraryCacheService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName TrainTask.java
+ * @Description 培训定时任务 主要是 判断报名截止以及培训开始、培训结束
+ * @createTime 2020年08月17日 23:20:00
+ */
+@Service
+@Slf4j
+public class DevideTask {
+    @Autowired
+    DeviceLibraryCacheService deviceLibraryCacheService;
+
+    @Scheduled(cron = "30 * * * * ? ")
+    private void signUpDeadline() {
+        log.info("定时device更新缓存开始");
+        deviceLibraryCacheService.deletAllDeviceLibraryList();
+        deviceLibraryCacheService.getAllDeviceLibraryList();
+        log.info("定时device更新缓存结束");
+    }
+}