lyhzzz 2 лет назад
Родитель
Сommit
32ef583ece

+ 2 - 1
src/main/java/com/fdkankan/fusion/entity/CaseTagPoint.java

@@ -65,5 +65,6 @@ public class CaseTagPoint implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
-
+    @TableField("bind_hide")
+    private String bindHide;
 }

+ 3 - 0
src/main/java/com/fdkankan/fusion/entity/CaseView.java

@@ -91,5 +91,8 @@ public class CaseView implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("bind_hide")
+    private String bindHide;
+
 
 }

+ 3 - 0
src/main/java/com/fdkankan/fusion/entity/FusionMeter.java

@@ -77,5 +77,8 @@ public class FusionMeter implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("bind_hide")
+    private String bindHide;
+
 
 }

+ 2 - 0
src/main/java/com/fdkankan/fusion/service/ICaseTagPointService.java

@@ -27,4 +27,6 @@ public interface ICaseTagPointService extends IService<CaseTagPoint> {
     void deleteByFusionNumIds(List<Integer> modelIds);
 
     void deleteByTagIds(List<Integer> tagIds);
+
+    void hideOrShow(List<Integer> fusionNumIds, Integer hide);
 }

+ 2 - 0
src/main/java/com/fdkankan/fusion/service/ICaseViewService.java

@@ -26,4 +26,6 @@ public interface ICaseViewService extends IService<CaseView> {
     void deleteByCaseId(Integer caseId);
 
     void deleteByNum(String num);
+
+    void hideOrShow(String num,Integer hide);
 }

+ 2 - 0
src/main/java/com/fdkankan/fusion/service/IFusionMeterService.java

@@ -24,4 +24,6 @@ public interface IFusionMeterService extends IService<FusionMeter> {
     void deleteByCaseId(Integer caseId);
 
     void deleteByFusionNumIds(List<Integer> fusionNunIds);
+
+    void hideOrShow( List<Integer> fusionNumIds, Integer hide);
 }

+ 2 - 0
src/main/java/com/fdkankan/fusion/service/IFusionNumService.java

@@ -34,4 +34,6 @@ public interface IFusionNumService extends IService<FusionNum> {
     void deleteByModelId(Integer modelId);
 
     void deleteById(Integer fusionNumId);
+
+    void hideOrShow(Integer modelId, String num,Integer hide);
 }

+ 11 - 4
src/main/java/com/fdkankan/fusion/service/impl/CaseServiceImpl.java

@@ -13,11 +13,8 @@ import com.fdkankan.fusion.request.CaseParam;
 import com.fdkankan.fusion.request.ScenePram;
 import com.fdkankan.fusion.response.HotVo;
 import com.fdkankan.fusion.response.SceneVo;
-import com.fdkankan.fusion.service.ICaseNumService;
-import com.fdkankan.fusion.service.ICaseService;
+import com.fdkankan.fusion.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.fusion.service.IModelService;
-import com.fdkankan.fusion.service.ISceneService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +44,8 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
     FdHotService fdHotService;
     @Autowired
     IModelService modelService;
+    @Autowired
+    IFusionNumService fusionNumService;
 
     @Override
     public PageInfo pageList(CaseParam param,String token) {
@@ -131,6 +130,14 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
                 listAll.add(sceneVo);
             }
         }
+        //相机解绑,标注,测量隐藏,视图
+        for (SceneVo sceneVo : listAll) {
+            if(!sceneVo.getBind()){
+                fusionNumService.hideOrShow(sceneVo.getModelId(),sceneVo.getNum(),1);
+            }else {
+                fusionNumService.hideOrShow(sceneVo.getModelId(),sceneVo.getNum(),0);
+            }
+        }
         listAll.removeIf(sceneVo -> !sceneVo.getBind());
         return listAll;
     }

+ 15 - 3
src/main/java/com/fdkankan/fusion/service/impl/CaseTagPointServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fdkankan.fusion.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.entity.CaseTag;
 import com.fdkankan.fusion.entity.CaseTagPoint;
@@ -70,6 +71,7 @@ public class CaseTagPointServiceImpl extends ServiceImpl<ICaseTagPointMapper, Ca
         }
         LambdaQueryWrapper<CaseTagPoint> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CaseTagPoint::getTagId,tagId);
+        wrapper.eq(CaseTagPoint::getBindHide,0);
         wrapper.orderByDesc(CaseTagPoint::getCreateTime);
         List<CaseTagPoint> list = this.list(wrapper);
         List<CaseTagPointVo> caseTagPointVoList = new ArrayList<>();
@@ -83,10 +85,10 @@ public class CaseTagPointServiceImpl extends ServiceImpl<ICaseTagPointMapper, Ca
     }
 
     @Override
-    public void deleteByFusionNumIds(List<Integer> FusionNumIds) {
-        if(FusionNumIds.size() >0){
+    public void deleteByFusionNumIds(List<Integer> fusionNumIds) {
+        if(fusionNumIds.size() >0){
             LambdaQueryWrapper<CaseTagPoint> wrapper = new LambdaQueryWrapper<>();
-            wrapper.in(CaseTagPoint::getFusionNumId,FusionNumIds);
+            wrapper.in(CaseTagPoint::getFusionNumId,fusionNumIds);
             this.remove(wrapper);
         }
     }
@@ -99,4 +101,14 @@ public class CaseTagPointServiceImpl extends ServiceImpl<ICaseTagPointMapper, Ca
             this.remove(wrapper);
         }
     }
+
+    @Override
+    public void hideOrShow(List<Integer> fusionNumIds, Integer hide) {
+        if(fusionNumIds.size() >0){
+            LambdaUpdateWrapper<CaseTagPoint> wrapper = new LambdaUpdateWrapper<>();
+            wrapper.in(CaseTagPoint::getFusionNumId,fusionNumIds);
+            wrapper.set(CaseTagPoint::getBindHide,hide);
+            this.update(wrapper);
+        }
+    }
 }

+ 10 - 0
src/main/java/com/fdkankan/fusion/service/impl/CaseViewServiceImpl.java

@@ -3,6 +3,7 @@ package com.fdkankan.fusion.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.fusion.common.ResultCode;
+import com.fdkankan.fusion.entity.FusionMeter;
 import com.fdkankan.fusion.entity.Model;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.entity.CaseView;
@@ -49,6 +50,7 @@ public class CaseViewServiceImpl extends ServiceImpl<ICaseViewMapper, CaseView>
         if(fusionId!=null){
             wrapper.eq(CaseView::getFusionId,fusionId);
         }
+        wrapper.eq(CaseView::getBindHide,0);
         wrapper.orderByAsc(CaseView::getSort);
         wrapper.orderByDesc(CaseView::getCreateTime);
         List<CaseView> list = list(wrapper);
@@ -115,4 +117,12 @@ public class CaseViewServiceImpl extends ServiceImpl<ICaseViewMapper, CaseView>
         queryW.eq(CaseView::getNum,num);
         this.remove(queryW);
     }
+
+    @Override
+    public void hideOrShow(String num,Integer hide) {
+        LambdaUpdateWrapper<CaseView> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(CaseView::getNum,num);
+        wrapper.set(CaseView::getBindHide,hide);
+        this.update(wrapper);
+    }
 }

+ 13 - 4
src/main/java/com/fdkankan/fusion/service/impl/FusionMeterServiceImpl.java

@@ -1,11 +1,9 @@
 package com.fdkankan.fusion.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.fusion.common.ResultCode;
-import com.fdkankan.fusion.entity.CaseFusion;
-import com.fdkankan.fusion.entity.CaseView;
-import com.fdkankan.fusion.entity.FusionMeter;
-import com.fdkankan.fusion.entity.FusionNum;
+import com.fdkankan.fusion.entity.*;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.mapper.IFusionMeterMapper;
 import com.fdkankan.fusion.service.ICaseFusionService;
@@ -38,6 +36,7 @@ public class FusionMeterServiceImpl extends ServiceImpl<IFusionMeterMapper, Fusi
     public List<FusionMeter> getListByFusionId(Integer fusionId, String meterTitle) {
         LambdaQueryWrapper<FusionMeter> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(FusionMeter::getFusionId,fusionId);
+        wrapper.eq(FusionMeter::getBindHide,0);
         if(StringUtils.isNotBlank(meterTitle)){
             wrapper.like(FusionMeter::getMeterTitle,meterTitle);
         }
@@ -91,4 +90,14 @@ public class FusionMeterServiceImpl extends ServiceImpl<IFusionMeterMapper, Fusi
             }
         }
     }
+
+    @Override
+    public void hideOrShow( List<Integer> fusionNumIds, Integer hide) {
+        for (Integer fusionNunId : fusionNumIds) {
+            LambdaUpdateWrapper<FusionMeter> wrapper = new LambdaUpdateWrapper<>();
+            wrapper.like(FusionMeter::getPosition,"\"fusionNumId\":\""+fusionNunId+"\"");
+            wrapper.set(FusionMeter::getBindHide,hide);
+            this.update(wrapper);
+        }
+    }
 }

+ 11 - 0
src/main/java/com/fdkankan/fusion/service/impl/FusionNumServiceImpl.java

@@ -249,4 +249,15 @@ public class FusionNumServiceImpl extends ServiceImpl<IFusionNumMapper, FusionNu
             this.removeById(fusionNumId);
         }
     }
+
+    @Override
+    public void hideOrShow(Integer modelId, String num,Integer hide) {
+        caseViewService.hideOrShow(num,hide);
+        LambdaQueryWrapper<FusionNum> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(FusionNum::getModelId,modelId);
+        List<FusionNum> list = this.list(wrapper);
+        List<Integer> fusionNumIds = list.parallelStream().map(FusionNum::getFusionNumId).collect(Collectors.toList());
+        fusionMeterService.hideOrShow(fusionNumIds,hide);
+        caseTagPointService.hideOrShow(fusionNumIds,hide);
+    }
 }