|
@@ -11,10 +11,7 @@ import com.fdkankan.redis.util.RedisUtil;
|
|
import com.fdkankan.ucenter.common.Result;
|
|
import com.fdkankan.ucenter.common.Result;
|
|
import com.fdkankan.ucenter.common.constants.ConstantFilePath;
|
|
import com.fdkankan.ucenter.common.constants.ConstantFilePath;
|
|
import com.fdkankan.ucenter.common.constants.ResultCode;
|
|
import com.fdkankan.ucenter.common.constants.ResultCode;
|
|
-import com.fdkankan.ucenter.entity.ScenePlus;
|
|
|
|
-import com.fdkankan.ucenter.entity.ScenePlusExt;
|
|
|
|
-import com.fdkankan.ucenter.entity.ScenePro;
|
|
|
|
-import com.fdkankan.ucenter.entity.User;
|
|
|
|
|
|
+import com.fdkankan.ucenter.entity.*;
|
|
import com.fdkankan.ucenter.service.*;
|
|
import com.fdkankan.ucenter.service.*;
|
|
import com.fdkankan.ucenter.vo.response.LaserSceneInfoVo;
|
|
import com.fdkankan.ucenter.vo.response.LaserSceneInfoVo;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -40,10 +37,14 @@ public class InnerServiceImpl implements IInnerService {
|
|
@Autowired
|
|
@Autowired
|
|
private ISceneProService sceneProService;
|
|
private ISceneProService sceneProService;
|
|
@Autowired
|
|
@Autowired
|
|
|
|
+ private ISceneProEditService sceneProEditService;
|
|
|
|
+ @Autowired
|
|
private IScenePlusService scenePlusService;
|
|
private IScenePlusService scenePlusService;
|
|
@Autowired
|
|
@Autowired
|
|
private IScenePlusExtService scenePlusExtService;
|
|
private IScenePlusExtService scenePlusExtService;
|
|
@Autowired
|
|
@Autowired
|
|
|
|
+ private ISceneEditInfoService sceneEditInfoService;
|
|
|
|
+ @Autowired
|
|
private IUserService userService;
|
|
private IUserService userService;
|
|
@Autowired
|
|
@Autowired
|
|
private RedisUtil redisUtil;
|
|
private RedisUtil redisUtil;
|
|
@@ -163,6 +164,10 @@ public class InnerServiceImpl implements IInnerService {
|
|
vo.setObjScenePath(scenepro.getWebSite());
|
|
vo.setObjScenePath(scenepro.getWebSite());
|
|
vo.setIsObj(scenepro.getIsObj());
|
|
vo.setIsObj(scenepro.getIsObj());
|
|
vo.setAlgorithmTime(scenepro.getCreateTime());
|
|
vo.setAlgorithmTime(scenepro.getCreateTime());
|
|
|
|
+ SceneProEdit sceneProEdit = sceneProEditService.getByProId(scenepro.getId());
|
|
|
|
+ if(sceneProEdit != null){
|
|
|
|
+ vo.setImgVersion(sceneProEdit.getImagesVersion());
|
|
|
|
+ }
|
|
return vo;
|
|
return vo;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -179,6 +184,10 @@ public class InnerServiceImpl implements IInnerService {
|
|
vo.setObjScenePath(plusExt.getWebSite());
|
|
vo.setObjScenePath(plusExt.getWebSite());
|
|
vo.setIsObj(plusExt.getIsObj());
|
|
vo.setIsObj(plusExt.getIsObj());
|
|
vo.setAlgorithmTime(plusExt.getAlgorithmTime());
|
|
vo.setAlgorithmTime(plusExt.getAlgorithmTime());
|
|
|
|
+ SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(plus.getId());
|
|
|
|
+ if(sceneEditInfo != null){
|
|
|
|
+ vo.setImgVersion(sceneEditInfo.getImgVersion());
|
|
|
|
+ }
|
|
return vo;
|
|
return vo;
|
|
}
|
|
}
|
|
}
|
|
}
|