diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceInfomationController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceInfomationController.java index 4c4b701c..50a14744 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceInfomationController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceInfomationController.java @@ -13,6 +13,7 @@ import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; import com.zt.plat.framework.excel.core.util.ExcelUtils; +import com.zt.plat.module.qms.common.service.BusinessFileService; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationPageReqVO; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationRespVO; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationSaveReqVO; @@ -56,7 +57,7 @@ public class DeviceInfomationController extends AbstractFileUploadController imp @Resource private DeviceInfomationService deviceInfomationService; @Resource private DeviceProductService deviceProductService; - + @Resource private BusinessFileService businessFileService; /** @@ -96,9 +97,9 @@ public class DeviceInfomationController extends AbstractFileUploadController imp @PutMapping("/update") @Operation(summary = "更新设备-设备信息") @PreAuthorize("@ss.hasPermission('resource:device-infomation:update')") - public CommonResult updateDeviceInfomation(@Valid @RequestBody DeviceInfomationSaveReqVO updateReqVO) { - deviceInfomationService.updateDeviceInfomation(updateReqVO); - return success(true); + public CommonResult updateDeviceInfomation(@Valid @RequestBody DeviceInfomationSaveReqVO updateReqVO) { + DeviceInfomationDO entity = deviceInfomationService.updateDeviceInfomation(updateReqVO); + return success(BeanUtils.toBean(entity, DeviceInfomationRespVO.class)); } @DeleteMapping("/delete") @@ -123,16 +124,17 @@ public class DeviceInfomationController extends AbstractFileUploadController imp @Operation(summary = "获得设备-设备信息") @Parameter(name = "id", description = "编号", required = true, example = "1024") public CommonResult getDeviceInfomation(@RequestParam("id") Long id) { - DeviceInfomationWithProductVO deviceInfomation = deviceInfomationService.getDeviceWithProduct(id); - String customConfig = deviceInfomation.getCustomConfig(); + DeviceInfomationWithProductVO vo = deviceInfomationService.getDeviceWithProduct(id); + String customConfig = vo.getCustomConfig(); if(!ObjectUtils.isEmpty(customConfig)){ try{ - deviceInfomation.setCustomConfigJson(JSON.parseObject(customConfig)); + vo.setCustomConfigJson(JSON.parseObject(customConfig)); }catch (Exception e){ e.printStackTrace(); } } - return success(deviceInfomation); + vo.setBusinessFileRet(businessFileService.getBusinessFileList(id)); + return success(vo); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationRespVO.java index 38a505d0..9c2baf6c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationRespVO.java @@ -3,11 +3,14 @@ package com.zt.plat.module.qms.resource.device.controller.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.fastjson.JSONObject; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.module.infra.api.businessfile.dto.BusinessFileWithUrlRespDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; @Schema(description = "管理后台 - 设备-设备信息 Response VO") @Data @@ -145,4 +148,8 @@ public class DeviceInfomationRespVO { @Schema(description = "数据采集设备类型") @ExcelProperty("数据采集设备类型") private String collectDeviceType; + + // ===================扩展字段========================= + @Schema(description = "附件对象") + private CommonResult> businessFileRet; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationSaveReqVO.java index 59c17a94..1a6a6ef0 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationSaveReqVO.java @@ -7,6 +7,7 @@ import lombok.Data; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; @Schema(description = "管理后台 - 设备-设备信息新增/修改 Request VO") @Data @@ -110,4 +111,8 @@ public class DeviceInfomationSaveReqVO { @Schema(description = "数据采集设备类型") private String collectDeviceType; + //=================扩展字段==================> + @Schema(description = "删除的文件id") + private List deleteFileIdList; + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceInfomationService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceInfomationService.java index c7407b85..797d7e7b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceInfomationService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceInfomationService.java @@ -67,8 +67,8 @@ public interface DeviceInfomationService { * * @param updateReqVO 更新信息 */ - void updateDeviceInfomation(@Valid DeviceInfomationSaveReqVO updateReqVO); - void updateDeviceInfomation(DeviceInfomationDO entity); + DeviceInfomationDO updateDeviceInfomation(@Valid DeviceInfomationSaveReqVO updateReqVO); + DeviceInfomationDO updateDeviceInfomation(DeviceInfomationDO entity); /** * 删除设备-设备信息 diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceInfomationServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceInfomationServiceImpl.java index e7989c67..84e0cf11 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceInfomationServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceInfomationServiceImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.module.qms.common.service.BusinessFileService; import com.zt.plat.module.qms.core.constant.DataTypeConstant; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationPageReqVO; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationRespVO; @@ -48,6 +49,7 @@ public class DeviceInfomationServiceImpl implements DeviceInfomationService { private DeviceInfomationMapper deviceInfomationMapper; @Resource private DeviceProductService deviceProductService; + @Resource private BusinessFileService businessFileService; @Override @Transactional(rollbackFor = Exception.class) @@ -276,17 +278,21 @@ public class DeviceInfomationServiceImpl implements DeviceInfomationService { } @Override - public void updateDeviceInfomation(DeviceInfomationSaveReqVO updateReqVO) { + @Transactional(rollbackFor = Exception.class) + public DeviceInfomationDO updateDeviceInfomation(DeviceInfomationSaveReqVO updateReqVO) { // 校验存在 validateDeviceInfomationExists(updateReqVO.getId()); // 更新 DeviceInfomationDO updateObj = BeanUtils.toBean(updateReqVO, DeviceInfomationDO.class); deviceInfomationMapper.updateById(updateObj); + businessFileService.deleteBusinessFileList(updateReqVO.getDeleteFileIdList()); + return updateObj; } @Override - public void updateDeviceInfomation(DeviceInfomationDO entity) { + public DeviceInfomationDO updateDeviceInfomation(DeviceInfomationDO entity) { deviceInfomationMapper.updateById(entity); + return entity; } @Override