|
@@ -60,7 +60,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
|
|
private FYunFileServiceInterface fYunFileService;
|
|
private FYunFileServiceInterface fYunFileService;
|
|
|
|
|
|
|
|
|
|
- public void updateSceneStatus(String sceneCode, int sceneStatus, String path, Date createTime, Date algorithmTime, Integer shootCount, Integer payStatus) {
|
|
|
|
|
|
+ public void updateSceneStatus(String sceneCode, int sceneStatus, String path, Date createTime, Date algorithmTime, ScenePlusExt scenePlusExt, Integer payStatus) {
|
|
Map<String, Object> params = new HashMap<>();
|
|
Map<String, Object> params = new HashMap<>();
|
|
params.put("sceneCode", sceneCode);
|
|
params.put("sceneCode", sceneCode);
|
|
params.put("status", sceneStatus);
|
|
params.put("status", sceneStatus);
|
|
@@ -70,14 +70,13 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
|
|
if (!ObjectUtils.isEmpty(path)) {
|
|
if (!ObjectUtils.isEmpty(path)) {
|
|
params.put("path", path);
|
|
params.put("path", path);
|
|
}
|
|
}
|
|
- params.put("shootCount", shootCount);
|
|
|
|
params.put("payStatus", payStatus);
|
|
params.put("payStatus", payStatus);
|
|
params.put("shootCount", scenePlusExt.getShootCount());
|
|
params.put("shootCount", scenePlusExt.getShootCount());
|
|
params.put("mixture", scenePlusExt.getMixture() == CommonStatus.NO.code().intValue() ? false : true);
|
|
params.put("mixture", scenePlusExt.getMixture() == CommonStatus.NO.code().intValue() ? false : true);
|
|
rabbitMqProducer.sendByWorkQueue(updateScene, params);
|
|
rabbitMqProducer.sendByWorkQueue(updateScene, params);
|
|
}
|
|
}
|
|
|
|
|
|
- public void syncBuildResult(String sceneNum, String dataSource,Date createTime, Date algorithmTime, Integer shootCount, Integer payStatus) {
|
|
|
|
|
|
+ public void syncBuildResult(String sceneNum, String dataSource,Date createTime, Date algorithmTime, ScenePlusExt scenePlusExt, Integer payStatus) {
|
|
log.info("激光转台相机构建结果 同步 请求 ");
|
|
log.info("激光转台相机构建结果 同步 请求 ");
|
|
try {
|
|
try {
|
|
String jgPath = dataSource;
|
|
String jgPath = dataSource;
|
|
@@ -109,7 +108,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
|
|
}
|
|
}
|
|
FileUtils.copyFile(dataSource + "/results/laserData", jgPath, true);
|
|
FileUtils.copyFile(dataSource + "/results/laserData", jgPath, true);
|
|
|
|
|
|
- updateSceneStatus(sceneNum, 2, jgPath + File.separator + "laserData",createTime, algorithmTime, shootCount, payStatus);
|
|
|
|
|
|
+ updateSceneStatus(sceneNum, 2, jgPath + File.separator + "laserData",createTime, algorithmTime, scenePlusExt, payStatus);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
log.error("激光转台相机同步失败", e);
|
|
log.error("激光转台相机同步失败", e);
|
|
}
|
|
}
|