|
|
@@ -24,6 +24,7 @@ import com.fdkankan.contro.constant.RedisConstants;
|
|
|
import com.fdkankan.contro.entity.*;
|
|
|
import com.fdkankan.contro.enums.CameraTypeEnum;
|
|
|
import com.fdkankan.contro.mapper.ISceneFileBuildMapper;
|
|
|
+import com.fdkankan.contro.mapper.ISceneUploadUserLogMapper;
|
|
|
import com.fdkankan.contro.service.ICommonService;
|
|
|
import com.fdkankan.contro.service.*;
|
|
|
import com.fdkankan.contro.vo.ResponseSceneFile;
|
|
|
@@ -445,6 +446,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
return buildScenePost(dataSource, jsonObject, buildType, cameraType, sceneNum, cameraDetail, rebuild, icon);
|
|
|
}
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ISceneUploadUserLogService sceneUploadUserLogService;
|
|
|
+
|
|
|
private ScenePlusVO buildScenePost(String dataSource, JSONObject jsonObject, String buildType, long cameraType,
|
|
|
String sceneNum, CameraDetail cameraDetail, int rebuild, String icon) throws Exception {
|
|
|
String imgViewPath = String.format(UploadFilePath.IMG_VIEW_PATH, sceneNum);
|
|
|
@@ -483,6 +487,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
jsonObject.getInteger("scenetype"), jsonObject.getString("gps"), rebuild,
|
|
|
jsonObject.getInteger("resolution"), firmwareVersion.toString(), sceneUrl, buildType, cameraDetail.getCooperationUser());
|
|
|
|
|
|
+ //记录场景每次上传所使用的账号
|
|
|
+ sceneUploadUserLogService.saveLog(jsonObject, sceneNum);
|
|
|
+
|
|
|
try {
|
|
|
//上传app状态文件
|
|
|
commonService.uploadStatusJson(sceneNum, scenePlusVO.getSceneStatus(),
|