1

src/main/java/com/fdkankan/manage/controller/OverallController.java

@@ -133,9 +133,10 @@ public class OverallController {
                     obj.put("algorithmTime",ext.getAlgorithmTime());
                     obj.put("gps",ext.getGps());
                     obj.put("addressComponent",commonService.getAddressComponent(ext.getGps()));
+                    obj.put("shootCount",ext.getShootCount());
                 }
             }
-            obj.put("statusString", SceneStatusUtil.getOverallStatusString(obj.getInteger("calcStatus")));
+            obj.put("statusString", SceneStatusUtil.getOverallStatusString(obj.getInteger("payStatus"),obj.getInteger("calcStatus")));
 
             if(mqSendLogMap!=null){
                 MqSendLog mqSendLog = mqSendLogMap.get(num);

src/main/java/com/fdkankan/manage/util/SceneStatusUtil.java

@@ -23,13 +23,17 @@ public class SceneStatusUtil {
     }
 
 
-    public static String getOverallStatusString(Integer calcStatus) {
-        if(calcStatus == null){
+    public static String getOverallStatusString(Integer payStatus,Integer calcStatus) {
+        if(calcStatus == null || payStatus == null){
             return "";
         }
         switch (calcStatus){
             case 0: return "计算中";
-            case 1: return "计算成功";
+            case 1:
+                if(payStatus != 1){
+                    return  "封存";
+                }
+                return "计算成功";
             case -1: return "计算失败";
             default: return "";
         }