Merge remote-tracking branch 'origin/v7.0_small_version_fix_20231120' into test

performance-web/src/main/java/com/clx/performance/service/impl/LargeScreenServiceImpl.java

@@ -68,6 +68,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
         List<String> list = orderChildList.stream().map(OrderChild::getTruckNo).collect(Collectors.toList());
         List<JSONObject> result = new LinkedList<>();
         int index = 0;
+        String s = "<div><div><spanstyle='color:#999;display:inline-block;width:96px;text-align:right;'>车牌号：</span><spanstyle='color:#000;'>truckNo</span></div><div></div></div>";
         for (String truckNo : data) {
             if (list.contains(truckNo)) {
                 continue;
@@ -83,7 +84,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
                 jsonObject.set("id", ++index);
                 jsonObject.set("lng", longitude);
                 jsonObject.set("lat", latitude);
-                jsonObject.set("info", "");
+                jsonObject.set("info", s.replace("truckNo", truckNo));
                 jsonObject.set("value", "");
                 jsonObject.set("iconField", "ok");
                 result.add(jsonObject);
@@ -106,6 +107,8 @@ public class LargeScreenServiceImpl implements LargeScreenService {
         List<String> list = orderChildList.stream().map(OrderChild::getTruckNo).collect(Collectors.toList());
         List<JSONObject> result = new LinkedList<>();
         int index = 0;
+        String s = "<div><div><spanstyle='color:#999;display:inline-block;width:96px;text-align:right;'>车牌号：</span><spanstyle='color:#000;'>truckNo</span></div><div></div></div>";
+
         for (String truckNo : data) {
             if (!list.contains(truckNo)) {
                 continue;
@@ -121,7 +124,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
                 jsonObject.set("id", ++index);
                 jsonObject.set("lng", longitude);
                 jsonObject.set("lat", latitude);
-                jsonObject.set("info", "");
+                jsonObject.set("info", s.replace("truckNo", truckNo));
                 jsonObject.set("value", "");
                 jsonObject.set("iconField", "ok");
                 result.add(jsonObject);