lyhzzz před 7 měsíci
rodič
revize
4290bf1235

+ 2 - 2
src/main/java/com/fdkankan/ucenter/UserCenterApplication.java

@@ -30,9 +30,9 @@ public class UserCenterApplication implements CommandLineRunner {
     private String mainUrl;
     @Value("${spring.profiles.active}")
     private String activeFile;
-    @Value("${camera.check.url}")
+    @Value("${camera.check.url:1}")
     private String fdMain;
-    @Value("${camera.check.companyId}")
+    @Value("${camera.check.companyId:1}")
     private Long companyId;
     public static void main(String[] args) {
         SpringApplication.run(UserCenterApplication.class, args);

+ 0 - 18
src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -292,8 +292,6 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         sceneResourceCameraService.deleteByCameraIds(cameraIds);       //删除协作相机
 
     }
-    @Autowired
-    FdkankanClient fdkankanClient;
 
     @Override
     public void bind(Integer cameraType, String snCodes, String username) {
@@ -312,22 +310,6 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             }else {
                 snCode = wifiName;
             }
-            try {
-                Result result = fdkankanClient.get(NacosProperty.fdMain+"/ucenter/_inner/getSnCode/"+snCode);
-                if(result.getCode() !=0){
-                    throw new BusinessException(CameraConstant.FAILURE_CODE_6031,wifiName +"-"+ CameraConstant.FAILURE_MSG_6031);
-                }
-                JSONObject jsonObject = (JSONObject) result.getData();
-                Long companyId = jsonObject.getLong("companyId");
-                if(!companyId.equals(NacosProperty.companyId)){
-                    throw new BusinessException(CameraConstant.FAILURE_CODE_6031,wifiName +"-"+ CameraConstant.FAILURE_MSG_6031);
-                }
-
-            }catch (Exception e){
-                log.info("相机查询4dkankan失败:{}",snCode);
-                throw new BusinessException(CameraConstant.FAILURE_CODE_6031,wifiName +"-"+ CameraConstant.FAILURE_MSG_6031);
-            }
-
 
             CameraInStoreParam param = new CameraInStoreParam();
             param.setCameraType(cameraType);