REPORT-67417 运营产品v1.0 bug patch

designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigManager.java

@@ -9,7 +9,7 @@ import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLReadable;
 import com.fr.stable.xml.XMLable;
 import com.fr.stable.xml.XMLableReader;
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -99,7 +99,6 @@ public class AlphaFineConfigManager implements XMLable {
     private String cacheBuildNO;
 
 
-    // todo 暂不持久化 方便测试
     /**
      * key: 登录的bbs用户
      * value: alphaFine历史搜索记录
@@ -154,6 +153,10 @@ public class AlphaFineConfigManager implements XMLable {
         } else if (reader.isChildNode()) {
             if (ComparatorUtils.equals(reader.getTagName(), "ActionSearchTextCache")) {
                 readActionSearchTextCacheXML(reader);
+            } else if ("SearchHistory".equals(reader.getTagName())) {
+                readHistorySearch(reader);
+            } else if ("ReadSet".equals(reader.getTagName())) {
+                readReadSet(reader);
             }
         }
     }
@@ -180,6 +183,53 @@ public class AlphaFineConfigManager implements XMLable {
         });
     }
 
+    private void readHistorySearch(XMLableReader reader) {
+        reader.readXMLObject(new XMLReadable() {
+            @Override
+            public void readXML(XMLableReader xmLableReader) {
+                if (ComparatorUtils.equals(reader.getTagName(), "history")) {
+                    String tmpVal = reader.getElementValue();
+                    if (tmpVal != null) {
+                        tmpVal = tmpVal.replace("[",StringUtils.EMPTY).replace("]",StringUtils.EMPTY);
+                        Stack<String> stack = new SizedStack<>(3);
+                        String[] historyList = tmpVal.split(",");
+                        for (String history : historyList) {
+                            String value = history.trim();
+                            if (StringUtils.isNotEmpty(value)) {
+                                stack.add(value);
+                            }
+                        }
+                        historySearchMap.put(reader.getAttrAsString("user", StringUtils.EMPTY), stack);
+                    }
+                }
+            }
+        });
+    }
+
+
+    private void readReadSet(XMLableReader reader) {
+        reader.readXMLObject(new XMLReadable() {
+            @Override
+            public void readXML(XMLableReader xmLableReader) {
+                if (ComparatorUtils.equals(reader.getTagName(), "readId")) {
+                    String tmpVal = reader.getElementValue();
+                    if (tmpVal != null) {
+                        tmpVal = tmpVal.replace("[",StringUtils.EMPTY).replace("]",StringUtils.EMPTY);
+                        String[] idArr = tmpVal.split(",");
+                        Set<Long> setId = new HashSet<>();
+                        for (String id : idArr) {
+                            String value = id.trim();
+                            if (StringUtils.isNotEmpty(value)) {
+                                setId.add(Long.parseLong(value));
+                            }
+                        }
+                        readSetMap.put(reader.getAttrAsString("user", StringUtils.EMPTY), setId);
+                    }
+                }
+            }
+        });
+    }
+
     @Override
     public void writeXML(XMLPrintWriter writer) {
         writer.startTAG("AlphaFineConfigManager");
@@ -198,6 +248,8 @@ public class AlphaFineConfigManager implements XMLable {
                 .attr("needIntelligentCustomerService", this.isNeedIntelligentCustomerService())
                 .attr("productDynamics", this.isProductDynamics());
         writeActionSearchTextCacheXML(writer);
+        writeSearchHistory(writer);
+        writeReadSet(writer);
         writer.end();
     }
 
@@ -212,6 +264,22 @@ public class AlphaFineConfigManager implements XMLable {
         writer.end();
     }
 
+    private void writeSearchHistory(XMLPrintWriter writer) {
+        writer.startTAG("SearchHistory");
+        for (Map.Entry<String, Stack<String>> entry : historySearchMap.entrySet()) {
+            writer.startTAG("history").attr("user", entry.getKey()).textNode(entry.getValue().toString()).end();
+        }
+        writer.end();
+    }
+
+    private void writeReadSet(XMLPrintWriter writer) {
+        writer.startTAG("ReadSet");
+        for (Map.Entry<String, Set<Long>> entry : readSetMap.entrySet()) {
+            writer.startTAG("readId").attr("user", entry.getKey()).textNode(entry.getValue().toString()).end();
+        }
+        writer.end();
+    }
+
     public boolean isSearchOnLine() {
         return searchOnLine;
     }

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineUtil.java

@@ -18,9 +18,7 @@ public class AlphaFineUtil {
         }
         for (String string : strings) {
             String primaryStr = getReplacedString(modelName, string);
-//            modelName = escapeExprSpecialWord(modelName);
             if (StringUtils.isNotEmpty(primaryStr)) {
-//                primaryStr = escapeExprSpecialWord(primaryStr);
                 modelName = modelName.replaceAll("(?i)" + primaryStr, "|<font color=" + AlphaFineConstants.HIGH_LIGHT_COLOR + ">" + primaryStr + "</font>|");
             }
         }
@@ -34,6 +32,10 @@ public class AlphaFineUtil {
 
 
     private static String getReplacedString(String modelName, String string) {
+        // 如果是直接包含了高亮字符 返回
+        if (StringUtils.contains(modelName, string)) {
+            return string;
+        }
         //需要考虑modelName有空格的情况
         //比如现在是work boo k 搜索词是workb,应该要替换的部分是work b
         //先去掉已经匹配替换过的部分,因为考虑到分词的情况,可能会进行多次替换
@@ -48,7 +50,7 @@ public class AlphaFineUtil {
         StringBuilder result = new StringBuilder();
         int count = 0;
         while (count < string.length()) {
-            char pos = noBlackName.charAt(index++);
+            char pos = modelName.charAt(index++);
             result.append(pos);
             count += pos == ' ' ? 0 : 1;
         }
@@ -67,7 +69,6 @@ public class AlphaFineUtil {
         return keyword;
     }
 
-
     public static boolean unread() {
         Set<Long> readSet = DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().getReadSet();
         Set<Long> idSet = ProductNewsSearchManager.getInstance().getIdSet();

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineFrame.java

@@ -77,6 +77,18 @@ import javax.swing.Timer;
 public class AlphaFineFrame extends JFrame {
 
     private static final String ADVANCED_SEARCH_MARK = "k:";
+    private static final String ACTION_MARK_SHORT = "k:1 ";
+    private static final String ACTION_MARK = "k:setting ";
+    private static final String DOCUMENT_MARK_SHORT = "k:2 ";
+    private static final String DOCUMENT_MARK = "k:help ";
+    private static final String FILE_MARK_SHORT = "k:3 ";
+    private static final String FILE_MARK = "k:reportlets ";
+    private static final String CPT_MARK = "k:cpt ";
+    private static final String FRM_MARK = "k:frm ";
+    private static final String DS_MARK = "k:ds ";
+    private static final String DS_NAME = "dsname=\"";
+    private static final String PLUGIN_MARK_SHORT = "k:4 ";
+    private static final String PLUGIN_MARK = "k:shop ";
 
     private static final int TIMER_DELAY = 300;
 
@@ -282,6 +294,7 @@ public class AlphaFineFrame extends JFrame {
             @Override
             public void mousePressed(MouseEvent e) {
                 searchTextField.setText(StringUtils.EMPTY);
+                beforeSearchStr = StringUtils.EMPTY;
                 clearLabel.setVisible(false);
             }
         });
@@ -354,27 +367,26 @@ public class AlphaFineFrame extends JFrame {
 
         JPanel tabPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 20, 10));
         tabPane.setBackground(Color.WHITE);
-        List<SelectedLabel> selectedLabelList = new ArrayList<>();
-        AlphaFineConfigManager alphaFineConfigManager = DesignerEnvManager.getEnvManager().getAlphaFineConfigManager();
-        if (alphaFineConfigManager.isProductDynamics()) {
-            selectedLabelList.add(new SelectedLabel(PRODUCT_NEWS, CellType.PRODUCT_NEWS, true));
-        }
-        if (alphaFineConfigManager.isContainAction()) {
-            selectedLabelList.add(new SelectedLabel(SETTING, CellType.ACTION));
-        }
-        if (alphaFineConfigManager.isContainFileContent() || alphaFineConfigManager.isContainTemplate()) {
-            selectedLabelList.add(new SelectedLabel(TEMPLATES, CellType.FILE));
+        List<SelectedLabel> selectedLabelList = createSelectedLabelList();
+        selectedType = selectedLabelList.get(0).getCellType();
+        // 第一个tab 非产品动态
+        if (selectedType != CellType.PRODUCT_NEWS) {
+            tabLabel.setText(selectedLabelList.get(0).getText());
+            readLabel.setVisible(false);
         }
-        if (alphaFineConfigManager.isContainDocument()) {
-            selectedLabelList.add(new SelectedLabel(HELP, CellType.DOCUMENT));
+        for (SelectedLabel selectedLabel : selectedLabelList) {
+            selectedLabel.addMouseListener(createMouseListener(selectedLabelList, selectedLabel, tabPane, tabLabel, readLabel));
+            tabPane.add(selectedLabel);
         }
-        if (alphaFineConfigManager.isContainPlugin()) {
-            selectedLabelList.add(new SelectedLabel(PLUGIN, CellType.PLUGIN));
+        showPane.add(tabPane, BorderLayout.NORTH);
+        showPane.add(labelPane, BorderLayout.CENTER);
+        showPane.add(resultPane, BorderLayout.SOUTH);
+        return showPane;
     }
-        selectedType = selectedLabelList.get(0).getCellType();
-        for (SelectedLabel selectedLabel : selectedLabelList) {
 
-            selectedLabel.addMouseListener(new MouseAdapter() {
+    private MouseAdapter createMouseListener(List<SelectedLabel> selectedLabelList, SelectedLabel selectedLabel,
+                                             JPanel tabPane, UILabel tabLabel, UILabel readLabel) {
+        return new MouseAdapter() {
             @Override
             public void mousePressed(MouseEvent e) {
                 for (SelectedLabel label : selectedLabelList) {
@@ -432,13 +444,28 @@ public class AlphaFineFrame extends JFrame {
             public void mouseExited(MouseEvent e) {
                 selectedLabel.setForeground(defaultColor);
             }
-            });
-            tabPane.add(selectedLabel);
+        };
     }
-        showPane.add(tabPane, BorderLayout.NORTH);
-        showPane.add(labelPane, BorderLayout.CENTER);
-        showPane.add(resultPane, BorderLayout.SOUTH);
-        return showPane;
+
+    private List<SelectedLabel> createSelectedLabelList() {
+        List<SelectedLabel> selectedLabelList = new ArrayList<>();
+        AlphaFineConfigManager alphaFineConfigManager = DesignerEnvManager.getEnvManager().getAlphaFineConfigManager();
+        if (alphaFineConfigManager.isProductDynamics()) {
+            selectedLabelList.add(new SelectedLabel(PRODUCT_NEWS, CellType.PRODUCT_NEWS, true));
+        }
+        if (alphaFineConfigManager.isContainAction()) {
+            selectedLabelList.add(new SelectedLabel(SETTING, CellType.ACTION));
+        }
+        if (alphaFineConfigManager.isContainFileContent() || alphaFineConfigManager.isContainTemplate()) {
+            selectedLabelList.add(new SelectedLabel(TEMPLATES, CellType.FILE));
+        }
+        if (alphaFineConfigManager.isContainDocument()) {
+            selectedLabelList.add(new SelectedLabel(HELP, CellType.DOCUMENT));
+        }
+        if (alphaFineConfigManager.isContainPlugin()) {
+            selectedLabelList.add(new SelectedLabel(PLUGIN, CellType.PLUGIN));
+        }
+        return selectedLabelList;
     }
 
     private void fireOneClickRead() {
@@ -543,6 +570,8 @@ public class AlphaFineFrame extends JFrame {
                 if (StringUtils.isNotEmpty(searchTextField.getText())) {
                     clearLabel.setVisible(true);
                     SearchTooltipPopup.getInstance().show(searchTextFieldWrapperPane);
+                } else {
+                    beforeSearchStr = StringUtils.EMPTY;
                 }
                 AlphaFineToolTipList alphaFineToolTipList = SearchTooltipPopup.getInstance().getAlphaFineToolTipList();
                 if (e.getKeyCode() == KeyEvent.VK_ENTER) {
@@ -590,6 +619,7 @@ public class AlphaFineFrame extends JFrame {
                 SearchTooltipPopup.getInstance().hide();
                 clearLabel.setVisible(false);
                 switchType(selectedType);
+                beforeSearchStr = StringUtils.EMPTY;
             } else if (searchTextField.hasFocus()) {
                 clearLabel.setVisible(true);
                 SearchTooltipPopup.getInstance().show(searchTextFieldWrapperPane);
@@ -659,7 +689,7 @@ public class AlphaFineFrame extends JFrame {
 
     private void doSearch(String text) {
         initSearchLoadingPane();
-        SearchTextBean searchTextBean = new SearchTextBean(text, segmentationResult);
+        SearchTextBean searchTextBean = generateSearchTextBean(text);
         this.productNewsSearchWorkerManager.doSearch(searchTextBean);
         this.settingSearchWorkerManager.doSearch(searchTextBean);
         this.fileSearchWorkerManager.doSearch(searchTextBean);
@@ -667,6 +697,21 @@ public class AlphaFineFrame extends JFrame {
         this.pluginSearchWorkerManager.doSearch(searchTextBean);
     }
 
+    private SearchTextBean generateSearchTextBean(String searchText) {
+        if (searchText.startsWith(ACTION_MARK_SHORT) || searchText.startsWith(ACTION_MARK)
+                || searchText.startsWith(DOCUMENT_MARK_SHORT) || searchText.startsWith(DOCUMENT_MARK)) {
+            return new SearchTextBean(StringUtils.EMPTY, new String[]{getStoreText(searchText)});
+        } else if (searchText.startsWith(FILE_MARK_SHORT) || searchText.startsWith(FILE_MARK)
+                || searchText.startsWith(CPT_MARK) || searchText.startsWith(FRM_MARK)
+                || searchText.startsWith(PLUGIN_MARK_SHORT) || searchText.startsWith(PLUGIN_MARK)) {
+            return new SearchTextBean(getStoreText(searchText), new String[]{getStoreText(searchText)});
+        } else if (searchText.startsWith(DS_MARK)) {
+            return new SearchTextBean(getStoreText(searchText), new String[]{DS_NAME + getStoreText(searchText)});
+        }   else {
+            return new SearchTextBean(searchText, segmentationResult == null ? new String[]{} : segmentationResult);
+        }
+    }
+
     /**
      * 仅搜索依赖网络的搜索项
      *
@@ -772,6 +817,9 @@ public class AlphaFineFrame extends JFrame {
     public void setVisible(boolean b) {
         super.setVisible(b);
         QuestionWindow.getInstance().setVisible(!b);
+        if (!b) {
+            AlphaFineHelper.resetAlphaFineDialog();
+        }
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineList.java

@@ -3,6 +3,7 @@ package com.fr.design.mainframe.alphafine.component;
 import com.fr.design.mainframe.alphafine.AlphaFineConstants;
 import com.fr.design.mainframe.alphafine.AlphaFineHelper;
 import com.fr.design.mainframe.alphafine.cell.model.AlphaCellModel;
+import com.fr.design.mainframe.alphafine.cell.model.DocumentModel;
 import com.fr.design.mainframe.alphafine.preview.ResultShowPane;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
@@ -26,7 +27,10 @@ public class AlphaFineList extends JList<AlphaCellModel> {
                 AlphaCellModel selectedValue = getSelectedValue();
                 if (e.getClickCount() == AlphaFineConstants.DEFAULT_CLICK_COUNT && selectedValue.hasAction()) {
                     // 点击搜索结果 主页面移动到后面
+                    if (!(selectedValue instanceof DocumentModel)) {
+                        // 帮助文档不跳转
                         AlphaFineHelper.getAlphaFineDialog().toBack();
+                    }
                     dealWithSearchResult();
                 }
             }
@@ -45,6 +49,10 @@ public class AlphaFineList extends JList<AlphaCellModel> {
             @Override
             public void keyPressed(KeyEvent e) {
                 if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+                    AlphaCellModel selectedValue = getSelectedValue();
+                    if (selectedValue.hasAction() && !(selectedValue instanceof DocumentModel)) {
+                        AlphaFineHelper.getAlphaFineDialog().toBack();
+                    }
                     dealWithSearchResult();
                 }
             }

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/question/QuestionPane.java

@@ -3,6 +3,7 @@ package com.fr.design.mainframe.alphafine.question;
 import com.fr.base.svg.SVGIcon;
 import com.fr.base.svg.SVGLoader;
 import com.fr.base.svg.SystemScaleUtils;
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.mainframe.alphafine.AlphaFineUtil;
 import com.fr.design.utils.SvgPaintUtils;
 import java.awt.Color;
@@ -38,7 +39,7 @@ public class QuestionPane extends JPanel {
         int width = SystemScaleUtils.isJreHiDPIEnabled() ? (int) (getWidth() * SVGIcon.SYSTEM_SCALE) : getWidth();
         int height = SystemScaleUtils.isJreHiDPIEnabled() ? (int) (getHeight() * SVGIcon.SYSTEM_SCALE) : getHeight();
 
-        if (AlphaFineUtil.unread()) {
+        if (AlphaFineUtil.unread() && DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isProductDynamics()) {
             g2.drawImage(NEW_MESSAGE_IMAGE, 0, 0, this);
         } else {
             g2.drawImage(QUESTION_BACKGROUND_IMAGE, 0, 0, this);