|
@@ -16,6 +16,7 @@ import com.fdkankan.manage.service.ICommonService;
|
|
|
import com.fdkankan.manage.service.IMqSendLogService;
|
|
|
import com.fdkankan.manage.service.IScenePlusExtService;
|
|
|
import com.fdkankan.manage.service.IScenePlusService;
|
|
|
+import com.fdkankan.manage.util.SceneStatusUtil;
|
|
|
import com.fdkankan.manage.vo.response.SceneVo;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -119,10 +120,12 @@ public class OverallController {
|
|
|
}
|
|
|
|
|
|
}
|
|
|
+ obj.put("statusString", SceneStatusUtil.getOverallStatusString(obj.getInteger("calcStatus")));
|
|
|
|
|
|
if(mqSendLogMap!=null){
|
|
|
MqSendLog mqSendLog = mqSendLogMap.get(num);
|
|
|
if(mqSendLog != null){
|
|
|
+ obj.put("statusString","排队中");
|
|
|
obj.put("calcStatus",-4);
|
|
|
}
|
|
|
}
|