Browse Source

更新redis配置

shaohongbo 3 years ago
parent
commit
6493c05336

+ 0 - 2
src/main/java/com/persagy/apm/diagnose/feign/client/CenterMiddlewareClient.java

@@ -25,6 +25,4 @@ public interface CenterMiddlewareClient {
     @PostMapping(value = "/hisdata/queryPeriodData")
     public String queryPeriodData(@RequestBody Map<String, Object> requestMap);
 
-
-    
 }

+ 29 - 16
src/main/java/com/persagy/apm/diagnose/indicatorrecord/service/impl/MonitorIndicatorRecordServiceImpl.java

@@ -276,16 +276,22 @@ public class MonitorIndicatorRecordServiceImpl extends ServiceImpl<MonitorIndica
             // 获取不到锁,略过
             return new AsyncResult<>("【监测指标数据计算线程】项目:" + projectDTO.getProjectId() + "被占用");
         }
-        long start = System.currentTimeMillis();
-        AsyncResult<String> projectDTO1 = computeProjectIndicatorData(projectDTO, projectIndicatorCompute);
-        if (projectDTO1 != null) {
-            return projectDTO1;
-        }
-        // 释放锁
-        lockUtil.unlock(projectDTO.getProjectId(), String.valueOf(time));
-        latch.countDown();
-        long end = System.currentTimeMillis();
-        return new AsyncResult<>("【监测指标数据计算线程】计算项目指标数据用时:" + projectDTO.getProjectId() + ";" + (end - start));
+        try{
+            long start = System.currentTimeMillis();
+            AsyncResult<String> projectDTO1 = computeProjectIndicatorData(projectDTO, projectIndicatorCompute);
+            if (projectDTO1 != null) {
+                return projectDTO1;
+            }
+            // 释放锁
+            long end = System.currentTimeMillis();
+            return new AsyncResult<>("【监测指标数据计算线程】计算项目指标数据用时:" + projectDTO.getProjectId() + ";" + (end - start));
+        }catch (Exception e){
+            throw(e);
+        }finally {
+            lockUtil.unlock(projectDTO.getProjectId(), String.valueOf(time));
+            latch.countDown();
+        }
+
     }
 
     private AsyncResult<String> computeProjectIndicatorData(ProjectDTO projectDTO, ProjectIndicatorCompute projectIndicatorCompute) throws Exception {
@@ -368,11 +374,18 @@ public class MonitorIndicatorRecordServiceImpl extends ServiceImpl<MonitorIndica
             // 获取不到锁,略过
             return new AsyncResult<>("发送指标数据:项目:" + projectDTO.getProjectId() + "被占用");
         }
-        sendIndicatorDataToAlarmServer(projectDTO);
-        // 释放锁
-        lockUtil.unlock(projectDTO.getProjectId() + "_sendData", String.valueOf(time));
-        latch.countDown();
-        return new AsyncResult<>("Task2 accomplished!");
+        try{
+            long start = System.currentTimeMillis();
+            sendIndicatorDataToAlarmServer(projectDTO);
+            long end = System.currentTimeMillis();
+            return new AsyncResult<>("【监测指标数据计算线程】计算项目指标数据用时:" + projectDTO.getProjectId() + ";" + (end - start));
+        }catch (Exception e){
+            throw(e);
+        }finally {
+            lockUtil.unlock(projectDTO.getProjectId() + "_sendData", String.valueOf(time));
+            latch.countDown();
+        }
+
     }
 
     private void sendIndicatorDataToAlarmServer(ProjectDTO projectDTO) throws Exception {
@@ -598,7 +611,7 @@ public class MonitorIndicatorRecordServiceImpl extends ServiceImpl<MonitorIndica
             QueryAlarmConfigDTO queryAlarmConfigDTO = new QueryAlarmConfigDTO();
             queryAlarmConfigDTO.setProjectId(projectId);
             queryAlarmConfigDTO.setGroupCode("WD");
-            queryAlarmConfigDTO.setCategory(Collections.singletonList("run"));
+            queryAlarmConfigDTO.setCategory(Collections.singletonList("Eqdx"));
             queryAlarmConfigDTO.setOpen(1);
             DmpResult<List<AlarmConfigItem>> configItemResult = alarmConfigService.query(queryAlarmConfigDTO);
             itemList = DmpResultUtil.getData(configItemResult);

+ 6 - 3
src/main/java/com/persagy/apm/diagnose/service/ComputeIndicatorDataService.java

@@ -61,12 +61,14 @@ public class ComputeIndicatorDataService {
         Map<String, ProjectIndicatorCompute> projectIdAndProjectCompute = projectIndicatorComputeService.getProjectIdAndProjectCompute();
 
         List<Future<String>> futureList = new ArrayList<>();
-        CountDownLatch latch = new CountDownLatch(projectDTOList.size());
+//        CountDownLatch latch = new CountDownLatch(projectDTOList.size());
+        CountDownLatch latch = new CountDownLatch(1);
         for (ProjectDTO projectDTO : projectDTOList) {
             if (!projectDTO.getProjectId().equals("Pj1101060001")) {
                 continue;
             }
-            futureList.add(monitorIndicatorRecordService.computeIndicatorData(projectDTO, projectIdAndProjectCompute.get(projectDTO.getProjectId()), latch));
+            Future<String> stringFuture = monitorIndicatorRecordService.computeIndicatorData(projectDTO, projectIdAndProjectCompute.get(projectDTO.getProjectId()), latch);
+            futureList.add(stringFuture);
         }
         //等待所有任务执行完
         latch.await();
@@ -86,7 +88,8 @@ public class ComputeIndicatorDataService {
             return;
         }
         List<Future<String>> futureList = new ArrayList<>();
-        CountDownLatch latch = new CountDownLatch(projectDTOList.size());
+//        CountDownLatch latch = new CountDownLatch(projectDTOList.size());
+        CountDownLatch latch = new CountDownLatch(1);
         for (ProjectDTO projectDTO : projectDTOList) {
             if (!projectDTO.getProjectId().equals("Pj1101051029")||!projectDTO.getProjectId().equals("Pj1101051029")) {
                 continue;

+ 1 - 1
src/main/java/com/persagy/apm/diagnose/service/schedule/SendIndicatorData.java

@@ -28,6 +28,6 @@ public class SendIndicatorData {
     	    return;
 		}
         log.info("【发送监测指标数据线程】:发送指标数据开始.......");
-        computeIndicatorDataService.sendIndicatorData();
+//        computeIndicatorDataService.sendIndicatorData();
     }
 }