AI对比模拟数据接口修改

jjt-biz/src/main/java/com/jjt/biz/controller/ApiYrController.java

@@ -2,6 +2,7 @@ package com.jjt.biz.controller;
 
 import cn.hutool.json.JSONUtil;
 import com.jjt.biz.service.IApiYrService;
+import com.jjt.biz.vo.YrCompareReq;
 import com.jjt.biz.vo.YrTwinVO;
 import com.jjt.common.constant.CacheConstants;
 import com.jjt.common.core.controller.BaseController;
@@ -11,14 +12,12 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.time.LocalDateTime;
 
 /**
  * swagger 用户测试方法
@@ -46,10 +45,10 @@ public class ApiYrController extends BaseController {
     }
 
     @ApiOperation("染整线数AI比对")
-    @GetMapping("/api/yr/compare")
+    @RequestMapping("/api/yr/compare")
     @CrossOrigin(origins = "*")
     @ResponseBody
-    public R<?> compare(@RequestParam("line1") Integer line1, @RequestParam("line1") Integer line2, @RequestParam("time1") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")  LocalDateTime time1, @RequestParam("time2") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")  LocalDateTime time2) throws IOException {
+    public R<?> compare(@RequestBody YrCompareReq vo) throws IOException {
         String str = new String(Files.readAllBytes(Paths.get(path)));
         return R.ok(JSONUtil.parseArray(str));
     }

jjt-biz/src/main/java/com/jjt/biz/vo/YrCompareReq.java

@@ -0,0 +1,35 @@
+package com.jjt.biz.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * IndexEfficiency$
+ *
+ * @author wukai
+ * @date 2024/5/8 15:50
+ */
+@ApiModel(value = "YrCompareReq", description = "印染AI工艺对比")
+@Data
+public class YrCompareReq {
+    @ApiModelProperty("对比产线1")
+    private Integer line1;
+    @ApiModelProperty("产线1开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime s1;
+    @ApiModelProperty("产线1结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime e1;
+    @ApiModelProperty("对比产线2")
+    private Integer line2;
+    @ApiModelProperty("产线2开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime s2;
+    @ApiModelProperty("产线2结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime e2;
+}

jjt-biz/src/main/java/com/jjt/biz/vo/YrCompareRes.java

@@ -0,0 +1,35 @@
+package com.jjt.biz.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * IndexEfficiency$
+ *
+ * @author wukai
+ * @date 2024/5/8 15:50
+ */
+@ApiModel(value = "YrCompareVO", description = "印染AI工艺对比")
+@Data
+public class YrCompareRes {
+    @ApiModelProperty("产线")
+    private Integer line;
+    @ApiModelProperty("开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime start;
+    @ApiModelProperty("结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime end;
+    @ApiModelProperty("合格率")
+    private BigDecimal rate;
+    @ApiModelProperty("米长")
+    private BigDecimal length;
+    @ApiModelProperty("重量")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime e2;
+}