diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/controller/TableController.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/controller/TableController.java index a64f57c..e31cacc 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/controller/TableController.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/controller/TableController.java @@ -66,13 +66,13 @@ public class TableController { @ApiOperation(value = "更新接口") @PutMapping({"/{typeName}/{version}", "/{typeName}"}) - public ResultVO update(@PathVariable String typeName, @RequestParam Map map, @PathVariable(required = false) Integer version) { + public ResultVO> update(@PathVariable String typeName, @RequestParam Map map, @PathVariable(required = false) Integer version) { return tableService.update(tableNameUtil.getTableName(typeName), map, version); } @ApiOperation(value = "更新接口(带更改日期)") @PutMapping({"/{typeName}/{version}/date", "/{typeName}/date"}) - public ResultVO updateWithDate(@PathVariable String typeName, @RequestParam Map map, @PathVariable(required = false) Integer version) { + public ResultVO> updateWithDate(@PathVariable String typeName, @RequestParam Map map, @PathVariable(required = false) Integer version) { return tableService.updateWithDate(tableNameUtil.getTableName(typeName), map, version); } diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/service/TableService.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/service/TableService.java index 8ce7708..d4f7868 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/service/TableService.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/service/TableService.java @@ -16,9 +16,9 @@ public interface TableService { ResultVO> saveWithDate(OsSysTable osSysTable, Map map); - ResultVO update(OsSysTable osSysTable, Map map, Integer version); + ResultVO> update(OsSysTable osSysTable, Map map, Integer version); - ResultVO updateWithDate(OsSysTable tableName, Map map, Integer version); + ResultVO> updateWithDate(OsSysTable tableName, Map map, Integer version); ResultVO delete(OsSysTable tableName, String ids); diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/service/impl/TableServiceImpl.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/service/impl/TableServiceImpl.java index 69a6941..c33bf5d 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/service/impl/TableServiceImpl.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/service/impl/TableServiceImpl.java @@ -67,14 +67,14 @@ public class TableServiceImpl implements TableService { } @Override - public ResultVO update(OsSysTable osSysTable, Map map, Integer version) { + public ResultVO> update(OsSysTable osSysTable, Map map, Integer version) { Object pk = map.get(osSysTable.getTablePk()); map.remove(osSysTable.getTablePk()); return versionValid(osSysTable, map, version, pk); } @Override - public ResultVO updateWithDate(OsSysTable osSysTable, Map map, Integer version) { + public ResultVO> updateWithDate(OsSysTable osSysTable, Map map, Integer version) { Object pk = map.get(osSysTable.getTablePk()); map.put(FieldConstants.UPDATE_TIME.toString(), new Date()); map.remove(osSysTable.getTablePk()); @@ -82,7 +82,7 @@ public class TableServiceImpl implements TableService { return versionValid(osSysTable, map, version, pk); } - private ResultVO versionValid(OsSysTable osSysTable, Map map, Integer version, Object pk) { + private ResultVO> versionValid(OsSysTable osSysTable, Map map, Integer version, Object pk) { if (!StringUtils.isEmpty(version)) { DataMap dataMap = DataMap.builder().sysOsTable(osSysTable).pkValue(pk).data(map).build(); Map data = baseMapper.selectByPk(dataMap); @@ -96,7 +96,7 @@ public class TableServiceImpl implements TableService { return updateByPk(osSysTable, map, pk); } - private ResultVO updateByPk(OsSysTable osSysTable, Map map, Object pk) { + private ResultVO> updateByPk(OsSysTable osSysTable, Map map, Object pk) { map.remove("ROW_ID"); // 设置更新项 DataMap dataMap = DataMap.builder() @@ -106,7 +106,8 @@ public class TableServiceImpl implements TableService { .build(); int i = baseMapper.updateByPk(dataMap); SqlException.operation(i, "更新失败"); - return ResultVO.getSuccess(i); + Map result = baseMapper.selectByPk(osSysTable,pk); + return ResultVO.getSuccess(result); } @Override