|
@@ -1,5 +1,6 @@
|
|
|
package com.fdkk.sxz.webApi.controller;
|
|
|
|
|
|
+import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
@@ -18,6 +19,7 @@ import com.fdkk.sxz.vo.request.RequestScene;
|
|
|
import com.fdkk.sxz.vo.request.RequestSceneLight;
|
|
|
import com.fdkk.sxz.vo.request.RequestSceneStyle;
|
|
|
import com.fdkk.sxz.vo.response.ResponseSceneLight;
|
|
|
+import com.fdkk.sxz.vo.response.ResponseSceneStyleIssue;
|
|
|
import com.fdkk.sxz.webApi.service.ISceneLightService;
|
|
|
import com.fdkk.sxz.webApi.service.ISceneStyleService;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
@@ -37,6 +39,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.util.*;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* Created by Hb_zzZ on 2020/7/14.
|
|
@@ -199,7 +202,12 @@ public class SceneStyleController extends BaseController {
|
|
|
wrapper.eq(SceneStyleEntity::getSceneNum, style.getSceneNum());
|
|
|
wrapper.eq(SceneStyleEntity::getIssue, 1);
|
|
|
List<SceneStyleEntity> list = sceneStyleService.list(wrapper);
|
|
|
- return Result.success(list);
|
|
|
+ List<ResponseSceneStyleIssue> collect = list.stream().map(a -> {
|
|
|
+ ResponseSceneStyleIssue vo = new ResponseSceneStyleIssue();
|
|
|
+ BeanUtil.copyProperties(a, vo);
|
|
|
+ return vo;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+ return Result.success(collect);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -208,7 +216,7 @@ public class SceneStyleController extends BaseController {
|
|
|
* @param scene
|
|
|
* @return
|
|
|
*/
|
|
|
- @ApiOperation("随心装场景码同步")
|
|
|
+ @ApiOperation("发布场景码")
|
|
|
@ApiImplicitParams({
|
|
|
@ApiImplicitParam(name = "sceneNum", value = "场景码", dataType = "String"),
|
|
|
@ApiImplicitParam(name = "vrsceneNum", value = "随心装场景码", dataType = "String"),
|
|
@@ -228,6 +236,7 @@ public class SceneStyleController extends BaseController {
|
|
|
if (issueCount > 4) {
|
|
|
return Result.failure(CodeConstant.FAILURE_CODE_4017, CodeConstant.FAILURE_MSG_4017);
|
|
|
}
|
|
|
+ styleEntity.setIssue(1);
|
|
|
} else {
|
|
|
styleEntity.setIssue(0);
|
|
|
}
|