|
@@ -44,16 +44,26 @@ public class SprayTimeServiceImpl implements ISprayTimeService {
|
|
|
String[] sprayTimeArray = sprayTimeEntity.getOpenTime().split(":");
|
|
|
timeBuilder.append(sprayTimeArray[0]+sprayTimeArray[1]);
|
|
|
}else{
|
|
|
- log.error("开始时间为null或为空.");
|
|
|
+ log.error("开始时间[open_time]为null或为空.");
|
|
|
}
|
|
|
//持续时间
|
|
|
- if(sprayTimeEntity.getDuration() != null && sprayTimeEntity.getDuration() > 0){
|
|
|
+// if(sprayTimeEntity.getDuration() != null && sprayTimeEntity.getDuration() > 0){
|
|
|
+// if(timeBuilder.length()>0){
|
|
|
+// timeBuilder.append(",");
|
|
|
+// }
|
|
|
+// timeBuilder.append(sprayTimeEntity.getDuration());
|
|
|
+// }else{
|
|
|
+// log.error("持续时间为null或为空.");
|
|
|
+// }
|
|
|
+ //结束时间
|
|
|
+ if(sprayTimeEntity.getCloseTime()!= null && sprayTimeEntity.getCloseTime().trim().length() > 0){
|
|
|
if(timeBuilder.length()>0){
|
|
|
timeBuilder.append(",");
|
|
|
}
|
|
|
- timeBuilder.append(sprayTimeEntity.getDuration());
|
|
|
+ String[] closeTimeArray = sprayTimeEntity.getCloseTime().split(":");
|
|
|
+ timeBuilder.append(closeTimeArray[0]+closeTimeArray[1]);
|
|
|
}else{
|
|
|
- log.error("持续时间为null或为空.");
|
|
|
+ log.error("结束时间[close_time]为null或为空.");
|
|
|
}
|
|
|
//开关时长
|
|
|
if(sprayTimeEntity.getOpenMode() != null && sprayTimeEntity.getOpenMode().trim().length() > 0){
|