修改

authority-admin/src/main/java/com/ruoyi/web/controller/system/SysSecretProjectController.java

@@ -84,24 +84,15 @@ public class SysSecretProjectController extends BaseController {
         // 获取当前日期
         LocalDate currentDate = LocalDate.now();
         // 获取当前日期前七天的日期
-        LocalDate previousDate = currentDate.minusDays(7);
+        LocalDate previousDate = sysSecretProjectDTO.getOverdueDate().minusDays(7);
         long milliseconds = Duration.between(LocalDateTime.now(), sysSecretProjectDTO.getOverdueDate().atStartOfDay()).toMillis();
         JSONObject json = new JSONObject();
         json.set("projectId", sysSecretProjectDTO.getProjectId());
         json.set("projectName", sysSecretProjectDTO.getProjectName());
         json.set("overdueDate", sysSecretProjectDTO.getOverdueDate());
-        String jwt = JWTExample.createJWT(json.toString(), milliseconds,sysSecretProjectDTO.getMacAddress());
+        String jwt = JWTExample.createJWT(json.toString(), milliseconds, sysSecretProjectDTO.getMacAddress());
         sysSecretProjectDTO.setSecretKey(jwt);
-        int comparisonResult = sysSecretProjectDTO.getOverdueDate().compareTo(currentDate);
-        if (comparisonResult > 0) {
-            sysSecretProjectDTO.setStatus(1L);
-//            sysSecretProjectDTO.setIsSwitch(1L);
-        } else if (comparisonResult < 0) {
-            sysSecretProjectDTO.setStatus(2L);
-        } else if (sysSecretProjectDTO.getOverdueDate().isAfter(previousDate) && sysSecretProjectDTO.getOverdueDate().isBefore(currentDate)) {
-//            sysSecretProjectDTO.setIsSwitch(1L);
-            sysSecretProjectDTO.setStatus(3L);
-        }
+        compareToDate(sysSecretProjectDTO, currentDate, previousDate);
         return toAjax(sysSecretProjectService.insertSysSecretProject(sysSecretProjectDTO));
     }
 
@@ -118,25 +109,30 @@ public class SysSecretProjectController extends BaseController {
             json.set("projectId", sysSecretProjectDTO.getProjectId());
             json.set("projectName", sysSecretProjectDTO.getProjectName());
             json.set("overdueDate", sysSecretProjectDTO.getOverdueDate());
-            String jwt = JWTExample.createJWT(json.toString(), milliseconds,sysSecretProjectDTO.getMacAddress());
+            String jwt = JWTExample.createJWT(json.toString(), milliseconds, sysSecretProjectDTO.getMacAddress());
             sysSecretProjectDTO.setSecretKey(jwt);
         }
 
         // 获取当前日期
         LocalDate currentDate = LocalDate.now();
-        // 获取当前日期前七天的日期
-        LocalDate previousDate = currentDate.minusDays(7);
+        // 获取过期日期前七天的日期
+        LocalDate previousDate = sysSecretProjectDTO.getOverdueDate().minusDays(7);
+        compareToDate(sysSecretProjectDTO, currentDate, previousDate);
+        return toAjax(sysSecretProjectService.updateSysSecretProject(sysSecretProjectDTO));
+    }
+
+
+    private void compareToDate(@RequestBody SysSecretProjectDTO sysSecretProjectDTO, LocalDate currentDate, LocalDate previousDate) {
         int comparisonResult = sysSecretProjectDTO.getOverdueDate().compareTo(currentDate);
-        if (comparisonResult > 0) {
+        if (currentDate.isAfter(previousDate) && currentDate.isBefore(sysSecretProjectDTO.getOverdueDate())) {
+//            sysSecretProjectDTO.setIsSwitch(1L);
+            sysSecretProjectDTO.setStatus(3L);
+        } else if (comparisonResult > 0) {
             sysSecretProjectDTO.setStatus(1L);
 //            sysSecretProjectDTO.setIsSwitch(1L);
-        } else if (comparisonResult < 0) {
+        } else {
             sysSecretProjectDTO.setStatus(2L);
-        } else if (sysSecretProjectDTO.getOverdueDate().isAfter(previousDate) && sysSecretProjectDTO.getOverdueDate().isBefore(currentDate)) {
-//            sysSecretProjectDTO.setIsSwitch(1L);
-            sysSecretProjectDTO.setStatus(3L);
         }
-        return toAjax(sysSecretProjectService.updateSysSecretProject(sysSecretProjectDTO));
     }
 
     /**

authority-ui/src/views/authority/secret/index.vue

@@ -136,6 +136,7 @@
         <el-form-item label="MAC地址" prop="macAddress" style="width: 360px">
           <el-input v-model="form.macAddress" placeholder="请输入MAC地址"></el-input>
         </el-form-item>
+        <h style="padding: 90px">MAC地址必须以-分隔，且英文必须为大写</h>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>