新增测试项修改功能

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/WlRecordFeignClient.java

@@ -46,7 +46,7 @@ public interface WlRecordFeignClient {
     HttpResult<Boolean> updateTestRecord(@RequestBody @Validated WlRecordParam.UpdateRecord record);
 
 
-    @GetMapping("/dayDealNoEndTimeEvent")
+    @PostMapping("/dayDealNoEndTimeEvent")
     void dayDealNoEndTimeEvent(@RequestParam("date") String date);
 
     @GetMapping("/getWlAssByWlId")

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("测试项名称")

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<Boolean> 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);
+    }
+
     /**
      * 新增或修改方案
      */

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IWlRecordService.java

@@ -63,6 +63,8 @@ public interface IWlRecordService extends IService<WlRecord> {
      */
     void updateTestRecord(WlRecordParam.UpdateRecord record);
 
+    void updateRecordData(WlRecordParam.UpdateRecord record);
+
     /**
      * 新增或修改方案
      * @param record

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java

@@ -206,6 +206,20 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
         overlimitService.saveOrUpdate(overlimit);
     }
 
+    @Override
+    public void updateRecordData(WlRecordParam.UpdateRecord record) {
+        LambdaQueryWrapper<WlRecord> 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<WlRecordMapper, WlRecord> 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();