lyhzzz 2 тижнів тому
батько
коміт
3e73c60638

+ 1 - 0
src/main/java/com/fdkankan/fusion/response/SceneVo.java

@@ -23,6 +23,7 @@ public class SceneVo extends Model {
     private Integer status;
     private String thumb;
     private String title;
+    private String laserTitle;
     private Integer viewCount;
     private Boolean isLaser;
     private Integer type;       // 0 四维看看,1看见场景,2 深时场景,3 三维模型

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

@@ -51,4 +51,6 @@ public interface ITmProjectService extends IService<TmProject> {
     List<DataGroupVo> groupByReason(DataParam param, List<String> deptIds);
 
     List<TmProject> getLikeByProjectSn(String projectSn);
+
+    void setMapShow(String tmProjectId, Integer mapShow);
 }

+ 8 - 0
src/main/java/com/fdkankan/fusion/service/impl/CaseServiceImpl.java

@@ -393,9 +393,17 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
 
     @Override
     public void setMapShow(Integer caseId, Integer mapShow) {
+        CaseEntity caseEntity = this.getById(caseId);
+        if(caseEntity == null){
+            return;
+        }
         LambdaUpdateWrapper<CaseEntity> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(CaseEntity::getCaseId,caseId);
         wrapper.set(CaseEntity::getMapShow,mapShow);
         this.update(wrapper);
+
+        if(caseEntity.getTmProjectId() != null){
+            tmProjectService.setMapShow(caseEntity.getTmProjectId(),mapShow);
+        }
     }
 }

+ 1 - 1
src/main/java/com/fdkankan/fusion/service/impl/SceneService.java

@@ -142,7 +142,7 @@ public class SceneService implements ISceneService {
             if(param.getIsObj() == 0){
                 JSONObject ssObj = laserMap.get(sceneVo.getNum());
                 if(ssObj!=null) {
-                    sceneVo.setSceneName(ssObj.getString("title"));
+                    sceneVo.setSceneName(sceneVo.getLaserTitle());
                     sceneVo.setThumb(ssObj.getString("thumb"));
                     sceneVo.setWebSite(ssObj.getString("webSite"));
                     sceneVo.setViewCount(ssObj.getInteger("viewCount"));

+ 8 - 0
src/main/java/com/fdkankan/fusion/service/impl/TmProjectServiceImpl.java

@@ -476,4 +476,12 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
     public List<DataGroupVo> groupByReason(DataParam param,List<String> deptIds) {
         return getBaseMapper().groupByReason(param.getStartTime(),param.getEndTime(),deptIds);
     }
+
+    @Override
+    public void setMapShow(String tmProjectId, Integer mapShow) {
+        LambdaUpdateWrapper<TmProject> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(TmProject::getId,tmProjectId);
+        wrapper.set(TmProject::getMapShow,mapShow);
+        this.update(wrapper);
+    }
 }

+ 1 - 1
src/main/resources/mapper/fusion/ScenePlusMapper.xml

@@ -47,7 +47,7 @@
     <sql id="commonSelect">
         select s.id,s.title as title,s.title as name ,s.title as sceneName, s.num,s.create_time,c.sn_code,e.space as sceneSize
         ,u.user_name,e.view_count,s.scene_status as status,s.pay_status,'v4' as scene_version,e.web_site , e.thumb
-        ,e.algorithm_time,s.user_id,s.scene_source,e.is_obj,d.type as cameraType,e.rtk_location,e.orientation,e.location
+        ,e.algorithm_time,s.user_id,s.scene_source,e.is_obj,d.type as cameraType,e.rtk_location,e.orientation,e.location,laser_title
         from t_scene_plus s
         left join t_scene_plus_ext e on s.id = e.plus_id
         left join t_user u on s.user_id = u.id