Commit 902d00dc authored by lisong's avatar lisong

更新

parent dc4fd4d6
...@@ -96,7 +96,7 @@ public class HouseholdPvContactController extends BaseController { ...@@ -96,7 +96,7 @@ public class HouseholdPvContactController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "户用光伏合同表分页查询", notes = "户用光伏合同表分页查询") @ApiOperation(httpMethod = "GET",value = "户用光伏合同表分页查询", notes = "户用光伏合同表分页查询")
public ResponseModel<Page<HouseholdPvContactDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam public ResponseModel<Page<HouseholdPvContactDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) { (value = "size") int size) {
Page<HouseholdPvContactDto> page = new Page<HouseholdPvContactDto>(); Page<HouseholdPvContactDto> page = new Page<>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(householdPvContactServiceImpl.queryForHouseholdPvContactPage(page)); return ResponseHelper.buildResponse(householdPvContactServiceImpl.queryForHouseholdPvContactPage(page));
......
...@@ -105,7 +105,7 @@ public class HouseholdPvDeviceController extends BaseController { ...@@ -105,7 +105,7 @@ public class HouseholdPvDeviceController extends BaseController {
@ApiOperation(httpMethod = "GET", value = "户用光伏设备表分页查询", notes = "户用光伏设备表分页查询") @ApiOperation(httpMethod = "GET", value = "户用光伏设备表分页查询", notes = "户用光伏设备表分页查询")
public ResponseModel<IPage<HouseholdPvDevice>> queryForPage(@RequestParam(value = "current") int current, public ResponseModel<IPage<HouseholdPvDevice>> queryForPage(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size, @RequestParam("objId") Long objId) { @RequestParam(value = "size") int size, @RequestParam("objId") Long objId) {
Page<HouseholdPvDevice> page = new Page<HouseholdPvDevice>(); Page<HouseholdPvDevice> page = new Page<>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(householdPvDeviceServiceImpl.queryForHouseholdPvDevicePage(page, objId)); return ResponseHelper.buildResponse(householdPvDeviceServiceImpl.queryForHouseholdPvDevicePage(page, objId));
......
...@@ -104,7 +104,7 @@ public class HouseholdPvDistrictController extends BaseController { ...@@ -104,7 +104,7 @@ public class HouseholdPvDistrictController extends BaseController {
@ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询") @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
public ResponseModel<Page<HouseholdPvDistrictDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam public ResponseModel<Page<HouseholdPvDistrictDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size) { (value = "size") int size) {
Page<HouseholdPvDistrictDto> page = new Page<HouseholdPvDistrictDto>(); Page<HouseholdPvDistrictDto> page = new Page<>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(householdPvDistrictServiceImpl.queryForHouseholdPvDistrictPage(page)); return ResponseHelper.buildResponse(householdPvDistrictServiceImpl.queryForHouseholdPvDistrictPage(page));
...@@ -189,7 +189,6 @@ public class HouseholdPvDistrictController extends BaseController { ...@@ -189,7 +189,6 @@ public class HouseholdPvDistrictController extends BaseController {
@DeleteMapping(value = "/treeNodesRemove") @DeleteMapping(value = "/treeNodesRemove")
@ApiOperation(httpMethod = "DELETE", value = "树节点删除", notes = "树节点删除") @ApiOperation(httpMethod = "DELETE", value = "树节点删除", notes = "树节点删除")
public CommonResponse treeNodesRemove(@RequestParam("id") String id) { public CommonResponse treeNodesRemove(@RequestParam("id") String id) {
ResponseModel<Object> model = new ResponseModel<>();
String result = householdPvDistrictService.treeNodesRemove(Long.parseLong(id)); String result = householdPvDistrictService.treeNodesRemove(Long.parseLong(id));
if (!"ok".equals(result)) { if (!"ok".equals(result)) {
return CommonResponseUtil.failure(result); return CommonResponseUtil.failure(result);
......
...@@ -96,7 +96,7 @@ public class HouseholdPvInstallController extends BaseController { ...@@ -96,7 +96,7 @@ public class HouseholdPvInstallController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "户用光伏合同表分页查询", notes = "户用光伏合同表分页查询") @ApiOperation(httpMethod = "GET",value = "户用光伏合同表分页查询", notes = "户用光伏合同表分页查询")
public ResponseModel<Page<HouseholdPvInstallDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam public ResponseModel<Page<HouseholdPvInstallDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) { (value = "size") int size) {
Page<HouseholdPvInstallDto> page = new Page<HouseholdPvInstallDto>(); Page<HouseholdPvInstallDto> page = new Page<>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(householdPvInstallServiceImpl.queryForHouseholdPvInstallPage(page)); return ResponseHelper.buildResponse(householdPvInstallServiceImpl.queryForHouseholdPvInstallPage(page));
......
...@@ -96,7 +96,7 @@ public class HouseholdPvLeaseController extends BaseController { ...@@ -96,7 +96,7 @@ public class HouseholdPvLeaseController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "户用光伏合同表分页查询", notes = "户用光伏合同表分页查询") @ApiOperation(httpMethod = "GET",value = "户用光伏合同表分页查询", notes = "户用光伏合同表分页查询")
public ResponseModel<Page<HouseholdPvLeaseDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam public ResponseModel<Page<HouseholdPvLeaseDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) { (value = "size") int size) {
Page<HouseholdPvLeaseDto> page = new Page<HouseholdPvLeaseDto>(); Page<HouseholdPvLeaseDto> page = new Page<>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(householdPvLeaseServiceImpl.queryForHouseholdPvLeasePage(page)); return ResponseHelper.buildResponse(householdPvLeaseServiceImpl.queryForHouseholdPvLeasePage(page));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment