Browse Source

移除原因错误

dev_power_axis
zhangyuan 4 years ago
parent
commit
78f9fe6f83
  1. 13
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractFileController.java
  2. 13
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentTenantInfoController.java
  3. 2
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentBlacklistServiceImpl.java

13
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractFileController.java

@ -34,20 +34,20 @@ public class RentContractFileController {
private RentContractFileService rentContractFileService; private RentContractFileService rentContractFileService;
@RequestMapping("page") @RequestMapping("page")
public Result<PageData<RentContractFileDTO>> page(@RequestParam Map<String, Object> params){ public Result<PageData<RentContractFileDTO>> page(@RequestParam Map<String, Object> params) {
PageData<RentContractFileDTO> page = rentContractFileService.page(params); PageData<RentContractFileDTO> page = rentContractFileService.page(params);
return new Result<PageData<RentContractFileDTO>>().ok(page); return new Result<PageData<RentContractFileDTO>>().ok(page);
} }
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
public Result<RentContractFileDTO> get(@PathVariable("id") String id){ public Result<RentContractFileDTO> get(@PathVariable("id") String id) {
RentContractFileDTO data = rentContractFileService.get(id); RentContractFileDTO data = rentContractFileService.get(id);
return new Result<RentContractFileDTO>().ok(data); return new Result<RentContractFileDTO>().ok(data);
} }
@NoRepeatSubmit @NoRepeatSubmit
@PostMapping("save") @PostMapping("save")
public Result save(@RequestBody RentContractFileDTO dto){ public Result save(@RequestBody RentContractFileDTO dto) {
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
rentContractFileService.save(dto); rentContractFileService.save(dto);
@ -56,7 +56,7 @@ public class RentContractFileController {
@NoRepeatSubmit @NoRepeatSubmit
@PostMapping("update") @PostMapping("update")
public Result update(@RequestBody RentContractFileDTO dto){ public Result update(@RequestBody RentContractFileDTO dto) {
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
rentContractFileService.update(dto); rentContractFileService.update(dto);
@ -64,7 +64,7 @@ public class RentContractFileController {
} }
@PostMapping("delete") @PostMapping("delete")
public Result delete(@RequestBody String[] ids){ public Result delete(@RequestBody String[] ids) {
//效验数据 //效验数据
AssertUtils.isArrayEmpty(ids, "id"); AssertUtils.isArrayEmpty(ids, "id");
rentContractFileService.delete(ids); rentContractFileService.delete(ids);
@ -78,5 +78,4 @@ public class RentContractFileController {
} }
} }

13
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentTenantInfoController.java

@ -34,20 +34,20 @@ public class RentTenantInfoController {
private RentTenantInfoService rentTenantInfoService; private RentTenantInfoService rentTenantInfoService;
@RequestMapping("page") @RequestMapping("page")
public Result<PageData<RentTenantInfoDTO>> page(@RequestParam Map<String, Object> params){ public Result<PageData<RentTenantInfoDTO>> page(@RequestParam Map<String, Object> params) {
PageData<RentTenantInfoDTO> page = rentTenantInfoService.page(params); PageData<RentTenantInfoDTO> page = rentTenantInfoService.page(params);
return new Result<PageData<RentTenantInfoDTO>>().ok(page); return new Result<PageData<RentTenantInfoDTO>>().ok(page);
} }
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
public Result<RentTenantInfoDTO> get(@PathVariable("id") String id){ public Result<RentTenantInfoDTO> get(@PathVariable("id") String id) {
RentTenantInfoDTO data = rentTenantInfoService.get(id); RentTenantInfoDTO data = rentTenantInfoService.get(id);
return new Result<RentTenantInfoDTO>().ok(data); return new Result<RentTenantInfoDTO>().ok(data);
} }
@NoRepeatSubmit @NoRepeatSubmit
@PostMapping("save") @PostMapping("save")
public Result save(@RequestBody RentTenantInfoDTO dto){ public Result save(@RequestBody RentTenantInfoDTO dto) {
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
return rentTenantInfoService.save(dto); return rentTenantInfoService.save(dto);
@ -55,7 +55,7 @@ public class RentTenantInfoController {
@NoRepeatSubmit @NoRepeatSubmit
@PostMapping("update") @PostMapping("update")
public Result update(@RequestBody RentTenantInfoDTO dto){ public Result update(@RequestBody RentTenantInfoDTO dto) {
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
rentTenantInfoService.update(dto); rentTenantInfoService.update(dto);
@ -63,7 +63,7 @@ public class RentTenantInfoController {
} }
@PostMapping("delete") @PostMapping("delete")
public Result delete(@RequestBody String[] ids){ public Result delete(@RequestBody String[] ids) {
//效验数据 //效验数据
AssertUtils.isArrayEmpty(ids, "id"); AssertUtils.isArrayEmpty(ids, "id");
rentTenantInfoService.delete(ids); rentTenantInfoService.delete(ids);
@ -77,5 +77,4 @@ public class RentTenantInfoController {
} }
} }

2
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentBlacklistServiceImpl.java

@ -113,7 +113,7 @@ public class RentBlacklistServiceImpl extends BaseServiceImpl<RentBlacklistDao,
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void update(RentBlacklistDTO dto) { public void update(RentBlacklistDTO dto) {
dto.setRemoveReason(DateUtils.format(new Date())); dto.setRemoveDate(DateUtils.format(new Date()));
RentBlacklistEntity entity = ConvertUtils.sourceToTarget(dto, RentBlacklistEntity.class); RentBlacklistEntity entity = ConvertUtils.sourceToTarget(dto, RentBlacklistEntity.class);
updateById(entity); updateById(entity);
baseDao.deleteBatchIds(Collections.singletonList(entity.getId())); baseDao.deleteBatchIds(Collections.singletonList(entity.getId()));

Loading…
Cancel
Save