bug修复

jjt-biz/src/main/java/com/jjt/biz/service/impl/AlarmRecordServiceImpl.java

@@ -198,7 +198,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
         search.setObjId(objId);
         search.setAlarmType("1");
         List<AlarmRecord> list = selectAlarmRecordList(search);
-        return list.stream().collect(Collectors.toMap(AlarmRecord::getObjMetricsId, Function.identity()));
+        return list.stream().collect(Collectors.toMap(AlarmRecord::getObjMetricsId, Function.identity(), (existing, replacement) -> existing));
     }
 
     /**

jjt-biz/src/main/java/com/jjt/check/service/impl/CheckRecordServiceImpl.java

@@ -12,6 +12,7 @@ import com.jjt.check.service.ICheckRecordDetailService;
 import com.jjt.check.service.ICheckRecordService;
 import com.jjt.check.vo.CheckExportVO;
 import com.jjt.common.utils.IntervalUtil;
+import com.jjt.common.utils.StringUtils;
 import com.jjt.common.utils.bean.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -51,7 +52,7 @@ public class CheckRecordServiceImpl implements ICheckRecordService {
      */
     @Override
     public CheckRecord selectCheckRecordByCrId(Long crId) {
-        CheckRecord cr=new CheckRecord();
+        CheckRecord cr = new CheckRecord();
         if (crId == 0L) {
             cr = checkRecordMapper.selectCheckRecordByLast();
         } else {
@@ -153,10 +154,15 @@ public class CheckRecordServiceImpl implements ICheckRecordService {
                         //平均值
                         BigDecimal total = BigDecimal.ZERO;
                         for (BizObjMetrics om : oms) {
-                            total = total.add(om.getDValue());
+                            if (om.getDValue() != null) {
+                                total = total.add(om.getDValue());
+                            }
                         }
                         BigDecimal avg = total.divide(BigDecimal.valueOf(oms.size()), 2, RoundingMode.HALF_UP);
-                        boolean flag = IntervalUtil.inNumRange(avg.floatValue(), checkConfig.getCheckRule());
+                        boolean flag = false;
+                        if (StringUtils.isNotEmpty(checkConfig.getCheckRule())) {
+                            flag = IntervalUtil.inNumRange(avg.floatValue(), checkConfig.getCheckRule());
+                        }
                         Map<String, String> pair = CheckExportVO.checkV(flag, avg.floatValue(), pos);
                         crd.setResultL(pair.get("left"));
                         crd.setResultR(pair.get("right"));
@@ -166,7 +172,10 @@ public class CheckRecordServiceImpl implements ICheckRecordService {
                     } else {
                         //发现一个就算异常
                         for (BizObjMetrics om : oms) {
-                            boolean flag = IntervalUtil.inNumRange(om.getDValue().floatValue(), checkConfig.getCheckRule());
+                            boolean flag = false;
+                            if (StringUtils.isNotEmpty(checkConfig.getCheckRule()) && om.getDValue() != null) {
+                                flag = IntervalUtil.inNumRange(om.getDValue().floatValue(), checkConfig.getCheckRule());
+                            }
                             Map<String, String> pair = CheckExportVO.checkV(true, 0f, pos);
                             crd.setResultL(pair.get("left"));
                             crd.setResultR(pair.get("right"));

jjt-biz/src/main/java/com/jjt/hl/service/impl/HlEventServiceImpl.java

@@ -151,7 +151,7 @@ public class HlEventServiceImpl implements IHlEventService {
         eventSearch.setObjId(objId);
         eventSearch.setEventStatus("1");
         List<HlEvent> events = selectHlEventList(eventSearch);
-        return events.stream().collect(Collectors.toMap(HlEvent::getObjMetricsId, Function.identity()));
+        return events.stream().collect(Collectors.toMap(HlEvent::getObjMetricsId, Function.identity(), (existing, replacement) -> existing));
     }
 
     /**

jjt-biz/src/main/java/com/jjt/hl/service/impl/HlScoreServiceImpl.java

@@ -268,12 +268,14 @@ public class HlScoreServiceImpl implements IHlScoreService {
                 }
                 //（告警组件数量/总数量 ）*细项分
                 if (eventNum > 0) {
-                    lost = BigDecimal.valueOf(eventNum).divide(BigDecimal.valueOf(total), RoundingMode.HALF_UP).multiply(hlMetrics.getHlScore());
+                    lost = BigDecimal.valueOf(eventNum).divide(BigDecimal.valueOf(total),2, RoundingMode.HALF_UP).multiply(hlMetrics.getHlScore());
                 }
                 //最终得分 = 分数-扣分
                 BigDecimal score2 = BigDecimal.ZERO;
-                if (hlMetrics.getHlScore().compareTo(lost) >= 0) {
-                    score2 = hlMetrics.getHlScore().subtract(lost);
+                if (hlMetrics.getHlScore() != null) {
+                    if (hlMetrics.getHlScore().compareTo(lost) >= 0) {
+                        score2 = hlMetrics.getHlScore().subtract(lost);
+                    }
                 }
                 HlMetricsScore metricsScore = new HlMetricsScore();
                 BeanUtils.copyBeanProp(metricsScore, hlMetrics);

jjt-biz/src/main/java/com/jjt/risk/controller/RiskAnalysisController.java

@@ -13,7 +13,6 @@ import com.jjt.risk.service.IRiskAnalysisService;
 import com.jjt.risk.service.IRiskModelService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -87,6 +86,7 @@ public class RiskAnalysisController extends BaseController {
                 return success();
             }
         } catch (Exception e) {
+            e.printStackTrace();
             return error(e.getMessage());
         }
 

jjt-biz/src/main/java/com/jjt/risk/controller/RiskOtherController.java

@@ -91,7 +91,9 @@ public class RiskOtherController extends BaseController {
                     Map<String, Object> dataMap = new HashMap<>(16);
                     dataMap.put("id", om.getObjMetricsId());
                     dataMap.put("objName", md.getBizObj().getObjName() + "/" + om.getMetricsName());
-                    dataMap.put("value", om.getDValue().floatValue());
+                    if (om.getDValue() != null) {
+                        dataMap.put("value", om.getDValue().floatValue());
+                    }
                     if ("2".equals(config.getRankingBased())) {
                         String sql = "SELECT COUNT(*) num,sum(TIMESTAMPDIFF(MINUTE, alarm_time, ifnull(end_time,SYSDATE()))) times FROM alarm_record WHERE alarm_time BETWEEN ? AND ? and obj_metrics_id=?";
                         Map<String, Object> dMap = jdbcTemplate.queryForMap(sql, begin, end, om.getObjMetricsId());

jjt-biz/src/main/java/com/jjt/risk/service/impl/RiskAnalysisServiceImpl.java

@@ -17,6 +17,7 @@ import com.jjt.risk.mapper.RiskAnalysisMapper;
 import com.jjt.risk.service.IRiskAnalysisService;
 import com.jjt.risk.service.IRiskModelService;
 import com.jjt.system.service.ISysConfigService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -32,6 +33,7 @@ import java.util.stream.Collectors;
  * @date 2024-09-12
  */
 @Service
+@Slf4j
 public class RiskAnalysisServiceImpl implements IRiskAnalysisService {
     @Resource
     private RiskAnalysisMapper riskAnalysisMapper;
@@ -195,7 +197,8 @@ public class RiskAnalysisServiceImpl implements IRiskAnalysisService {
                     List<BizObjMetricsData> currList = dataService.selectBizObjMetricsDataList(currQ);
                     List<BizObjMetricsData> lastList = dataService.selectBizObjMetricsDataList(lastQ);
                     if (lastList.size() == 0) {
-                        throw new RuntimeException("数据量不足2周");
+                        return;
+//                        throw new RuntimeException("数据量不足2周");
                     }
 
 
@@ -204,7 +207,7 @@ public class RiskAnalysisServiceImpl implements IRiskAnalysisService {
                     JSONArray sortArr = new JSONArray();
                     //用于补数据，因为需要本周的长度与上周相等
                     int dataSize = currList.size();
-                    if (lastList.size() > dataSize) {
+                    if (lastList.size() < dataSize) {
                         dataSize = lastList.size();
                     }
 

jjt-common/src/main/java/com/jjt/common/utils/http/HttpUtils.java

@@ -71,12 +71,16 @@ public class HttpUtils {
             }
             log.info("recv - {}", result);
         } catch (ConnectException e) {
+            e.printStackTrace();
             log.error("调用HttpUtils.sendGet ConnectException, url=" + url + ",param=" + param, e);
         } catch (SocketTimeoutException e) {
+            e.printStackTrace();
             log.error("调用HttpUtils.sendGet SocketTimeoutException, url=" + url + ",param=" + param, e);
         } catch (IOException e) {
+            e.printStackTrace();
             log.error("调用HttpUtils.sendGet IOException, url=" + url + ",param=" + param, e);
         } catch (Exception e) {
+            e.printStackTrace();
             log.error("调用HttpsUtil.sendGet Exception, url=" + url + ",param=" + param, e);
         } finally {
             try {
@@ -128,12 +132,16 @@ public class HttpUtils {
             }
             log.info("recv - {}", result);
         } catch (ConnectException e) {
+            e.printStackTrace();
             log.error("调用HttpUtils.sendPost ConnectException, url=" + url + ",obj=" + obj, e);
         } catch (SocketTimeoutException e) {
+            e.printStackTrace();
             log.error("调用HttpUtils.sendPost SocketTimeoutException, url=" + url + ",obj=" + obj, e);
         } catch (IOException e) {
+            e.printStackTrace();
             log.error("调用HttpUtils.sendPost IOException, url=" + url + ",obj=" + obj, e);
         } catch (Exception e) {
+            e.printStackTrace();
             log.error("调用HttpsUtil.sendPost Exception, url=" + url + ",obj=" + obj, e);
         } finally {
             try {
@@ -144,6 +152,7 @@ public class HttpUtils {
                     in.close();
                 }
             } catch (IOException ex) {
+                ex.printStackTrace();
                 log.error("调用in.close Exception, url=" + url + ",obj=" + obj, ex);
             }
         }