合并分支 'dev' 到 'master'

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java

@@ -724,29 +724,30 @@ public class DeviceCheckController {
         updateLink.setStatId(billId);
         linkRepo.save(updateLink);
 
-        if (billId == 18 && type == 7) {
-
-            List<LinkExamDetail> leDetail = linkVo.getLeDetail();
-            List<LinkExamDetail> newLeDetail = new ArrayList<>(13);
-            newLeDetail.set(0, leDetail.get(0));
-            newLeDetail.set(1, leDetail.get(12));
-            newLeDetail.set(2, leDetail.get(13));
-            newLeDetail.set(3, leDetail.get(7));
-            newLeDetail.set(4, leDetail.get(4));
-            newLeDetail.set(5, leDetail.get(5));
-            newLeDetail.set(6, leDetail.get(8));
-            newLeDetail.set(7, leDetail.get(6));
-            newLeDetail.set(8, leDetail.get(10));
-            newLeDetail.set(9, leDetail.get(11));
-            newLeDetail.set(10, leDetail.get(3));
-            newLeDetail.set(11, leDetail.get(9));
-            newLeDetail.set(12, leDetail.get(1));
-            newLeDetail.set(13, leDetail.get(2));
-            linkVo.setLeDetail(newLeDetail);
-
-            return ResponseEntity.ok(linkVo);
-
-        }
+//        if (billId == 18 && type == 7) {
+//            // 适配2021年5月老数据的排序问题
+//
+//            List<LinkExamDetail> leDetail = linkVo.getLeDetail();
+//            List<LinkExamDetail> newLeDetail = new ArrayList<>(14);
+//            newLeDetail.set(0, leDetail.get(0));
+//            newLeDetail.set(1, leDetail.get(12));
+//            newLeDetail.set(2, leDetail.get(13));
+//            newLeDetail.set(3, leDetail.get(7));
+//            newLeDetail.set(4, leDetail.get(4));
+//            newLeDetail.set(5, leDetail.get(5));
+//            newLeDetail.set(6, leDetail.get(8));
+//            newLeDetail.set(7, leDetail.get(6));
+//            newLeDetail.set(8, leDetail.get(10));
+//            newLeDetail.set(9, leDetail.get(11));
+//            newLeDetail.set(10, leDetail.get(3));
+//            newLeDetail.set(11, leDetail.get(9));
+//            newLeDetail.set(12, leDetail.get(1));
+//            newLeDetail.set(13, leDetail.get(2));
+//            linkVo.setLeDetail(newLeDetail);
+//
+//            return ResponseEntity.ok(linkVo);
+//
+//        }
 
         return ResponseEntity.ok(linkVo);
 

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更新缓存结束");
+    }
+}