重建索引

doc-admin/src/main/java/com/doc/task/DocIndexTask.java

@@ -34,9 +34,10 @@ public class DocIndexTask {
                 server.copyTo();
                 double cpuUsed = server.getCpu().getUsed();
                 double memUsed = server.getMem().getUsed();
+                double jvmUsed = server.getJvm().getUsed();
                 double limit = 80d;
-                if (cpuUsed > limit || memUsed > limit) {
-                    //如果cpu或者内存使用率超过80，则退出任务，等待下次执行
+                if (cpuUsed > limit || memUsed > limit || jvmUsed > limit) {
+                    //如果cpu或者内存或者jvm内存使用率超过80，则退出任务，等待下次执行
                     return;
                 }
 

doc-biz/src/main/java/com/doc/biz/service/impl/DocInfoServiceImpl.java

@@ -79,8 +79,6 @@ public class DocInfoServiceImpl implements IDocInfoService {
         if (StringUtils.isNotEmpty(info.getFileId())) {
             elasticSearchService.save(info);
         }
-        //改变空间容量
-        spaceService.updateUsedCap(info.getSpaceId());
     }
 
     /**
@@ -158,8 +156,9 @@ public class DocInfoServiceImpl implements IDocInfoService {
                 elasticSearchService.save(docInfo);
             }
         }
+
         //改变空间容量
-        spaceService.updateUsedCap(docInfo.getSpaceId());
+        spaceService.changeUsedCap(docInfo.getSpaceId(), docInfo.getFileSize());
         return i;
     }
 
@@ -202,17 +201,11 @@ public class DocInfoServiceImpl implements IDocInfoService {
      */
     @Override
     public int deleteDocInfoByDocIds(Long[] docIds) {
-        List<Long> spaceIds = new ArrayList<>();
+        int i = 1;
         for (Long docId : docIds) {
-            DocInfo docInfo = selectDocInfoByDocId(docId);
-            spaceIds.add(docInfo.getSpaceId());
-        }
-        int i = docInfoMapper.deleteDocInfoByDocIds(docIds);
-        //改变空间容量
-        for (Long spaceId : spaceIds) {
-            spaceService.updateUsedCap(spaceId);
+            i = i & deleteDocInfoByDocId(docId);
         }
-        return i;
+        return 1;
     }
 
     /**
@@ -226,8 +219,7 @@ public class DocInfoServiceImpl implements IDocInfoService {
         DocInfo docInfo = selectDocInfoByDocId(docId);
         int i = docInfoMapper.deleteDocInfoByDocId(docId);
         //改变空间容量
-        spaceService.updateUsedCap(docInfo.getSpaceId());
-
+        spaceService.changeUsedCap(docInfo.getSpaceId(), 0 - docInfo.getFileSize());
         return i;
     }