1

src/main/java/com/fdkankan/fusion/controller/CaseViewController.java

@@ -27,10 +27,11 @@ public class CaseViewController {
 
     @GetMapping("/allList")
     public ResultData allList(@RequestParam(required = false)Integer caseId,
+                              @RequestParam(required = false)Integer fusionId,
                               @RequestParam(required = false) String num,
                               @RequestParam(required = false,defaultValue = "50") String smallImgH,
                               @RequestParam(required = false,defaultValue = "50") String smallImgW){
-        return ResultData.ok(caseViewService.allList(caseId,num,smallImgH,smallImgW));
+        return ResultData.ok(caseViewService.allList(caseId,fusionId,num,smallImgH,smallImgW));
     }
 
     @PostMapping("/add")

src/main/java/com/fdkankan/fusion/controller/FusionMeterController.java

@@ -42,12 +42,17 @@ public class FusionMeterController {
 
     @PostMapping("/updateMeterTitle")
     public ResultData updateMeterTitle(@RequestBody FusionMeter fusionMeter){
-        if(fusionMeter.getFusionMeterId() == null || StringUtils.isEmpty(fusionMeter.getMeterTitle())){
+        if(fusionMeter.getFusionMeterId() == null ){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         LambdaUpdateWrapper<FusionMeter> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(FusionMeter::getFusionMeterId,fusionMeter.getFusionMeterId())
-                .set(FusionMeter::getMeterTitle,fusionMeter.getMeterTitle());
+        wrapper.eq(FusionMeter::getFusionMeterId,fusionMeter.getFusionMeterId());
+        if(StringUtils.isNotBlank(fusionMeter.getMeterTitle())){
+            wrapper.set(FusionMeter::getMeterTitle,fusionMeter.getMeterTitle());
+        }
+        if(StringUtils.isNotBlank(fusionMeter.getPosition())){
+            wrapper.set(FusionMeter::getPosition,fusionMeter.getPosition());
+        }
         fusionMeterService.update(wrapper);
         return ResultData.ok();
     }

src/main/java/com/fdkankan/fusion/entity/CaseView.java

@@ -64,6 +64,11 @@ public class CaseView implements Serializable {
     /**
      * 场景码
      */
+    @TableField("fusion_id")
+    private String fusionId;
+    /**
+     * 场景码
+     */
     @TableField("num")
     private String num;
 
@@ -73,12 +78,6 @@ public class CaseView implements Serializable {
     @TableField("num_type")
     private Integer numType;
 
-    /**
-     * 场景链接
-     */
-    @TableField("num_thumb")
-    private String numThumb;
-
     @TableField("sort")
     private Integer sort;
 

src/main/java/com/fdkankan/fusion/service/ICaseViewService.java

@@ -15,7 +15,7 @@ import java.util.List;
  */
 public interface ICaseViewService extends IService<CaseView> {
 
-    List<CaseView> allList(Integer caseId, String num, String smallImgH, String smallImgW);
+    List<CaseView> allList(Integer caseId,Integer fusionId,  String num, String smallImgH, String smallImgW);
 
     CaseView add(CaseView caseView);
 

src/main/java/com/fdkankan/fusion/service/impl/CaseVideoServiceImpl.java

@@ -149,7 +149,6 @@ public class CaseVideoServiceImpl extends ServiceImpl<ICaseVideoMapper, CaseVide
                 FileUtil.del(FilePath.VIDEO_LOCAL_PATH);
                 redisUtil.set(RedisKeyUtil.mergerVideoKey+videoFolder.getVideoFolderId(),"100");
                 updateCaseVideoStatus(videoFolder.getVideoFolderId(),1);
-
             }
         }.run();
     }

src/main/java/com/fdkankan/fusion/service/impl/CaseViewServiceImpl.java

@@ -29,8 +29,8 @@ public class CaseViewServiceImpl extends ServiceImpl<ICaseViewMapper, CaseView>
    private String small;
 
     @Override
-    public List<CaseView> allList(Integer caseId, String num,String smallImgH, String smallImgW){
-        if(caseId == null && StringUtils.isEmpty(num)){
+    public List<CaseView> allList(Integer caseId,Integer fusionId,  String num,String smallImgH, String smallImgW){
+        if(caseId == null && StringUtils.isEmpty(num) && fusionId == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         LambdaQueryWrapper<CaseView> wrapper = new LambdaQueryWrapper<>();
@@ -40,6 +40,9 @@ public class CaseViewServiceImpl extends ServiceImpl<ICaseViewMapper, CaseView>
         if(StringUtils.isNotBlank(num)){
             wrapper.eq(CaseView::getNum,num);
         }
+        if(fusionId!=null){
+            wrapper.eq(CaseView::getFusionId,fusionId);
+        }
         wrapper.orderByAsc(CaseView::getSort);
         wrapper.orderByDesc(CaseView::getCreateTime);
         List<CaseView> list = list(wrapper);
@@ -49,8 +52,8 @@ public class CaseViewServiceImpl extends ServiceImpl<ICaseViewMapper, CaseView>
 
     @Override
     public CaseView add(CaseView caseView) {
-        if(caseView.getCaseId() == null || StringUtils.isEmpty(caseView.getNum()) || StringUtils.isEmpty(caseView.getNumThumb())
-            || caseView.getNumType() == null || StringUtils.isEmpty(caseView.getViewImg()) || StringUtils.isEmpty(caseView.getViewTitle())
+        if(caseView.getCaseId() == null || ((StringUtils.isEmpty(caseView.getNum()) || caseView.getNumType() == null) && caseView.getFusionId() == null)
+                || StringUtils.isEmpty(caseView.getViewImg()) || StringUtils.isEmpty(caseView.getViewTitle())
             || StringUtils.isEmpty(caseView.getViewPoint())) {
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }