|
|
@@ -22,6 +22,7 @@ public class AppletsLinkUtil {
|
|
|
*/
|
|
|
public static final Pattern pattern1 = Pattern.compile("/cmpage/info-1");
|
|
|
public static final Pattern pattern34 = Pattern.compile("/topic.html");
|
|
|
+ public static final Pattern pattern34_1 = Pattern.compile("/topic-");
|
|
|
/**
|
|
|
* 2项目仪器详情
|
|
|
*/
|
|
|
@@ -141,7 +142,7 @@ public class AppletsLinkUtil {
|
|
|
*/
|
|
|
public static Integer getLinkType(String link) {
|
|
|
if (StringUtils.isNotEmpty(link)) {
|
|
|
- if (pattern1.matcher(link).find() || pattern34.matcher(link).find()) {
|
|
|
+ if (pattern1.matcher(link).find() || pattern34.matcher(link).find() || pattern34_1.matcher(link).find()) {
|
|
|
return 1;
|
|
|
} else if (pattern2.matcher(link).find() || pattern6.matcher(link).find() || pattern6_1.matcher(link).find()) {
|
|
|
return 2;
|
|
|
@@ -222,7 +223,7 @@ public class AppletsLinkUtil {
|
|
|
map.put("id", split3[0]);
|
|
|
}
|
|
|
} else if (linkType == 1 || linkType == 2 || linkType == 4 || linkType == 7) {
|
|
|
- if (pattern1.matcher(link).find() || pattern2.matcher(link).find() || pattern6_1.matcher(link).find() || pattern8_1.matcher(link).find() || pattern4.matcher(link).find() || pattern7.matcher(link).find() || pattern10.matcher(link).find() || pattern33_1.matcher(link).find()) {
|
|
|
+ if (pattern1.matcher(link).find() || pattern2.matcher(link).find() || pattern6_1.matcher(link).find() || pattern8_1.matcher(link).find() || pattern4.matcher(link).find() || pattern7.matcher(link).find() || pattern10.matcher(link).find() || pattern33_1.matcher(link).find() || pattern34_1.matcher(link).find()) {
|
|
|
//-{id}.html
|
|
|
if (split3 != null && split3.length == 2) {
|
|
|
map.put("id", split3[0]);
|
chao