修改算法服务

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/forward/vo/AlgorithmWarningVo.java

@@ -0,0 +1,36 @@
+package com.zd.algorithm.api.forward.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+/***
+ * <p>识别返回参数</p>
+ *
+ * @author linft
+ * @date 6/16/2023
+ * @version 3.0
+ */
+@Data
+public class AlgorithmWarningVo implements Serializable {
+
+    private static final long serialVersionUID = -6807148872001305307L;
+
+    @ApiModelProperty("id")
+    private Long id;
+
+    @ApiModelProperty("日志id")
+    private Long logId;
+
+    @ApiModelProperty("原始图")
+    private String originalImage;
+
+    @ApiModelProperty("识别后")
+    private String resultImage;
+
+    @ApiModelProperty("状态")
+    private Boolean state;
+
+    @ApiModelProperty("是否预警")
+    private Boolean isAlert;
+}

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/serivce/impl/AlgorithmServiceImpl.java

@@ -1,6 +1,5 @@
 package com.zd.alg.forward.serivce.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.zd.alg.forward.config.AlgorithmYml;
 import com.zd.alg.forward.domain.AlgorithmResponseResult;
@@ -90,6 +89,8 @@ public class AlgorithmServiceImpl implements AlgorithmService {
                 vo.setOriginalImage(fileUrl);
                 vo.setResultImage(algorithm.getAlgorithmResult());
                 vo.setIsAlert(responseResult.getIsPass());
+                Boolean State = (responseResult.getObjects() != null && responseResult.getObjects().size() > 0) ? Boolean.TRUE : Boolean.FALSE;
+                vo.setState(State);
                 return vo;
             }
         }
@@ -154,7 +155,6 @@ public class AlgorithmServiceImpl implements AlgorithmService {
      */
     @Override
     public AlgorithmResponseResult getResponseResult(ImgPostResponse<AnalysisReturnData> send) {
-        log.info("【算法响应数据】==============>>>>{}",JSON.toJSONString(send));
         AlgorithmResponseResult responseResult = new AlgorithmResponseResult();
         if (send != null) {
             responseResult.setCode(send.getStatus_code());

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/RedisExpiredPhotographListener.java

@@ -151,7 +151,6 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                 //algorithmWarningVo.setId(warningNoticeLog.getId());
                 //==========================test code 算法调用 默认返回异常假数据=========================
 
-
                 WarningDetail warningDetail = new WarningDetail();
                 warningDetail.setLogId(warningNoticeLog.getId());
                 warningDetail.setSubId(warningNoticeLog.getSubId());

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/WarningNoticeLogServiceImpl.java

@@ -96,7 +96,7 @@ public class WarningNoticeLogServiceImpl extends ServiceImpl<WarningNoticeLogMap
         WarningConfig warningConfig = warningConfigService.getOne(new LambdaQueryWrapper<WarningConfig>().eq(WarningConfig::getWarningType, 1));
         Optional.ofNullable(labSubjects).orElseGet(Collections::emptyList).stream().forEach(LabOnlineSubVO -> {
             //异常识别频率
-            Long frequency = 10L;
+            Long frequency = 30L;
             //异常再识别数
             Integer anomalyCount = warningConfig.getAnomalyCount();
             WarningNoticeLog warningNoticeLog = new WarningNoticeLog();