Merge branch 'cirs-biz-branch' of http://47.108.150.237:10000/allen/cirs into cirs-biz-branch

cirs-biz/src/main/java/com/cirs/biz/controller/SysTrainController.java

@@ -182,6 +182,7 @@ public class SysTrainController extends BaseController
 
             objectMap.put("modelPath", modelPath);
             // 发送请求
+            // todo wangruilin uri 应该是一个全地址+端口，这个地址可以通过数据字典配置和获取
             Mono<String> mono = webClient
                     .post() // POST 请求
                     .uri("/posts")  // 请求路径
@@ -192,7 +193,7 @@ public class SysTrainController extends BaseController
 
 
             mono.subscribe(result -> {
-                System.out.println(result);
+                logger.info(result);
             });
             //接下来就传入算法即可
 //            System.out.println(JSON.toJSONString(objectMap));
@@ -220,6 +221,7 @@ public class SysTrainController extends BaseController
             objectMap.put("result5Id",recommend_args.getResult5Id());
             //接下来就传入算法
 //            System.out.println(JSON.toJSONString(objectMap));
+            // todo wangruilin uri 应该是一个全地址+端口，这个地址可以通过数据字典配置和获取
             Mono<String> mono = webClient
                     .post() // POST 请求
                     .uri("/posts")  // 请求路径
@@ -230,6 +232,7 @@ public class SysTrainController extends BaseController
 
 
             mono.subscribe(result -> {
+                // // todo wangruilin 改成logger
                 System.out.println(result);
             });
             //暂时赋值

cirs-biz/src/main/java/com/cirs/biz/controller/TVerificationTaskDetailController.java

@@ -169,6 +169,7 @@ public class TVerificationTaskDetailController extends BaseController
     public AjaxResult train(Long taskid,String modelPath) {
 
         try {
+            // todo wangruilin 后续测试的日志可以删除
             System.out.println(taskid);
             System.out.println(modelPath);
             getComponentIds(taskid);
@@ -179,6 +180,7 @@ public class TVerificationTaskDetailController extends BaseController
             }
             objectMap.put("dataSet", dataset);
             objectMap.put("modelPath", modelPath);
+            // todo wangruilin uri应该还有个全地址的链接和端口号，比如192.168.1.2:8080/verification
             // 发送请求
             Mono<String> mono = webClient
                     .post() // POST 请求
@@ -190,9 +192,11 @@ public class TVerificationTaskDetailController extends BaseController
 
             AjaxResult res = new AjaxResult();
             Object result = mono.block();
+            // todo wangruilin result 在这块没必要给用户返回
             res.put("data",result);
             res.put("msg","任务"+taskid+"验证算法调用成功");
             res.put("code",200);
+            // todo System.out.println System.out.println应该使用logger框架替换
             System.out.println(result);//返回值有accuracyRate和recallRate属性
             return res;
 

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

@@ -116,21 +116,6 @@ public class TVerificationTaskDetailServiceImpl implements ITVerificationTaskDet
 
     @Override
     public String importTaskDetail(List<TVerificationTaskDetail> taskDetailList, boolean updateSupport, String operName, String fileName) {
-//        // todo WangRunLin refactor code
-//        String msg = null;
-//        // 1 new a task and insert
-//        TVerificationTask task = new TVerificationTask();
-//        // 添加taskName createBy createTime等信息,taskName 使用文件名称，文件名称应该在导入的MultipartFile里能获取到
-//        task.setTaskName("fileName");
-//        tVerificationTaskMapper.insertTVerificationTask(task);
-//        // 2 loop taskDetailList
-//        for (TVerificationTaskDetail taskDetail : taskDetailList) {
-//            taskDetail.setTaskId(task.getId());
-//            tVerificationTaskDetailMapper.insertTVerificationTaskDetail(taskDetail);
-//        }
-//        return msg;
-
-
         if (StringUtils.isNull(taskDetailList) || taskDetailList.size() == 0)
         {
             throw new ServiceException("导入任务数据不能为空！");
@@ -145,8 +130,6 @@ public class TVerificationTaskDetailServiceImpl implements ITVerificationTaskDet
         task.setCreateBy(operName);//setCreateBy(operName)
         task.setTaskStatus("未运行");
 
-        // todo taskName 使用文件名称，文件名称应该在导入的MultipartFile里能获取到
-//                task.setTaskName("undefined");
         task.setTaskName(fileName);
         task.setCreateTime(new Date());