Merge branch 'dev' into pre-production

blade-service-api/logpm-data-sharing-api/src/main/java/com/logpm/datasharing/vo/NodeInfoVO.java

@@ -57,4 +57,5 @@ public class NodeInfoVO implements Serializable {
 	@ApiModelProperty(value = "操作计划时间")
 	private Date operatePlanTime;
 
+
 }

blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java

@@ -223,6 +223,10 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
 
 		}
 		if(!nodeInfoVOList.isEmpty() ){
+			for (NodeInfoVO infoVO : nodeInfoVOList) {
+				log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
+				log.info("infoVO {}",infoVO.toString());
+			}
 			nodeInfoVOList.sort(Comparator.comparing(NodeInfoVO::getOperateTime).reversed());
 		}
 		//对nodeInfoVOList集合中的作业时间 按照 时间倒序排序
@@ -397,6 +401,12 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
 		}
 
 		if(!nodeInfoVOList.isEmpty() ){
+
+			for (NodeInfoVO infoVO : nodeInfoVOList) {
+				log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
+				log.info("infoVO {}",infoVO.toString());
+			}
+
 			nodeInfoVOList.sort(Comparator.comparing(NodeInfoVO::getOperateTime).reversed());
 		}
 		result.setNodeInfoVOList(nodeInfoVOList);