Browse Source

remove index/convertGoodsFromComponent

sunyj 8 years ago
parent
commit
a633db2084

+ 0 - 7
src/main/java/com/uas/search/controller/IndexController.java

@@ -70,13 +70,6 @@ public class IndexController {
         return "Downloaded: "+ indexService.multiDownloadComponent(threads, startFileIndex, endFileIndex);
     }
 
-    @RequestMapping("/convertGoodsFromComponent")
-    @ResponseBody
-    public String convertGoodsFromComponent(HttpServletRequest request) {
-        return String.format("Downloaded in %.2fs",
-                indexService.convertGoodsFromComponent() / 1000.0);
-    }
-
     @RequestMapping("/multiDownloadGoods")
     @ResponseBody
     public String multiDownloadGoods(Integer threads, Integer startFileIndex, Integer endFileIndex, HttpServletRequest request) {

+ 0 - 7
src/main/java/com/uas/search/service/IndexService.java

@@ -33,13 +33,6 @@ public interface IndexService {
      */
     public long multiDownloadComponent(Integer threads, Integer startFileIndex, Integer endFileIndex);
 
-    /**
-     * 根据本地器件的数据文件,转为批次数据
-     *
-     * @return 花费总时间 ms
-     */
-    public Long convertGoodsFromComponent();
-
     /**
      * 多线程下载批次的数据至本地文件中,以供建索引用
      *

+ 0 - 57
src/main/java/com/uas/search/service/impl/IndexServiceImpl.java

@@ -18,7 +18,6 @@ import com.uas.search.support.DownloadHelper;
 import com.uas.search.support.DownloadService;
 import com.uas.search.support.IndexSearcherManager;
 import com.uas.search.support.IndexWriterManager;
-import com.uas.search.util.FileUtils;
 import com.uas.search.util.ObjectToDocumentUtils;
 import com.uas.search.util.SearchUtils;
 import org.apache.lucene.document.Document;
@@ -420,62 +419,6 @@ public class IndexServiceImpl implements IndexService {
         return multiDownloadData(COMPONENT_TABLE_NAME,threads,startFileIndex,endFileIndex);
     }
 
-    @Override
-    public Long convertGoodsFromComponent() {
-        Long startTime = new Date().getTime();
-        Long size = 0L;
-        logger.info("转换批次... ");
-        BufferedReader bufferedReader = null;
-        try {
-            // 从本地路径读取器件数据
-            String componentDataPath = SearchUtils.getDataPath(COMPONENT_TABLE_NAME);
-            String goodsDataPath = SearchUtils.getDataPath(SearchConstants.GOODS_TABLE_NAME);
-            File[] files = new File(componentDataPath).listFiles();
-            if (files == null || files.length == 0) {
-                logger.info("转换批次失败,原因:器件数据文件不存在!");
-                return 0L;
-            }
-            FileUtils.deleteSubFiles(new File(goodsDataPath));
-            int fileIndex = 1;
-            for (File file : files) {
-                logger.info("读取器件文件: " + file.getName());
-                bufferedReader = new BufferedReader(new FileReader(file));
-                String goodsFileName = String.format("%010d", fileIndex) + ".txt";
-                PrintWriter printWriter = new PrintWriter(goodsDataPath + "/" + goodsFileName);
-                String line;
-                while (!StringUtils.isEmpty(line = bufferedReader.readLine())) {
-                    Component component;
-                    try {
-                        component = JSONObject.parseObject(line, Component.class);
-                    } catch (JSONException e) {
-                        throw new IllegalArgumentException(line, e);
-                    }
-                    // 器件作为主体,得到批次
-                    printWriter.println(JSONObject.toJSONString(new Goods(null, null, component, null)));
-                    size++;
-                }
-                logger.info(goodsFileName + " - Converted..................." + size);
-                printWriter.flush();
-                printWriter.close();
-                fileIndex++;
-                bufferedReader.close();
-            }
-            long endStartTime = new Date().getTime();
-            logger.info(String.format("转换完成,耗时%.2fs\n ", (endStartTime - startTime) / 1000.0));
-            return endStartTime - startTime;
-        } catch (Throwable e) {
-            throw new IllegalStateException("批次转换失败", e);
-        }finally{
-            if(bufferedReader!=null){
-                try {
-                    bufferedReader.close();
-                } catch (IOException e) {
-                    throw new IllegalStateException("批次转换失败", e);
-                }
-            }
-        }
-    }
-
     @Override
     public long multiDownloadGoods(Integer threads, Integer startFileIndex, Integer endFileIndex) {
         return multiDownloadData(GOODS_TABLE_NAME,threads,startFileIndex,endFileIndex);

+ 0 - 1
src/main/webapp/WEB-INF/views/console.html

@@ -87,7 +87,6 @@
 				<li><a target="_blank">index/create</a></li>
 				<li><a target="_blank">index/create?tableNames=product$brand,trade$order</a></li>
 				<li><a target="_blank">index/multiDownloadComponent?threads=2&startFileIndex=0&endFileIndex=10000000</a></li>
-                <li><a target="_blank">index/convertGoodsFromComponent</a></li>
 				<li><a target="_blank">index/multiDownloadGoods?threads=2&startFileIndex=0&endFileIndex=10000000</a></li>
 				<li><a target="_blank">index/listen/start?interval=10</a></li>
 				<li><a target="_blank">index/listen/stop</a></li>