修改方法名称

src/main/java/com/fdkankan/scene/controller/SceneMarkShapeController.java

@@ -91,11 +91,11 @@ public class SceneMarkShapeController extends BaseController
         return ResultData.ok();
     }
     /**
-     * 将需要重新推理的场景推入到队列
+     * 将需要训练的场景推入到队列
      */
-    @PostMapping("/reDetectScene")
-    public ResultData reDetectScene(@RequestBody @Validated SceneMarkShapeReDetectParamVO param) {
-        sceneMarkShapeService.reDetectScene(param);
+    @PostMapping("/trainScene")
+    public ResultData trainScene(@RequestBody @Validated SceneMarkShapeReDetectParamVO param) {
+        sceneMarkShapeService.trainScene(param);
         return ResultData.ok();
     }
     /**
@@ -103,7 +103,7 @@ public class SceneMarkShapeController extends BaseController
      */
     @PostMapping("/editReDetectStatus")
     public ResultData editReDetectStatus(@RequestBody @Validated SceneMarkShapeParamVO param) {
-        sceneMarkShapeService.editReDetectStatus(param);
+        sceneMarkShapeService.editTrainStatus(param);
         return ResultData.ok();
     }
     /**
@@ -143,8 +143,8 @@ public class SceneMarkShapeController extends BaseController
     @PostMapping("/testquery")
     public ResultData testquery()   {
         Map<String, List<SceneMarkShape>> res=new HashMap<>();
-        res.put("findByReDetectStatus",sceneMarkShapeService.findByReDetectStatus(1));
-        res.put("findByReDetectStatus",sceneMarkShapeService.findByToDetectStatus(0));
+        res.put("findByReTrainStatus",sceneMarkShapeService.findByReTrainStatus(1));
+        res.put("findByToTrainStatus",sceneMarkShapeService.findByToTrainStatus(0));
         return ResultData.ok(res);
     }
 }

src/main/java/com/fdkankan/scene/entity/SceneMarkShape.java

@@ -50,13 +50,13 @@ public class SceneMarkShape implements Serializable {
       /**
        * 0不需要 1需要
        */
-      @TableField("re_detect")
-      private Integer reDetect;
+      @TableField("re_train")
+      private Integer reTrain;
       /**
        * 0需要训练 1已经训练过
        */
-      @TableField("to_detect")
-      private Integer toDetect;
+      @TableField("to_train")
+      private Integer toTrain;
 
       @TableField("create_time")
       private Date createTime;

src/main/java/com/fdkankan/scene/service/ISceneMarkShapeService.java

@@ -21,10 +21,10 @@ public interface ISceneMarkShapeService extends IService<SceneMarkShape> {
 
     ResultData editLabelByFile(String num, String imgPath, MultipartFile file) throws IOException;
 
-    void reDetectScene(SceneMarkShapeReDetectParamVO param);
+    void trainScene(SceneMarkShapeReDetectParamVO param);
 
-    List<SceneMarkShape> findByReDetectStatus(Integer reDetect);
-    List<SceneMarkShape> findByToDetectStatus(Integer toDetect);
+    List<SceneMarkShape> findByReTrainStatus(Integer reTrain);
+    List<SceneMarkShape> findByToTrainStatus(Integer toTrain);
 
-    void editReDetectStatus(SceneMarkShapeParamVO param);
+    void editTrainStatus(SceneMarkShapeParamVO param);
 }

src/main/java/com/fdkankan/scene/service/impl/SceneMarkShapeServiceImpl.java

@@ -41,13 +41,13 @@ import java.util.List;
 public class SceneMarkShapeServiceImpl extends ServiceImpl<MarkShapeMapper, SceneMarkShape> implements ISceneMarkShapeService {
     @Autowired
     private RabbitMqProducer rabbitMqProducer;
-    @Value("${queue.scene.yolov5-re-detect-queue}")
-    private String yolov5ReDetectQueue;
+    @Value("${queue.scene.yolov5-re-train-queue}")
+    private String yolov5TrainQueue;
     @Value("${main.url}")
     private String mainUrl;
 
     @Override
-    public void editReDetectStatus(SceneMarkShapeParamVO param) {
+    public void editTrainStatus(SceneMarkShapeParamVO param) {
         SceneMarkShape byNumAndImagePath = findByNumAndImagePath(param.getNum(), param.getImagePath());
         if (ObjectUtil.isNotNull(byNumAndImagePath)){
             byNumAndImagePath.setReDetect(0);
@@ -57,14 +57,14 @@ public class SceneMarkShapeServiceImpl extends ServiceImpl<MarkShapeMapper, Scen
     }
 
     @Override
-    public List<SceneMarkShape> findByReDetectStatus(Integer reDetect){
+    public List<SceneMarkShape> findByReTrainStatus(Integer reDetect){
         LambdaQueryWrapper<SceneMarkShape> wrapper = Wrappers.lambdaQuery();
         wrapper.eq(SceneMarkShape::getReDetect,reDetect);
         return list(wrapper);
     }
 
     @Override
-    public List<SceneMarkShape> findByToDetectStatus(Integer toDetect) {
+    public List<SceneMarkShape> findByToTrainStatus(Integer toDetect) {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.select("DISTINCT num")
                 .eq("to_detect",toDetect) ;
@@ -72,9 +72,9 @@ public class SceneMarkShapeServiceImpl extends ServiceImpl<MarkShapeMapper, Scen
     }
 
     @Override
-    public void reDetectScene(SceneMarkShapeReDetectParamVO param) {
+    public void trainScene(SceneMarkShapeReDetectParamVO param) {
         //查询需要重新训练的图片
-        List<SceneMarkShape> reDetectStatuList = findByReDetectStatus(1);
+        List<SceneMarkShape> reDetectStatuList = findByReTrainStatus(1);
         for (SceneMarkShape shape : reDetectStatuList) {
             SceneMarkShapeReDetectParamVO paramVO=new SceneMarkShapeReDetectParamVO();
             paramVO.setWebSite(mainUrl);
@@ -84,10 +84,10 @@ public class SceneMarkShapeServiceImpl extends ServiceImpl<MarkShapeMapper, Scen
             paramVO.setNum(shape.getNum());
             paramVO.setImagePath(shape.getImagePath());
             paramVO.setDetectType(1);
-            rabbitMqProducer.sendByWorkQueue(yolov5ReDetectQueue,paramVO);
+            rabbitMqProducer.sendByWorkQueue(yolov5TrainQueue,paramVO);
         }
         //查询需要进入训练的场景
-        List<SceneMarkShape> byToDetectStatus = findByToDetectStatus(0);
+        List<SceneMarkShape> byToDetectStatus = findByToTrainStatus(0);
         for (SceneMarkShape shape : byToDetectStatus) {
             SceneMarkShapeReDetectParamVO paramVO=new SceneMarkShapeReDetectParamVO();
             paramVO.setWebSite(mainUrl);
@@ -96,7 +96,7 @@ public class SceneMarkShapeServiceImpl extends ServiceImpl<MarkShapeMapper, Scen
             }
             paramVO.setNum(shape.getNum());
             paramVO.setDetectType(2);
-            rabbitMqProducer.sendByWorkQueue(yolov5ReDetectQueue,paramVO);
+            rabbitMqProducer.sendByWorkQueue(yolov5TrainQueue,paramVO);
         }
     }