1

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

@@ -84,7 +84,4 @@ public class ProjectSceneGps implements Serializable {
 
     @TableField(exist = false)
     private String sceneTitle;
-
-    @TableField("is_obj")
-    private Integer isObj;
 }

src/main/java/com/fdkankan/manage_jp/task/TaskService.java

@@ -33,31 +33,25 @@ public class TaskService {
 
     @Scheduled(initialDelay = 2000, fixedDelay = 1000 * 60 )
     public void run() {
-        List<SceneGpsDb> numList = projectSceneGpsService.getNotGpsScene();
-        if(numList.isEmpty()){
+        addLaserData();
+    }
+
+    private void addLaserData() {
+        List<SceneGpsDb> sceneGpsDbs1 = projectSceneGpsService.getNotGpsScene();
+        if(sceneGpsDbs1.isEmpty()){
             log.info("没有需要更新GPS数据的场景");
+            return;
         }
-
         List<ProjectSceneGps> laserssList = new ArrayList<>();
         List<ProjectSceneGps> lasersgList = new ArrayList<>();
-        for (SceneGpsDb sceneGpsDb : numList) {
+        for (SceneGpsDb sceneGpsDb : sceneGpsDbs1) {
             ProjectSceneGps sceneGps = projectSceneGpsService.addGps(sceneGpsDb);
             if(sceneGps != null){
                 log.info("num:{}gps:{}",sceneGpsDb.getNum(),sceneGps);
                 if(sceneGps.getSceneSource() == 4 ) {
                     laserssList.add(sceneGps);
-                    if(sceneGpsDb.getIsObj() == 1){
-                        sceneGps.setIsObj(1);
-                        sceneGps.setWebSite(sceneGpsDb.getWebSite());
-                        laserssList.add(sceneGps);
-                    }
                 }else if( sceneGps.getSceneSource() == 5){
                     lasersgList.add(sceneGps);
-                    if(sceneGpsDb.getIsObj() == 1){
-                        sceneGps.setIsObj(1);
-                        sceneGps.setWebSite(sceneGpsDb.getWebSite());
-                        laserssList.add(sceneGps);
-                    }
                 }
             }
         }
@@ -68,14 +62,12 @@ public class TaskService {
     private void addLaserList(List<ProjectSceneGps> laserssList,Integer sceneSource) {
         List<String> sceneMapShowList = new ArrayList<>();
         if(!laserssList.isEmpty()){
-            List<String> numList1 = laserssList.stream().filter(e -> e.getIsObj() == 0).map(ProjectSceneGps::getNum).collect(Collectors.toList());
+            List<String> numList1 = laserssList.stream().map(ProjectSceneGps::getNum).collect(Collectors.toList());
             HashMap<String, JSONObject> ssSceneMap = laserService.list(numList1,sceneSource);
             for (ProjectSceneGps sceneGps : laserssList) {
                 JSONObject ssObj = ssSceneMap.get(sceneGps.getNum());
                 if(ssObj!=null ){
-                    if(sceneGps.getIsObj() == 0){
-                        sceneGps.setWebSite(ssObj.getString("webSite"));
-                    }
+                    sceneGps.setWebSite(ssObj.getString("webSite"));
                     sceneMapShowList.add(sceneGps.getNum());
                     projectSceneGpsService.save(sceneGps);
                 }

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

@@ -3,46 +3,14 @@
 <mapper namespace="com.fdkankan.manage_jp.mapper.IProjectSceneGpsMapper">
 
     <select id="getNotGpsScene" resultType="com.fdkankan.manage_jp.vo.response.SceneGpsDb">
-        SELECT s.num,s.scene_source,s.web_site,s.gps,s.data_source ,'v3' as scene_version,s.is_obj FROM t_scene_pro s
-                LEFT JOIN t_project_scene_gps gps on s.num = gps.num
-        WHERE s.rec_status = 'A' and is_upgrade = 0 and s.gps is not null and s.`status` = -2 and s.scene_source in (4,5) and gps.num is null
-        UNION
         SELECT s.num,s.scene_source,e.web_site,e.gps,e.data_source ,'v4' as scene_version,e.is_obj FROM t_scene_plus s
                 LEFT JOIN t_scene_plus_ext e on s.id = e.plus_id
                 LEFT JOIN t_project_scene_gps gps on s.num = gps.num
         WHERE s.rec_status = 'A' and e.gps is not null and s.scene_status = -2 and s.scene_source in (4,5) and gps.num is null
-
         LIMIT 1000
     </select>
     
     <select id="listGps" resultType="com.fdkankan.manage_jp.vo.response.SceneGpsDbVp">
-        SELECT s.num,s.scene_name as title,null as laserTile,s.scene_source,'v3' as scene_version ,gps.lat,gps.lon,gps.alt,gps.web_site,gps.is_obj
-        FROM t_project_scene_gps gps
-            LEFT JOIN t_scene_pro s  on gps.num = s.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 s.map_show = 1 and s.num is not null
-        <if test="param.searchKey != null and param.searchKey!='' ">
-            and s.scene_name like concat ('%',#{param.searchKey},'%')
-        </if>
-        <if test="param.numList !=null and param.numList.size >0">
-            and  s.num in
-            <foreach collection="param.numList" item="num" open="(" separator="," close=")">
-                #{num}
-            </foreach>
-        </if>
-        <if test="param.userId !=null and param.companyId !=null and param.cooperateSceneCodes !=null and param.cooperateSceneCodes.size >0">
-            and ( s.user_id = #{param.userId} or co.id = #{param.companyId} or s.num in
-            <foreach collection="param.cooperateSceneCodes" item="coNum" open="(" separator="," close=")">
-                #{coNum}
-            </foreach>
-            )
-        </if>
-        <if test="param.userId !=null and param.companyId !=null and param.cooperateSceneCodes !=null and param.cooperateSceneCodes.size ==0 ">
-            and (co.id = #{param.companyId} or s.user_id = #{param.userId} )
-        </if>
-
-        UNION
         SELECT s.num,s.title ,s.laser_title,s.scene_source,'v4' as scene_version  ,gps.lat,gps.lon,gps.alt,gps.web_site,gps.is_obj
             FROM t_project_scene_gps gps
             LEFT JOIN t_scene_plus s on gps.num = s.num