| | |
| | | import lombok.AllArgsConstructor; |
| | | import lombok.extern.slf4j.Slf4j; |
| | | import org.springblade.core.mp.base.BizServiceImpl; |
| | | import org.springblade.core.tool.utils.DateUtil; |
| | | import org.springblade.core.tool.utils.Func; |
| | | import org.springblade.mdm.basesetting.machine.entity.Machine; |
| | | import org.springblade.mdm.basesetting.machine.service.MachineService; |
| | |
| | | * @param time |
| | | */ |
| | | public void mergeNodeToHisGeTime(Date time) { |
| | | List<NcNode> nodes = ncNodeService.lambdaQuery().ge(NcNode::getUpdateTime,time) |
| | | Date okTime = DateUtil.minusSeconds(time,10);//避免mysql数据库时间不精确导致不能同步 |
| | | List<NcNode> nodes = ncNodeService.lambdaQuery().ge(NcNode::getUpdateTime,okTime) |
| | | .in(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE,NcNode.TYPE_PROGRAM_FILE).list(); |
| | | |
| | | for(NcNode node : nodes){ |
| | |
| | | ncNodeService.deleteOldEditionNodeData(); |
| | | } |
| | | |
| | | /** |
| | | * 查询偏离单的序号 |
| | | * @param programPkgNode 偏离单的程序包名节点 |
| | | * @return 序号 |
| | | */ |
| | | public long getDeviationSerialForNode(NcNodeHis programPkgNode) { |
| | | return lambdaQuery().eq(NcNodeHis::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE) |
| | | .eq(NcNodeHis::getName,programPkgNode.getName()) |
| | | |
| | | .eq(NcNodeHis::getDrawingNo,programPkgNode.getDrawingNo()) |
| | | .eq(NcNodeHis::getProcessNo,programPkgNode.getProcessNo()) |
| | | .eq(NcNodeHis::getProcessEdition,programPkgNode.getProcessEdition()) |
| | | |
| | | .isNotNull(NcNodeHis::getDeviation) |
| | | .le(NcNodeHis::getCreateTime,programPkgNode.getCreateTime()) //时间小于等于当前节点 |
| | | .count(); |
| | | } |
| | | |
| | | /** |
| | | * 查询节点的历史列表(节点的上级节点”程序包名“因为存在多个版本,所以历史记录也需要根据不同版本程序包名进行查询) |