update model

lcstore · Nov 19, 2015 · f243210 · f243210
1 parent b4f54b7
commit f243210
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 24 deletions.
diff --git a/iscript-common/iscript-common-rest/src/main/java/com/taobao/securityjni/EtaoSignMain.java b/iscript-common/iscript-common-rest/src/main/java/com/taobao/securityjni/EtaoSignMain.java
@@ -3,8 +3,6 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.junit.Assert;
-
 import com.google.common.collect.Maps;
 import com.taobao.securityjni.impl.CImplSecretUtil;
 import com.taobao.securityjni.tools.DataContext;
@@ -42,6 +40,6 @@ public static void main(String[] args) throws Exception {
         String sign = CImplSecretUtil.getSign(localBytes, dataBytes, paramDataContext);
         sign = sign.toLowerCase();
         System.err.println("sign:" + sign);
-        Assert.assertEquals("8f4bf0b894ab0a8e6e0de10dc46460a9", sign);
+        // Assert.assertEquals("8f4bf0b894ab0a8e6e0de10dc46460a9", sign);
     }
 }
diff --git a/...ript-core-match/src/main/java/com/lezo/iscript/match/algorithm/analyse/ModelAnalyser.java b/...ript-core-match/src/main/java/com/lezo/iscript/match/algorithm/analyse/ModelAnalyser.java
@@ -38,6 +38,7 @@ public int compare(Entry<CellStat, Integer> o1, Entry<CellStat, Integer> o2) {
                 }
             };
     private static final int MIN_LEN = 2;
+    private static final int MAX_LEN = 100;
 
     @Override
     public CellAssort analyse(List<CellToken> tokens) {
@@ -103,7 +104,7 @@ private boolean isSkipLen(String sVal) {
         if (StringUtils.isBlank(sVal)) {
             return true;
         }
-        return sVal.trim().length() <= MIN_LEN;
+        sVal = sVal.trim();
+        return sVal.length() <= MIN_LEN || sVal.length() > MAX_LEN;
     }
-
 }
diff --git a/...ore/iscript-core-resulter/src/main/java/com/lezo/iscript/match/job/SimilarToMatchJob.java b/...ore/iscript-core-resulter/src/main/java/com/lezo/iscript/match/job/SimilarToMatchJob.java
@@ -95,12 +95,12 @@ public void run() {
                     log.warn("empty brand...");
                     continue;
                 }
-                // if (!hasDo) {
-                // hasDo = "brother".equals(brand);
-                // }
-                // if (!hasDo) {
-                // continue;
-                // }
+                if (!hasDo) {
+                    hasDo = "玛丽黛佳".equals(brand);
+                }
+                if (!hasDo) {
+                    continue;
+                }
                 fromId = 0L;
                 Map<String, List<SimilarDto>> skuMap = Maps.newHashMap();
                 while (true) {
@@ -250,9 +250,6 @@ private List<MatchDto> toMatchDtos(List<SimilarCenter> centers, List<SimilarDto>
             skuCodeMap.put(dto.getSkuCode(), dto);
         }
         for (SimilarCenter center : centers) {
-            if (CollectionUtils.isEmpty(center.getOuts())) {
-                continue;
-            }
             MatchDto referDto = new MatchDto();
             copyProperties(referDto, center.getValue(), skuCodeMap);
             referDto.setId(null);
@@ -262,16 +259,18 @@ private List<MatchDto> toMatchDtos(List<SimilarCenter> centers, List<SimilarDto>
             referDto.setSimilarScore(100);
             referDto.setCaption("center");
             referDto.setArbiterId(MatchDto.ARBITER_NAME);
-            for (SimilarOut out : center.getOuts()) {
-                MatchDto currentDto = new MatchDto();
-                copyProperties(currentDto, out.getCurrent(), skuCodeMap);
-                currentDto.setMatchCode(referDto.getMatchCode());
-                currentDto.setCreateTime(currentDate);
-                currentDto.setUpdateTime(currentDate);
-                currentDto.setSimilarScore(out.getScore());
-                currentDto.setArbiterId(MatchDto.ARBITER_NAME);
-                currentDto.setId(null);
-                matchDtos.add(currentDto);
+            if (CollectionUtils.isNotEmpty(center.getOuts())) {
+                for (SimilarOut out : center.getOuts()) {
+                    MatchDto currentDto = new MatchDto();
+                    copyProperties(currentDto, out.getCurrent(), skuCodeMap);
+                    currentDto.setMatchCode(referDto.getMatchCode());
+                    currentDto.setCreateTime(currentDate);
+                    currentDto.setUpdateTime(currentDate);
+                    currentDto.setSimilarScore(out.getScore());
+                    currentDto.setArbiterId(MatchDto.ARBITER_NAME);
+                    currentDto.setId(null);
+                    matchDtos.add(currentDto);
+                }
             }
             matchDtos.add(referDto);
         }