|
@@ -22,7 +22,6 @@ import com.lantone.qc.pub.model.label.PastLabel;
|
|
|
import com.lantone.qc.pub.model.label.PresentLabel;
|
|
|
import com.lantone.qc.pub.model.vo.EzAnalysisVO;
|
|
|
import com.lantone.qc.pub.res.EzAnalysisDTO;
|
|
|
-import com.lantone.qc.pub.util.FileUtil;
|
|
|
import com.lantone.qc.pub.util.ListUtil;
|
|
|
import com.lantone.qc.pub.util.StringUtil;
|
|
|
import com.lantone.qc.trans.beilun.util.ez.EzXmlAnalysis;
|
|
@@ -61,7 +60,7 @@ public class EZAnalysis {
|
|
|
|
|
|
public List<EzAnalysisDTO> anlysis(EzAnalysisVO ezAnalysisVO) throws Exception {
|
|
|
List<EzAnalysisDTO> details = Lists.newArrayList();
|
|
|
-// ezAnalysisVO.setXml(bom(FileUtil.fileRead("C:\\Users\\Administrator\\Desktop\\恩泽\\eztest.txt")));
|
|
|
+ // ezAnalysisVO.setXml(bom(FileUtil.fileRead("C:\\Users\\Administrator\\Desktop\\恩泽\\eztest.txt")));
|
|
|
Map<String, String> sourceMap = EzXmlAnalysis.analysisEk(ezAnalysisVO.getDeptName(), ezAnalysisVO.getXml());
|
|
|
InputInfo inputInfo = ai(sourceMap);
|
|
|
structHandle(inputInfo, sourceMap);
|
|
@@ -82,8 +81,10 @@ public class EZAnalysis {
|
|
|
if (modelValue == null) {
|
|
|
return "";
|
|
|
}
|
|
|
- if ((modelValue.endsWith(",") || modelValue.endsWith(","))) {
|
|
|
- modelValue = modelValue.substring(0, modelValue.length() - 1) + "。";
|
|
|
+ if (modelValue.endsWith(",") || modelValue.endsWith(",") || modelValue.endsWith("、")
|
|
|
+ || modelValue.endsWith("(") || modelValue.endsWith("(") || modelValue.endsWith(")")
|
|
|
+ || modelValue.endsWith(")") || modelValue.endsWith("/")) {
|
|
|
+ modelValue = modelValue.substring(0, modelValue.length() - 1);
|
|
|
}
|
|
|
return modelValue;
|
|
|
}
|