修改bug

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

@@ -48,7 +48,7 @@ public class ProjectAuthorityController {
             map.put("isOverdue", false);
         }
         map.put("overdueDate", seconds);
-        map.put("isSwitch", sysSecretProject.getIsSwitch());
+        map.put("isSwitch", sysSecretProject.getIsSwitch().equals(true) ? 1 : 0);
         return R.ok(map);
     }
 

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

@@ -92,11 +92,11 @@ public class SysSecretProjectController extends BaseController {
         int comparisonResult = sysSecretProjectDTO.getOverdueDate().compareTo(currentDate);
         if (comparisonResult > 0) {
             sysSecretProjectDTO.setStatus(1L);
-            sysSecretProjectDTO.setIsSwitch(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.setIsSwitch(1L);
             sysSecretProjectDTO.setStatus(3L);
         }
         return toAjax(sysSecretProjectService.insertSysSecretProject(sysSecretProjectDTO));
@@ -108,6 +108,16 @@ public class SysSecretProjectController extends BaseController {
     @Log(title = "修改项目授权管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SysSecretProjectDTO sysSecretProjectDTO) {
+        if (sysSecretProjectDTO.getAuthorityType().equals("2")) {
+            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.setSecretKey(jwt);
+        }
+
         // 获取当前日期
         LocalDate currentDate = LocalDate.now();
         // 获取当前日期前七天的日期
@@ -115,15 +125,16 @@ public class SysSecretProjectController extends BaseController {
         int comparisonResult = sysSecretProjectDTO.getOverdueDate().compareTo(currentDate);
         if (comparisonResult > 0) {
             sysSecretProjectDTO.setStatus(1L);
-            sysSecretProjectDTO.setIsSwitch(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.setIsSwitch(1L);
             sysSecretProjectDTO.setStatus(3L);
         }
         return toAjax(sysSecretProjectService.updateSysSecretProject(sysSecretProjectDTO));
     }
+
     /**
      * 关闭项目授权管理
      */
@@ -136,7 +147,7 @@ public class SysSecretProjectController extends BaseController {
         LocalDate previousDate = currentDate.minusDays(7);
         sysSecretProjectDTO.setOverdueDate(previousDate);
         sysSecretProjectDTO.setStatus(2L);
-        sysSecretProjectDTO.setIsSwitch(1L);
+//        sysSecretProjectDTO.setIsSwitch(1L);
         RestUtil.get(sysSecretProjectService.selectSysSecretProjectAddress(sysSecretProjectDTO));
         return toAjax(sysSecretProjectService.updateSysSecretProject(sysSecretProjectDTO));
     }

authority-system/src/main/java/com/ruoyi/system/domain/SysSecretProject.java

@@ -48,9 +48,9 @@ public class SysSecretProject extends BaseEntity {
     private String secretKey;
 
     /**
-     * 是否校验授权(1:是；2：否)
+     * 是否校验授权(1:是；0：否)
      */
-    private Long isSwitch;
+    private Boolean isSwitch;
 
     /**
      * 授权认证类型（1：离线认证；2：在线认证；）
@@ -97,11 +97,11 @@ public class SysSecretProject extends BaseEntity {
         return secretKey;
     }
 
-    public void setIsSwitch(Long isSwitch) {
+    public void setIsSwitch(Boolean isSwitch) {
         this.isSwitch = isSwitch;
     }
 
-    public Long getIsSwitch() {
+    public Boolean getIsSwitch() {
         return isSwitch;
     }
 

authority-system/src/main/java/com/ruoyi/system/domain/dto/SysSecretProjectDTO.java

@@ -44,9 +44,9 @@ public class SysSecretProjectDTO extends BaseEntity {
     private String statusText;
 
     /**
-     * 是否校验授权(1:是；2：否)
+     * 是否校验授权(1:是；0：否)
      */
-    private Long isSwitch;
+    private Boolean isSwitch;
 
     private Boolean value;
     /**
@@ -83,11 +83,11 @@ public class SysSecretProjectDTO extends BaseEntity {
         return statusText;
     }
 
-    public void setIsSwitch(Long isSwitch) {
+    public void setIsSwitch(Boolean isSwitch) {
         this.isSwitch = isSwitch;
     }
 
-    public Long getIsSwitch() {
+    public Boolean getIsSwitch() {
         return isSwitch;
     }
 

authority-system/src/main/java/com/ruoyi/system/service/impl/SysSecretProjectServiceImpl.java

@@ -92,11 +92,11 @@ public class SysSecretProjectServiceImpl implements ISysSecretProjectService {
 
     @Override
     public int updateIsSwitch(SysSecretProjectDTO sysSecretProjectDTO) {
-        if (sysSecretProjectDTO.getIsSwitch().equals(1L)) {
-            sysSecretProjectDTO.setIsSwitch(2L);
-        } else {
-            sysSecretProjectDTO.setIsSwitch(1L);
-        }
+//        if (sysSecretProjectDTO.getIsSwitch().equals(1L)) {
+//            sysSecretProjectDTO.setIsSwitch(2L);
+//        } else {
+//            sysSecretProjectDTO.setIsSwitch(1L);
+//        }
         return sysSecretProjectMapper.updateIsSwitch(sysSecretProjectDTO);
     }
 }

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

@@ -41,11 +41,12 @@
           <dict-tag :options="dict.type.sys_is_status" :value="scope.row.authorityType"/>
         </template>
       </el-table-column>
-      <el-table-column label="是否校验授权" align="center" prop="value">
+      <el-table-column label="是否校验授权" align="center" prop="isSwitch">
         <template slot-scope="scope">
           <el-switch
+            v-if="scope.row.authorityType==1"
             @change="switchChange(scope.row.isSwitch,scope.row.id)"
-            v-model="form.isSwitch"
+            v-model="scope.row.isSwitch"
             active-color="#13ce66"
             inactive-color="#ff4949">
           </el-switch>
@@ -53,13 +54,13 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdate(scope.row)"-->
-<!--          >修改-->
-<!--          </el-button>-->
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-edit"-->
+          <!--            @click="handleUpdate(scope.row)"-->
+          <!--          >修改-->
+          <!--          </el-button>-->
           <el-button
             size="mini"
             type="text"
@@ -71,6 +72,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            v-if="scope.row.authorityType==1"
             @click="handleClose(scope.row)"
           >关闭授权
           </el-button>
@@ -251,9 +253,6 @@ export default {
       this.loading = true;
       listSecret(this.queryParams).then(response => {
         this.secretList = response.rows;
-        this.secretList.forEach(item => {
-          this.form.isSwitch = item.isSwitch == 1 ? true : false
-        })
         this.total = response.total;
         this.loading = false;
       });