增加Products索引字段，调整下载索引名

mall-search/src/main/java/com/uas/search/model/Products.java

@@ -34,6 +34,24 @@ public class Products implements RowMapper, Serializable {
     @Column(name = "pr_pcmpcode")
     private String pcmpCode;
 
+    /**
+     * 标准英文品牌
+     */
+    @Column(name = "pr_pbranden")
+    private String pBrandEn;
+
+    /**
+     * 标准中文品牌
+     */
+    @Column(name = "pr_pbrand")
+    private String pBrandCn;
+
+    /**
+     * 是否标准（1标准 ，非1 非标）
+     */
+    @Column(name = "pr_standard")
+    private Short standard;
+
     public Long getId() {
         return id;
     }
@@ -50,11 +68,38 @@ public class Products implements RowMapper, Serializable {
         this.pcmpCode = pcmpCode;
     }
 
+    public String getpBrandEn() {
+        return pBrandEn;
+    }
+
+    public void setpBrandEn(String pBrandEn) {
+        this.pBrandEn = pBrandEn;
+    }
+
+    public String getpBrandCn() {
+        return pBrandCn;
+    }
+
+    public void setpBrandCn(String pBrandCn) {
+        this.pBrandCn = pBrandCn;
+    }
+
+    public Short getStandard() {
+        return standard;
+    }
+
+    public void setStandard(Short standard) {
+        this.standard = standard;
+    }
+
     @Override
     public String toString() {
         return "Products{" +
                 "id=" + id +
                 ", pcmpCode='" + pcmpCode + '\'' +
+                ", pBrandEn='" + pBrandEn + '\'' +
+                ", pBrandCn='" + pBrandCn + '\'' +
+                ", standard='" + standard + '\'' +
                 '}';
     }
 
@@ -63,6 +108,9 @@ public class Products implements RowMapper, Serializable {
         Products products = new Products();
         products.setId(rs.getLong("pr_id"));
         products.setPcmpCode(rs.getString("pr_pcmpcode"));
+        products.setpBrandEn(rs.getString("pr_pbranden"));
+        products.setpBrandCn(rs.getString("pr_pbrand"));
+        products.setStandard(rs.getShort("pr_standard"));
         return products;
     }
 }

mall-search/src/main/java/com/uas/search/model/V_Products.java

@@ -70,6 +70,12 @@ public class V_Products implements RowMapper, Serializable {
     @Column(name = "pr_pbranden")
     private String pBrandEn;
 
+    /**
+     * 标准中文品牌
+     */
+    @Column(name = "pr_pbrand")
+    private String pBrandCn;
+
     /**
      * 是否标准（1标准 ，非1 非标）
      */
@@ -146,6 +152,14 @@ public class V_Products implements RowMapper, Serializable {
         this.pBrandEn = pBrandEn;
     }
 
+    public String getpBrandCn() {
+        return pBrandCn;
+    }
+
+    public void setpBrandCn(String pBrandCn) {
+        this.pBrandCn = pBrandCn;
+    }
+
     public Short getStandard() {
         return standard;
     }
@@ -173,6 +187,7 @@ public class V_Products implements RowMapper, Serializable {
                 ", kind='" + kind + '\'' +
                 ", pCmpCode='" + pCmpCode + '\'' +
                 ", pBrandEn='" + pBrandEn + '\'' +
+                ", pBrandCn='" + pBrandCn + '\'' +
                 ", standard=" + standard +
                 ", b2cEnabled=" + b2cEnabled +
                 '}';
@@ -188,6 +203,7 @@ public class V_Products implements RowMapper, Serializable {
         products.setEnUU(rs.getLong("pr_enuu"));
         products.setKind(rs.getString("pr_kind"));
         products.setpBrandEn(rs.getString("pr_pbranden"));
+        products.setpBrandCn(rs.getString("pr_pbrand"));
         products.setpCmpCode(rs.getString("pr_pcmpcode"));
         products.setStandard(rs.getShort("pr_standard"));
         products.setTitle(rs.getString("pr_title"));

mall-search/src/main/java/com/uas/search/support/DownloadHelper.java

@@ -29,9 +29,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Component;
 
 
 /**
@@ -181,37 +179,16 @@ public class DownloadHelper<T> {
         }
 
         if (GOODS_TABLE_NAME.equals(tableName)) {
-            tableName = TRADE_GOODS_TABLE_NAME;
-            trueTableName = GOODS_TABLE_NAME;
+            trueTableName = TRADE_GOODS_TABLE_NAME;
         } else if (PCB_GOODS_TABLE_NAME.equals(tableName)) {
-            tableName = TRADE_GOODS_TABLE_NAME;
-            trueTableName = PCB_GOODS_TABLE_NAME;
-        }
-
-        if (TRADE_GOODS_TABLE_NAME.equals(tableName) && GOODS_TABLE_NAME.equals(trueTableName)) {
-            tableName = GOODS_TABLE_NAME;
-        } else if (TRADE_GOODS_TABLE_NAME.equals(tableName) && PCB_GOODS_TABLE_NAME.equals(trueTableName)){
-            tableName = PCB_GOODS_TABLE_NAME;
-        }
-
-        if (GOODS_TABLE_NAME.equals(tableName) || PCB_GOODS_TABLE_NAME.equals(tableName)) {
-            tableName = TRADE_GOODS_TABLE_NAME;
-        }
-
-        if (TRADE_GOODS_TABLE_NAME.equals(tableName) && GOODS_TABLE_NAME.equals(trueTableName)) {
-            tableName = GOODS_TABLE_NAME;
-        } else if (TRADE_GOODS_TABLE_NAME.equals(tableName) && PCB_GOODS_TABLE_NAME.equals(trueTableName)) {
-            tableName = PCB_GOODS_TABLE_NAME;
-        }
-
-        if (GOODS_TABLE_NAME.equals(tableName) || PCB_GOODS_TABLE_NAME.equals(tableName)) {
-            tableName = TRADE_GOODS_TABLE_NAME;
+            trueTableName = TRADE_GOODS_TABLE_NAME;
         }
 
         // 获取下载总条数
-        totalElements = getTotalElements(tableName);
-        long minId = jdbcService.getMinId(tableName, sortField);
-        long maxId = jdbcService.getMaxId(tableName, sortField);
+        totalElements = getTotalElements(trueTableName);
+        long minId = jdbcService.getMinId(trueTableName, sortField);
+        long maxId = jdbcService.getMaxId(trueTableName, sortField);
+
         logger.info(tableName + " 发现数据 " + totalElements + " 条, id: " + minId + "~" + maxId);
         // 线程数量高于下载的文件数量，则为文件数量
         threadSize = threadSize <= endFileIndex - startFileIndex + 1 ? threadSize : endFileIndex - startFileIndex + 1;

mall-search/src/main/java/com/uas/search/support/DownloadService.java

@@ -1,20 +1,15 @@
 package com.uas.search.support;
 
-import static com.uas.search.constant.SearchConstants.GOODS_TABLE_NAME;
-import static com.uas.search.constant.SearchConstants.PCB_GOODS_TABLE_NAME;
-import static com.uas.search.constant.SearchConstants.TRADE_GOODS_TABLE_NAME;
 import static com.uas.search.service.impl.IndexServiceImpl.PAGE_SIZE;
 import static com.uas.search.service.impl.IndexServiceImpl.SINGLE_FILE_MAX_SIZE;
 
 import com.alibaba.fastjson.JSONObject;
-import com.uas.search.constant.model.PageInfo;
 import com.uas.search.constant.model.PageParams;
 import com.uas.search.service.JdbcService;
 import com.uas.search.util.CollectionUtils;
 import com.uas.search.util.SearchUtils;
 import java.io.File;
 import java.io.PrintWriter;
-import java.util.Date;
 import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -73,8 +68,7 @@ public class DownloadService<T> {
             pageParams.setPage((startFileIndex - 1) * SINGLE_FILE_MAX_SIZE / PAGE_SIZE + 1);
             pageParams.setSize(PAGE_SIZE);
 
-            Long maxId = jdbcService.getMaxId(tableName, sortField);
-            Long minId = jdbcService.getMinId(tableName, sortField);
+            Long maxId = jdbcService.getMaxId(trueTableName, sortField);
             // 理论上的总文件数
             int totalFiles = (int) (maxId / SINGLE_FILE_MAX_SIZE + 1);
             if (startFileIndex > totalFiles) {
@@ -100,7 +94,7 @@ public class DownloadService<T> {
                 Long startId = (long) ((pageParams.getPage() - 1) * pageParams.getSize() + 1);
                 Long endId = (long) (pageParams.getPage() * pageParams.getSize());
                 // 获取数据
-                List<T> content = jdbcService.getData(tableName, startId, endId, sortField, Sort.Direction.ASC.name());
+                List<T> content = jdbcService.getData(trueTableName, startId, endId, sortField, Sort.Direction.ASC.name());
                 // 数据以 JSON 格式写入文件
                 if (!CollectionUtils.isEmpty(content)) {
                     // 有数据，并且还没有创建新文件时，进行创建新文件