|
@@ -58,6 +58,7 @@ import org.springframework.util.ObjectUtils;
|
|
|
import org.springframework.web.client.RestTemplate;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
|
import java.io.File;
|
|
|
import java.io.IOException;
|
|
|
import java.nio.charset.StandardCharsets;
|
|
@@ -215,9 +216,12 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
@Autowired
|
|
|
private IFdkkLaserService fdkkLaserService;
|
|
|
|
|
|
- @Autowired
|
|
|
+ @Resource
|
|
|
private MyClient myClient;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ IJySceneAuthService jySceneAuthService;
|
|
|
+
|
|
|
@Override
|
|
|
public SceneFileBuild findByFileId(String fileId) {
|
|
|
|
|
@@ -1555,6 +1559,14 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
jsonObject.getInteger("scenetype"), jsonObject.getString("gps"), rebuild,
|
|
|
jsonObject.getInteger("resolution"), firmwareVersion.toString(), sceneUrl, buildType, cameraDetail.getCooperationUser());
|
|
|
|
|
|
+ //江门公安项目场景浏览默认是非公开
|
|
|
+ JySceneAuth jySceneAuth = jySceneAuthService.getByNum(sceneNum);
|
|
|
+ if(Objects.isNull(jySceneAuth)){
|
|
|
+ jySceneAuth.setAuthType(0);
|
|
|
+ jySceneAuth.setNum(sceneNum);
|
|
|
+ jySceneAuthService.save(jySceneAuth);
|
|
|
+ }
|
|
|
+
|
|
|
if (Objects.nonNull(scenePlusVO)) {
|
|
|
JSONObject statusJson = new JSONObject();
|
|
|
//临时将-2改成1,app还没完全更新
|