基础信息信息相关修改

src/main/java/com/glxp/api/config/ReplaceBatch.java

@@ -39,6 +39,9 @@ public class ReplaceBatch extends AbstractMethod {
         KeyGenerator keyGenerator = new NoKeyGenerator();
         CustomerSqlMethod sqlMethod = CustomerSqlMethod.REPLACE_ONE;
         List<TableFieldInfo> fieldList = tableInfo.getFieldList();
+
+//        String columnScript = SqlScriptUtils.convertTrim(tableInfo.getAllInsertSqlColumnMaybeIf(null),
+//                LEFT_BRACKET, RIGHT_BRACKET, null, COMMA);
         String insertSqlColumn = tableInfo.getKeyInsertSqlColumn(true, true) +
                 this.filterTableFieldInfo(fieldList, predicate, TableFieldInfo::getInsertSqlColumn, EMPTY);
         String columnScript = LEFT_BRACKET + insertSqlColumn.substring(0, insertSqlColumn.length() - 1) + RIGHT_BRACKET;

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

@@ -219,20 +219,26 @@ public class UdiProductController extends BaseController {
         List<BasicUdiProductEntity> udiInfoEntities = udiDlHttpClient.getUdiByUuid(udiCombineRequest.getUuid());
         if (CollUtil.isNotEmpty(udiInfoEntities)) {
             BaseResponse<List<ProductInfoEntity>> listBaseResponse = asyncDiDlHelper.dlLastVersionByDi(udiInfoEntities.get(0).getNameCode());
+            String newUuid;
             if (listBaseResponse.getCode() == 20000) {
                 List<ProductInfoEntity> productInfoEntityList = listBaseResponse.getData();
                 if (CollUtil.isNotEmpty(productInfoEntityList)) {
                     productInfoService.insertProductInfos(productInfoEntityList);
+                    newUuid = productInfoEntityList.get(0).getUuid();
+                } else {
+                    return ResultVOUtils.error(500, "更新失败！");
                 }
+            } else {
+                return ResultVOUtils.error(500, "更新失败！");
             }
-            udiInfoEntities = udiDlHttpClient.getUdiByUuid(udiCombineRequest.getUuid());
+            udiInfoEntities = udiDlHttpClient.getUdiByUuid(newUuid);
             basicUdiProductService.deleteByUuid(udiCombineRequest.getUuid());
             for (BasicUdiProductEntity udiProductEntity : udiInfoEntities) {
-                udiProductEntity.setUuid(udiCombineRequest.getUuid());
+                udiProductEntity.setUuid(newUuid);
                 udiProductEntity.setUpdateTime(new Date());
                 udiProductEntity.setId(IdUtil.getSnowflakeNextId());
             }
-            basicUdiProductService.saveBatch(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities));
+            basicUdiProductService.replaceBatch(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities));
             return ResultVOUtils.success("更新成功！");
         } else {
             return ResultVOUtils.error(500, "更新失败！");

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

@@ -3,6 +3,7 @@ package com.glxp.api.controller.basic;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.res.BaseResponse;
@@ -83,6 +84,8 @@ public class UdiRelController extends BaseController {
     @ApiOperation(value = "获取企业产品信息", response = BasicUdiRelResponse.class)
     @GetMapping("udi/basic/rel/company/filter")
     public BaseResponse filterRelByCompany(FilterUdiRelRequest filterUdiRelRequest) {
+        if (StrUtil.isEmpty(filterUdiRelRequest.getCompanyIdFk()))
+            return ResultVOUtils.error(500, "企业ID不能为空！");
         System.out.println(filterUdiRelRequest.toString());
         String nameCode;
         if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) {
@@ -107,6 +110,18 @@ public class UdiRelController extends BaseController {
         return ResultVOUtils.success(basicUdiRelResponsePageSimpleResponse);
     }
 
+    //获取同步库UDI信息
+    @ApiIgnore
+    @AuthRuleAnnotation("")
+    @ApiOperation(value = "获取企业产品信息数量", response = BasicUdiRelResponse.class)
+    @GetMapping("udi/basic/rel/company/count")
+    public BaseResponse countRelByCompany(FilterUdiRelRequest filterUdiRelRequest) {
+        if (StrUtil.isEmpty(filterUdiRelRequest.getCompanyIdFk()))
+            return ResultVOUtils.error(500, "企业ID不能为空！");
+        long count = basicUdiRelService.count(new QueryWrapper<BasicUdiRelEntity>().eq("companyIdFk", filterUdiRelRequest.getCompanyIdFk()));
+        return ResultVOUtils.success(count);
+    }
+
 
     //产品信息关联新增
     @ApiIgnore

src/main/java/com/glxp/api/dao/BaseMapperPlus.java

@@ -18,10 +18,7 @@ import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
 
 import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * 自定义 Mapper 接口, 实现 自定义扩展
@@ -242,8 +239,39 @@ public interface BaseMapperPlus<M, T, V> extends BaseMapper<T> {
      * @param entityList 实体类列表
      * @return 影响条数
      */
+    default boolean insertIgnoreBatchs(List<T> entityList) {
+        return insertIgnoreBatchs(entityList, DEFAULT_BATCH_SIZE);
+    }
+
+    default boolean insertIgnoreBatchs(List<T> entityList, int batchSize) {
+
+        try {
+            int size = entityList.size();
+            int idxLimit = Math.min(DEFAULT_BATCH_SIZE, size);
+            int i = 1;
+            //保存单批提交的数据集合
+            List<T> oneBatchList = new ArrayList<>();
+            for (Iterator<T> var7 = entityList.iterator(); var7.hasNext(); ++i) {
+                T element = var7.next();
+                oneBatchList.add(element);
+                if (i == idxLimit) {
+
+                    this.insertIgnoreBatch(oneBatchList);
+                    //每次提交后需要清空集合数据
+                    oneBatchList.clear();
+                    idxLimit = Math.min(idxLimit + batchSize, size);
+                }
+            }
+        } catch (Exception e) {
+            log.error("insertIgnoreBatch fail", e);
+            return false;
+        }
+        return true;
+    }
+
     int insertIgnoreBatch(List<T> entityList);
 
+
     /**
      * 替换数据
      * replace into表示插入替换数据，需求表中有PrimaryKey，或者unique索引，如果数据库已经存在数据，则用新数据替换，如果没有数据效果则和insert into一样；
@@ -262,5 +290,36 @@ public interface BaseMapperPlus<M, T, V> extends BaseMapper<T> {
      * @param entityList 实体类列表
      * @return 影响条数
      */
+    default boolean replaceBatchs(List<T> entityList) {
+        return this.replaceBatchs(entityList, DEFAULT_BATCH_SIZE);
+    }
+
+    default boolean replaceBatchs(List<T> entityList, int batchSize) {
+
+        try {
+            int size = entityList.size();
+            int idxLimit = Math.min(DEFAULT_BATCH_SIZE, size);
+            int i = 1;
+            //保存单批提交的数据集合
+            List<T> oneBatchList = new ArrayList<>();
+            for (Iterator<T> var7 = entityList.iterator(); var7.hasNext(); ++i) {
+                T element = var7.next();
+                oneBatchList.add(element);
+                if (i == idxLimit) {
+
+                    this.replaceBatch(oneBatchList);
+                    //每次提交后需要清空集合数据
+                    oneBatchList.clear();
+                    idxLimit = Math.min(idxLimit + batchSize, size);
+                }
+            }
+        } catch (Exception e) {
+            log.error("insertIgnoreBatch fail", e);
+            return false;
+        }
+        return true;
+    }
+
     int replaceBatch(List<T> entityList);
+
 }

src/main/java/com/glxp/api/dao/basic/BasicUdiProductMapper.java

@@ -1,6 +1,7 @@
 package com.glxp.api.dao.basic;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.basic.BasicUdiProductEntity;
 import com.glxp.api.entity.basic.ProductInfoEntity;
 import com.glxp.api.req.basic.BasicUdiProductRequest;
@@ -12,7 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
 import java.util.List;
 
 @Mapper
-public interface BasicUdiProductMapper extends BaseMapper<BasicUdiProductEntity> {
+public interface BasicUdiProductMapper extends BaseMapperPlus<BasicUdiProductMapper, BasicUdiProductEntity, BasicUdiProductEntity> {
 
     List<BasicUdiProductEntity> filterList(FilterUdiRelRequest filterUdiRelRequest);
 

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

@@ -273,7 +273,6 @@ public class BasicUdiProductEntity implements Serializable {
     private Boolean isNewest;
 
     /**
-     *
      * 更新时间
      */
     @ApiModelProperty(value = "更新时间")
@@ -375,6 +374,8 @@ public class BasicUdiProductEntity implements Serializable {
      * 生产数据对接方（1.生产企业/2.代理商/3.购买方）
      */
     @ApiModelProperty(value = "生产数据对接方（1.生产企业/2.代理商/3.购买方）")
+
+    @TableField(exist = false)
     private Integer companyType;
 
     private static final long serialVersionUID = 1L;

src/main/java/com/glxp/api/service/CustomService.java

@@ -0,0 +1,12 @@
+package com.glxp.api.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+public interface CustomService<T> extends IService<T> {
+    int insertIgnore(T entity);
+    boolean insertIgnoreBatch(List<T> entityList);
+    int replace(T entity);
+    boolean replaceBatch(List<T> entityList);
+}

src/main/java/com/glxp/api/service/CustomServiceImpl.java

@@ -0,0 +1,29 @@
+package com.glxp.api.service;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.dao.BaseMapperPlus;
+
+import java.util.List;
+
+public class CustomServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<BaseMapperPlus<M,T,T>, T>  implements CustomService<T>{
+    @Override
+    public int insertIgnore(T entity) {
+        return baseMapper.insertIgnore(entity);
+    }
+
+    @Override
+    public boolean insertIgnoreBatch(List<T> entityList) {
+        return baseMapper.insertIgnoreBatchs(entityList);
+    }
+
+    @Override
+    public int replace(T entity) {
+        return baseMapper.replace(entity);
+    }
+
+    @Override
+    public boolean replaceBatch(List<T> entityList) {
+        return baseMapper.replaceBatchs(entityList);
+    }
+}

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

@@ -10,11 +10,12 @@ import com.glxp.api.req.basic.BasicUdiProductRequest;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.req.basic.ProductInfoFilterRequest;
 import com.glxp.api.req.basic.UdiCompanyRequest;
+import com.glxp.api.service.CustomService;
 
 import javax.validation.Valid;
 import java.util.List;
 
-public interface BasicUdiProductService extends IService<BasicUdiProductEntity> {
+public interface BasicUdiProductService extends CustomService<BasicUdiProductEntity> {
 
     public boolean isExit(String uuid);
 

src/main/java/com/glxp/api/service/basic/impl/BasicUdiProductServiceImpl.java

@@ -7,6 +7,7 @@ import com.glxp.api.entity.basic.ProductInfoEntity;
 import com.glxp.api.req.basic.BasicUdiProductRequest;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.req.basic.ProductInfoFilterRequest;
+import com.glxp.api.service.CustomServiceImpl;
 import com.glxp.api.service.basic.BasicUdiProductService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,7 +19,7 @@ import java.util.Collections;
 import java.util.List;
 
 @Service
-public class BasicUdiProductServiceImpl extends ServiceImpl<BasicUdiProductMapper, BasicUdiProductEntity> implements BasicUdiProductService {
+public class BasicUdiProductServiceImpl extends CustomServiceImpl<BasicUdiProductMapper, BasicUdiProductEntity> implements BasicUdiProductService {
     @Resource
     BasicUdiProductMapper basicUdiProductMapper;
 

src/main/resources/application-dev.yml

@@ -4,9 +4,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_cpt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_cpt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: 123456
+    password: Glxp@6066
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 20
@@ -76,7 +76,8 @@ logging:
 
 file_path: D:/udi/inUdiwms/udiwmsfile/
 UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
-UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
+#UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
+UDI_SERVER_URL: http://127.0.0.1:9994
 SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
 
 back_file_path: D:/share/udisps/back/

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: pro
+    active: dev
   jmx:
     enabled: false
   servlet:

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

@@ -285,6 +285,7 @@
     </select>
 
 
+
     <select id="findDiListByProduct"
             resultType="java.lang.String">
         select nameCode

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

@@ -71,8 +71,6 @@
     </select>
 
 
-
-
     <select id="filterUdiByTyshxydm" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
             resultType="com.glxp.api.entity.basic.ProductInfoEntity">
         SELECT *
@@ -451,7 +449,7 @@
     </insert>
 
 
-    <insert id="insertProductInfos" keyProperty="id"
+    <insert id="insertProductInfos"
             parameterType="com.glxp.api.entity.basic.ProductInfoEntity">
         REPLACE INTO productinfo
                 (id, nameCode, packRatio, packLevel, bhxjsl,

src/main/resources/schemas/schema_v2.1.sql

@@ -12,6 +12,7 @@ CALL Pro_Temp_ColumnWork('user_register', 'fmobile', 'varchar(255)', 1);
 
 CALL Pro_Temp_ColumnWork('trace_order', 'recordCode', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('trace_order', 'count', 'int', 1);
+CALL Pro_Temp_ColumnWork('trace_order', 'invCount', 'int', 1);