From 158917f2bc277ddfd9c7e491e7f77caea2b0cde0 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Thu, 9 Jan 2025 11:52:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=8B=E8=AF=95=E9=A1=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/csdevice/api/WlRecordFeignClient.java | 2 +- .../njcn/csdevice/pojo/param/WlRecordParam.java | 3 +++ .../controller/scheme/WlRecordController.java | 14 ++++++++++++++ .../njcn/csdevice/service/IWlRecordService.java | 2 ++ .../service/impl/WlRecordServiceImpl.java | 16 +++++++++++++++- 5 files changed, 35 insertions(+), 2 deletions(-) diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/WlRecordFeignClient.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/WlRecordFeignClient.java index 26f9cf0..bd844ef 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/WlRecordFeignClient.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/WlRecordFeignClient.java @@ -46,7 +46,7 @@ public interface WlRecordFeignClient { HttpResult updateTestRecord(@RequestBody @Validated WlRecordParam.UpdateRecord record); - @GetMapping("/dayDealNoEndTimeEvent") + @PostMapping("/dayDealNoEndTimeEvent") void dayDealNoEndTimeEvent(@RequestParam("date") String date); @GetMapping("/getWlAssByWlId") diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/WlRecordParam.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/WlRecordParam.java index c9d068e..24ba9f0 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/WlRecordParam.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/WlRecordParam.java @@ -1,5 +1,6 @@ package com.njcn.csdevice.pojo.param; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -34,9 +35,11 @@ public class WlRecordParam { private String lineId; @ApiModelProperty("项目起始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime proStartTime; @ApiModelProperty("项目结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime proEndTime; @ApiModelProperty("测试项名称") diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/scheme/WlRecordController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/scheme/WlRecordController.java index 5a2e5fb..c22fff5 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/scheme/WlRecordController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/scheme/WlRecordController.java @@ -127,6 +127,20 @@ public class WlRecordController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + /** + * 修改测试项日志 + */ + @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE) + @PostMapping("/updateRecordData") + @ApiOperation("修改测试项日志") + @ApiImplicitParam(name = "record", value = "测试项日志信息", required = true) + public HttpResult updateRecordData(@RequestBody @Validated WlRecordParam.UpdateRecord record) { + String methodDescribe = getMethodDescribe("updateRecordData"); + LogUtil.njcnDebug(log, "{}，修改的测试项日志信息：{}", methodDescribe, record); + wlRecordService.updateRecordData(record); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } + /** * 新增或修改方案 */ diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IWlRecordService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IWlRecordService.java index 49aee9c..b7a33d5 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IWlRecordService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IWlRecordService.java @@ -63,6 +63,8 @@ public interface IWlRecordService extends IService { */ void updateTestRecord(WlRecordParam.UpdateRecord record); + void updateRecordData(WlRecordParam.UpdateRecord record); + /** * 新增或修改方案 * @param record diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java index d88db3d..5d69d28 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java @@ -206,6 +206,20 @@ public class WlRecordServiceImpl extends ServiceImpl i overlimitService.saveOrUpdate(overlimit); } + @Override + public void updateRecordData(WlRecordParam.UpdateRecord record) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(WlRecord::getId, record.getId()); + WlRecord wlRecord = this.getOne(queryWrapper); + if (Objects.isNull(wlRecord)) { + throw new BusinessException("测试项缺失!"); + } else { + wlRecord.setStartTime(record.getProStartTime()); + wlRecord.setEndTime(record.getProEndTime()); + } + this.updateById(wlRecord); + } + @Override public void updateSchemeRecord(WlRecordParam.UpdateRecord record) { WlRecord wlRecord = new WlRecord(); @@ -682,7 +696,7 @@ public class WlRecordServiceImpl extends ServiceImpl i StatisticalDataDTO statisticalDataDTO = commonMapper.getLineRtData(influxQueryWrapper); if(Objects.nonNull(statisticalDataDTO)){ LocalDateTime endTime = statisticalDataDTO.getTime().atOffset(ZoneOffset.ofHours(0)).toLocalDateTime(); - Duration duration = Duration.between(now, endTime); + Duration duration = Duration.between(endTime,now); long hour = duration.toHours(); if(hour>6){ WlRecord wlRecord = new WlRecord();