|
|
@@ -16,7 +16,6 @@ import com.fdkk.sxz.base.Result;
|
|
|
import com.fdkk.sxz.constant.CodeConstant;
|
|
|
import com.fdkk.sxz.entity.SceneEntity;
|
|
|
import com.fdkk.sxz.entity.SceneLightEntity;
|
|
|
-import com.fdkk.sxz.entity.SceneLightStyleEntity;
|
|
|
import com.fdkk.sxz.entity.SceneStyleEntity;
|
|
|
import com.fdkk.sxz.other.mq.TopicRabbitConfig;
|
|
|
import com.fdkk.sxz.util.*;
|
|
|
@@ -334,7 +333,7 @@ public class ImportDataController extends BaseController {
|
|
|
@AroundLog(name = "渲染场景")
|
|
|
public Result buildChangeScene(String sceneNum, String styleNum, String type,
|
|
|
String dateType, String buildType, String ratio,
|
|
|
- String isShow, String quality, Long lightStyleId) {
|
|
|
+ String isShow, String quality) {
|
|
|
try {
|
|
|
if (StringUtils.isEmpty(sceneNum) || StringUtils.isEmpty(styleNum)) {
|
|
|
return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
|
|
|
@@ -439,16 +438,7 @@ public class ImportDataController extends BaseController {
|
|
|
} else {
|
|
|
return Result.failure(CodeConstant.FAILURE_CODE_4003, CodeConstant.FAILURE_MSG_4003);
|
|
|
}
|
|
|
- if (ObjectUtil.isNotNull(lightStyleId) && lightStyleId > 0) {
|
|
|
- SceneLightStyleEntity sceneLightStyle = sceneLightStyleService.findById(lightStyleId);
|
|
|
- if (ObjectUtil.isNotNull(sceneLightStyle)) {
|
|
|
- JSONObject jsonObject = new JSONObject();
|
|
|
- jsonObject.put("obj", JSON.parseObject(sceneLightStyle.getProLightJson()));
|
|
|
- String result = HttpRequest.post(buildUrl + "getLightInfo")
|
|
|
- .body(jsonObject.toString())
|
|
|
- .execute().body();
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
rabbitTemplate.convertAndSend(TopicRabbitConfig.TOPICE, TopicRabbitConfig.LIGHT,
|
|
|
styleNum + ":;" + sceneNum + ":;" + type + ":;" + dateType + ":;" +
|
|
|
ratio + ":;" + sceneLightEntity.getId().longValue() + ":;" +
|
xiewenjie