|
@@ -2,7 +2,7 @@ package com.monitor.cmdb.controller; |
|
@@ -2,7 +2,7 @@ package com.monitor.cmdb.controller; |
|
2
|
|
2
|
|
|
3
|
import com.model.MechineInfo;
|
3
|
import com.model.MechineInfo;
|
|
4
|
import com.monitor.cmdb.service.IMechineInfoService;
|
4
|
import com.monitor.cmdb.service.IMechineInfoService;
|
|
5
|
-import com.monitor.cmdb.vo.req.MechineInfoReq;
|
5
|
+import com.monitor.model.request.MechineInfoReq;
|
|
6
|
import com.monitor.model.response.PageResponse;
|
6
|
import com.monitor.model.response.PageResponse;
|
|
7
|
import com.monitor.model.response.Response;
|
7
|
import com.monitor.model.response.Response;
|
|
8
|
import org.slf4j.Logger;
|
8
|
import org.slf4j.Logger;
|
|
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.ResponseBody; |
|
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.ResponseBody; |
|
18
|
* Created by yoho on 2016/6/14.
|
18
|
* Created by yoho on 2016/6/14.
|
|
19
|
*/
|
19
|
*/
|
|
20
|
@Controller
|
20
|
@Controller
|
|
21
|
-@RequestMapping("MechineInfoController")
|
21
|
+@RequestMapping("mechineInfo")
|
|
22
|
public class MechineInfoController {
|
22
|
public class MechineInfoController {
|
|
23
|
|
23
|
|
|
24
|
Logger log = LoggerFactory.getLogger(MechineInfoController.class);
|
24
|
Logger log = LoggerFactory.getLogger(MechineInfoController.class);
|
|
@@ -26,7 +26,7 @@ public class MechineInfoController { |
|
@@ -26,7 +26,7 @@ public class MechineInfoController { |
|
26
|
@Autowired
|
26
|
@Autowired
|
|
27
|
IMechineInfoService mechineInfoService;
|
27
|
IMechineInfoService mechineInfoService;
|
|
28
|
|
28
|
|
|
29
|
- @RequestMapping("/getMechineInfos.do")
|
29
|
+ @RequestMapping("/getMechineInfos")
|
|
30
|
@ResponseBody
|
30
|
@ResponseBody
|
|
31
|
public Response<PageResponse<MechineInfo>> getMechineInfos(MechineInfoReq req) throws Exception {
|
31
|
public Response<PageResponse<MechineInfo>> getMechineInfos(MechineInfoReq req) throws Exception {
|
|
32
|
log.debug("getMechineInfos with param is {}", req);
|
32
|
log.debug("getMechineInfos with param is {}", req);
|
|
@@ -35,7 +35,6 @@ public class MechineInfoController { |
|
@@ -35,7 +35,6 @@ public class MechineInfoController { |
|
35
|
if (responseBO == null || CollectionUtils.isEmpty(responseBO.getRows())) {
|
35
|
if (responseBO == null || CollectionUtils.isEmpty(responseBO.getRows())) {
|
|
36
|
return new Response<PageResponse<MechineInfo>>();
|
36
|
return new Response<PageResponse<MechineInfo>>();
|
|
37
|
}
|
37
|
}
|
|
38
|
-
|
|
|
|
39
|
PageResponse<MechineInfo> response = new PageResponse<MechineInfo>();
|
38
|
PageResponse<MechineInfo> response = new PageResponse<MechineInfo>();
|
|
40
|
response.setCurrentPage(responseBO.getCurrentPage());
|
39
|
response.setCurrentPage(responseBO.getCurrentPage());
|
|
41
|
response.setRows(responseBO.getRows());
|
40
|
response.setRows(responseBO.getRows());
|
