机构版-迭代

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/api/OrganizationApi.java

@@ -2,6 +2,7 @@ package cn.com.qmth.stmms.ms.admin.api;
 
 import cn.com.qmth.stmms.ms.admin.service.OrganizationService;
 import cn.com.qmth.stmms.ms.commons.utils.specification.PagingAndSortingDTO;
+import cn.com.qmth.stmms.ms.core.cache.CacheService;
 import cn.com.qmth.stmms.ms.core.domain.Organization;
 import cn.com.qmth.stmms.ms.core.domain.user.MarkUser;
 import cn.com.qmth.stmms.ms.core.domain.user.Role;
@@ -33,6 +34,9 @@ public class OrganizationApi {
     @Autowired
     private MarkUserRepo markUserRepo;
 
+    @Autowired
+    CacheService cacheService;
+
     /**
      * 机构管理列表
      *
@@ -85,7 +89,14 @@ public class OrganizationApi {
         if (markUser != null) {
             markUser.setEnabled(!markUser.isEnabled());
         }
-        return markUserRepo.save(markUser);
+        markUserRepo.save(markUser);
+
+        // 禁用，强制下线
+        if(!markUser.isEnabled()){
+            cacheService.deleteTokenCache(markUser.getId().toString());
+        }
+
+        return markUser;
     }
 
     /**

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/api/UserApi.java

@@ -2,6 +2,7 @@ package cn.com.qmth.stmms.ms.admin.api;
 
 import cn.com.qmth.stmms.ms.admin.dto.MarkUserDTO;
 import cn.com.qmth.stmms.ms.commons.web.PageableDTO;
+import cn.com.qmth.stmms.ms.core.cache.CacheService;
 import cn.com.qmth.stmms.ms.core.domain.MarkLog;
 import cn.com.qmth.stmms.ms.core.domain.MarkStage;
 import cn.com.qmth.stmms.ms.core.domain.MarkSubject;
@@ -55,6 +56,9 @@ public class UserApi {
     @Autowired
     MarkerAssembler markerAssembler;
 
+    @Autowired
+    CacheService cacheService;
+
     @RequestMapping(value = "{userId}", method = RequestMethod.DELETE)
     public void remove(@PathVariable Long userId) {
         long count = markTaskRepo.countByMarkerId(userId);
@@ -267,6 +271,10 @@ public class UserApi {
         MarkUser markUser = markUserRepo.findOne(userId);
         markUser.setEnabled(enable);
         markUserRepo.saveAndFlush(markUser);
+        // 禁用，强制下线
+        if(!enable){
+            cacheService.deleteTokenCache(userId.toString());
+        }
         return new ResponseEntity(HttpStatus.OK);
     }