diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFixedAssetsController.java index 9b88f48..217c73a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFixedAssetsController.java @@ -89,27 +89,47 @@ /** * 刪除固定资产 + * + * 标准配套设备/检定设备/测量工装-删除：修改设备属性标志 + * 测量设备/固定资产-删除：删除设备 */ - @ApiOperation("删除固定资产") + @ApiOperation("删除固定资产(测量设备/固定资产-删除)") @PostMapping("/delete") @ResponseBody public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { return iMeterFixedAssetsService.deleteByFixedAssetId(idDTO.getId()); } + @ApiOperation("删除标准配套设备") + @PostMapping("/removeStandardSupportEquipment") + @ResponseBody + public ReturnDTO removeStandardSupportEquipment(@RequestBody @Valid IdDTO idDTO) { + return iMeterFixedAssetsService.removeStandardSupportEquipment(idDTO.getId()); + } + + @ApiOperation("删除检定设备") + @PostMapping("/removeCalibrationTestEquipment") + @ResponseBody + public ReturnDTO removeCalibrationTestEquipment(@RequestBody @Valid IdDTO idDTO) { + return iMeterFixedAssetsService.removeCalibrationTestEquipment(idDTO.getId()); + } + + @ApiOperation("删除测量工装") + @PostMapping("/removeMeasureAccount") + @ResponseBody + public ReturnDTO removeMeasureAccount(@RequestBody @Valid IdDTO idDTO) { + return iMeterFixedAssetsService.removeMeasureAccount(idDTO.getId()); + } /** * 导出固定资产 */ @ApiOperation("导出excel") @PostMapping("/exportExcel") -// @GetMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception { -// public void exportExcel() throws Exception { DictCodeUtils.validDictCode(request); -// FixedAssetRequest request = new FixedAssetRequest(); -// request.setAssetType(1); + List list = iMeterFixedAssetsService.list(request); if (CollectionUtils.isEmpty(list)) { return; @@ -146,30 +166,6 @@ } -// /** -// * 导出测量设备/标准-检定设备/标准配套装置/测量工装 -// */ -// @ApiOperation("导出测量设备/标准-检定设备/标准配套装置/测量工装") -// @PostMapping("/exportMeterEquipmentExcel") -// public void exportMeterEquipmentExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception { -// DictCodeUtils.validDictCode(request); -// super.exportExcel(MeterFixedAssets.class, iMeterFixedAssetsService.list(request), ExportEnum.FIXED_ASSETS.getSheetName()); -// } -// -// -// -// /** -// * 导出标准配套装置 -// */ -// @ApiOperation("导出标准配套装置") -// @PostMapping("/exportStandardExcel") -// @ResponseBody -// public void exportStandardExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception { -// DictCodeUtils.validDictCode(request); -// super.exportExcel(MeterFixedAssets.class, iMeterFixedAssetsService.list(request), ExportEnum.FIXED_ASSETS.getSheetName()); -// } - - /** * 批量导入测量设备信息 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFixedAssetsController.java index 9b88f48..217c73a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFixedAssetsController.java @@ -89,27 +89,47 @@ /** * 刪除固定资产 + * + * 标准配套设备/检定设备/测量工装-删除：修改设备属性标志 + * 测量设备/固定资产-删除：删除设备 */ - @ApiOperation("删除固定资产") + @ApiOperation("删除固定资产(测量设备/固定资产-删除)") @PostMapping("/delete") @ResponseBody public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { return iMeterFixedAssetsService.deleteByFixedAssetId(idDTO.getId()); } + @ApiOperation("删除标准配套设备") + @PostMapping("/removeStandardSupportEquipment") + @ResponseBody + public ReturnDTO removeStandardSupportEquipment(@RequestBody @Valid IdDTO idDTO) { + return iMeterFixedAssetsService.removeStandardSupportEquipment(idDTO.getId()); + } + + @ApiOperation("删除检定设备") + @PostMapping("/removeCalibrationTestEquipment") + @ResponseBody + public ReturnDTO removeCalibrationTestEquipment(@RequestBody @Valid IdDTO idDTO) { + return iMeterFixedAssetsService.removeCalibrationTestEquipment(idDTO.getId()); + } + + @ApiOperation("删除测量工装") + @PostMapping("/removeMeasureAccount") + @ResponseBody + public ReturnDTO removeMeasureAccount(@RequestBody @Valid IdDTO idDTO) { + return iMeterFixedAssetsService.removeMeasureAccount(idDTO.getId()); + } /** * 导出固定资产 */ @ApiOperation("导出excel") @PostMapping("/exportExcel") -// @GetMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception { -// public void exportExcel() throws Exception { DictCodeUtils.validDictCode(request); -// FixedAssetRequest request = new FixedAssetRequest(); -// request.setAssetType(1); + List list = iMeterFixedAssetsService.list(request); if (CollectionUtils.isEmpty(list)) { return; @@ -146,30 +166,6 @@ } -// /** -// * 导出测量设备/标准-检定设备/标准配套装置/测量工装 -// */ -// @ApiOperation("导出测量设备/标准-检定设备/标准配套装置/测量工装") -// @PostMapping("/exportMeterEquipmentExcel") -// public void exportMeterEquipmentExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception { -// DictCodeUtils.validDictCode(request); -// super.exportExcel(MeterFixedAssets.class, iMeterFixedAssetsService.list(request), ExportEnum.FIXED_ASSETS.getSheetName()); -// } -// -// -// -// /** -// * 导出标准配套装置 -// */ -// @ApiOperation("导出标准配套装置") -// @PostMapping("/exportStandardExcel") -// @ResponseBody -// public void exportStandardExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception { -// DictCodeUtils.validDictCode(request); -// super.exportExcel(MeterFixedAssets.class, iMeterFixedAssetsService.list(request), ExportEnum.FIXED_ASSETS.getSheetName()); -// } - - /** * 批量导入测量设备信息 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java index 12049e9..9073149 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java @@ -1,6 +1,8 @@ package com.casic.missiles.service.Impl.meter; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; @@ -23,6 +25,7 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -216,12 +219,36 @@ return ReturnUtil.failed("删除失败"); } -// /** -// * 导出数据 -// */ -// public void exportExcel(FixedAssetRequest request, HttpServletResponse) { -// -// } + @Override + public ReturnDTO removeStandardSupportEquipment(Long id) { + return removeTypeSign(id,"is_standard_support_equipment"); + } + + @Override + public ReturnDTO removeCalibrationTestEquipment(Long id) { + return removeTypeSign(id,"is_calibration_test_equipment"); + } + + @Override + public ReturnDTO removeMeasureAccount(Long id) { + return removeTypeSign(id,"is_measure_account"); + } + + /** + * 删除类型标记（更新字段） + * @param id 固定资产id + * @param signName 字段名 + * @return 更新结果 + */ + @NotNull + private ReturnDTO removeTypeSign(Long id, String signName) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", id).set(signName, 0); + if(meterFixedAssetsMapper.update(null, updateWrapper)>0){ + return ReturnUtil.success(); + } + return ReturnUtil.failed("删除失败"); + } /** * diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFixedAssetsController.java index 9b88f48..217c73a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFixedAssetsController.java @@ -89,27 +89,47 @@ /** * 刪除固定资产 + * + * 标准配套设备/检定设备/测量工装-删除：修改设备属性标志 + * 测量设备/固定资产-删除：删除设备 */ - @ApiOperation("删除固定资产") + @ApiOperation("删除固定资产(测量设备/固定资产-删除)") @PostMapping("/delete") @ResponseBody public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) { return iMeterFixedAssetsService.deleteByFixedAssetId(idDTO.getId()); } + @ApiOperation("删除标准配套设备") + @PostMapping("/removeStandardSupportEquipment") + @ResponseBody + public ReturnDTO removeStandardSupportEquipment(@RequestBody @Valid IdDTO idDTO) { + return iMeterFixedAssetsService.removeStandardSupportEquipment(idDTO.getId()); + } + + @ApiOperation("删除检定设备") + @PostMapping("/removeCalibrationTestEquipment") + @ResponseBody + public ReturnDTO removeCalibrationTestEquipment(@RequestBody @Valid IdDTO idDTO) { + return iMeterFixedAssetsService.removeCalibrationTestEquipment(idDTO.getId()); + } + + @ApiOperation("删除测量工装") + @PostMapping("/removeMeasureAccount") + @ResponseBody + public ReturnDTO removeMeasureAccount(@RequestBody @Valid IdDTO idDTO) { + return iMeterFixedAssetsService.removeMeasureAccount(idDTO.getId()); + } /** * 导出固定资产 */ @ApiOperation("导出excel") @PostMapping("/exportExcel") -// @GetMapping("/exportExcel") @ResponseBody public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception { -// public void exportExcel() throws Exception { DictCodeUtils.validDictCode(request); -// FixedAssetRequest request = new FixedAssetRequest(); -// request.setAssetType(1); + List list = iMeterFixedAssetsService.list(request); if (CollectionUtils.isEmpty(list)) { return; @@ -146,30 +166,6 @@ } -// /** -// * 导出测量设备/标准-检定设备/标准配套装置/测量工装 -// */ -// @ApiOperation("导出测量设备/标准-检定设备/标准配套装置/测量工装") -// @PostMapping("/exportMeterEquipmentExcel") -// public void exportMeterEquipmentExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception { -// DictCodeUtils.validDictCode(request); -// super.exportExcel(MeterFixedAssets.class, iMeterFixedAssetsService.list(request), ExportEnum.FIXED_ASSETS.getSheetName()); -// } -// -// -// -// /** -// * 导出标准配套装置 -// */ -// @ApiOperation("导出标准配套装置") -// @PostMapping("/exportStandardExcel") -// @ResponseBody -// public void exportStandardExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception { -// DictCodeUtils.validDictCode(request); -// super.exportExcel(MeterFixedAssets.class, iMeterFixedAssetsService.list(request), ExportEnum.FIXED_ASSETS.getSheetName()); -// } - - /** * 批量导入测量设备信息 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java index 12049e9..9073149 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java @@ -1,6 +1,8 @@ package com.casic.missiles.service.Impl.meter; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; @@ -23,6 +25,7 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -216,12 +219,36 @@ return ReturnUtil.failed("删除失败"); } -// /** -// * 导出数据 -// */ -// public void exportExcel(FixedAssetRequest request, HttpServletResponse) { -// -// } + @Override + public ReturnDTO removeStandardSupportEquipment(Long id) { + return removeTypeSign(id,"is_standard_support_equipment"); + } + + @Override + public ReturnDTO removeCalibrationTestEquipment(Long id) { + return removeTypeSign(id,"is_calibration_test_equipment"); + } + + @Override + public ReturnDTO removeMeasureAccount(Long id) { + return removeTypeSign(id,"is_measure_account"); + } + + /** + * 删除类型标记（更新字段） + * @param id 固定资产id + * @param signName 字段名 + * @return 更新结果 + */ + @NotNull + private ReturnDTO removeTypeSign(Long id, String signName) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", id).set(signName, 0); + if(meterFixedAssetsMapper.update(null, updateWrapper)>0){ + return ReturnUtil.success(); + } + return ReturnUtil.failed("删除失败"); + } /** * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFixedAssetsService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFixedAssetsService.java index 85f25bd..9f333e3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFixedAssetsService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterFixedAssetsService.java @@ -23,6 +23,12 @@ ReturnDTO deleteByFixedAssetId(Long id); + ReturnDTO removeStandardSupportEquipment(Long id); + + ReturnDTO removeCalibrationTestEquipment(Long id); + + ReturnDTO removeMeasureAccount(Long id); + ReturnDTO updateFixedAsset(MeterFixedAssets meterFixedAssets); List list(FixedAssetRequest request) throws Exception;