hanzhiwei пре 2 година
родитељ
комит
477c0028a9

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

@@ -154,7 +154,7 @@ public class AlgorithmServiceImpl implements AlgorithmService {
      */
      */
     @Override
     @Override
     public AlgorithmResponseResult getResponseResult(ImgPostResponse<AnalysisReturnData> send) {
     public AlgorithmResponseResult getResponseResult(ImgPostResponse<AnalysisReturnData> send) {
-        log.info("【算法响应数据】==============>>>> \n" + JSON.toJSONString(send));
+        log.info("【算法响应数据】==============>>>>{}",JSON.toJSONString(send));
         AlgorithmResponseResult responseResult = new AlgorithmResponseResult();
         AlgorithmResponseResult responseResult = new AlgorithmResponseResult();
         if (send != null) {
         if (send != null) {
             responseResult.setCode(send.getStatus_code());
             responseResult.setCode(send.getStatus_code());

+ 3 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/WarningNoticeLogController.java

@@ -66,6 +66,9 @@ public class WarningNoticeLogController extends AbstractController {
         if(queryWarningLogParam.getWarningType() != null && queryWarningLogParam.getWarningType() != 0){
         if(queryWarningLogParam.getWarningType() != null && queryWarningLogParam.getWarningType() != 0){
             queryWrapper.eq(WarningNoticeLog::getWarningType, queryWarningLogParam.getWarningType());
             queryWrapper.eq(WarningNoticeLog::getWarningType, queryWarningLogParam.getWarningType());
         }
         }
+        if(queryWarningLogParam.getWarningType() != null && queryWarningLogParam.getWarningType() == 0){
+            queryWrapper.ne(WarningNoticeLog::getWarningType, 4);
+        }
         if(queryWarningLogParam.getWarningStartTime() != null && queryWarningLogParam.getWarningEndTime() != null){
         if(queryWarningLogParam.getWarningStartTime() != null && queryWarningLogParam.getWarningEndTime() != null){
             queryWrapper.between(WarningNoticeLog::getWarningTime, queryWarningLogParam.getWarningStartTime(),queryWarningLogParam.getWarningEndTime());
             queryWrapper.between(WarningNoticeLog::getWarningTime, queryWarningLogParam.getWarningStartTime(),queryWarningLogParam.getWarningEndTime());
         }
         }