修改查询场景方案接口

sxz-core/src/main/java/com/fdkk/sxz/webApi/controller/SceneStyleController.java

@@ -197,26 +197,39 @@ public class SceneStyleController extends BaseController {
     @NoAuthentication
     @AroundLog(name = "根据场景码获取风格列表")
     public Result getIssueList(@RequestBody RequestSceneStyle style) {
+        JSONObject res = new JSONObject();
+        List<ResponseSceneStyleIssue> collect = null;
+        if (ObjectUtil.isNotNull(style.getVrSceneNum())) {
+            LambdaQueryWrapper<SceneStyleEntity> wrapper = Wrappers.lambdaQuery();
+            wrapper.eq(SceneStyleEntity::getSceneNum, style.getSceneNum());
+            wrapper.ne(SceneStyleEntity::getStyleNum, style.getVrSceneNum());
+            wrapper.eq(SceneStyleEntity::getIssue, 1);
+            List<SceneStyleEntity> list = sceneStyleService.list(wrapper);
+            collect = list.stream().map(a -> {
+                ResponseSceneStyleIssue vo = new ResponseSceneStyleIssue();
+                BeanUtil.copyProperties(a, vo);
+                return vo;
+            }).collect(Collectors.toList());
+        }
 
-        LambdaQueryWrapper<SceneStyleEntity> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(SceneStyleEntity::getSceneNum, style.getSceneNum());
-        wrapper.ne(SceneStyleEntity::getStyleNum, style.getVrSceneNum());
-        wrapper.eq(SceneStyleEntity::getIssue, 1);
-        List<SceneStyleEntity> list = sceneStyleService.list(wrapper);
-        List<ResponseSceneStyleIssue> collect = list.stream().map(a -> {
-            ResponseSceneStyleIssue vo = new ResponseSceneStyleIssue();
-            BeanUtil.copyProperties(a, vo);
-            return vo;
-        }).collect(Collectors.toList());
 
         LambdaQueryWrapper<SceneStyleEntity> onewrapper = Wrappers.lambdaQuery();
-        onewrapper.eq(SceneStyleEntity::getStyleNum, style.getVrSceneNum());
+        if (ObjectUtil.isNotNull(style.getVrSceneNum())) {
+            onewrapper.eq(SceneStyleEntity::getStyleNum, style.getVrSceneNum());
+        } else {
+            onewrapper.eq(SceneStyleEntity::getSceneNum, style.getSceneNum());
+            onewrapper.last("limit 1");
+        }
         onewrapper.eq(SceneStyleEntity::getIssue, 1);
         onewrapper.orderByDesc(SceneStyleEntity::getNum);
+
         SceneStyleEntity one = sceneStyleService.getOne(onewrapper);
-        JSONObject res = new JSONObject();
         res.put("title", ObjectUtil.isNotNull(one.getStyleName()) ? one.getStyleName() : "");
-        res.put("styleList", collect);
+        res.put("sceneNum", ObjectUtil.isNotNull(one.getSceneNum()) ? one.getSceneNum() : "");
+        res.put("styleNum", ObjectUtil.isNotNull(one.getStyleNum()) ? one.getStyleNum() : "");
+        if (ObjectUtil.isNotNull(collect)) {
+            res.put("styleList", collect);
+        }
 
         return Result.success(res);
     }