Merge remote-tracking branch 'origin/test'

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -675,7 +675,7 @@ public class UdiRelevanceController extends BaseController {
             UdiRlSupEntity udiRlSupEntity = new UdiRlSupEntity();
             udiRlSupEntity.setUpdateTime(new Date());
             udiRlSupEntity.setPrice(new BigDecimal(udiProductEntity.getPrice()));
-            udiRlSupEntity.setId(udiProductEntity.getRelSupId());
+            udiRlSupEntity.setId(Long.valueOf(udiProductEntity.getRelSupId()));
             udiRlSupService.updateCompanyProductRelevance(udiRlSupEntity);
         }
         if (falg) {

src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java

@@ -11,7 +11,7 @@ import java.util.Date;
 @Data
 public class UdiRlSupEntity {
 
-    private Integer id;
+    private Long id;
     private String customerId;
     private String productId;
     private String enterpriseId;

src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java

@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class UdiRlSupResponse {
 
-    private int id;
+    private Long id;
     private Integer rlId;
     private String thirdId;
     private String thirdName;

src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java

@@ -1,17 +1,13 @@
 package com.glxp.api.service.basic;
 
-import cn.hutool.core.util.StrUtil;
-import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
-import com.glxp.api.entity.basic.UdiRlSupEntity;
+import cn.hutool.core.util.IdUtil;
 import com.glxp.api.entity.basic.UdiRelevanceEntity;
+import com.glxp.api.entity.basic.UdiRlSupEntity;
 import com.glxp.api.req.basic.UdiInfoExportRequest;
-import com.glxp.api.req.basic.UdiInfoRequest;
-import org.springframework.beans.BeanUtils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -39,6 +35,7 @@ public class CompanyProductsRelService {
                 udiRlSupEntity.setUnitFk(udiInfoExportRequest.getUnitFk());
                 udiRlSupEntity.setUdiRlIdFk(uuid);
                 udiRlSupEntity.setCustomerId(udiInfoExportRequest.getUnitFk());
+                udiRlSupEntity.setId(IdUtil.getSnowflakeNextId());
                 boolean b = udiRlSupService.insertCompanyProductRelevance(udiRlSupEntity);
             }
 

src/main/resources/application-test.yml

@@ -43,7 +43,7 @@ logging:
   level:
     com.glxp.api.dao: debug
 
-file_path: /udi/udiwms/udiwmsfile/
+file_path:  D:/udi/udiwms/udiwmsfile/
 back_file_path: /share/udisps/back/
 UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
 UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test

src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml

@@ -285,10 +285,10 @@
     <insert id="insertCompanyProductRelevance"
             parameterType="com.glxp.api.entity.basic.UdiRlSupEntity">
         replace
-        INTO company_product_relevance(customerId, productId, enterpriseId, registrationId,
+        INTO company_product_relevance(id,customerId, productId, enterpriseId, registrationId,
         createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk,
         price, createUser, updateUser)
-        values (#{customerId},
+        values (#{id},#{customerId},
         #{productId},
         #{enterpriseId},
         #{registrationId},