From 153b891aea3fab7528d497e2ededf294fa016c3a Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Sun, 24 Dec 2017 21:51:38 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2
---
src/main/java/com/moral/controller/DeviceVersionController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/controller/DeviceVersionController.java b/src/main/java/com/moral/controller/DeviceVersionController.java
index 14bf960..e9c750b 100644
--- a/src/main/java/com/moral/controller/DeviceVersionController.java
+++ b/src/main/java/com/moral/controller/DeviceVersionController.java
@@ -1,12 +1,24 @@
package com.moral.controller;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.moral.common.bean.PageBean;
+import com.moral.common.bean.PageResult;
+import com.moral.entity.DeviceVersion;
+import com.moral.service.DeviceVersionService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
@RestController
@RequestMapping("device-version")
@CrossOrigin(origins = "*", maxAge = 3600)
public class DeviceVersionController {
+ @Resource
+ private DeviceVersionService deviceVersionService;
+
+ @GetMapping("page-list")
+ public PageBean<DeviceVersion> pageList(PageBean pageBean) throws NoSuchMethodException, UnsupportedEncodingException {
+ return deviceVersionService.queryByPageBean(pageBean);
+ }
}
--
Gitblit v1.8.0