Merge remote-tracking branch 'origin/master'

signal-optimize-service/src/main/java/net/wanji/opt/controller/strategy/SceneController.java

@@ -77,8 +77,6 @@ public class SceneController {
     })
     public JsonViewObject queryScene(@RequestBody QuerySceneDTO querySceneDTO) {
         PageInfo<AddOrUpdateSceneDTO> sceneList = sceneService.queryScene(querySceneDTO);
-        JsonViewObject jsonViewObject = JsonViewObject.newInstance();
-
-        return jsonViewObject.success(sceneList);
+        return JsonViewObject.newInstance().success(sceneList);
     }
 }

signal-optimize-service/src/main/java/net/wanji/opt/service/strategy/impl/SceneServiceImpl.java

@@ -206,7 +206,7 @@ public class SceneServiceImpl implements SceneService {
             strategyList.add(strategyListElement);
         }
         List<AddOrUpdateSceneDTO.StrategyListElement> collect = strategyList.stream()
-                .sorted(Comparator.comparing(AddOrUpdateSceneDTO.StrategyListElement::getPriority).reversed())
+                .sorted(Comparator.comparing(AddOrUpdateSceneDTO.StrategyListElement::getPriority))
                 .collect(Collectors.toList());
         return collect;
     }