|
@@ -1,6 +1,5 @@
|
|
|
package com.jjt.biz.controller;
|
|
|
|
|
|
-import cn.hutool.json.JSONUtil;
|
|
|
import com.jjt.biz.service.IApiYrService;
|
|
|
import com.jjt.biz.vo.YrCompareBackReq;
|
|
|
import com.jjt.biz.vo.YrCompareReq;
|
|
@@ -16,9 +15,7 @@ import org.springframework.beans.factory.annotation.Value;
|
|
|
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.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
@@ -50,16 +47,27 @@ public class ApiYrController extends BaseController {
|
|
|
@RequestMapping("/api/yr/compare")
|
|
|
@CrossOrigin(origins = "*")
|
|
|
@ResponseBody
|
|
|
- public R<?> compare(@RequestBody List<YrCompareBackReq> list) {
|
|
|
- return R.ok( service.compare(list,false));
|
|
|
+ public R<?> compare(@RequestBody YrCompareReq req) {
|
|
|
+ List<YrCompareBackReq> list = new ArrayList<>();
|
|
|
+ YrCompareBackReq req1 = new YrCompareBackReq();
|
|
|
+ req1.setLine(req.getLine1());
|
|
|
+ req1.setStart(req.getS1());
|
|
|
+ req1.setEnd(req.getE1());
|
|
|
+ list.add(req1);
|
|
|
+ YrCompareBackReq req2 = new YrCompareBackReq();
|
|
|
+ req2.setLine(req.getLine2());
|
|
|
+ req2.setStart(req.getS2());
|
|
|
+ req2.setEnd(req.getE2());
|
|
|
+ list.add(req2);
|
|
|
+ return R.ok(service.compare(list, false));
|
|
|
}
|
|
|
|
|
|
@ApiOperation("后台工艺比对")
|
|
|
@RequestMapping("/api/yr/compare/back")
|
|
|
@CrossOrigin(origins = "*")
|
|
|
@ResponseBody
|
|
|
- public R<?> compareBack(@RequestBody List<YrCompareBackReq> list) {
|
|
|
- return R.ok( service.compare(list,true));
|
|
|
+ public R<?> compareBack(@RequestBody List<YrCompareBackReq> list) {
|
|
|
+ return R.ok(service.compare(list, true));
|
|
|
}
|
|
|
|
|
|
|