Skip to content

A
amos-boot-zx-biz
Commit 8dd0ffbf authored by lilongyang's avatar lilongyang
Browse files
Options

Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

parents d1d7a071 42eac343
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TDBigScreenAnalyseController.java
View file @ 8dd0ffbf
...@@ -804,11 +804,15 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl ...@@ -804,11 +804,15 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
// String replace3 = CharSequenceUtil.replace(replace2, "风机", ""); // String replace3 = CharSequenceUtil.replace(replace2, "风机", "");
String equipmentName = item.get("equipmentName").toString(); String equipmentName = item.get("equipmentName").toString();
String str1 = equipmentName.substring(0, equipmentName.indexOf("#")); if(StrUtil.isNotEmpty(equipmentName)&&equipmentName.contains("#")){
String str2 = equipmentName.substring(str1.length() + 1, equipmentName.length()); String str1 = equipmentName.substring(0, equipmentName.indexOf("#"));
String str3 = CharSequenceUtil.replace(str2, "风机", ""); String str2 = equipmentName.substring(str1.length() + 1, equipmentName.length());
String str3 = CharSequenceUtil.replace(str2, "风机", "");
item.put("equipmentNameSimple", str3);
}else {
item.put("equipmentNameSimple", equipmentName);
}
item.put("equipmentNameSimple", str3);
}); });
Page<Map<String, Object>> mapPage = new Page<>(); Page<Map<String, Object>> mapPage = new Page<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment