Commit 840c1e5d authored by tianbo's avatar tianbo

96333救援时长修改

parent 74a95085
...@@ -6,7 +6,6 @@ import org.eclipse.paho.client.mqttv3.MqttMessage; ...@@ -6,7 +6,6 @@ import org.eclipse.paho.client.mqttv3.MqttMessage;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.typroject.tyboot.component.emq.EmqxListener; import org.typroject.tyboot.component.emq.EmqxListener;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
/** /**
* @Description: 气瓶充装信息mqtt监听服务 * @Description: 气瓶充装信息mqtt监听服务
...@@ -23,8 +22,8 @@ public class FillingRecordSyncListener extends EmqxListener { ...@@ -23,8 +22,8 @@ public class FillingRecordSyncListener extends EmqxListener {
@Override @Override
public void processMessage(String topic, MqttMessage message) throws Exception { public void processMessage(String topic, MqttMessage message) throws Exception {
System.out.println(message); System.out.println(message);
if (!ValidationUtil.isEmpty(message.toString())) { // if (!ValidationUtil.isEmpty(message.toString())) {
cylinderInfoService.synUnitFillingCheckData(); // cylinderInfoService.synUnitFillingCheckData();
} // }
} }
} }
...@@ -100,8 +100,8 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu ...@@ -100,8 +100,8 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
rescueProcessDto.setIsTimeout(arriveTimes < 1800000 ? false : true); rescueProcessDto.setIsTimeout(arriveTimes < 1800000 ? false : true);
} }
// 救援时长 用完成时间减去到达时间 // 救援时长 用完成时间减去到达时间
if(rescueTime != null && dispatchTime != null) { if(rescueTime != null && arriveTime != null) {
String hms = DateUtils.getTimeDiffString(arriveTime, dispatchTime); String hms = DateUtils.getTimeDiffString(rescueTime, arriveTime);
rescueProcessDto.setArriveUseTime(hms); rescueProcessDto.setArriveUseTime(hms);
} }
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
......
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