Эх сурвалжийг харах

fix bugs and add log for catch

allen 1 жил өмнө
parent
commit
e57d8f274f

+ 1 - 10
cirs-biz/src/main/java/com/cirs/biz/controller/FactoryScoreController.java

@@ -154,7 +154,6 @@ public class FactoryScoreController extends BaseController
 
             objectMap.put("modelPath", model_path);
             // 发送请求
-            // todo wangruilin uri 应该是一个全地址+端口,这个地址可以通过数据字典配置和获取
             Mono<String> mono = webClient
                     .post() // POST 请求
                     .uri(train_uri)  // 请求路径
@@ -168,7 +167,6 @@ public class FactoryScoreController extends BaseController
             logger.info(res);
 
             //接下来就传入算法即可
-//            System.out.println(JSON.toJSONString(objectMap));
             AjaxResult result = new AjaxResult();
             result.put("msg","成功");
             result.put("data",res);
@@ -176,7 +174,7 @@ public class FactoryScoreController extends BaseController
             return result;
 
         } catch (Exception e) {
-
+            logger.error("训练失败", e);
             return error("训练失败");
         }
     }
@@ -211,15 +209,8 @@ public class FactoryScoreController extends BaseController
             JSONObject object = jsonObject.getJSONObject("data").getJSONObject("dataSet");
             TMarkingrecord markingrecord = JSONObject.parseObject(object.toJSONString(),TMarkingrecord.class);
             tMarkingrecordService.updateTMarkingrecord(markingrecord);
-            // // todo wangruilin 改成logger
             logger.info(res);
-
-//            AjaxResult result = new AjaxResult();
-//            result.put("msg","成功");
-//            result.put("data",res);
-//            result.put("code",200);
             if(jsonObject.getIntValue("code")!=200){
-
                 throw new Exception();
             }
             return success(jsonObject.getString("msg"));

+ 1 - 3
cirs-biz/src/main/java/com/cirs/biz/controller/SysTrainController.java

@@ -239,9 +239,8 @@ public class SysTrainController extends BaseController
             objectMap.put("result3Id",recommend_args.getResult3Id());
             objectMap.put("result4Id",recommend_args.getResult4Id());
             objectMap.put("result5Id",recommend_args.getResult5Id());
+            logger.info("request payload: {}",JSON.toJSONString(objectMap));
             //接下来就传入算法
-//            System.out.println(JSON.toJSONString(objectMap));
-            // todo wangruilin uri 应该是一个全地址+端口,这个地址可以通过数据字典配置和获取
             Mono<String> mono = webClient
                     .post() // POST 请求
                     .uri(recommend_uri)  // 请求路径
@@ -251,7 +250,6 @@ public class SysTrainController extends BaseController
                     .bodyToMono(String.class); //响应数据类型转换
 
                 String res = mono.block();
-                // // todo wangruilin 改成logger
                 logger.info(res);
             AjaxResult result = new AjaxResult();
             result.put("data",res);

+ 2 - 4
cirs-biz/src/main/java/com/cirs/biz/controller/TVerificationScoretaskDetailController.java

@@ -167,6 +167,7 @@ public class TVerificationScoretaskDetailController extends BaseController
             List<TVerificationScoretaskDetail> dataset = tVerificationScoretaskDetailService.getByscoretaskid(taskid);
             objectMap.put("dataSet", dataset);
             objectMap.put("modelPath", model_path);
+            logger.info("request payload: {}", JSON.toJSONString(objectMap));
             // 发送请求
             Mono<String> mono = WebClientUtils.createWebClient()
                     .post() // POST 请求
@@ -189,7 +190,6 @@ public class TVerificationScoretaskDetailController extends BaseController
             List<TVerificationScoretaskDetail> dataSet = JSONArray.parseArray(jsonArray.toJSONString(),TVerificationScoretaskDetail.class);
             tVerificationScoretaskService.updateTVerificationScoretask(task);
             updateDetails(dataSet);
-//            System.out.println(result);
             logger.info(result);
 
             if(jsonObject.getIntValue("code")!=200){
@@ -197,10 +197,8 @@ public class TVerificationScoretaskDetailController extends BaseController
                 throw new Exception();
             }
             return success(jsonObject.getString("msg"));
-//            return success(returndata);
-
-//            return success("任务"+taskid+"验证算法调用成功");
         } catch (Exception e) {
+            logger.info("任务"+taskid+"验证算法调用失败",e);
             task.setTaskStatus("运行失败");
             tVerificationScoretaskService.updateTVerificationScoretask(task);
             return error("任务"+taskid+"验证算法调用失败");

+ 2 - 13
cirs-biz/src/main/java/com/cirs/biz/controller/TVerificationTaskDetailController.java

@@ -9,6 +9,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 
+import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.cirs.biz.domain.*;
@@ -186,25 +187,13 @@ public class TVerificationTaskDetailController extends BaseController
             String model_path = DictUtils.getDictValue("biz_algorithm_config","model_path");
             String verification_uri = DictUtils.getDictValue("biz_algorithm_config","verification_uri");
 
-
-//            logger.info(taskid.toString());
-//            System.out.println(taskid);
-
-//            getComponentIds(taskid);
             Map<String, Object> objectMap=new HashMap<>();
             List<VerificationData> dataset = tVerificationTaskDetailService.getComponentids(taskid);//id就是taskdetail的id,由此更新相应的taskdetail
-//            for(int i=0;i<dataset.size();i++){
-//                dataset.get(i).setId((long)(i+1));
-//            }
 
             objectMap.put("dataSet", dataset);
             objectMap.put("modelPath", model_path);
-            // 创建一个 ObjectMapper 实例
-//            ObjectMapper objectMapper = new ObjectMapper();
+            logger.info("request payload: {}", JSON.toJSONString(objectMap));
 
-// 将对象转换为 JSON 字符串
-//            String json = objectMapper.writeValueAsString(objectMap);
-//            logger.info("post json: {}", json);
             // 发送请求
             Mono<String> mono = webClient
                     .post() // POST 请求

+ 2 - 2
cirs-biz/src/main/java/com/cirs/biz/service/impl/TVerificationTaskDetailServiceImpl.java

@@ -212,8 +212,8 @@ public class TVerificationTaskDetailServiceImpl implements ITVerificationTaskDet
 
     @Override
     public Long setComponentId(String result) {
-        String[] attrs = result.split("-");//切割不同属性
-        return tVerificationTaskDetailMapper.getComponentId(attrs[0], attrs.length >= 2 ? attrs[1] : null, attrs.length >= 3 ? attrs[2] : null);
+//        String[] attrs = result.split("-");//切割不同属性
+        return tVerificationTaskDetailMapper.getComponentId(result, null, null);
     }
 
     @Override