From 55dfe6583ebcfa99e48662e4d4fc7d539160bcc5 Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Wed, 10 Jul 2024 14:11:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=20interger=20=E5=8F=98=20long?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/leger/controller/EquipmentLedgerController.java | 4 ++-- .../leger/controller/InspectionStandardsController.java | 2 +- .../leger/controller/InventoryDocumentController.java | 2 +- .../modules/leger/controller/TechParametersController.java | 2 +- .../leger/controller/ToolInventoryRecordController.java | 6 +++--- .../org/energy/modules/leger/entity/InventoryDocument.java | 2 -- .../modules/leger/mapper/InspectionStandardsMapper.java | 2 +- .../modules/leger/mapper/InventoryDocumentMapper.java | 2 +- .../energy/modules/leger/mapper/TechParametersMapper.java | 2 +- .../modules/leger/service/IInspectionStandardsService.java | 2 +- .../modules/leger/service/IInventoryDocumentService.java | 2 +- .../modules/leger/service/ITechParametersService.java | 2 +- .../leger/service/impl/InspectionStandardsServiceImpl.java | 2 +- .../leger/service/impl/InventoryDocumentServiceImpl.java | 2 +- .../leger/service/impl/TechParametersServiceImpl.java | 2 +- 15 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java index b24d90d..97a6592 100644 --- a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java +++ b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java @@ -170,8 +170,8 @@ public class EquipmentLedgerController extends DafController { @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { for (String id : ids.split(",")) { - inventoryDocumentService.delInventoryDocument(Integer.parseInt(id)); - techParametersService.delTechParameters(Integer.parseInt(id)); + inventoryDocumentService.delInventoryDocument(Long.parseLong(id)); + techParametersService.delTechParameters(Long.parseLong(id)); } return R.status(equipmentLedgerService.deleteLogic(Func.toLongList(ids))); } diff --git a/src/main/java/org/energy/modules/leger/controller/InspectionStandardsController.java b/src/main/java/org/energy/modules/leger/controller/InspectionStandardsController.java index ba7c6ba..1312e0b 100644 --- a/src/main/java/org/energy/modules/leger/controller/InspectionStandardsController.java +++ b/src/main/java/org/energy/modules/leger/controller/InspectionStandardsController.java @@ -142,7 +142,7 @@ public class InspectionStandardsController extends DafController { @GetMapping("/del") @ApiOperationSupport(order = 9) @ApiOperation(value = "逻辑删除", notes = "传入toolscodeid") - public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Integer toolsCodeId) { + public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Long toolsCodeId) { return R.status(inspectionStandardsService.delInspectionStandards(toolsCodeId)); } diff --git a/src/main/java/org/energy/modules/leger/controller/InventoryDocumentController.java b/src/main/java/org/energy/modules/leger/controller/InventoryDocumentController.java index f44ebe0..4b60da1 100644 --- a/src/main/java/org/energy/modules/leger/controller/InventoryDocumentController.java +++ b/src/main/java/org/energy/modules/leger/controller/InventoryDocumentController.java @@ -142,7 +142,7 @@ public class InventoryDocumentController extends DafController { @GetMapping("/del") @ApiOperationSupport(order = 9) @ApiOperation(value = "逻辑删除", notes = "传入eqLedgerId") - public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Integer eqLedgerId) { + public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Long eqLedgerId) { return R.status(inventoryDocumentService.delInventoryDocument(eqLedgerId)); } } diff --git a/src/main/java/org/energy/modules/leger/controller/TechParametersController.java b/src/main/java/org/energy/modules/leger/controller/TechParametersController.java index 6e9fba3..f927b54 100644 --- a/src/main/java/org/energy/modules/leger/controller/TechParametersController.java +++ b/src/main/java/org/energy/modules/leger/controller/TechParametersController.java @@ -142,7 +142,7 @@ public class TechParametersController extends DafController { @GetMapping("/del") @ApiOperationSupport(order = 9) @ApiOperation(value = "逻辑删除", notes = "传入eqLedgerId") - public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Integer eqLedgerId) { + public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Long eqLedgerId) { return R.status(techParametersService.delTechParameters(eqLedgerId)); } } diff --git a/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java b/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java index 6fcbfdf..d19206e 100644 --- a/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java +++ b/src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.java @@ -162,9 +162,9 @@ public class ToolInventoryRecordController extends DafController { @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { for (String id : ids.split(",")) { - inventoryDocumentService.delInventoryDocument(Integer.parseInt(id)); - techParametersService.delTechParameters(Integer.parseInt(id)); - inspectionStandardsService.delInspectionStandards(Integer.parseInt(id)); + inventoryDocumentService.delInventoryDocument(Long.parseLong(id)); + techParametersService.delTechParameters(Long.parseLong(id)); + inspectionStandardsService.delInspectionStandards(Long.parseLong(id)); } return R.status(toolInventoryRecordService.deleteLogic(Func.toLongList(ids))); } diff --git a/src/main/java/org/energy/modules/leger/entity/InventoryDocument.java b/src/main/java/org/energy/modules/leger/entity/InventoryDocument.java index 5ca0419..f1c21cb 100644 --- a/src/main/java/org/energy/modules/leger/entity/InventoryDocument.java +++ b/src/main/java/org/energy/modules/leger/entity/InventoryDocument.java @@ -34,13 +34,11 @@ public class InventoryDocument extends BaseEntity { /** * 设备台账主键 */ - @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value = "设备台账主键") private Long eqLedgerId; /** * 工器具编码主键 */ - @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value = "工器具编码主键") private Long toolsCodeId; /** diff --git a/src/main/java/org/energy/modules/leger/mapper/InspectionStandardsMapper.java b/src/main/java/org/energy/modules/leger/mapper/InspectionStandardsMapper.java index 5e8f431..7117e98 100644 --- a/src/main/java/org/energy/modules/leger/mapper/InspectionStandardsMapper.java +++ b/src/main/java/org/energy/modules/leger/mapper/InspectionStandardsMapper.java @@ -29,6 +29,6 @@ public interface InspectionStandardsMapper extends BaseMapper { * @param eqLedgerId * @return */ - boolean delInventoryDocument(Integer eqLedgerId); + boolean delInventoryDocument(Long eqLedgerId); } diff --git a/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.java b/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.java index a792c80..9355cae 100644 --- a/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.java +++ b/src/main/java/org/energy/modules/leger/mapper/TechParametersMapper.java @@ -29,6 +29,6 @@ public interface TechParametersMapper extends BaseMapper { * @param eqLedgerId * @return */ - boolean delTechParameters(Integer eqLedgerId); + boolean delTechParameters(Long eqLedgerId); } diff --git a/src/main/java/org/energy/modules/leger/service/IInspectionStandardsService.java b/src/main/java/org/energy/modules/leger/service/IInspectionStandardsService.java index 715f7b1..e40b40e 100644 --- a/src/main/java/org/energy/modules/leger/service/IInspectionStandardsService.java +++ b/src/main/java/org/energy/modules/leger/service/IInspectionStandardsService.java @@ -28,6 +28,6 @@ public interface IInspectionStandardsService extends BaseService { * @param eqLedgerId * @return */ - boolean delTechParameters(Integer eqLedgerId); + boolean delTechParameters(Long eqLedgerId); } diff --git a/src/main/java/org/energy/modules/leger/service/impl/InspectionStandardsServiceImpl.java b/src/main/java/org/energy/modules/leger/service/impl/InspectionStandardsServiceImpl.java index 1e607d0..127733f 100644 --- a/src/main/java/org/energy/modules/leger/service/impl/InspectionStandardsServiceImpl.java +++ b/src/main/java/org/energy/modules/leger/service/impl/InspectionStandardsServiceImpl.java @@ -22,7 +22,7 @@ public class InspectionStandardsServiceImpl extends BaseServiceImpl