Merge branch 'dev' into test

src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java

@@ -49,6 +49,7 @@ import com.glxp.api.util.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -74,6 +75,7 @@ import java.util.List;
 @RestController
 @Api(tags = "同步下载相关")
 @RequiredArgsConstructor
+@Slf4j
 public class SpsSyncDownloadController {
 
     @Resource
@@ -341,10 +343,10 @@ public class SpsSyncDownloadController {
             JSONObject obj = JSONUtil.parseObj(upLoadRequest.getData());
             switch (upLoadRequest.getExportType()) {
                 case BASIC_DATA:
-                    saveUploadBasicData(JSONUtil.toBean(obj, SpsSyncBasicDataResponse.class));
+//                    saveUploadBasicData(JSONUtil.toBean(obj, SpsSyncBasicDataResponse.class));
                     break;
                 case OTHER_DATA:
-                    saveUploadOtherData(JSONUtil.toBean(obj, SpsSyncOtherDataResponse.class));
+//                    saveUploadOtherData(JSONUtil.toBean(obj, SpsSyncOtherDataResponse.class));
                     break;
                 case DOCUMENT_TYPE_DATA:
                     saveUploadDocumentTypeData(JSONUtil.toBean(obj, SpsSyncBusResponse.class));
@@ -376,6 +378,7 @@ public class SpsSyncDownloadController {
             basicDownloadService.insertDownloadStatus(downloadStatus);
             return ResultVOUtils.success();
         } catch (Exception e) {
+            log.error("",e);
             e.printStackTrace();
             return ResultVOUtils.error(ResultEnum.NOT_NETWORK, e.getMessage());
         }

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

@@ -18,7 +18,7 @@ public class BasicBusTypePreEntity {
     /**
      * id
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

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

@@ -17,7 +17,7 @@ import java.util.Date;
 public class UdiRlSupEntity {
 
 
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java

@@ -14,7 +14,7 @@ import lombok.Data;
 @Data
 @TableName(value = "io_order_invoice")
 public class IoOrderInvoiceEntity {
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 @Data
 @TableName(value = "pur_receive")
 public class PurReceiveEntity {
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

src/main/java/com/glxp/api/entity/purchase/CustomerContactEntity.java

@@ -38,7 +38,7 @@ public class CustomerContactEntity{
     @TableField("comments")
     private String comments;
 
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

src/main/java/com/glxp/api/entity/purchase/PurArrivalEntity.java

@@ -15,7 +15,7 @@ import java.util.Date;
 @TableName(value = "pur_arrival")
 public class PurArrivalEntity {
 
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

src/main/java/com/glxp/api/entity/purchase/PurDeliveryEntity.java

@@ -16,7 +16,7 @@ import java.util.Date;
 @TableName(value = "pur_delivery")
 public class PurDeliveryEntity {
 
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 @Data
 @TableName(value = "pur_order")
 public class PurOrderEntity {
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

src/main/java/com/glxp/api/entity/purchase/PurReturnedEntity.java

@@ -16,7 +16,7 @@ import java.util.Date;
 public class PurReturnedEntity {
 
 
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

src/main/java/com/glxp/api/entity/sync/SyncDataBustypeEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 @Data
 @TableName(value = "sync_data_bustypes")
 public class SyncDataBustypeEntity {
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
     @TableField(value = "`action`")
     private String action;

src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java

@@ -20,7 +20,7 @@ public class ThrBusTypeOriginEntity {
     /**
      * id
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
     /**
      * 单据类型名称

src/main/java/com/glxp/api/entity/thrsys/ThrCorpEntity.java

@@ -18,7 +18,7 @@ import java.util.Date;
 @TableName("thr_corp")
 public class ThrCorpEntity{
 
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     @TableField("unitId")

src/main/java/com/glxp/api/entity/thrsys/ThrCorpExportLogEntity.java

@@ -17,7 +17,7 @@ import java.util.Date;
 @Data
 public class ThrCorpExportLogEntity{
 
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Integer id;
 
     /**

src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java

@@ -20,7 +20,7 @@ import java.util.Date;
 @TableName("thr_products")
 public class ThrProductsEntity{
 
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**