diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceConfigBusinessItemController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceConfigBusinessItemController.java index 51cc23f9..eb9f1584 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceConfigBusinessItemController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceConfigBusinessItemController.java @@ -108,7 +108,7 @@ public class DeviceConfigBusinessItemController extends AbstractFileUploadContro Long productId = pageReqVO.getProductId(); if (productId != null) { - DeviceConfigBusinessRuleDO ruleDO = deviceConfigBusinessRuleService.getByProductId(productId, DeviceConstant.MAINTAIN_TYPE); + DeviceConfigBusinessRuleDO ruleDO = deviceConfigBusinessRuleService.getByProductId(productId, pageReqVO.getBusinessDomain()); if(ruleDO != null){ pageReqVO.setRuleId(ruleDO.getId()); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceMaintainController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceMaintainController.java index 80b97792..0ad32f0c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceMaintainController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceMaintainController.java @@ -20,6 +20,7 @@ import jakarta.validation.*; import jakarta.servlet.http.*; import java.text.SimpleDateFormat; +import java.time.LocalDate; import java.util.*; import java.io.IOException; @@ -103,8 +104,23 @@ public class DeviceMaintainController extends AbstractFileUploadController imple @PostMapping("/create") @Operation(summary = "创建设备-点检、保养记录") // @PreAuthorize("@ss.hasPermission('qms:device-maintain:create')") - public CommonResult createDeviceMaintain(@Valid @RequestBody DeviceMaintainSaveReqVO createReqVO) { - return success(deviceMaintainService.createDeviceMaintain(createReqVO)); + public CommonResult createDeviceMaintain(@RequestBody JSONObject jsonObject) { + Long deviceId = jsonObject.getLong("deviceId"); + String dataType = jsonObject.getString("dataType"); + String dateStr = jsonObject.getString("date"); + if (deviceId == null || dataType == null) { + return CommonResult.error(DEVICE_MAINTAIN_NOT_EXISTS.getCode(), "参数错误"); + } + //检查设备状态 + CommonResult checkResult = deviceInfomationService.checkDeviceUsable(deviceId); + if(!checkResult.isSuccess()){ + return checkResult.error(checkResult.getCode(), checkResult.getMsg()); + } + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if(ObjectUtils.isEmpty(dateStr)) + dateStr = sdf.format(new Date()); + LocalDate localDate = LocalDate.parse(dateStr); + return deviceMaintainService.create(deviceId, localDate, dataType); } @PutMapping("/update") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceConfigBusinessItemPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceConfigBusinessItemPageReqVO.java index 408444dc..399e8a95 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceConfigBusinessItemPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceConfigBusinessItemPageReqVO.java @@ -57,4 +57,7 @@ public class DeviceConfigBusinessItemPageReqVO extends PageParam { @Schema(description = "设备大类id") private Long productId; + @Schema(description = "业务类型") + private String businessDomain; + } \ 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/dal/dataobject/DeviceMaintainItemDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/dataobject/DeviceMaintainItemDO.java index 4314fabf..d4e00bc1 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/dataobject/DeviceMaintainItemDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/dataobject/DeviceMaintainItemDO.java @@ -99,7 +99,7 @@ public class DeviceMaintainItemDO extends BusinessBaseDO { /** * 所属周期截止日期 */ - @TableField("FREQ_TM_STRT") + @TableField("FREQ_TM_END") private LocalDateTime frequencyTimeEnd; /** * 检查标准