Merge branch 'master' of http://192.168.1.43:3000/git/sass-lab-distributed-java

zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/CheckService.java

@@ -93,19 +93,16 @@ public class CheckService {
      * 合并检查 三合一套餐
      */
     public R checkAndCommit(Long id, MultipartFile file, Long subId) {
-        logger.info("===============1.进入方法=================");
         try {
             int alarmNum = 0;
             //========= 请求超时验证部分开始 ===========
             //600 则代表退出验证流程 需要重新刷卡
             R<Long> fail = getObjectR(id);
-            logger.info("===============1================={}", fail);
             if (fail.getCode() != 200) {
                 return fail;
             }
             //根据实验室id查询检查项
             R<Map<Object, Object>> subject = laboratoryService.getCheckInfo(subId);
-            logger.info("===============2================={}", subject);
             if (subject.getCode() != 200) {
                 return subject;
             }
@@ -124,7 +121,6 @@ public class CheckService {
             if (StringUtils.isNotNull(labCheckCountObj)) {
                 labCheckCount = String.valueOf(labCheckCountObj);
             }
-            logger.info("########{}########", labCheckCount);
             String labCheckIn = String.valueOf(labCheckInObj);
             String[] checkItem = labCheckIn.split(",");
             for (String code : checkItem) {
@@ -132,12 +128,14 @@ public class CheckService {
                 AlgorithmYml.CheckValid checkValid = algorithmYml.getCheckValid(Integer.valueOf(code));
                 MultiValueMap<String, Object> params = getStringObjectMultiValueMap(checkValid, String.valueOf(id));
                 HttpEntity<MultiValueMap<String, Object>> files = getHttpEntityMap(file, params);
+                logger.info("===============4=================");
                 ImgPostResponse<DataPostAnalysisRespDto> send = HttpUtils.send(restTemplateLocal, files, algorithmYml);
                 if (send == null || send.getStatus_code() != 1000) {
                     assert send != null;
                     logger.error(send.getMessage());
                     return R.fail("算法服务错误，请重试！");
                 }
+                logger.info("===============5=================");
                 R algorithm = saveAlgorithm(send, checkValid);
                 if (algorithm.getCode() != 200) return algorithm;
                 DataPostAnalysisRespDto data = send.getData();
@@ -146,7 +144,6 @@ public class CheckService {
                 Map<String, Object> algorithmData = (Map<String, Object>) result.get("algorithm_data");
                 Map<String, Object> modelResult = (Map<String, Object>) result.get("model_data");
                 List<Map<String, Object>> objects = (List<Map<String, Object>>) modelResult.get("objects");
-                logger.info("============{}============", data);
                 logger.info("============算法请求日志打印：算法ID：{},请求结果：{}", code, algorithmData.getOrDefault("is_alert", ""));
                 //通过的
                 if (algorithmData.getOrDefault("is_alert", "").toString().equals("false") && !objects.isEmpty()) {