pdi部件绑定修改

nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiComponentBindingControllerService.java

@@ -129,7 +129,10 @@ public class QmsPdiComponentBindingControllerService {
             boundComponentStatusKeys.add(componentStatusKey(binding.getPdiComponentId(), binding.getStatus()));
         }
 
-        vo.setBoundList(new ArrayList<>(boundImageMap.values()));
+        vo.setBoundList(boundImageMap.values().stream()
+                .sorted(Comparator.comparing(QmsPdiComponentBindingSearchVO.ImageBindingVO::getUploadImageId,
+                        Comparator.nullsLast(Long::compareTo)))
+                .collect(Collectors.toList()));
 
         inspectionItemMap.forEach((key, inspectionItems) -> {
             if (boundComponentStatusKeys.contains(key)) {

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiComponentBindingSaveQO.java

@@ -1,5 +1,7 @@
 package com.nflg.wms.common.pojo.qo;
 
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -17,6 +19,7 @@ public class QmsPdiComponentBindingSaveQO {
      * PDI标准检测规则ID
      */
     @NotNull(message = "PDI标准检测规则ID不能为空")
+    @JsonAlias("pdi_detection_rules_id")
     private Long pdiDetectionRulesId;
 
     /**
@@ -33,6 +36,7 @@ public class QmsPdiComponentBindingSaveQO {
          * 上传图片的ID
          */
         @NotNull(message = "上传图片ID不能为空")
+        @JsonAlias("upload_image_id")
         private Long uploadImageId;
 
         /**
@@ -48,16 +52,21 @@ public class QmsPdiComponentBindingSaveQO {
         /**
          * 部件ID
          */
+        @JsonAlias("pdi_component_id")
         private Long pdiComponentId;
 
         /**
          * x轴坐标
          */
+        @JsonProperty("xCoordinatePoint")
+        @JsonAlias({"x_coordinate_point", "XCoordinatePoint"})
         private String xCoordinatePoint;
 
         /**
          * y轴坐标
          */
+        @JsonProperty("yCoordinatePoint")
+        @JsonAlias({"y_coordinate_point", "YCoordinatePoint"})
         private String yCoordinatePoint;
 
         /**