96333电梯新列表切换数据源

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/ElevatorController.java

@@ -337,24 +337,24 @@ public class ElevatorController extends BaseController {
     }
 
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/ocp/query_elevator_list", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "分页查询电梯信息（数据源切换）", notes = "分页查询电梯信息（数据源切换）")
-    public ResponseModel<Page<Map<String, Object>>> selectElevatorList(Long pageNum, Long pageSize,ElevatorDto dto) {
-        Page<Map<String, Object>> mapPage = new Page<>(pageNum, pageSize);
-        Page<Map<String, Object>> list = iElevatorService.selectElevators(mapPage, dto);
-        return ResponseHelper.buildResponse(list);
-    }
-
 //    @TycloudOperation(ApiLevel = UserType.AGENCY)
-//    @GetMapping(value = "/ocp/query_elevator_list")
-//    @ApiOperation(httpMethod = "GET", value = "电梯列表", notes = "电梯列表")
-//    public ResponseModel<Page<JSONObject>> viewJgAll( @RequestParam Map<String,Object> map) {
-//        JSONObject jsonObject = new JSONObject(map);
-//        return ResponseHelper.buildResponse(iElevatorService.queryByKeys(jsonObject));
+//    @RequestMapping(value = "/ocp/query_elevator_list", method = RequestMethod.GET)
+//    @ApiOperation(httpMethod = "GET", value = "分页查询电梯信息（数据源切换）", notes = "分页查询电梯信息（数据源切换）")
+//    public ResponseModel<Page<Map<String, Object>>> selectElevatorList(Long pageNum, Long pageSize,ElevatorDto dto) {
+//        Page<Map<String, Object>> mapPage = new Page<>(pageNum, pageSize);
+//        Page<Map<String, Object>> list = iElevatorService.selectElevators(mapPage, dto);
+//        return ResponseHelper.buildResponse(list);
 //    }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/ocp/query_elevator_list")
+    @ApiOperation(httpMethod = "GET", value = "电梯列表", notes = "电梯列表")
+    public ResponseModel<Page<JSONObject>> viewJgAll( @RequestParam Map<String,Object> map) {
+        JSONObject jsonObject = new JSONObject(map);
+        return ResponseHelper.buildResponse(iElevatorService.queryByKeys(jsonObject));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/ocp/exportData")
     @ApiOperation(httpMethod = "GET", value = "设备信息导出", notes = "设备信息导出")
     public void exportData(HttpServletResponse response, ElevatorDto dto) {