修改 calendar 表相关字段 部分关联

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -10,6 +10,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -1433,6 +1434,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
 
 
         ArrayList<Map<String, String>> arrayList = new ArrayList<>();
+        AtomicInteger id = new AtomicInteger(1);
         //返回工作站结果
         firstArticleWorkshopList.forEach(item -> {
             Map<String, String> workMap = Convert.toMap(String.class, String.class, item);
@@ -1458,13 +1460,15 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                     frequencyList.add("中断");
                 }
                 boolean numType = item1.getValFlag().equals(0);
-                String greadScope = numType ? item1.getSnoStart().toString() + "Nm - " + item1.getSnoEnd().toString() + "Nm" : (item1.getValOk().equals(0) ? "OK" : "NoK");
-                beanMap.put("valFlag", greadScope);
+                String greadScope = numType ? item1.getSnoStart().toString() + "Nm - " + item1.getSnoEnd().toString() + "Nm" : "OK/NoK";
+                beanMap.put("scop", greadScope);
 
                 String frequency = Stream.of(frequencyList.toArray(new String[frequencyList.size()])).collect(Collectors.joining("&"));
                 beanMap.put("frequency", frequency);
                 beanMap.put("toolDesc", "");
                 beanMap.put("tool", item1.getToolId().equals("-1") ? "非工具校验" : item1.getToolId().toString());
+                beanMap.put("id", String.valueOf(id.get()));
+                id.getAndIncrement();
                 arrayList.add(beanMap);
 
             });

common-user/src/main/java/com/factory/user/service/impl/CommonServiceImpl.java

@@ -195,7 +195,7 @@ public class CommonServiceImpl implements CommonService {
         HashMap<String, Object> fileUploadMap = new HashMap<>();
         fileUploadMap.put("file", tempFile);
         try {
-            HttpResponse response = HttpRequest.post("https://127.0.0.1:40045/file/file/uploadOne")
+            HttpResponse response = HttpRequest.post("http://127.0.0.1:40045/file/file/uploadOne")
                     .form(fileUploadMap)
                     .header("content-type", "multipart/form-data")
                     .header(authenticationProperties.getHeaderName(), "")