1

src/main/java/com/fdkankan/manage_jp/controller/ProjectSceneController.java

@@ -64,7 +64,7 @@ public class ProjectSceneController extends BaseController{
 
     @PostMapping("/getSceneMap")
     public Result getSceneMap(@RequestBody SceneGpsParam param) {
-        if (StringUtils.isBlank(param.getCiphertext())){
+        if (StringUtils.isBlank(param.getCiphertext()) || param.getType() == null){
             throw new BusinessException(ResultCode.PARAM_ERROR);
         }
         log.info("ciphertext:{},type:{}",param.getCiphertext(),param.getType());

src/main/java/com/fdkankan/manage_jp/controller/SceneProController.java

@@ -160,5 +160,11 @@ public class SceneProController extends BaseController{
         sceneProService.move(param);
         return Result.success();
     }
+
+    @PostMapping("/updateMapShow")
+    public Result updateMapShow(@RequestBody SceneParam param){
+        sceneProService.updateMapShow(param);
+        return Result.success();
+    }
 }
 

src/main/java/com/fdkankan/manage_jp/entity/ScenePlus.java

@@ -123,4 +123,7 @@ public class ScenePlus implements Serializable {
 
     @TableField("laser_title")
     private String laserTitle;
+
+    @TableField("map_show")
+    private Integer mapShow;
 }

src/main/java/com/fdkankan/manage_jp/entity/ScenePro.java

@@ -235,4 +235,7 @@ public class ScenePro implements Serializable {
 
     @TableField("laser_title")
     private String laserTitle;
+
+    @TableField("map_show")
+    private Integer mapShow;
 }

src/main/java/com/fdkankan/manage_jp/service/ISceneProService.java

@@ -41,4 +41,6 @@ public interface ISceneProService extends IService<ScenePro> {
     void generateObjFile(String num);
 
     void move(SceneParam param);
+
+    void updateMapShow(SceneParam param);
 }

src/main/java/com/fdkankan/manage_jp/service/impl/SceneProServiceImpl.java

@@ -498,4 +498,20 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             sceneMoveLogService.saveLog(scenePro,scenePlus,camera.getSnCode(),oldCamera.getSnCode(),dataSource,dataSource, null);
         }
     }
+
+    @Override
+    public void updateMapShow(SceneParam param) {
+        if(StringUtils.isBlank(param.getNum()) || param.getMapShow() == null){
+            throw new BusinessException(ResultCode.PARAM_ERROR);
+        }
+        LambdaUpdateWrapper<ScenePro> proWr = new LambdaUpdateWrapper<>();
+        proWr.eq(ScenePro::getNum,param.getNum());
+        proWr.set(ScenePro::getMapShow,param.getMapShow());
+        this.update(proWr);
+
+        LambdaUpdateWrapper<ScenePlus> plusWr = new LambdaUpdateWrapper<>();
+        plusWr.eq(ScenePlus::getNum,param.getNum());
+        plusWr.set(ScenePlus::getMapShow,param.getMapShow());
+        scenePlusService.update(plusWr);
+    }
 }

src/main/java/com/fdkankan/manage_jp/vo/request/SceneParam.java

@@ -34,4 +34,5 @@ public class SceneParam extends RequestBase {
     private Integer id;
     private Integer projectId;
     private List<String> projectNums;
+    private Integer mapShow;
 }

src/main/java/com/fdkankan/manage_jp/vo/response/SceneVo.java

@@ -45,6 +45,6 @@ public class SceneVo {
     private String laserTitle;
     private Integer shootCount;
     private Integer sceneType;
-
+    private Integer mapShow;
 
 }

src/main/resources/mapper/manage_jp/ProjectSceneGpsMapper.xml

@@ -21,7 +21,7 @@
                 LEFT JOIN t_project_scene_gps gps on s.num = gps.num
                 LEFT JOIN t_user u on s.user_id = u.id
                 LEFT JOIN t_company co on u.company_id = co.id
-        WHERE s.rec_status = 'A' and is_upgrade = 0 and  s.`status` = -2 and gps.num is not null
+        WHERE s.rec_status = 'A' and is_upgrade = 0 and  s.`status` = -2 and s.map_show = 1 and gps.num is not null
         <if test="param.searchKey != null and param.searchKey!='' ">
             and s.scene_name like concat ('%',#{param.searchKey},'%')
         </if>

src/main/resources/mapper/manage_jp/SceneProMapper.xml

@@ -7,7 +7,7 @@
         SELECT * FROM(
         select s.scene_name ,s.num,s.create_time,c.sn_code,s.space as sceneSize
         ,u.user_name,s.view_count,s.status,s.pay_status,'v3' as scene_version ,s.web_site as webSite,thumb
-        ,null as algorithmTime,c.child_name,s.camera_id,s.laser_title,co.company_name,null as location,s.scene_source,s.shoot_count
+        ,null as algorithmTime,c.child_name,s.camera_id,s.laser_title,co.company_name,null as location,s.scene_source,s.shoot_count,s.map_show
         from t_scene_pro s
         <include refid="commonWhere"></include>
         <if test="param.sceneName != null and param.sceneName!='' ">
@@ -17,7 +17,7 @@
         UNION
         select 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 as webSite,thumb
-        ,algorithm_time,c.child_name,s.camera_id,s.laser_title,co.company_name,e.location,s.scene_source,e.shoot_count
+        ,algorithm_time,c.child_name,s.camera_id,s.laser_title,co.company_name,e.location,s.scene_source,e.shoot_count,s.map_show
         from t_scene_plus s
         left join t_scene_plus_ext e on s.id = e.plus_id
         <include refid="commonWhere"></include>