|
@@ -13,8 +13,6 @@ import com.fdkankan.common.util.DateUtil;
|
|
|
import com.fdkankan.common.util.FileUtils;
|
|
import com.fdkankan.common.util.FileUtils;
|
|
|
import com.fdkankan.common.util.SecurityUtil;
|
|
import com.fdkankan.common.util.SecurityUtil;
|
|
|
import com.fdkankan.fyun.face.FYunFileServiceInterface;
|
|
import com.fdkankan.fyun.face.FYunFileServiceInterface;
|
|
|
-import com.fdkankan.model.constants.ConstantCmd;
|
|
|
|
|
-import com.fdkankan.model.utils.CreateObjUtil;
|
|
|
|
|
import com.fdkankan.redis.constant.RedisKey;
|
|
import com.fdkankan.redis.constant.RedisKey;
|
|
|
import com.fdkankan.redis.constant.RedisLockKey;
|
|
import com.fdkankan.redis.constant.RedisLockKey;
|
|
|
import com.fdkankan.redis.util.RedisLockUtil;
|
|
import com.fdkankan.redis.util.RedisLockUtil;
|
|
@@ -44,7 +42,6 @@ import com.fdkankan.ucenter.vo.request.RequestSceneStatistics;
|
|
|
import com.fdkankan.ucenter.vo.response.LoginVo;
|
|
import com.fdkankan.ucenter.vo.response.LoginVo;
|
|
|
import com.fdkankan.ucenter.vo.response.SceneInfoVo;
|
|
import com.fdkankan.ucenter.vo.response.SceneInfoVo;
|
|
|
import com.fdkankan.ucenter.vo.response.UserVo;
|
|
import com.fdkankan.ucenter.vo.response.UserVo;
|
|
|
-import com.sun.xml.bind.v2.TODO;
|
|
|
|
|
import java.io.File;
|
|
import java.io.File;
|
|
|
import java.net.URLEncoder;
|
|
import java.net.URLEncoder;
|
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
@@ -53,7 +50,6 @@ import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
-import org.joda.time.DateTime;
|
|
|
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
@@ -61,7 +57,6 @@ import org.springframework.web.bind.annotation.GetMapping;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
|
@@ -333,7 +328,7 @@ public class SceneApiController extends BaseController {
|
|
|
//14表示matterPro场景，需要调用命令获取切图，并且修改sceneScheme为13
|
|
//14表示matterPro场景，需要调用命令获取切图，并且修改sceneScheme为13
|
|
|
if(sceneProEntity.getSceneSource() == 14){
|
|
if(sceneProEntity.getSceneSource() == 14){
|
|
|
sceneProEntity.setSceneScheme(13);
|
|
sceneProEntity.setSceneScheme(13);
|
|
|
- RuntimeUtil.execForStr(ConstantCmd.MATTERPRO_CUT_IMG + " -s " + sceneProEntity.getNum() + " -d " + ConstantFilePath.BASE_PATH + "/local/localHose" + sceneNum);
|
|
|
|
|
|
|
+ RuntimeUtil.execForStr("node /opt/4dkankan_scene/index.js -s " + sceneProEntity.getNum() + " -d " + ConstantFilePath.BASE_PATH + "/local/localHose" + sceneNum);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
BeanUtils.copyProperties(editEntity, responseScene);
|
|
BeanUtils.copyProperties(editEntity, responseScene);
|
