场景码前缀定义

src/main/java/com/fdkankan/contro/service/impl/CommonServiceImpl.java

@@ -993,6 +993,7 @@ public class CommonServiceImpl implements ICommonService {
 
     @Override
     public String getPluginPrefix(JSONObject dataFdage) {
+        //新版本app把插件写在plugins数组中
         JSONArray plugins = dataFdage.getJSONArray("plugins");
         //datafdage中的插件不为空，就从插件列表中去匹配，按照插件枚举定义顺序，只要匹配上即终止匹配
         if(CollUtil.isNotEmpty(plugins)){
@@ -1002,13 +1003,20 @@ public class CommonServiceImpl implements ICommonService {
                     JSONObject obj = plugins.getJSONObject(i);
                     String name = obj.getString("name");
                     if (StrUtil.isNotBlank(name) && name.startsWith(code)) {
-                        return plugin; // 匹配到第一个，直接返回
+                        return name; // 匹配到第一个，直接返回
                     }
                 }
             }
-        }
+        }else{//兼容修版本app
+
+            //判断是否有禾赛雷达
+
 
+            //判断是否有知象光电
+
+
+        }
 
-        return "";
+        return null;
     }
 }

src/main/java/com/fdkankan/contro/service/impl/Scene3dNumServiceImpl.java

@@ -14,6 +14,7 @@ import com.fdkankan.contro.entity.Scene3dNum;
 import com.fdkankan.contro.enums.CameraTypeEnum;
 import com.fdkankan.contro.mapper.IScene3dNumMapper;
 import com.fdkankan.contro.service.ICameraTypeService;
+import com.fdkankan.contro.service.ICommonService;
 import com.fdkankan.contro.service.IScene3dNumService;
 import com.fdkankan.dingtalk.DingTalkSendUtils;
 import com.fdkankan.redis.constant.RedisKey;
@@ -72,13 +73,17 @@ public class Scene3dNumServiceImpl extends ServiceImpl<IScene3dNumMapper, Scene3
     private DingTalkSendUtils dingTalkSendUtils;
     @Autowired
     private ICameraTypeService cameraTypeService;
+    @Autowired
+    private ICommonService commonService;
 
     @Override
     public String generateSceneNum(Integer cameraType, JSONObject dataFdage) throws Exception {
         // 从缓存中获取
         String sceneNum = redisUtil.lLeftPop(RedisKey.FDKANKAN_SCENE_NUMS);
+        //获取插件前缀
+        String pluginPrefix = commonService.getPluginPrefix(dataFdage);
         if(Objects.nonNull(sceneNum)){
-            return addPrefix(sceneNum,cameraType, null);
+            return addPrefix(sceneNum,cameraType, pluginPrefix);
         }
         //为了防止场景量暴增导致定时任务来还不急处理，如果上面redis获取不到，需要调用一下生成场景码方法
         log.warn("定时任务没有生成足够的场景码，此处实时调用批量生成场景码程序");
@@ -91,7 +96,7 @@ public class Scene3dNumServiceImpl extends ServiceImpl<IScene3dNumMapper, Scene3
             dingTalkSendUtils.sendActioncardMsgToDingRobot(content, "场景码穷尽告警");
             throw new Exception("场景计算获取场景码失败");
         }
-        return addPrefix(sceneNum,cameraType,null);
+        return addPrefix(sceneNum,cameraType,pluginPrefix);
     }
 
     @Override

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -2053,17 +2053,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         return scene;
     }
 
-    private ResultData rebuildV3SceneToMini(ScenePro scenePro) {
-        log.info("v3场景重算，请求v3服务器，url：{}", v3controlUrl + "api/scene/rebuildScene?num=" + scenePro.getNum());
-        ResponseEntity<Result> responseEntity = restTemplate.getForEntity(v3controlUrl + "api/scene/rebuildScene?num=" + scenePro.getNum(), Result.class);
-        if (responseEntity.getStatusCode().value() != HttpStatus.OK.value() || responseEntity.getBody().getCode() != ServerCode.SUCCESS.code()) {
-            log.error("请求V3服务器重算场景失败, num:{}, result:{}", scenePro.getNum(), JSON.toJSONString(responseEntity));
-            throw new BusinessException(ErrorCode.SYSTEM_BUSY);
-        }
-        log.info("v3场景重算，请求v3服务器，url：{}, result", v3controlUrl + "api/scene/rebuildScene?num=" + scenePro.getNum(), JSON.toJSONString(responseEntity));
-        return ResultData.ok();
-    }
-
     @Override
     public ResultData uploadLiguang(String num, String snCode, String ossPath) throws Exception {